page header/footer become functions, forum passwords (I know, I know but it appears a popular feature for some reason ... inclusion not yet set in concrete nor complete), various bug fixes (and no doubt new bugs).

git-svn-id: file:///svn/phpbb/trunk@3969 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Paul S. Owen <psotfx@users.sourceforge.net> 2003-05-03 23:58:45 +0000
committer: Paul S. Owen <psotfx@users.sourceforge.net> 2003-05-03 23:58:45 +0000
commit: dac0adead30ed70400a2a22f9439a8184ad479d8 (patch)
tree: 6a04b15e16669a1b6900c550ae06c856c06d09d8 /phpBB/adm
parent: 5b927b016203cf0eb73bc33a787b778b9f614578 (diff)
download: forums-dac0adead30ed70400a2a22f9439a8184ad479d8.tar
forums-dac0adead30ed70400a2a22f9439a8184ad479d8.tar.gz
forums-dac0adead30ed70400a2a22f9439a8184ad479d8.tar.bz2
forums-dac0adead30ed70400a2a22f9439a8184ad479d8.tar.xz
forums-dac0adead30ed70400a2a22f9439a8184ad479d8.zip
21 files changed, 96 insertions, 82 deletions
diff --git a/phpBB/adm/admin_attachments.php b/phpBB/adm/admin_attachments.php
index a48c62fba7..db5181504f 100644
--- a/phpBB/adm/admin_attachments.php
+++ b/phpBB/adm/admin_attachments.php
@@ -159,7 +159,7 @@ switch ($mode)
 
 // Temporary Language Variables
 
-page_header($user->lang[$l_title]);
+adm_page_header($user->lang[$l_title]);
 
 // Search Imagick
 if ($search_imagick)
@@ -847,7 +847,7 @@ if ($mode == 'ext_groups')
 
 <?php
 
-page_footer();
+adm_page_footer();
 
 // Test Settings
 function test_upload(&$error, &$error_msg, $upload_dir, $ftp_path, $ftp_upload_allowed, $create_directory = false)
diff --git a/phpBB/adm/admin_ban.php b/phpBB/adm/admin_ban.php
index 5afade6ff8..f243d359d4 100644
--- a/phpBB/adm/admin_ban.php
+++ b/phpBB/adm/admin_ban.php
@@ -408,7 +408,7 @@ switch ($mode)
 }
 
 // Output page
-page_header($l_title);
+adm_page_header($l_title);
 
 ?>
 
@@ -614,6 +614,6 @@ function display_details(option)
 
 <?php
 
-page_footer();
+adm_page_footer();
 
 ?>
 \ No newline at end of file
diff --git a/phpBB/adm/admin_board.php b/phpBB/adm/admin_board.php
index 45b3b7f01a..e3ad82465a 100644
--- a/phpBB/adm/admin_board.php
+++ b/phpBB/adm/admin_board.php
@@ -112,7 +112,7 @@ if (isset($_POST['submit']))
 	trigger_error($user->lang['Config_updated']);
 }
 
-page_header($user->lang[$l_title]);
+adm_page_header($user->lang[$l_title]);
 
 ?>
 
@@ -655,6 +655,6 @@ switch ($mode)
 
 <?php
 
-page_footer();
+adm_page_footer();
 
 ?>
 \ No newline at end of file
diff --git a/phpBB/adm/admin_database.php b/phpBB/adm/admin_database.php
index 6c07995c5e..e2e999f36f 100644
--- a/phpBB/adm/admin_database.php
+++ b/phpBB/adm/admin_database.php
@@ -81,7 +81,7 @@ switch($mode)
 
 		if (!isset($_POST['backupstart']) && !isset($_GET['backupstart']))
 		{
-			page_header($user->lang['DB_BACKUP']);
+			adm_page_header($user->lang['DB_BACKUP']);
 
 ?>
 
@@ -156,9 +156,9 @@ switch($mode)
 
 			$message = (empty($store_path)) ? $user->lang['Backup_download'] : $user->lang['Backup_writing'];
 
-			page_header($user->lang['DB_Backup'], $meta);
+			adm_page_header($user->lang['DB_Backup'], $meta);
 			page_message($user->lang['DB_Backup'], $message);
-			page_footer();
+			adm_page_footer();
 		}
 
 		$tables = (SQL_LAYER != 'postgresql') ? mysql_get_tables() : pg_get_tables();
