diff --git a/phpBB/common.php b/phpBB/common.php
index 6ba17d0c58..894cfd3fc4 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -11,17 +11,6 @@
  *
  ***************************************************************************/
 
-
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *
- ***************************************************************************/
-
 error_reporting  (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
 set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
 
diff --git a/phpBB/config.php b/phpBB/config.php
index c86f982f3d..e9e6ef120c 100644
--- a/phpBB/config.php
+++ b/phpBB/config.php
@@ -11,17 +11,6 @@
  * 
  ***************************************************************************/ 
 
-
-/***************************************************************************  
- *                                                     
- *   This program is free software; you can redistribute it and/or modify    
- *   it under the terms of the GNU General Public License as published by   
- *   the Free Software Foundation; either version 2 of the License, or  
- *   (at your option) any later version.                      
- *                                                          
- * 
- ***************************************************************************/ 
-
 // DB connection config
 // 
 // Uncomment the relevant entry
diff --git a/phpBB/extension.inc b/phpBB/extension.inc
index 89a877d414..2168f7e2c0 100644
--- a/phpBB/extension.inc
+++ b/phpBB/extension.inc
@@ -11,20 +11,10 @@
  * 
  ***************************************************************************/ 
 
-
-/***************************************************************************  
- *                                                     
- *   This program is free software; you can redistribute it and/or modify    
- *   it under the terms of the GNU General Public License as published by   
- *   the Free Software Foundation; either version 2 of the License, or  
- *   (at your option) any later version.                      
- *                                                          
- * 
- ***************************************************************************/ 
 $phpEx = "php";
 $mtime = microtime();
 $mtime = explode(" ",$mtime);
 $mtime = $mtime[1] + $mtime[0];
 $starttime = $mtime;
 
-?>
+?>
\ No newline at end of file
diff --git a/phpBB/faq.php b/phpBB/faq.php
index 26dfa5e070..53d867430f 100644
--- a/phpBB/faq.php
+++ b/phpBB/faq.php
@@ -11,17 +11,6 @@
  *
  ***************************************************************************/
 
-
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modified
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *
- ***************************************************************************/
-
 $phpbb_root_path = "./";
 include($phpbb_root_path . 'extension.inc');
 include($phpbb_root_path . 'common.'.$phpEx);
diff --git a/phpBB/groupcp.php b/phpBB/groupcp.php
index 0b350bdccb..870549048c 100644
--- a/phpBB/groupcp.php
+++ b/phpBB/groupcp.php
@@ -11,17 +11,6 @@
  *
  ***************************************************************************/
 
-
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modified
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *
- ***************************************************************************/
-
 $phpbb_root_path = "./";
 include($phpbb_root_path . 'extension.inc');
 include($phpbb_root_path . 'common.'.$phpEx);
@@ -752,4 +741,4 @@ else
 //
 include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
 
-?>
+?>
\ No newline at end of file
diff --git a/phpBB/index.php b/phpBB/index.php
index 4a406f6d2e..8fe6949070 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -11,16 +11,6 @@
  *
  ***************************************************************************/
 
-
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *
- ***************************************************************************/
 $phpbb_root_path = "./";
 include($phpbb_root_path . 'extension.inc');
 include($phpbb_root_path . 'common.'.$phpEx);
diff --git a/phpBB/login.php b/phpBB/login.php
index 4d619dd6a5..51cf27f76a 100644
--- a/phpBB/login.php
+++ b/phpBB/login.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************  
- *                                 login.php
+ *                                login.php
  *                            -------------------                         
  *   begin                : Saturday, Feb 13, 2001 
  *   copyright            : (C) 2001 The phpBB Group        
@@ -11,16 +11,6 @@
  * 
  ***************************************************************************/ 
 
-
-/***************************************************************************  
- *                                                     
- *   This program is free software; you can redistribute it and/or modify    
- *   it under the terms of the GNU General Public License as published by   
- *   the Free Software Foundation; either version 2 of the License, or  
- *   (at your option) any later version.                      
- *                                                          
- * 
- ***************************************************************************/ 
 $phpbb_root_path = "./";
 include($phpbb_root_path . 'extension.inc');
 include($phpbb_root_path . 'common.'.$phpEx);
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index dbffab15ff..e0e8f71464 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -10,15 +10,6 @@
  *
  ***************************************************************************/
 
-
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- ***************************************************************************/
-
 $phpbb_root_path = "./";
 include($phpbb_root_path . 'extension.inc');
 include($phpbb_root_path . 'common.'.$phpEx);
diff --git a/phpBB/modcp.php b/phpBB/modcp.php
index e8a69f4875..ac7857d7f3 100644
--- a/phpBB/modcp.php
+++ b/phpBB/modcp.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                                modcp.php
+ *                                 modcp.php
  *                            -------------------
  *   begin                : July 4, 2001
  *   copyright            : (C) 2001 The phpBB Group
@@ -11,17 +11,6 @@
  *
  ***************************************************************************/
 
-
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *
- ***************************************************************************/
-
 /**
  * Moderator Control Panel
  *
@@ -828,4 +817,4 @@ switch($mode)
 
 include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
 
-?>
+?>
\ No newline at end of file
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 4882704f5c..184aedebbf 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                                 posting.php
+ *                                posting.php
  *                            -------------------
  *   begin                : Saturday, Feb 13, 2001
  *   copyright            : (C) 2001 The phpBB Group
@@ -11,15 +11,6 @@
  *
  ***************************************************************************/
 
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *
- ***************************************************************************/
 $phpbb_root_path = "./";
 include($phpbb_root_path . 'extension.inc');
 include($phpbb_root_path . 'common.'.$phpEx);
diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php
index c3bd87f305..f603050dad 100644
--- a/phpBB/privmsg.php
+++ b/phpBB/privmsg.php
@@ -11,16 +11,6 @@
  *
  ***************************************************************************/
 
-
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *
- ***************************************************************************/
 $phpbb_root_path = "./";
 include($phpbb_root_path . 'extension.inc');
 include($phpbb_root_path . 'common.'.$phpEx);
diff --git a/phpBB/profile.php b/phpBB/profile.php
index 2a8b205913..02b593e137 100644
--- a/phpBB/profile.php
+++ b/phpBB/profile.php
@@ -11,16 +11,6 @@
  *
  ***************************************************************************/
 
-
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modified
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *
- ***************************************************************************/
 $phpbb_root_path = "./";
 include($phpbb_root_path . 'extension.inc');
 include($phpbb_root_path . 'common.'.$phpEx);
diff --git a/phpBB/search.php b/phpBB/search.php
index cc40e6176f..0a82d307ac 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -11,15 +11,6 @@
  *
  ***************************************************************************/
 
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- ***************************************************************************/
-
 //
 // Massive overhaul for phpBB2,
 // originally based on search code
diff --git a/phpBB/upgrade_20.php b/phpBB/upgrade_20.php
index 7655d37402..22c5e84b19 100644
--- a/phpBB/upgrade_20.php
+++ b/phpBB/upgrade_20.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
-*                           upgrade_20.php  -  description
+*                                upgrade_20.php
 *                              -------------------
 *     begin                : Sat Oct 14 2000
 *     copyright            : (C) 2001 The phpBB Group        
@@ -10,14 +10,6 @@
 * 
 ****************************************************************************/
   
-/***************************************************************************
-*
-*   This program is free software; you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation; either version 2 of the License, or
-*   (at your option) any later version.
-*
-***************************************************************************/
 include('extension.inc');
 include('config.'.$phpEx);
 include('includes/constants.'.$phpEx);
@@ -1006,4 +998,4 @@ else
 }
 ?>
 </BODY>
