diff options
24 files changed, 384 insertions, 361 deletions
diff --git a/phpBB/admin/admin_board.php b/phpBB/admin/admin_board.php index 36f3dbc2cd..0715123f27 100644 --- a/phpBB/admin/admin_board.php +++ b/phpBB/admin/admin_board.php @@ -25,7 +25,7 @@ if($setmodules == 1) { $file = basename(__FILE__); - $module['General']['config'] = "$file?mode=config"; + $module['General']['Configuration'] = "$file?mode=config"; return; } @@ -138,54 +138,58 @@ switch($mode) $template->pparse("reg_header"); } - $template->set_filenames(array("body" => "admin/admin_config_body.tpl")); + $template->set_filenames(array( + "body" => "admin/admin_config_body.tpl") + ); - $template->assign_vars(array("S_CONFIG_ACTION" => append_sid("admin/admin_board.$phpEx"), - "SITENAME" => $sitename, - "ACTIVATION_YES" => $activation_yes, - "ACTIVATION_NO" => $activation_no, - "FLOOD_INTERVAL" => $flood_interval, - "TOPICS_PER_PAGE" => $topics_per_page, - "POSTS_PER_PAGE" => $posts_per_page, - "HOT_TOPIC" => $hot_topic, - "TEMPLATE_SELECT" => $template_select, - "THEME_SELECT" => $theme_select, - "LANG_SELECT" => $lang_select, - "L_DATE_FORMAT_EXPLAIN" => $lang['Date_format_explain'], - "DATE_FORMAT" => $date_format, - "TIMEZONE_SELECT" => $timezone_select, - "GZIP_YES" => $gzip_yes, - "GZIP_NO" => $gzip_no, - "HTML_YES" => $html_yes, - "HTML_NO" => $html_no, - "BBCODE_YES" => $bbcode_yes, - "BBCODE_NO" => $bbcode_no, - "SMILE_YES" => $smile_yes, - "SMILE_NO" => $smile_no, - "SIG_YES" => $sig_yes, - "SIG_NO" => $sig_no, - "NAMECHANGE_YES" => $namechange_yes, - "NAMECHANGE_NO" => $namechange_no, - "AVATARS_LOCAL_YES" => $avatars_local_yes, - "AVATARS_LOCAL_NO" => $avatars_local_no, - "AVATARS_REMOTE_YES" => $avatars_remote_yes, - "AVATARS_REMOTE_NO" => $avatars_remote_no, - "AVATARS_UPLOAD_YES" => $avatars_upload_yes, - "AVATARS_UPLOAD_NO" => $avatars_upload_no, - "AVATAR_FILESIZE" => $avatar_filesize, - "AVATAR_HEIGHT" => $avatar_height, - "AVATAR_WIDTH" => $avatar_width, - "AVATAR_PATH" => $avatar_path, - "ADMIN_EMAIL" => $admin_email, - "EMAIL_SIG" => $email_sig, - "SMTP_YES" => $smtp_yes, - "SMTP_NO" => $smtp_no, - "SMTP_SERVER" => $smtp_server)); + $template->assign_vars(array( + "S_CONFIG_ACTION" => append_sid("admin/admin_board.$phpEx"), + "SITENAME" => $sitename, + "ACTIVATION_YES" => $activation_yes, + "ACTIVATION_NO" => $activation_no, + "FLOOD_INTERVAL" => $flood_interval, + "TOPICS_PER_PAGE" => $topics_per_page, + "POSTS_PER_PAGE" => $posts_per_page, + "HOT_TOPIC" => $hot_topic, + "TEMPLATE_SELECT" => $template_select, + "THEME_SELECT" => $theme_select, + "LANG_SELECT" => $lang_select, + "L_DATE_FORMAT_EXPLAIN" => $lang['Date_format_explain'], + "DATE_FORMAT" => $date_format, + "TIMEZONE_SELECT" => $timezone_select, + "GZIP_YES" => $gzip_yes, + "GZIP_NO" => $gzip_no, + "HTML_YES" => $html_yes, + "HTML_NO" => $html_no, + "BBCODE_YES" => $bbcode_yes, + "BBCODE_NO" => $bbcode_no, + "SMILE_YES" => $smile_yes, + "SMILE_NO" => $smile_no, + "SIG_YES" => $sig_yes, + "SIG_NO" => $sig_no, + "NAMECHANGE_YES" => $namechange_yes, + "NAMECHANGE_NO" => $namechange_no, + "AVATARS_LOCAL_YES" => $avatars_local_yes, + "AVATARS_LOCAL_NO" => $avatars_local_no, + "AVATARS_REMOTE_YES" => $avatars_remote_yes, + "AVATARS_REMOTE_NO" => $avatars_remote_no, + "AVATARS_UPLOAD_YES" => $avatars_upload_yes, + "AVATARS_UPLOAD_NO" => $avatars_upload_no, + "AVATAR_FILESIZE" => $avatar_filesize, + "AVATAR_HEIGHT" => $avatar_height, + "AVATAR_WIDTH" => $avatar_width, + "AVATAR_PATH" => $avatar_path, + "ADMIN_EMAIL" => $admin_email, + "EMAIL_SIG" => $email_sig, + "SMTP_YES" => $smtp_yes, + "SMTP_NO" => $smtp_no, + "SMTP_SERVER" => $smtp_server) + ); $template->pparse("body"); - break; - + break; } include('page_footer_admin.'.$phpEx); + ?>
\ No newline at end of file diff --git a/phpBB/admin/admin_db_utilities.php b/phpBB/admin/admin_db_utilities.php index 3c0dc9274d..ef4e9da39a 100644 --- a/phpBB/admin/admin_db_utilities.php +++ b/phpBB/admin/admin_db_utilities.php @@ -307,8 +307,7 @@ function get_table_def_postgres($table, $crlf) if (!$result) { - $error = $db->sql_error(); - message_die(GENERAL_ERROR, 'Failed in get_table_def (show fields) : ' . $error['message']); + message_die(GENERAL_ERROR, "Failed in get_table_def (show fields)", "", __LINE__, __FILE__, $sql_checks); } while ($row = $db->sql_fetchrow($result)) diff --git a/phpBB/admin/admin_forum_prune.php b/phpBB/admin/admin_forum_prune.php index a72eafdcd6..ac6a9a84bb 100644 --- a/phpBB/admin/admin_forum_prune.php +++ b/phpBB/admin/admin_forum_prune.php @@ -34,7 +34,7 @@ if( $setmodules == 1 ) { $filename = basename(__FILE__); - $module['Forums']['prune'] = $filename; + $module['Forums']['Prune'] = $filename; return; } @@ -117,22 +117,29 @@ else if($submit == "Prune") { $prunedays = $HTTP_POST_VARS['prunedays']; + // Convert days to seconds for timestamp functions... $prunesecs = $prunedays * 1440 * 60; $prunedate = time() - $prunesecs; + + include('page_header_admin.'.$phpEx); + $template->set_filenames(array( "body" => "admin/forum_prune_result_body.tpl") ); + reset($forum_rows); while(list(, $forum_data) = each ($forum_rows)) { $p_result = prune($forum_data['forum_id'], $prunedate); + $template->assign_block_vars("prune_results", array( "FORUM_NAME" => $forum_data['forum_name'], "FORUM_TOPICS" => $p_result['topics'], "FORUM_POSTS" => $p_result['posts']) ); } + $template->assign_vars(array( "PRUNE_MSG" => "Pruning of forums was successful") ); @@ -148,17 +155,21 @@ else // // Output a selection table if no forum id has been specified. // + include('page_header_admin.'.$phpEx); + $template->set_filenames(array( "body" => "admin/forum_prune_select_body.tpl") ); + $select_list = "<select name=\"" . POST_FORUM_URL . "\">\n"; - $select_list .= "<option value=\"\">Select a Forum</option>\n"; $select_list .= "<option value=\"ALL\">All Forums</option>\n"; + for($i = 0; $i < count($forum_rows); $i++) { $select_list .= "<option value=\"" . $forum_rows[$i]['forum_id'] . "\">" . $forum_rows[$i]['forum_name'] . "</option>\n"; } $select_list .= "</select>\n"; + // // Assign the template variables. // @@ -172,13 +183,17 @@ else // // Output the form to retrieve Prune information. // + include('page_header_admin.'.$phpEx); + $template->set_filenames(array( "body" => "admin/forum_prune_body.tpl") ); $forum_name = ($forum_id == "ALL") ? 'All Forums' : $forum_rows[0]['forum_name']; + $prune_data = "Prune Topics that haven't been posted to in the last "; $prune_data .= "<input type=\"text\" name=\"prunedays\" size=\"4\"> Days."; + $hidden_input = "<input type=\"hidden\" name=\"" . POST_FORUM_URL . "\" value=\"$forum_id\">"; // @@ -199,4 +214,4 @@ $template->pparse("body"); include('page_footer_admin.'.$phpEx); -?> +?>
\ No newline at end of file diff --git a/phpBB/admin/admin_forumauth.php b/phpBB/admin/admin_forumauth.php index 6562a3ca4e..feb76a1cb3 100644 --- a/phpBB/admin/admin_forumauth.php +++ b/phpBB/admin/admin_forumauth.php @@ -59,7 +59,7 @@ else if( $userdata['user_level'] != ADMIN ) // Start program - define vars // $simple_auth_ary = array( - 0 => array(0, 0, 0, 0, 1, 0, 3, 3), + 0 => array(0, 0, 0, 0, 1, 1, 3, 3), 1 => array(0, 0, 0, 0, 3, 3, 3, 3), 2 => array(0, 0, 1, 1, 1, 1, 3, 3), 3 => array(1, 1, 1, 1, 1, 1, 3, 3), @@ -67,8 +67,8 @@ $simple_auth_ary = array( 5 => array(2, 2, 2, 2, 2, 2, 2, 3), 6 => array(0, 3, 3, 3, 3, 3, 3, 3), 7 => array(3, 3, 3, 3, 3, 3, 3, 3), - 8 => array(0, 0, 3, 0, 0, 0, 3, 3), - 9 => array(0, 0, 3, 1, 0, 0, 3, 3) + 8 => array(0, 0, 3, 0, 1, 1, 3, 3), + 9 => array(0, 0, 3, 1, 1, 1, 3, 3) ); $simple_auth_types = array("Public", "Test Restricted", "Registered", "Registered [Hidden]", "Private", "Private [Hidden]", "Moderators", "Moderators [Hidden]", "Moderator Post + All Reply", "Moderator Post + Reg Reply"); diff --git a/phpBB/admin/admin_userauth.php b/phpBB/admin/admin_userauth.php index d5ae0517f5..19027be152 100644 --- a/phpBB/admin/admin_userauth.php +++ b/phpBB/admin/admin_userauth.php @@ -583,7 +583,7 @@ if(isset($HTTP_POST_VARS['submit']) && !empty($HTTP_POST_VARS[POST_USERS_URL])) } else { - header("Location: admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id"); + header("Location: " . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id")); } } diff --git a/phpBB/admin/page_header_admin.php b/phpBB/admin/page_header_admin.php index 336af4ac08..d0a727e1c1 100644 --- a/phpBB/admin/page_header_admin.php +++ b/phpBB/admin/page_header_admin.php @@ -52,12 +52,8 @@ if($board_config['gzip_compress']) } } -if(empty($template_header)) -{ - $template_header = "admin/page_header.tpl"; -} $template->set_filenames(array( - "header" => $template_header) + "header" => "admin/page_header.tpl") ); // @@ -129,12 +125,21 @@ $template->assign_vars(array( "T_TR_COLOR1" => "#".$theme['tr_color1'], "T_TR_COLOR2" => "#".$theme['tr_color2'], "T_TR_COLOR3" => "#".$theme['tr_color3'], + "T_TR_CLASS1" => $theme['tr_class1'], + "T_TR_CLASS2" => $theme['tr_class2'], + "T_TR_CLASS3" => $theme['tr_class3'], "T_TH_COLOR1" => "#".$theme['th_color1'], "T_TH_COLOR2" => "#".$theme['th_color2'], "T_TH_COLOR3" => "#".$theme['th_color3'], + "T_TH_CLASS1" => $theme['th_class1'], + "T_TH_CLASS2" => $theme['th_class2'], + "T_TH_CLASS3" => $theme['th_class3'], "T_TD_COLOR1" => "#".$theme['td_color1'], "T_TD_COLOR2" => "#".$theme['td_color2'], "T_TD_COLOR3" => "#".$theme['td_color3'], + "T_TD_CLASS1" => $theme['td_class1'], + "T_TD_CLASS2" => $theme['td_class2'], + "T_TD_CLASS3" => $theme['td_class3'], "T_FONTFACE1" => $theme['fontface1'], "T_FONTFACE2" => $theme['fontface2'], "T_FONTFACE3" => $theme['fontface3'], @@ -144,10 +149,9 @@ $template->assign_vars(array( "T_FONTCOLOR1" => "#".$theme['fontcolor1'], "T_FONTCOLOR2" => "#".$theme['fontcolor2'], "T_FONTCOLOR3" => "#".$theme['fontcolor3'], - "T_IMG1" => $theme['img1'], - "T_IMG2" => $theme['img2'], - "T_IMG3" => $theme['img3'], - "T_IMG4" => $theme['img4']) + "T_SPAN_CLASS1" => $theme['span_class1'], + "T_SPAN_CLASS2" => $theme['span_class2'], + "T_SPAN_CLASS3" => $theme['span_class3']) ); header ("Expires: " . gmdate("D, d M Y H:i:s", time()) . " GMT"); diff --git a/phpBB/db/mysql_basic.sql b/phpBB/db/mysql_basic.sql index fd66c00452..2a5be6b264 100644 --- a/phpBB/db/mysql_basic.sql +++ b/phpBB/db/mysql_basic.sql @@ -44,20 +44,14 @@ INSERT INTO phpbb_posts (post_id, topic_id, forum_id, poster_id, post_time, post INSERT INTO phpbb_posts_text (post_id, post_subject, post_text) VALUES (1, 'This is the subject', 'This is a demo post in the demo topic, what do you think of it?'); # -- Themes -INSERT INTO phpbb_themes (themes_id, themes_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, th_color1, th_color2, th_color3, td_color1, td_color2, td_color3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, img1, img2, img3, img4) VALUES ( '1', 'Default-Default', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'CCCCCC', 'DDDDDD', '', '', '', '', '0', '0', '0', '', '', '', '', '', '', ''); -INSERT INTO phpbb_themes_name (themes_id, tr_color1_name, tr_color2_name, tr_color3_name, th_color1_name, th_color2_name, th_color3_name, td_color1_name, td_color2_name, td_color3_name, fontface1_name, fontface2_name, fontface3_name, fontsize1_name, fontsize2_name, fontsize3_name, fontcolor1_name, fontcolor2_name, fontcolor3_name, img1_name, img2_name, img3_name, img4_name) VALUES ( '1', '', '', '', '', '', '', '', 'Row Color 1', 'Row Color 2', '', '', '', '', '', '', '', '', '', '', '', '', ''); +INSERT INTO phpbb_themes (themes_id, themes_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (1,'Default-Default','','','','','','','','','','','',NULL,NULL,NULL,'','','',NULL,NULL,NULL,'CCCCCC','DDDDDD','',NULL,NULL,NULL,'','','','','','','','','',NULL,NULL,NULL); -INSERT INTO phpbb_themes (themes_id, themes_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, th_color1, th_color2, th_color3, td_color1, td_color2, td_color3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, img1, img2, img3, img4) VALUES ( '2', 'PSO-Default', 'site_style_default.css', '', 'FFFFFF', '000000', '002266', '004411', '', '', '', '', '', '000000', 'D2D2D2', 'BCBCBC', 'EDEDED', 'DEDEDE', '', 'verdana,serif', 'arial,helvetica', 'courier', '1', '2', '3', '', '', '', '', '', '', ''); -INSERT INTO phpbb_themes_name (themes_id, tr_color1_name, tr_color2_name, tr_color3_name, th_color1_name, th_color2_name, th_color3_name, td_color1_name, td_color2_name, td_color3_name, fontface1_name, fontface2_name, fontface3_name, fontsize1_name, fontsize2_name, fontsize3_name, fontcolor1_name, fontcolor2_name, fontcolor3_name, img1_name, img2_name, img3_name, img4_name) VALUES ( '2', '', '', '', 'Table Background', 'Title Header', 'Category Header', 'Table background', 'Row Color 1', 'Row Color 2', 'Verdana,Serif', 'Arial,Sans-serif', 'Verdana,serif', 'Smallest', 'Typical', 'Largest', 'All text', '', '', '', '', '', ''); +INSERT INTO phpbb_themes (themes_id, themes_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (2,'PSO-Default','','','FFFFFF','000000','002266','004411','','','','','','','','','000000','D2D2D2','BCBCBC','','','','EDEDED','DEDEDE','','row1','row2','','verdana,serif','arial,helvetica','courier',1,2,3,'','','','','',''); -INSERT INTO phpbb_themes (themes_id, themes_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, th_color1, th_color2, th_color3, td_color1, td_color2, td_color3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, img1, img2, img3, img4) VALUES ( '3', 'PSO-Wheat', '', '', 'FFFFFF', '000000', '002266', '004411', '', '', '', '', '', '001100', 'E5CCA5', 'D4A294', 'EBE4D9', 'DAD1C4', '', 'verdana,serif', 'arial,helvetica', 'courier', '1', '2', '3', '000000', '', '', '', '', '', ''); -INSERT INTO phpbb_themes_name (themes_id, tr_color1_name, tr_color2_name, tr_color3_name, th_color1_name, th_color2_name, th_color3_name, td_color1_name, td_color2_name, td_color3_name, fontface1_name, fontface2_name, fontface3_name, fontsize1_name, fontsize2_name, fontsize3_name, fontcolor1_name, fontcolor2_name, fontcolor3_name, img1_name, img2_name, img3_name, img4_name) VALUES ( '3', '', '', '', 'Table Background', 'Title Header', 'Category Header', 'Table background', 'Row Color 1', 'Row Color 2', 'Verdana,Serif', 'Arial,Sans-serif', 'Verdana,serif', 'Smallest', 'Typical', 'Largest', 'All text', '', '', '', '', '', ''); +INSERT INTO phpbb_themes (themes_id, themes_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (3,'PSO-Wheat','','','FFFFFF','000000','002266','004411','','','','','',NULL,NULL,NULL,'001100','E5CCA5','D4A294',NULL,NULL,NULL,'EBE4D9','DAD1C4','','row1','row2',NULL,'verdana,serif','arial,helvetica','courier',1,2,3,'000000','','',NULL,NULL,NULL); -INSERT INTO phpbb_themes (themes_id, themes_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, th_color1, th_color2, th_color3, td_color1, td_color2, td_color3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, img1, img2, img3, img4) VALUES ( '4', 'PSO-Ocean', '', '', 'DFF5FF', '000000', '011001', '2100cc', '', '', '', '', '', '000000', 'A7C1CB', '7897A8', '83D7CC', 'A0CCE0', '', 'verdana,serif', 'arial,helvetica', 'courier', '1', '2', '3', '', '', '', '', '', '', ''); -INSERT INTO phpbb_themes_name (themes_id, tr_color1_name, tr_color2_name, tr_color3_name, th_color1_name, th_color2_name, th_color3_name, td_color1_name, td_color2_name, td_color3_name, fontface1_name, fontface2_name, fontface3_name, fontsize1_name, fontsize2_name, fontsize3_name, fontcolor1_name, fontcolor2_name, fontcolor3_name, img1_name, img2_name, img3_name, img4_name) VALUES ( '4', '', '', '', 'Table Background', 'Title Header', 'Category Header', 'Table background', 'Row Color 1', 'Row Color 2', 'Verdana,Serif', 'Arial,Sans-serif', 'Verdana,serif', 'Smallest', 'Typical', 'Largest', 'All text', '', '', '', '', '', ''); +INSERT INTO phpbb_themes (themes_id, themes_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (4,'PSO-Ocean','','','DFF5FF','000000','011001','2100cc','','','','','',NULL,NULL,NULL,'000000','A7C1CB','7897A8',NULL,NULL,NULL,'83D7CC','A0CCE0','','row1','row2',NULL,'verdana,serif','arial,helvetica','courier',1,2,3,'','','',NULL,NULL,NULL); -INSERT INTO phpbb_themes (themes_id, themes_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, th_color1, th_color2, th_color3, td_color1, td_color2, td_color3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, img1, img2, img3, img4) VALUES ( '6', 'PSO-Blue', '', '', 'FFFFFF', '000000', '417FB9', '4E6172', '0000AA', '', '', '', '', '000000', '90BAE2', '518EC7', 'cde3f2', 'daedFd', '', 'verdana,serif', 'arial,helvetica', 'courier', '1', '2', '3', '000000', '', '', '', '', '', ''); -INSERT INTO phpbb_themes_name (themes_id, tr_color1_name, tr_color2_name, tr_color3_name, th_color1_name, th_color2_name, th_color3_name, td_color1_name, td_color2_name, td_color3_name, fontface1_name, fontface2_name, fontface3_name, fontsize1_name, fontsize2_name, fontsize3_name, fontcolor1_name, fontcolor2_name, fontcolor3_name, img1_name, img2_name, img3_name, img4_name) VALUES ( '5', '', '', '', 'Table Background', 'Title Header', 'Category Header', 'Table background', 'Row Color 1', 'Row Color 2', 'Verdana,Serif', 'Arial,Sans-serif', 'Verdana,serif', 'Smallest', 'Typical', 'Largest', 'All text', '', '', '', '', '', ''); +INSERT INTO phpbb_themes (themes_id, themes_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (6,'PSO-Blue','','','FFFFFF','000000','417FB9','4E6172','0000AA','','','','','','','','000000','90BAE2','5195D4','','','','cde3f2','daedFd','','row1','row2','','verdana,serif','arial,helvetica','courier',1,2,3,'000000','','','','',''); -INSERT INTO phpbb_themes (themes_id, themes_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, th_color1, th_color2, th_color3, td_color1, td_color2, td_color3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, img1, img2, img3, img4) VALUES ( '7', 'PSO-Cool Midnight', '', '', '444444', 'ECECEC', 'EDF2F2', 'DDEDED', 'FFFFFF', 'EDF2F2', '', '', '', '000000', '80707F', '66555F', '60707D', '667A80', '', 'Verdana,serif', 'Arial,Helvetica,sans-serif', 'courier', '0', '0', '0', 'ECECEC', 'ECECEC', 'ECECEC', '', '', '', ''); -INSERT INTO phpbb_themes_name (themes_id, tr_color1_name, tr_color2_name, tr_color3_name, th_color1_name, th_color2_name, th_color3_name, td_color1_name, td_color2_name, td_color3_name, fontface1_name, fontface2_name, fontface3_name, fontsize1_name, fontsize2_name, fontsize3_name, fontcolor1_name, fontcolor2_name, fontcolor3_name, img1_name, img2_name, img3_name, img4_name) VALUES ( '6', '', '', '', 'Table Background', 'Title Header', 'Category Header', 'Table background', 'Row Color 1', 'Row Color 2', 'Verdana,Serif', 'Arial,Sans-serif', 'Verdana,serif', 'Smallest', 'Typical', 'Largest', 'All text', '', '', '', '', '', ''); +INSERT INTO phpbb_themes (themes_id, themes_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (7,'PSO-Cool Midnight','','','444444','ECECEC','EDF2F2','DDEDED','FFFFFF','EDF2F2','','','',NULL,NULL,NULL,'000000','80707F','66555F',NULL,NULL,NULL,'60707D','667A80','','row1','row2',NULL,'Verdana,serif','Arial,Helvetica,sans-serif','courier','','','','ECECEC','ECECEC','ECECEC',NULL,NULL,NULL); diff --git a/phpBB/db/mysql_schema.sql b/phpBB/db/mysql_schema.sql index 10d23f8f7e..1439032195 100644 --- a/phpBB/db/mysql_schema.sql +++ b/phpBB/db/mysql_schema.sql @@ -327,43 +327,50 @@ CREATE TABLE phpbb_smilies ( # Table structure for table 'phpbb_themes' # DROP TABLE IF EXISTS phpbb_themes; - -CREATE TABLE phpbb_themes ( - themes_id int(11) NOT NULL auto_increment, - themes_name varchar(30) NOT NULL, - head_stylesheet varchar(100), - body_background varchar(100), - body_bgcolor char(6), - body_text char(6), - body_link char(6), - body_vlink char(6), - body_alink char(6), - body_hlink char(6), - tr_color1 char(6), - tr_color2 char(6), - tr_color3 char(6), - th_color1 char(6), - th_color2 char(6), - th_color3 char(6), - td_color1 char(6), - td_color2 char(6), - td_color3 char(6), - fontface1 varchar(50), - fontface2 varchar(50), - fontface3 varchar(50), - fontsize1 tinyint(4), - fontsize2 tinyint(4), - fontsize3 tinyint(4), - fontcolor1 char(6), - fontcolor2 char(6), - fontcolor3 char(6), - img1 varchar(100), - img2 varchar(100), - img3 varchar(100), - img4 varchar(100), - PRIMARY KEY (themes_id), - KEY themes_name (themes_name) -); +CREATE TABLE `phpbb_themes` ( + `themes_id` int(11) NOT NULL auto_increment, + `themes_name` varchar(30) NOT NULL default '', + `head_stylesheet` varchar(100) default NULL, + `body_background` varchar(100) default NULL, + `body_bgcolor` varchar(6) default NULL, + `body_text` varchar(6) default NULL, + `body_link` varchar(6) default NULL, + `body_vlink` varchar(6) default NULL, + `body_alink` varchar(6) default NULL, + `body_hlink` varchar(6) default NULL, + `tr_color1` varchar(6) default NULL, + `tr_color2` varchar(6) default NULL, + `tr_color3` varchar(6) default NULL, + `tr_class1` varchar(20) default NULL, + `tr_class2` varchar(20) default NULL, + `tr_class3` varchar(25) default NULL, + `th_color1` varchar(6) default NULL, + `th_color2` varchar(6) default NULL, + `th_color3` varchar(6) default NULL, + `th_class1` varchar(25) default NULL, + `th_class2` varchar(25) default NULL, + `th_class3` varchar(6) default NULL, + `td_color1` varchar(6) default NULL, + `td_color2` varchar(6) default NULL, + `td_color3` varchar(6) default NULL, + `td_class1` varchar(25) default NULL, + `td_class2` varchar(25) default NULL, + `td_class3` varchar(25) default NULL, + `fontface1` varchar(50) default NULL, + `fontface2` varchar(50) default NULL, + `fontface3` varchar(50) default NULL, + `fontsize1` tinyint(4) default NULL, + `fontsize2` tinyint(4) default NULL, + `fontsize3` tinyint(4) default NULL, + `fontcolor1` varchar(6) default NULL, + `fontcolor2` varchar(6) default NULL, + `fontcolor3` varchar(6) default NULL, + `span_class1` varchar(25) default NULL, + `span_class2` varchar(25) default NULL, + `span_class3` varchar(25) default NULL, + PRIMARY KEY (`themes_id`), + KEY `themes_name` (`themes_name`) +) # -------------------------------------------------------- diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 7cb2c761d8..4e41e1e9fb 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -752,12 +752,12 @@ function tz_select($default) "+5.5" => "(GMT +5:30 hours) Bombay, Calcutta, Madras, New Delhi", "+6" => "(GMT +6:00 hours) Almaty, Colombo, Dhaka", "+7" => "(GMT +7:00 hours) Bangkok, Hanoi, Jakarta", - "+8" => "(GMT +8:00 hours) Beijing, Chongqing, Hong Kong, Perth, Singapore, Taipei", + "+8" => "(GMT +8:00 hours) Beijing, Hong Kong, Perth, Singapore, Taipei", "+9" => "(GMT +9:00 hours) Osaka, Sapporo, Seoul, Tokyo, Yakutsk", "+9.5" => "(GMT +9:30 hours) Adelaide, Darwin", - "+10" => "(GMT +10:00 hours) Guam, Melbourne, Papua New Guinea, Sydney, Vladivostok", + "+10" => "(GMT +10:00 hours) Melbourne, Papua New Guinea, Sydney, Vladivostok", "+11" => "(GMT +11:00 hours) Magadan, New Caledonia, Solomon Islands", - "+12" => "(GMT +12:00 hours) Auckland, Wellington, Fiji, Kamchatka, Marshall Island"); + "+12" => "(GMT +12:00 hours) Auckland, Wellington, Fiji, Marshall Island"); while(list($offset, $zone) = each($tz_array)) { diff --git a/phpBB/templates/PSO/admin/admin_config_body.tpl b/phpBB/templates/PSO/admin/admin_config_body.tpl index 514f0c35c0..a754eb9ef2 100644 --- a/phpBB/templates/PSO/admin/admin_config_body.tpl +++ b/phpBB/templates/PSO/admin/admin_config_body.tpl @@ -1,159 +1,146 @@ -<h1>Configuration</h1> +<br clear="all" /> + +<h1>General Configuration</h1> + +<p>The form below will allow you to customize all the general board options. For User and Forum configurations use the related links on the left hand side.</p> -<p> - The form below will allow you to customize all the general board options. For User and Forum configurations use the related links on the left hand side. -</p> <form action="{S_CONFIG_ACTION}" method="POST"> -<table border="0" cellpadding="1" cellspacing="0" width="70%" align="center"> + +<table width="99%" cellpadding="1" cellspacing="0" border="0" align="center"> <tr> - <td class="tablebg"> - <table width="100%" cellpadding="4" cellspacing="1" border="0"> - <tr> - <th colspan="2">General Board Settings</th> - </tr> - <tr> - <td class="row1">Site Name:</td> - <td class="row2"><input type="text" size="25" maxlength="100" name="sitename" value="{SITENAME}"></td> - </tr> - <tr> - <td class="row1">Require user account activation:</td> - <td class="row2"><input type="radio" name="require_activation" value="1" {ACTIVATION_YES}>Yes <input type="radio" name="require_activation" value="0" {ACTIVATION_NO}>No</td> - </tr> - <tr> - <td class="row1">Flood Interval: <br /> - <span class="gensmall">(number of seconds a user must wait between posts)</span> - </td> - <td class="row2"><input type="text" size="3" maxlengh="4" name="flood_interval" value="{FLOOD_INTERVAL}"></td> - </tr> - <tr> - <td class="row1">Topics Per Page</td> - <td class="row2"><input type="text" name="topics_per_page" size="3" maxlengh="4" value="{TOPICS_PER_PAGE}"></td> - </tr> - <tr> - <td class="row1">Posts Per Page</td> - <td class="row2"><input type="text" name="posts_per_page" size="3" maxlengh="4" value="{POSTS_PER_PAGE}"></td> - </tr> - <tr> - <td class="row1">Hot Threshold</td> - <td class="row2"><input type="text" name="hot_topic" size="3" maxlengh="4" value="{HOT_TOPIC}"></td> - </tr> - <tr> - <td class="row1">Default Template:</td> - <td class="row2">{TEMPLATE_SELECT}</td> - </tr> - <tr> - <td class="row1">Default Theme:</td> - <td class="row2">{THEME_SELECT}</td> - </tr> - <tr> - <td class="row1">Default Language:</td> - <td class="row2">{LANG_SELECT}</td> - </tr> - <tr> - <td class="row1">Date Format:<br /> - <span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span> - </td> - <td class="row2"><input type="text" maxlength="16" name="date_format" value="{DATE_FORMAT}"></td> - </tr> - <tr> - <td class="row1">System Timezone:</td> - <td class="row2">{TIMEZONE_SELECT}</td> - </tr> - <tr> - <td class="row1">Enable GZip Compression:</td> - <td class="row2"><input type="radio" name="gzip" value="1" {GZIP_YES}> Yes <input type="radio" name="gzip" value="1" {GZIP_NO}> No</td> - </tr> - <tr> - <th colspan="2">User/Forum Ability Settings</th> - </tr> - <tr> - <td class="row1">Allow HTML</td> - <td class="row2"><input type="radio" name="allow_html" value="1" {HTML_YES}> Yes <input type="radio" name="allow_html" value="0" {HTML_NO}> No</td> - </tr> - <tr> - <td class="row1">Allow BBCode</td> - <td class="row2"><input type="radio" name="allow_bbcode" value="1" {BBCODE_YES}> Yes <input type="radio" name="allow_bbcode" value="0" {BBCODE_NO}> No</td> - </tr> - <tr> - <td class="row1">Allow Smilies</td> - <td class="row2"><input type="radio" name="allow_smile" value="1" {SMILE_YES}> Yes <input type="radio" name="allow_smile" value="0" {SMILE_NO}> No</td> - </tr> - <tr> - <td class="row1">Allow Signatures</td> - <td class="row2"><input type="radio" name="allow_sig" value="1" {SIG_YES}> Yes <input type="radio" name="allow_sig" value="0" {SIG_NO}> No</td> - </tr> - <tr> - <td class="row1">Allow Name Change</td> - <td class="row2"><input type="radio" name="allow_namechange" value="1" {NAMECHANGE_YES}> Yes <input type="radio" name="allow_namechange" value="0" {NAMECHANGE_NO}> No</td> - </tr> - <tr> - <th colspan="2">Avatar Settings</th> - </tr> - <tr> - <td class="row1">Allow use of local avatar images</td> - <td class="row2"><input type="radio" name="allow_avatars_local" value="1" {AVATARS_LOCAL_YES}> Yes <input type="radio" name="allow_avatars_local" value="0" {AVATARS_LOCAL_NO}> No</td> - </tr> - <tr> - <td class="row1">Allow use of remote avatar images <br /> - <span class="gensmall">(Avatars linked from another website) - </td> - <td class="row2"><input type="radio" name="allow_avatars_remote" value="1" {AVATARS_REMOTE_YES}> Yes <input type="radio" name="allow_avatars_remote" value="0" {AVATARS_REMOTE_NO}> No</td> - </tr> - <tr> - <td class="row1">Allow avatar uploading</td> - <td class="row2"><input type="radio" name="allow_avatars_upload" value="1" {AVATARS_UPLOAD_YES}> Yes <input type="radio" name="allow_avatars_upload" value="0" {AVATARS_UPLOAD_NO}> No</td> - </tr> - <tr> - <td class="row1">Max. Avatar File Size<br /> - <span class="gensmall">(For uploaded avatar files)</span> - </td> - <td class="row2"><input type="text" size="4" maxlength="10" name="avatar_filesize" value="{AVATAR_FILESIZE}"> Bytes</td> - </tr> - <tr> - <td class="row1">Max. Avatar Size <br /> - <span class="gensmall">(height x width)</span> - </td> - <td class="row2"><input type="text" size="3" maxlength="4" name="avatar_height" value="{AVATAR_HEIGHT}"> x <input type="text" size="3" maxlength="4" name="avatar_width" value="{AVATAR_WIDTH}"></td> - </tr> - <tr> - <td class="row1">Avatar Storage Path <br /> - <span class="gensmall">(Specify the path under your phpBB root dir. e.g.: images/avatars)</span> - </td> - <td class="row2"><input type="text" size="20" maxlength="255" name="avatar_path" value="{AVATAR_PATH}"></td> - </tr> - <tr> - <th colspan="2">Email Settings</th> - </tr> - <tr> - <td class="row1">Admin Email Address</td> - <td class="row2"><input type="text" size="25" maxlength="100" name="admin_email" value="{ADMIN_EMAIL}"></td> - </tr> - <tr> - <td class="row1">Email Signature<br /> - <span class="gensmall">(This text will be attached to all emails the board sends)</span> - </td> - <td class="row2"><textarea name="email_sig" rows="5" cols="30">{EMAIL_SIG}</textarea></td> - </tr> - <tr> - <td class="row1">Use SMTP for delivery<br /> - <span class="gensmall">(This will tell phpBB to use a specified email server insted of the built in mail() function)</span> - </td> - <td class="row2"><input type="radio" name="use_smtp" value="1" {SMTP_YES}> Yes <input type="radio" name="use_smtp" value="0" {SMTP_NO}> No</td> - </tr> - <tr> - <td class="row1">SMTP Server</td> - <td class="row2"><input type="text" name="smtp_server" value="{SMTP_SERVER}" size="25" maxlength="50"></td> - </tr> - <tr> - <td class="row1" align="center" colspan="2"> - <input type="hidden" name="mode" value="config"> - <input type="submit" name="submit" value="Save Settings"> - </td> - </tr> - </table> - </td> + <td class="tablebg" width="100%"><table width="100%" cellpadding="4" cellspacing="1" border="0"> + <tr> + <td class="cat" colspan="2"><span class="cattitle">General Board Settings</span></td> + </tr> + <tr> + <td class="row1">Site Name:</td> + <td class="row2"><input type="text" size="25" maxlength="100" name="sitename" value="{SITENAME}"></td> + </tr> + <tr> + <td class="row1">Enable account activation:</td> + <td class="row2"><input type="radio" name="require_activation" value="1" {ACTIVATION_YES}>Yes <input type="radio" name="require_activation" value="0" {ACTIVATION_NO}>No</td> + </tr> + <tr> + <td class="row1">Flood Interval: <br /><span class="gensmall">Number of seconds a user must wait between posts</span></td> + <td class="row2"><input type="text" size="3" maxlength="4" name="flood_interval" value="{FLOOD_INTERVAL}"></td> + </tr> + <tr> + <td class="row1">Topics Per Page</td> + <td class="row2"><input type="text" name="topics_per_page" size="3" maxlength="4" value="{TOPICS_PER_PAGE}"></td> + </tr> + <tr> + <td class="row1">Posts Per Page</td> + <td class="row2"><input type="text" name="posts_per_page" size="3" maxlength="4" value="{POSTS_PER_PAGE}"></td> + </tr> + <tr> + <td class="row1">Hot Threshold</td> + <td class="row2"><input type="text" name="hot_topic" size="3" maxlength="4" value="{HOT_TOPIC}"></td> + </tr> + <tr> + <td class="row1">Default Template:</td> + <td class="row2">{TEMPLATE_SELECT}</td> + </tr> + <tr> + <td class="row1">Default Theme:</td> + <td class="row2">{THEME_SELECT}</td> + </tr> + <tr> + <td class="row1">Default Language:</td> + <td class="row2">{LANG_SELECT}</td> + </tr> + <tr> + <td class="row1">Date Format:<br /><span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td> + <td class="row2"><input type="text" maxlength="16" name="date_format" value="{DATE_FORMAT}"></td> + </tr> + <tr> + <td class="row1">System Timezone:</td> + <td class="row2">{TIMEZONE_SELECT}</td> + </tr> + <tr> + <td class="row1">Enable GZip Compression:</td> + <td class="row2"><input type="radio" name="gzip" value="1" {GZIP_YES}> Yes <input type="radio" name="gzip" value="1" {GZIP_NO}> No</td> + </tr> + <tr> + <td class="cat" colspan="2"><span class="cattitle">User/Forum Ability Settings</span></td> + </tr> + <tr> + <td class="row1">Allow HTML</td> + <td class="row2"><input type="radio" name="allow_html" value="1" {HTML_YES}> Yes <input type="radio" name="allow_html" value="0" {HTML_NO}> No</td> + </tr> + <tr> + <td class="row1">Allow BBCode</td> + <td class="row2"><input type="radio" name="allow_bbcode" value="1" {BBCODE_YES}> Yes <input type="radio" name="allow_bbcode" value="0" {BBCODE_NO}> No</td> + </tr> + <tr> + <td class="row1">Allow Smilies</td> + <td class="row2"><input type="radio" name="allow_smile" value="1" {SMILE_YES}> Yes <input type="radio" name="allow_smile" value="0" {SMILE_NO}> No</td> + </tr> + <tr> + <td class="row1">Allow Signatures</td> + <td class="row2"><input type="radio" name="allow_sig" value="1" {SIG_YES}> Yes <input type="radio" name="allow_sig" value="0" {SIG_NO}> No</td> + </tr> + <tr> + <td class="row1">Allow Name Change</td> + <td class="row2"><input type="radio" name="allow_namechange" value="1" {NAMECHANGE_YES}> Yes <input type="radio" name="allow_namechange" value="0" {NAMECHANGE_NO}> No</td> + </tr> + <tr> + <td class="cat" colspan="2"><span class="cattitle">Avatar Settings</span></td> + </tr> + <tr> + <td class="row1">Allow local gallery avatars</td> + <td class="row2"><input type="radio" name="allow_avatars_local" value="1" {AVATARS_LOCAL_YES}> Yes <input type="radio" name="allow_avatars_local" value="0" {AVATARS_LOCAL_NO}> No</td> + </tr> + <tr> + <td class="row1">Allow remote avatars <br /><span class="gensmall">Avatars linked from another website</span></td> + <td class="row2"><input type="radio" name="allow_avatars_remote" value="1" {AVATARS_REMOTE_YES}> Yes <input type="radio" name="allow_avatars_remote" value="0" {AVATARS_REMOTE_NO}> No</td> + </tr> + <tr> + <td class="row1">Allow avatar uploading</td> + <td class="row2"><input type="radio" name="allow_avatars_upload" value="1" {AVATARS_UPLOAD_YES}> Yes <input type="radio" name="allow_avatars_upload" value="0" {AVATARS_UPLOAD_NO}> No</td> + </tr> + <tr> + <td class="row1">Max. Avatar File Size<br /><span class="gensmall">For uploaded avatar files</span></td> + <td class="row2"><input type="text" size="4" maxlength="10" name="avatar_filesize" value="{AVATAR_FILESIZE}"> Bytes</td> + </tr> + <tr> + <td class="row1">Max. Avatar Size <br /> + <span class="gensmall">(height x width)</span> + </td> + <td class="row2"><input type="text" size="3" maxlength="4" name="avatar_height" value="{AVATAR_HEIGHT}"> x <input type="text" size="3" maxlength="4" name="avatar_width" value="{AVATAR_WIDTH}"></td> + </tr> + <tr> + <td class="row1">Avatar Storage Path <br /><span class="gensmall">Path under your phpBB root dir, e.g. images/avatars</span></td> + <td class="row2"><input type="text" size="20" maxlength="255" name="avatar_path" value="{AVATAR_PATH}"></td> + </tr> + <tr> + <td class="cat" colspan="2"><span class="cattitle">Email Settings</span></td> + </tr> + <tr> + <td class="row1">Admin Email Address</td> + <td class="row2"><input type="text" size="25" maxlength="100" name="admin_email" value="{ADMIN_EMAIL}"></td> + </tr> + <tr> + <td class="row1">Email Signature<br /><span class="gensmall">This text will be attached to all emails the board sends</span></td> + <td class="row2"><textarea name="email_sig" rows="5" cols="30">{EMAIL_SIG}</textarea></td> + </tr> + <tr> + <td class="row1">Use SMTP for delivery<br /><span class="gensmall">Say yes if you want or have to send email via a server instead of the local mail function</span></td> + <td class="row2"><input type="radio" name="use_smtp" value="1" {SMTP_YES}> Yes <input type="radio" name="use_smtp" value="0" {SMTP_NO}> No</td> + </tr> + <tr> + <td class="row1">SMTP Server</td> + <td class="row2"><input type="text" name="smtp_server" value="{SMTP_SERVER}" size="25" maxlength="50"></td> + </tr> + <tr> + <td class="cat" colspan="2" align="center"> + <input type="hidden" name="mode" value="config"> + <input type="submit" name="submit" value="Save Settings"> + </td> + </tr> + </table></td> </tr> </table> + </form> <br clear="all"> diff --git a/phpBB/templates/PSO/admin/admin_index_body.tpl b/phpBB/templates/PSO/admin/admin_index_body.tpl index 6888afec42..bcea64e37f 100644 --- a/phpBB/templates/PSO/admin/admin_index_body.tpl +++ b/phpBB/templates/PSO/admin/admin_index_body.tpl @@ -1,50 +1,49 @@ -<h1>Welcome to phpBB</h1> +<br clear="all"> -<p> - Thank you for choosing phpBB as your forum solution. This screen will give you a quick overview of all the various statistics of your board. You can get back to this page by clicking on the <i><u>overview</u></i> link in the left pane.<br /> - The other links on the left hand side of this screen will allow you to control every aspect of your forum experiance, each screen will have instructions on how to use the tools. -</p> +<h1>Welcome to phpBB</h1> +<p>Thank you for choosing phpBB as your forum solution. This screen will give you a quick overview of all the various statistics of your board. You can get back to this page by clicking on the <u>Admin Index</u> link in the left pane. To return to the index of your board, click the <u>Board Index</u> link also in the left pane. The other links on the left hand side of this screen will allow you to control every aspect of your forum experience, each screen will have instructions on how to use the tools.</p> <h2>Forum Statistics</h2> -<table border="0" cellpadding="1" cellspacing="0" width="70%" align="center"> + +<table border="0" cellpadding="1" cellspacing="0" width="98%" align="center"> <tr> <td class="tablebg"> <table width="100%" cellpadding="4" cellspacing="1" border="0"> <tr> - <th width="25%">Statistic</th> + <th width="25%" nowrap>Statistic</th> <th width="25%">Value</th> - <th width="25%">Statistic</th> + <th width="25%" nowrap>Statistic</th> <th width="25%">Value</th> </tr> <tr> - <td class="row1">Current number of posts:</td> + <td class="row1" nowrap>Current number of posts:</td> <td class="row2"><b>{NUMBER_OF_POSTS}</b></td> - <td class="row1">Current number of topics:</td> - <td class="row2"><b>{NUMBER_OF_TOPICS}</b></td> - </tr> - <tr> - <td class="row1">Current number of users:</td> - <td class="row2"><b>{NUMBER_OF_USERS}</b></td> - <td class="row1">Board started on:</td> - <td class="row2"><b>{STARTDATE}</b></td> + <td class="row1" nowrap>Posts per day:</td> + <td class="row2"><b>{POSTS_PER_DAY}</b></td> </tr> <tr> - <td class="row1">Posts per day:</td> - <td class="row2"><b>{POSTS_PER_DAY}</b></td> - <td class="row1">Topics per day:</td> + <td class="row1" nowrap>Current number of topics:</td> + <td class="row2"><b>{NUMBER_OF_TOPICS}</b></td> + <td class="row1" nowrap>Topics per day:</td> <td class="row2"><b>{TOPICS_PER_DAY}</b></td> </tr> <tr> - <td class="row1">Users per day:</td> + <td class="row1" nowrap>Current number of users:</td> + <td class="row2"><b>{NUMBER_OF_USERS}</b></td> + <td class="row1" nowrap>Users per day:</td> <td class="row2"><b>{USERS_PER_DAY}</b></td> - <td class="row1">Avatar directory size:</td> + </tr> + <tr> + <td class="row1" nowrap>Board started on:</td> + <td class="row2"><b>{START_DATE}</b></td> + <td class="row1" nowrap>Avatar directory size:</td> <td class="row2"><b>{AVATAR_DIR_SIZE}</b></td> </tr> <tr> - <td class="row1">Database size:</td> + <td class="row1" nowrap>Database size:</td> <td class="row2"><b>{DB_SIZE}</b></td> - <td class="row1"> </td> + <td class="row1" nowrap> </td> <td class="row2"> </td> </tr> </table> diff --git a/phpBB/templates/PSO/admin/admin_message_body.tpl b/phpBB/templates/PSO/admin/admin_message_body.tpl index 29308c53dc..d813a56f3f 100644 --- a/phpBB/templates/PSO/admin/admin_message_body.tpl +++ b/phpBB/templates/PSO/admin/admin_message_body.tpl @@ -1,5 +1,5 @@ -<br clear="all"><br> +<br clear="all" /><br /> <table width="85%" cellpadding="1" cellspacing="0" border="0" align="center"> <tr> @@ -14,4 +14,4 @@ </tr> </table> -<br clear="all"> +<br clear="all" /> diff --git a/phpBB/templates/PSO/admin/db_utilities_body.tpl b/phpBB/templates/PSO/admin/db_utilities_body.tpl index f56eda21d2..fff49f02be 100644 --- a/phpBB/templates/PSO/admin/db_utilities_body.tpl +++ b/phpBB/templates/PSO/admin/db_utilities_body.tpl @@ -1,7 +1,9 @@ +<br clear="all" /> + <h1>Database Utilities</h1> <div align="center">{U_DB_MESSAGE} -<br clear="all" /> - {U_DB_LINKS}</div> + +<br clear="all" /> diff --git a/phpBB/templates/PSO/admin/forum_auth_body.tpl b/phpBB/templates/PSO/admin/forum_auth_body.tpl index b1a957378b..dc623ebb27 100644 --- a/phpBB/templates/PSO/admin/forum_auth_body.tpl +++ b/phpBB/templates/PSO/admin/forum_auth_body.tpl @@ -1,11 +1,13 @@ +<br clear="all" /> + <h1>Forum Authorisation Control</h1> <p>Here you can control individual authorisation levels for each forum. You can either choose a <i>simple</i> setting which has pre-defined levels for each discrete authorisation type, or you can set each type via the <i>advanced</i> settings.</p> <h2>Forum: {FORUM_NAME}</h2> -<div align="center"><table cellspacing="1" cellpadding="4" border="0"> - <tr><form method="post" action="admin_forumauth.php"> +<table cellspacing="1" cellpadding="4" border="0" align="center"> + <tr><form method="post" action="{S_FORUMAUTH_ACTION}"> <!-- BEGIN forum_auth_titles --> <th>{forum_auth_titles.CELL_TITLE}</th> <!-- END forum_auth_titles --> @@ -18,13 +20,13 @@ <tr> <td colspan="{S_COLUMN_SPAN}"><table width="100%" cellspacing="0" cellpadding="4" border="0"> <tr> - <td align="center">{U_SWITCH_MODE}</td> + <td align="center"><span class="gensmall">{U_SWITCH_MODE}</span></td> </tr> <tr> <td align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="Submit Changes"> <input type="reset" value="Reset to Initial"></td> </tr> </table></td> </form></tr> -</table></div> +</table> -<br clear="all"> +<br clear="all" /> diff --git a/phpBB/templates/PSO/admin/forum_auth_select_body.tpl b/phpBB/templates/PSO/admin/forum_auth_select_body.tpl index 919c394dfb..af2b12f919 100644 --- a/phpBB/templates/PSO/admin/forum_auth_select_body.tpl +++ b/phpBB/templates/PSO/admin/forum_auth_select_body.tpl @@ -1,7 +1,8 @@ +<br clear="all" /> -<div align="center"><h1>Forum Authorisation Control</h1> +<h1>Forum Authorisation Control</h1> -<table cellspacing="1" cellpadding="4" border="0"> +<table cellspacing="1" cellpadding="4" border="0" align="center"> <tr> <th bgcolor="#CCCCCC">Select a Forum</th> </tr> @@ -10,4 +11,4 @@ </form></tr> </table></div> -<br clear="all"> +<br clear="all" /> diff --git a/phpBB/templates/PSO/admin/forum_prune_body.tpl b/phpBB/templates/PSO/admin/forum_prune_body.tpl index 42d555e7f7..2a3300258d 100644 --- a/phpBB/templates/PSO/admin/forum_prune_body.tpl +++ b/phpBB/templates/PSO/admin/forum_prune_body.tpl @@ -1,17 +1,20 @@ + +<br clear="all" /> + <h1>Forum Pruning</h1> <h2>Forum: {FORUM_NAME}</h2> -<div align="center"><table cellspacing="1" cellpadding="4" border="0"> - <tr><form method="post" action="{S_FORUMPRUNE_ACTION}">{S_HIDDEN_VARS} - <td>{S_PRUNE_DATA}</td> +<table cellspacing="1" cellpadding="4" border="0" align="center"> + <tr><form method="post" action="{S_FORUMPRUNE_ACTION}">{S_HIDDEN_VARS} + <td>{S_PRUNE_DATA}</td> </tr> <tr> - <td align="center"><input type="submit" name="submit" value="Prune"></td> + <td align="center"><input type="submit" name="submit" value="Prune"></td> </tr> <tr> - <td><i>Note: This will not prune announcements or sticky topics, these must be removed manually.</i></td> - </tr> - </form> -</table></div> -<br clear="all"> + <td><span class="gensmall">Note: This will not prune announcements or sticky topics, these must be removed manually.</span></td> + </form></tr> +</table> + +<br clear="all" /> diff --git a/phpBB/templates/PSO/admin/forum_prune_result_body.tpl b/phpBB/templates/PSO/admin/forum_prune_result_body.tpl index 44131dccbc..07703e41c5 100644 --- a/phpBB/templates/PSO/admin/forum_prune_result_body.tpl +++ b/phpBB/templates/PSO/admin/forum_prune_result_body.tpl @@ -1,19 +1,23 @@ + +<br clear="all" /> + <h1>Forum Pruning</h1> <p>Here are the results from your forum pruning:</p> -<div align="center"><table cellspacing="1" cellpadding="4" border="0"> +<table cellspacing="1" cellpadding="4" border="0" align="center"> <tr> <th>FORUM NAME</th> <th>TOPICS PRUNED</th> <th>POSTS PRUNED</th> </tr> - <!-- BEGIN prune_results --> + <!-- BEGIN prune_results --> <tr> <td class="row1" align="center">{prune_results.FORUM_NAME}</td> <td class="row1" align="center">{prune_results.FORUM_TOPICS}</td> <td class="row1" align="center">{prune_results.FORUM_POSTS}</td> </tr> - <!-- END prune_results --> - </table></div> -<br clear="all"> + <!-- END prune_results --> +</table> + +<br clear="all" /> diff --git a/phpBB/templates/PSO/admin/forum_prune_select_body.tpl b/phpBB/templates/PSO/admin/forum_prune_select_body.tpl index f313007852..6c9256375d 100644 --- a/phpBB/templates/PSO/admin/forum_prune_select_body.tpl +++ b/phpBB/templates/PSO/admin/forum_prune_select_body.tpl @@ -1,13 +1,15 @@ -<div align="center"><h1>Forum Pruning</h1> +<br clear="all" /> -<table cellspacing="1" cellpadding="4" border="0"> +<h1>Forum Pruning</h1> + +<table cellspacing="1" cellpadding="4" border="0" align="center"> <tr> <th bgcolor="#CCCCCC">Select a Forum</th> </tr> <tr><form method="get" action="{S_FORUMPRUNE_ACTION}"> <td class="row1" align="center">{S_FORUMS_SELECT} <input type="submit" value="Select"> </td> </form></tr> -</table></div> +</table> -<br clear="all"> +<br clear="all" /> diff --git a/phpBB/templates/PSO/admin/index_frameset.tpl b/phpBB/templates/PSO/admin/index_frameset.tpl index a979525dcc..64efee3f7d 100644 --- a/phpBB/templates/PSO/admin/index_frameset.tpl +++ b/phpBB/templates/PSO/admin/index_frameset.tpl @@ -1,18 +1,17 @@ <html> <head> -<title>Admin</title> +<title>phpBB Administration</title> </head> -<frameset rows="80,*" border="0" frameborder="0"> - <frame src="{S_FRAME_HEADER}" name="top" SCROLLING="NO"> - <frameset cols="140,*" border="0" frameborder="0"> - <frame src="{S_FRAME_NAV}" name="nav"> - <frame src="{S_FRAME_MAIN}" name="main"> - </frameset> +<frameset cols="140,*" scrolling="no" border="0"> + <frame src="{S_FRAME_NAV}" name="nav"> + <frame src="{S_FRAME_MAIN}" name="main"> </frameset> + <noframes> - <body bgcolor="#FFFFFF"> - Sorry, your browser doesn't seem to support Frames.. -</body> + <body bgcolor="#FFFFFF" text="#000000"> + <p>Sorry, your browser doesn't seem to support frames</p> + </body> </noframes> -</html> + +</html>
\ No newline at end of file diff --git a/phpBB/templates/PSO/admin/navigate.tpl b/phpBB/templates/PSO/admin/navigate.tpl index 121d8fe398..0f52a36216 100644 --- a/phpBB/templates/PSO/admin/navigate.tpl +++ b/phpBB/templates/PSO/admin/navigate.tpl @@ -1,21 +1,24 @@ -<base target="main"> - -<table width="99%" cellpadding="1" cellspacing="0" border="0" align="center"> +<table width="100%" cellpadding="4" cellspacing="1" border="0"> + <tr> + <th class="cat">phpBB Admin</th> + </tr> + <tr> + <td class="row1"><a href="{U_ADMIN_INDEX}" target="main">{L_ADMIN_INDEX}</a></td> + </tr> + <tr> + <td class="row2"><a href="{U_BOARD_INDEX}" target="_top">{L_BOARD_INDEX}</a></td> + </tr> + <!-- BEGIN catrow --> + <tr> + <td class="cat" align="center"><span class="cattitle"><b>{catrow.CATNAME}</b></span></td> + </tr> + <!-- BEGIN actionrow --> <tr> - <td class="tablebg"><table width="100%" cellpadding="3" cellspacing="1" border="0"> - <!-- BEGIN catrow --> - <tr> - <td class="cat" colspan="6"><span class="cattitle"><b>{catrow.CATNAME}</b> </span></td> - </tr> - <!-- BEGIN actionrow --> - <tr> - <td class="row1" width="7%"><a href="{catrow.actionrow.FILE}">{catrow.actionrow.ACTIONNAME}</a></td> - </tr> - <!-- END actionrow --> - <!-- END catrow --> - </table></td> + <td class="{catrow.actionrow.ROW_CLASS}"><a href="{catrow.actionrow.FILE}" target="main">{catrow.actionrow.ACTIONNAME}</a></td> </tr> + <!-- END actionrow --> + <!-- END catrow --> </table> </body> diff --git a/phpBB/templates/PSO/admin/overall_header.tpl b/phpBB/templates/PSO/admin/overall_header.tpl index f87d3867c6..573275bb9b 100644 --- a/phpBB/templates/PSO/admin/overall_header.tpl +++ b/phpBB/templates/PSO/admin/overall_header.tpl @@ -20,20 +20,16 @@ SPAN.gensmall {font-family:{T_FONTFACE1};font-size:8pt} </head> <body bgcolor="{T_BODY_BGCOLOR}" text="{T_BODY_TEXT}" link="{T_BODY_LINK}" vlink="{T_BODY_VLINK}" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0"> -<table width="100%" height="100%" cellpadding="1" cellspacing="2" border="0" align="center"> +<table width="100%" height="100%" cellpadding="4" cellspacing="0" border="0" align="center"> <tr> - <td class="tablebg" width="100%" height="100%"><table width="100%" height="100%" cellspacing="1" cellpadding="4" border="0"> + <td class="cat" width="100%" height="100%"><table width="100%" height="100%" cellspacing="0" border="0"> <tr> - <td class="cat" width="100%" height="100%"><table width="100%" height="100%" cellspacing="0" border="0"> - <tr> - <td valign="top"><span class="title"><a href="{U_INDEX}" target="_top">phpBB2</a></span><span class="smalltitle"> : Administration</td> - <td align="right" valign="bottom"><span class="gensmall"><a href="http://www.phpbb.com/">Goto phpBB.com</a></span></td> - </tr> - </table></td> + <td valign="top"><span class="title"><a href="{U_INDEX}" target="_top">phpBB2</a></span><span class="smalltitle"> : Administration</td> + <td align="right" valign="bottom"><span class="gensmall"><a href="http://www.phpbb.com/">Goto phpBB.com</a></span></td> </tr> </table></td> </tr> -</table> +</table></td> </body> </html>
\ No newline at end of file diff --git a/phpBB/templates/PSO/admin/page_header.tpl b/phpBB/templates/PSO/admin/page_header.tpl index af42becb81..f402cac0ee 100644 --- a/phpBB/templates/PSO/admin/page_header.tpl +++ b/phpBB/templates/PSO/admin/page_header.tpl @@ -12,7 +12,7 @@ P {font-family:{T_FONTFACE1};font-size:10pt} TH {background-color:{T_TH_COLOR3};font-family:{T_FONTFACE2};font-size:8pt;font-weight:normal} TH.secondary {background-color:{T_TH_COLOR3};font-family:{T_FONTFACE1};font-size:10pt;font-weight:normal;text-align:left} -TD {font-family:Verdana,serif;font-size:8pt} +TD {font-family:Verdana,serif;font-size:10pt} TD.tablebg {background-color:{T_TH_COLOR1}} TD.cat {background-color:{T_TH_COLOR2}} TD.row1 {background-color:{T_TD_COLOR1}} @@ -34,4 +34,4 @@ INPUT.text {font-family:"Courier New",courier;font-size:8pt;} //--> </style> </head> -<body bgcolor="{T_BODY_BGCOLOR}" text="{T_BODY_TEXT}" link="{T_BODY_LINK}" vlink="{T_BODY_VLINK}"> +<body bgcolor="{T_BODY_BGCOLOR}" text="{T_BODY_TEXT}" link="{T_BODY_LINK}" vlink="{T_BODY_VLINK}" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0"> diff --git a/phpBB/templates/PSO/admin/ug_auth_body.tpl b/phpBB/templates/PSO/admin/ug_auth_body.tpl index 991ba30b90..f5eb8f8d1b 100644 --- a/phpBB/templates/PSO/admin/ug_auth_body.tpl +++ b/phpBB/templates/PSO/admin/ug_auth_body.tpl @@ -1,3 +1,4 @@ +<br clear="all" /> <h1>{L_USER_OR_GROUP} Authorisation Control</h1> @@ -31,7 +32,7 @@ <tr> <td colspan="{S_COLUMN_SPAN}"><table width="100%" cellspacing="0" cellpadding="4" border="0"> <tr> - <td align="center">{U_SWITCH_MODE}</td> + <td align="center"><span class="gensmall">{U_SWITCH_MODE}</span></td> </tr> <tr> <td align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="Request Update"> <input type="reset" value="Reset Changes"></td> diff --git a/phpBB/templates/PSO/admin/ug_auth_select_body.tpl b/phpBB/templates/PSO/admin/ug_auth_select_body.tpl index 2a1cc29712..bbd2cdec6f 100644 --- a/phpBB/templates/PSO/admin/ug_auth_select_body.tpl +++ b/phpBB/templates/PSO/admin/ug_auth_select_body.tpl @@ -1,7 +1,8 @@ +<br clear="all" /> -<div align="center"><h1>{L_USER_OR_GROUP} Authorisation Control</h1> +<h1>{L_USER_OR_GROUP} Authorisation Control</h1> -<table cellspacing="1" cellpadding="4" border="0"> +<table cellspacing="1" cellpadding="4" border="0" align="center"> <tr> <th>Select a {L_USER_OR_GROUP}</th> </tr> @@ -10,4 +11,4 @@ </form></tr> </table></div> -<br clear="all"> +<br clear="all" /> |