@@ -380,7 +380,7 @@ switch($mode)
 		//
 		// Restore page
 		//
-		page_header($user->lang['DB_RESTORE']);
+		adm_page_header($user->lang['DB_RESTORE']);
 
 ?>
 
@@ -430,7 +430,7 @@ switch($mode)
 
 }
 
-page_footer();
+adm_page_footer();
 
 // -----------------------------------------------
 // Begin Functions
diff --git a/phpBB/adm/admin_disallow.php b/phpBB/adm/admin_disallow.php
index af7c7fdf3d..f8f92a699e 100644
--- a/phpBB/adm/admin_disallow.php
+++ b/phpBB/adm/admin_disallow.php
@@ -99,7 +99,7 @@ if ($row = $db->sql_fetchrow($result))
 }
 
 // Output page
-page_header($user->lang['DISALLOW']);
+adm_page_header($user->lang['DISALLOW']);
 
 ?>
 
@@ -160,6 +160,6 @@ page_header($user->lang['DISALLOW']);
 
 <?php
 
-page_footer();
+adm_page_footer();
 
 ?>
 \ No newline at end of file
diff --git a/phpBB/adm/admin_email.php b/phpBB/adm/admin_email.php
index a3c3747cc5..c2c614a644 100644
--- a/phpBB/adm/admin_email.php
+++ b/phpBB/adm/admin_email.php
@@ -150,7 +150,7 @@ if ($row = $db->sql_fetchrow($result))
 }
 $select_list .= '</select>';
 
-page_header($user->lang['Mass_Email']);
+adm_page_header($user->lang['Mass_Email']);
 
 ?>
 
@@ -181,6 +181,6 @@ page_header($user->lang['Mass_Email']);
 
 <?php
 
-page_footer();
+adm_page_footer();
 
 ?>
 \ No newline at end of file
diff --git a/phpBB/adm/admin_forums.php b/phpBB/adm/admin_forums.php
index 4e4c92fa47..f480b122a5 100644
--- a/phpBB/adm/admin_forums.php
+++ b/phpBB/adm/admin_forums.php
@@ -82,8 +82,8 @@ switch ($mode)
 		$enable_prune = (!empty($_POST['enable_prune'])) ? 1 : 0;
 		$prune_days = (isset($_POST['prune_days'])) ? intval($_POST['prune_days']) : 7;
 		$prune_freq = (isset($_POST['prune_freq'])) ? intval($_POST['prune_freq']) : 1;
-		$forum_password = (isset($_POST['forum_password'])) ? intval($_POST['forum_password']) : '';
-		$forum_password_confirm = (isset($_POST['forum_password_confirm'])) ? intval($_POST['forum_password_confirm']) : '';
+		$forum_password = (isset($_POST['forum_password'])) ? htmlspecialchars($_POST['forum_password']) : '';
+		$forum_password_confirm = (isset($_POST['forum_password_confirm'])) ? htmlspecialchars($_POST['forum_password_confirm']) : '';
 
 		if (isset($_POST['update']))
 		{
@@ -271,7 +271,8 @@ switch ($mode)
 
 			$parents_list = make_forum_select($parent_id, $forum_id, false, false, false);
 			$forums_list = make_forum_select($parent_id, $forum_id, false, true, false);
-			
+
+			$forum_password_confirm = $forum_password;
 		}
 		else
 		{
@@ -279,6 +280,19 @@ switch ($mode)
 
 			$forum_id = $parent_id;
 			$parents_list = make_forum_select($parent_id);
+
+			if ($parent_id && !isset($_POST['update']))
+			{
+				$temp_forum_desc = $forum_desc;
+				$temp_forum_name = $forum_name;
+				$temp_forum_type = $forum_type;
+
+				extract(get_forum_info($parent_id));
+				$forum_type = $temp_forum_type;
+				$forum_name = $temp_forum_name;
+				$forum_desc = $temp_forum_desc;
+				$forum_password_confirm = $forum_password;
+			}
 		}
 
 		$forum_type_options = '';