-</HTML>
+</HTML>
\ No newline at end of file
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index ad8d132cdc..4832b7076d 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *
+ *                               viewforum.php
  *                            -------------------
  *   begin                : Saturday, Feb 13, 2001
  *   copyright            : (C) 2001 The phpBB Group
@@ -11,16 +11,6 @@
  *
  ***************************************************************************/
 
-
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *
- ***************************************************************************/
 $phpbb_root_path = "./";
 include($phpbb_root_path . 'extension.inc');
 include($phpbb_root_path . 'common.'.$phpEx);
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php
index 94af35e9f1..3fd3ff6aa7 100644
--- a/phpBB/viewonline.php
+++ b/phpBB/viewonline.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************  
- *                               viewonline.php
+ *                              viewonline.php
  *                            -------------------                         
  *   begin                : Saturday, Feb 13, 2001 
  *   copyright            : (C) 2001 The phpBB Group        
@@ -11,16 +11,6 @@
  * 
  ***************************************************************************/ 
 
-
-/***************************************************************************  
- *                                                     
- *   This program is free software; you can redistribute it and/or modify    
- *   it under the terms of the GNU General Public License as published by   
- *   the Free Software Foundation; either version 2 of the License, or  
- *   (at your option) any later version.                      
- *                                                          
- * 
- ***************************************************************************/ 
 $phpbb_root_path = "./";
 include($phpbb_root_path . 'extension.inc');
 include($phpbb_root_path . 'common.'.$phpEx);
@@ -122,7 +112,7 @@ if( count($onlinerow_reg) )
 	{
 		if( !eregi("," . $onlinerow_reg[$i]['user_id'], $displayed_userid_list) )
 		{
-			if( $onlinerow_reg[$i]['user_allow_viewonline'] )
+			if( $onlinerow_reg[$i]['user_allow_viewonline'] || $userdata['user_level'] == ADMIN )
 			{
 				$displayed_userid_list .= "," . $onlinerow_reg[$i]['user_id'];
 
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 64db6ef2ac..2ea7ae0473 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -11,15 +11,6 @@
  *
  ***************************************************************************/
 
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *
- ***************************************************************************/
 $phpbb_root_path = "./";
 include($phpbb_root_path . 'extension.inc');
 include($phpbb_root_path . 'common.'.$phpEx);