@@ -312,7 +326,7 @@ switch ($mode)
 			$navigation .= ($row['forum_id'] == $forum_id) ? ' -&gt; ' . $row['forum_name'] : ' -&gt; <a href="admin_forums.' . $phpEx . $SID . '&amp;f=' . $row['forum_id'] . '">' . $row['forum_name'] . '</a>';
 		}
 
-		page_header($l_title);
+		adm_page_header($l_title);
 
 ?>
 
@@ -472,11 +486,11 @@ switch ($mode)
 	</tr>
 	<tr>
 		<td class="row1"><?php echo $user->lang['FORUM_PASSWORD'] ?>: <br /><span class="gensmall"><?php echo $user->lang['FORUM_PASSWORD_EXPLAIN']; ?></span></td>
-		<td class="row2"><input type="password" name="forum_password" value="<?php echo $password; ?>" size="25" maxlength="200" /></td>
+		<td class="row2"><input type="password" name="forum_password" value="<?php echo $forum_password; ?>" size="25" maxlength="25" /></td>
 	</tr>
 	<tr>
 		<td class="row1"><?php echo $user->lang['FORUM_PASSWORD_CONFIRM'] ?>: <br /><span class="gensmall"><?php echo $user->lang['FORUM_PASSWORD_CONFIRM_EXPLAIN']; ?></span></td>
-		<td class="row2"><input type="password" name="forum_password_confirm" value="<?php echo $password_confirm; ?>" size="25" maxlength="200" /></td>
+		<td class="row2"><input type="password" name="forum_password_confirm" value="<?php echo $forum_password_confirm; ?>" size="25" maxlength="25" /></td>
 	</tr>
 <?php
 
@@ -492,7 +506,7 @@ switch ($mode)
 
 <?php
 
-		page_footer();
+		adm_page_footer();
 		break;
 
 	case 'delete':
@@ -657,7 +671,7 @@ switch ($mode)
 		}
 	
 
-		page_header($user->lang['MANAGE']);
+		adm_page_header($user->lang['MANAGE']);
 		extract(get_forum_info($forum_id));
 
 		$subforums_id = array();
@@ -733,7 +747,7 @@ switch ($mode)
 </table></form>
 <?php
 
-		page_footer();
+		adm_page_footer();
 		break;
 
 	case 'move_up':
@@ -889,7 +903,7 @@ else
 $forum_box = make_forum_select($forum_id);
 
 // Front end
-page_header($user->lang['MANAGE']);
+adm_page_header($user->lang['MANAGE']);
 
 ?>
 
@@ -994,7 +1008,7 @@ while ($row = $db->sql_fetchrow($result))
 </table></form>
 <?php
 
-page_footer();
+adm_page_footer();
 
 //
 // END
diff --git a/phpBB/adm/admin_groups.php b/phpBB/adm/admin_groups.php
index 308b0df9ad..93a7a61b4a 100644
--- a/phpBB/adm/admin_groups.php
+++ b/phpBB/adm/admin_groups.php
@@ -84,7 +84,7 @@ if (!empty($group_id))
 }
 
 // Page header
-page_header($user->lang['MANAGE']);
+adm_page_header($user->lang['MANAGE']);
 
 // Which page?
 switch ($action)
@@ -906,6 +906,6 @@ function marklist(match, status)
 
 <?php
 
-page_footer();
+adm_page_footer();
 
 ?>
 \ No newline at end of file
diff --git a/phpBB/adm/admin_icons.php b/phpBB/adm/admin_icons.php
index 023b66a8e3..1a8d0322e2 100644
--- a/phpBB/adm/admin_icons.php
+++ b/phpBB/adm/admin_icons.php
@@ -188,7 +188,7 @@ switch ($action)
 		unset($existing_imgs);
 		unset($imglist);
 	
-		page_header($user->lang[$lang]);
+		adm_page_header($user->lang[$lang]);
 
 ?>
 
@@ -274,7 +274,7 @@ function update_image_dimensions()
 </table></form>
 <?php
 
-		page_footer();
+		adm_page_footer();
 		break;
 
 	case 'create':
@@ -495,7 +495,7 @@ function update_image_dimensions()
 				}
 			}
 
-			page_header($user->lang[$lang]);
+			adm_page_header($user->lang[$lang]);
 
 ?>
 <h1><?php echo $user->lang[$lang] ?></h1>
@@ -540,14 +540,14 @@ function update_image_dimensions()
 ?>
 </table></form>
 <?php
-			page_footer();
+			adm_page_footer();
 
 		}
 		break;
 
 	case 'export':
 
-		page_header($user->lang['EXPORT_' . $lang]);
+		adm_page_header($user->lang['EXPORT_' . $lang]);
 		trigger_error(sprintf($user->lang['EXPORT_' . $lang . '_EXPLAIN'], '<a href="admin_icons.' . $phpEx . $SID . '&amp;mode=' . $mode . '&amp;action=send">', '</a>'));
 		break;
 
@@ -625,7 +625,7 @@ function update_image_dimensions()
 		$db->sql_freeresult($result);
 
 		// Output the page
-		page_header($user->lang[$lang]);
+		adm_page_header($user->lang[$lang]);
 
 ?>
 
@@ -716,7 +716,7 @@ function update_image_dimensions()
 
 <?php
 
-		page_footer();
+		adm_page_footer();
 
 		break;
 }
diff --git a/phpBB/adm/admin_permissions.php b/phpBB/adm/admin_permissions.php
index bc505d7a40..2ad92446b4 100644
--- a/phpBB/adm/admin_permissions.php
+++ b/phpBB/adm/admin_permissions.php
@@ -421,7 +421,7 @@ switch ($submit)
 
 
 // Output page header
-page_header($l_title);
+adm_page_header($l_title);
 
 
 // First potential form ... this is for selecting forums, users
@@ -1312,6 +1312,6 @@ if (in_array($submit, array('add_options', 'edit_options', 'presetsave', 'preset
 }
 
 // Output page footer
-page_footer();
+adm_page_footer();
 
 ?>
 \ No newline at end of file
diff --git a/phpBB/adm/admin_phpinfo.php b/phpBB/adm/admin_phpinfo.php
index d918fa9c76..d4583a8631 100644
--- a/phpBB/adm/admin_phpinfo.php
+++ b/phpBB/adm/admin_phpinfo.php
@@ -83,12 +83,12 @@ switch ($layout)
 		break;
 }
 
-page_header($user->lang['PHP_INFO']);
+adm_page_header($user->lang['PHP_INFO']);
 
 echo '<h1>' . $user->lang['PHP_INFO'] . '</h1>';
 echo '<p>' . $user->lang['PHP_INFO_EXPLAIN'] . '</p>';
 echo $output; 
 
-page_footer();
+adm_page_footer();
 
 ?>
 \ No newline at end of file
diff --git a/phpBB/adm/admin_prune.php b/phpBB/adm/admin_prune.php
index 88909384b8..8593625f0f 100644
--- a/phpBB/adm/admin_prune.php
+++ b/phpBB/adm/admin_prune.php
@@ -54,7 +54,7 @@ if (isset($_POST['doprune']))
 	// Convert days to seconds for timestamp functions...
 	$prunedate = time() - ($prunedays * 86400);
 
-	page_header($user->lang['PRUNE']);
+	adm_page_header($user->lang['PRUNE']);
 
 ?>
 
@@ -124,11 +124,11 @@ if (isset($_POST['doprune']))
 
 <?php
 
-	page_footer();
+	adm_page_footer();
 
 }
 
-page_header($user->lang['PRUNE']);
+adm_page_header($user->lang['PRUNE']);
 
 ?>
 
@@ -192,6 +192,6 @@ else
 
 }
 
-page_footer();
+adm_page_footer();
 
 ?>
 \ No newline at end of file
diff --git a/phpBB/adm/admin_prune_users.php b/phpBB/adm/admin_prune_users.php
index ef466b1be5..d7b6bc3235 100644
--- a/phpBB/adm/admin_prune_users.php
+++ b/phpBB/adm/admin_prune_users.php
@@ -62,7 +62,7 @@ if (isset($_POST['prune']))
 
 		$l_message .= '</form>';
 
-		page_header($user->lang['Prune_users']);
+		adm_page_header($user->lang['Prune_users']);
 
 ?>
 
@@ -73,7 +73,7 @@ if (isset($_POST['prune']))
 <?php
 
 		page_message($user->lang['CONFIRM'], $l_message, false);
-		page_footer();
+		adm_page_footer();
 
 	}
 	else if (isset($_POST['confirm']))
@@ -208,7 +208,7 @@ foreach ($find_time as $key => $value)
 //
 //
 //
-page_header($user->lang['Prune_users']);
+adm_page_header($user->lang['Prune_users']);
 
 ?>
 
@@ -255,6 +255,6 @@ page_header($user->lang['Prune_users']);
 
 <?php
 
-page_footer();
+adm_page_footer();
 
 ?>
 \ No newline at end of file
diff --git a/phpBB/adm/admin_ranks.php b/phpBB/adm/admin_ranks.php
index d72447ec3c..b4ff6e9b9f 100644
--- a/phpBB/adm/admin_ranks.php
+++ b/phpBB/adm/admin_ranks.php
@@ -98,7 +98,7 @@ if ($mode != '')
 			$rank_info['rank_special'] = 0;
 		}
 
-		page_header($user->lang['RANKS']);
+		adm_page_header($user->lang['RANKS']);
 
 ?>
 
@@ -133,7 +133,7 @@ if ($mode != '')
 
 <?php
 
-		page_footer();
+		adm_page_footer();
 
 	}
 	else if ($mode == 'save')
@@ -218,7 +218,7 @@ if ($mode != '')
 	}
 }
 
-page_header($user->lang['RANKS']);
+adm_page_header($user->lang['RANKS']);
 
 ?>
 
@@ -268,6 +268,6 @@ if ($row = $db->sql_fetchrow($result))
 
 <?php
 
-page_footer();
+adm_page_footer();
 
 ?>
 \ No newline at end of file
diff --git a/phpBB/adm/admin_search.php b/phpBB/adm/admin_search.php
index 70f4d752a2..69b427caa3 100644
--- a/phpBB/adm/admin_search.php
+++ b/phpBB/adm/admin_search.php
@@ -269,7 +269,7 @@ if (isset($_POST['start']) || isset($_GET['batchstart']))
 	else
 	{
 		set_config('board_disable', 0);
-		page_header($user->lang['SEARCH_INDEX']);
+		adm_page_header($user->lang['SEARCH_INDEX']);
 
 ?>
 
@@ -279,7 +279,7 @@ if (isset($_POST['start']) || isset($_GET['batchstart']))
 
 <?php
 
-		page_footer();
+		adm_page_footer();
 
 	}
 
@@ -289,7 +289,7 @@ if (isset($_POST['start']) || isset($_GET['batchstart']))
 else if (isset($_POST['cancel']))
 {
 	set_config('board_disable', 0);
-	page_header($user->lang['SEARCH_INDEX']);
+	adm_page_header($user->lang['SEARCH_INDEX']);
 
 ?>
 
@@ -299,12 +299,12 @@ else if (isset($_POST['cancel']))
 
 <?php
 
-	page_footer();
+	adm_page_footer();
 
 }
 else
 {
-	page_header($user->lang['Search_index']);
+	adm_page_header($user->lang['Search_index']);
 
 ?>
 
@@ -320,7 +320,7 @@ else
 
 <?php
 
-	page_footer();
+	adm_page_footer();
 
 }
 
diff --git a/phpBB/adm/admin_styles.php b/phpBB/adm/admin_styles.php
index e38f8f9530..c37b8e26d3 100644
--- a/phpBB/adm/admin_styles.php
+++ b/phpBB/adm/admin_styles.php
@@ -71,7 +71,7 @@ switch ($mode)
 		closedir($dp);
 
 		// Output page
-		page_header($user->lang['Edit_Imageset']);
+		adm_page_header($user->lang['Edit_Imageset']);
 
 ?>
 
@@ -129,7 +129,7 @@ switch ($mode)
 
 	}
 
-		page_footer();
+		adm_page_footer();
 
 		break;
 
@@ -214,7 +214,7 @@ switch ($mode)
 		closedir($dp);
 
 		//
-		page_header($user->lang['Edit_template']);
+		adm_page_header($user->lang['Edit_template']);
 
 ?>
 
@@ -246,7 +246,7 @@ switch ($mode)
 
 <?php
 
-		page_footer();
+		adm_page_footer();
 		break;
 
 	case 'edittheme':
@@ -278,7 +278,7 @@ switch ($mode)
 			}
 		}
 
-		page_header($user->lang['Edit_theme']);
+		adm_page_header($user->lang['Edit_theme']);
 
 		$sql = "SELECT theme_id, theme_name
 			FROM " . STYLES_CSS_TABLE;
@@ -338,7 +338,7 @@ switch ($mode)
 
 <?php
 
-		page_footer();
+		adm_page_footer();
 
 		break;
 }
diff --git a/phpBB/adm/admin_users.php b/phpBB/adm/admin_users.php
index b09102e77d..c1ae355ae2 100644
--- a/phpBB/adm/admin_users.php
+++ b/phpBB/adm/admin_users.php
@@ -108,7 +108,7 @@ if (isset($_POST['username']) || isset($_REQUEST['u']))
 
 
 	// Output relevant page
-	page_header($user->lang['MANAGE']);
+	adm_page_header($user->lang['MANAGE']);
 
 ?>
 
@@ -280,7 +280,7 @@ if (isset($_POST['username']) || isset($_REQUEST['u']))
 
 	}
 
-	page_footer();
+	adm_page_footer();
 
 }
 
@@ -290,7 +290,7 @@ if (!$auth->acl_get('a_user'))
 	trigger_error($user->lang['No_admin']);
 }
 
-page_header($user->lang['Manage']);
+adm_page_header($user->lang['Manage']);
 
 ?>
 
@@ -310,7 +310,7 @@ page_header($user->lang['Manage']);
 <?php
 
 
-page_footer();
+adm_page_footer();
 
 // ---------
 // FUNCTIONS
diff --git a/phpBB/adm/admin_viewlogs.php b/phpBB/adm/admin_viewlogs.php
index 6a997fb62d..fa582ab3c2 100644
--- a/phpBB/adm/admin_viewlogs.php
+++ b/phpBB/adm/admin_viewlogs.php
@@ -99,7 +99,7 @@ $sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC'
 
 
 // Output page
-page_header($l_title);
+adm_page_header($l_title);
 
 ?>
 
@@ -221,6 +221,6 @@ function marklist(status)
 
 <?php
 
-page_footer();
+adm_page_footer();
 
 ?>
 \ No newline at end of file
diff --git a/phpBB/adm/admin_words.php b/phpBB/adm/admin_words.php
index e8880e86d6..2ff3ff0769 100644
--- a/phpBB/adm/admin_words.php
+++ b/phpBB/adm/admin_words.php
@@ -91,7 +91,7 @@ if ($mode != '')
 				$s_hidden_fields .= '<input type="hidden" name="id" value="' . $word_id . '" />';
 			}
 
-			page_header($user->lang['WORDS_TITLE']);
+			adm_page_header($user->lang['WORDS_TITLE']);
 
 ?>
 
@@ -118,7 +118,7 @@ if ($mode != '')
 
 <?php
 
-			page_footer();
+			adm_page_footer();
 			break;
 
 		case 'save':
@@ -172,7 +172,7 @@ if ($mode != '')
 else
 {
 
-	page_header($user->lang['WORDS_TITLE']);
+	adm_page_header($user->lang['WORDS_TITLE']);
 
 ?>
 
@@ -222,7 +222,7 @@ else
 
 <?php
 
-	page_footer();
+	adm_page_footer();
 
 }
 
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index 5cb8d69423..09578054b3 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -38,7 +38,7 @@ if (!$auth->acl_get('a_'))
 // Generate relevant output
 if (isset($_GET['pane']) && $_GET['pane'] == 'top')
 {
-	page_header('', '', false);
+	adm_page_header('', '', false);
 
 ?>
 
@@ -51,13 +51,13 @@ if (isset($_GET['pane']) && $_GET['pane'] == 'top')
 
 <?php
 
-	page_footer(false);
+	adm_page_footer(false);
 
 }
 else if (isset($_GET['pane']) && $_GET['pane'] == 'left')
 {
 	// Cheat and use the meta tag to change some stylesheet info
-	page_header('', '<style type="text/css">body {background-color: #98AAB1}</style>', false);
+	adm_page_header('', '<style type="text/css">body {background-color: #98AAB1}</style>', false);
 
 	// Grab module information using Bart's "neat-o-module" system (tm)
 	$dir = @opendir('.');
@@ -134,7 +134,7 @@ else if (isset($_GET['pane']) && $_GET['pane'] == 'left')
 <?php
 
 	// Output footer but don't include copyright info
-	page_footer(false);
+	adm_page_footer(false);
 
 }
 elseif (isset($_GET['pane']) && $_GET['pane'] == 'right')
@@ -419,7 +419,7 @@ elseif (isset($_GET['pane']) && $_GET['pane'] == 'right')
 		$dbsize = ($dbsize >= 1048576) ? sprintf('%.2f MB', ($dbsize / 1048576)) : (($dbsize >= 1024) ? sprintf('%.2f KB', ($dbsize / 1024)) : sprintf('%.2f Bytes', $dbsize));
 	}
 
-	page_header($user->lang['ADMIN_INDEX']);
+	adm_page_header($user->lang['ADMIN_INDEX']);
 
 ?>
 
@@ -595,7 +595,7 @@ elseif (isset($_GET['pane']) && $_GET['pane'] == 'right')
 
 	}
 
-	page_footer();
+	adm_page_footer();
 
 }
 else
diff --git a/phpBB/adm/pagestart.php b/phpBB/adm/pagestart.php
index 8f5e2c03d6..cde8711f24 100644
--- a/phpBB/adm/pagestart.php
+++ b/phpBB/adm/pagestart.php
@@ -44,7 +44,7 @@ $auth->acl($user->data);
 
 // -----------------------------
 // Functions
-function page_header($sub_title, $meta = '', $table_html = true)
+function adm_page_header($sub_title, $meta = '', $table_html = true)
 {
 	global $config, $db, $user, $phpEx;
 
@@ -107,7 +107,7 @@ td.cat	{ background-image: url('images/cellpic1.gif') }
 
 }
 
-function page_footer($copyright_html = true)
+function adm_page_footer($copyright_html = true)
 {
 	global $cache, $config, $db, $phpEx;
 
@@ -144,7 +144,7 @@ function page_footer($copyright_html = true)
 	exit;
 }
 
-function page_message($title, $message, $show_header = false)
+function adm_page_message($title, $message, $show_header = false)
 {
 	global $phpEx, $SID, $user;
author	Paul S. Owen <psotfx@users.sourceforge.net>	2003-05-03 23:58:45 +0000
committer	Paul S. Owen <psotfx@users.sourceforge.net>	2003-05-03 23:58:45 +0000
commit	dac0adead30ed70400a2a22f9439a8184ad479d8 (patch)
tree	6a04b15e16669a1b6900c550ae06c856c06d09d8 /phpBB/adm
parent	5b927b016203cf0eb73bc33a787b778b9f614578 (diff)
download	forums-dac0adead30ed70400a2a22f9439a8184ad479d8.tar forums-dac0adead30ed70400a2a22f9439a8184ad479d8.tar.gz forums-dac0adead30ed70400a2a22f9439a8184ad479d8.tar.bz2 forums-dac0adead30ed70400a2a22f9439a8184ad479d8.tar.xz forums-dac0adead30ed70400a2a22f9439a8184ad479d8.zip