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 = "\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 .= " Days."; + $hidden_input = ""; // @@ -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 @@ -

Configuration

+
+ +

General Configuration

+ +

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.

-

- 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. -

- + +
- +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
General Board Settings
Site Name:
Require user account activation:Yes  No
Flood Interval:
- (number of seconds a user must wait between posts) -
Topics Per Page
Posts Per Page
Hot Threshold
Default Template:{TEMPLATE_SELECT}
Default Theme:{THEME_SELECT}
Default Language:{LANG_SELECT}
Date Format:
- {L_DATE_FORMAT_EXPLAIN} -
System Timezone:{TIMEZONE_SELECT}
Enable GZip Compression: Yes   No
User/Forum Ability Settings
Allow HTML Yes   No
Allow BBCode Yes   No
Allow Smilies Yes   No
Allow Signatures Yes   No
Allow Name Change Yes   No
Avatar Settings
Allow use of local avatar images Yes   No
Allow use of remote avatar images
- (Avatars linked from another website) - 		Yes   No
Allow avatar uploading Yes   No
Max. Avatar File Size
- (For uploaded avatar files) - 		Bytes
Max. Avatar Size
- (height x width) - 		x
Avatar Storage Path
- (Specify the path under your phpBB root dir. e.g.: images/avatars) -
Email Settings
Admin Email Address
Email Signature
- (This text will be attached to all emails the board sends) -
Use SMTP for delivery
- (This will tell phpBB to use a specified email server insted of the built in mail() function) - 		Yes   No
SMTP Server
- - -
- 		+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
General Board Settings
Site Name:
Enable account activation:Yes  No
Flood Interval:
Number of seconds a user must wait between posts
Topics Per Page
Posts Per Page
Hot Threshold
Default Template:{TEMPLATE_SELECT}
Default Theme:{THEME_SELECT}
Default Language:{LANG_SELECT}
Date Format:
{L_DATE_FORMAT_EXPLAIN}
System Timezone:{TIMEZONE_SELECT}
Enable GZip Compression: Yes   No
User/Forum Ability Settings
Allow HTML Yes   No
Allow BBCode Yes   No
Allow Smilies Yes   No
Allow Signatures Yes   No
Allow Name Change Yes   No
Avatar Settings
Allow local gallery avatars Yes   No
Allow remote avatars
Avatars linked from another website		 Yes   No
Allow avatar uploading Yes   No
Max. Avatar File Size
For uploaded avatar files		 Bytes
Max. Avatar Size
+ (height x width) + 		x
Avatar Storage Path
Path under your phpBB root dir, e.g. images/avatars
Email Settings
Admin Email Address
Email Signature
This text will be attached to all emails the board sends
Use SMTP for delivery
Say yes if you want or have to send email via a server instead of the local mail function		 Yes   No
SMTP Server
+ + +
+

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 @@ +
+

Welcome to phpBB

-

- 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 overview link 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 experiance, each screen will have instructions on how to use the tools. -

- +

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 Admin Index link in the left pane. To return to the index of your board, click the Board Index 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.

Forum Statistics

- + +
- + - + - + - - - - - - - - - - - + - + + + + + - + + + - + + + + + - + - +
StatisticStatistic ValueStatisticStatistic Value
Current number of posts:Current number of posts: {NUMBER_OF_POSTS}Current number of topics:{NUMBER_OF_TOPICS}
Current number of users:{NUMBER_OF_USERS}Board started on:{STARTDATE}
Posts per day:Posts per day: {POSTS_PER_DAY}Topics per day:
Current number of topics:{NUMBER_OF_TOPICS}Topics per day: {TOPICS_PER_DAY}
Users per day:Current number of users:{NUMBER_OF_USERS}Users per day: {USERS_PER_DAY}Avatar directory size:
Board started on:{START_DATE}Avatar directory size: {AVATAR_DIR_SIZE}
Database size:Database size: {DB_SIZE}    
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 @@ -

+

@@ -14,4 +14,4 @@
-
+
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 @@ +
+

Database Utilities

{U_DB_MESSAGE} -
- {U_DB_LINKS}
+ +
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 @@ +
+

Forum Authorisation Control

Here you can control individual authorisation levels for each forum. You can either choose a simple setting which has pre-defined levels for each discrete authorisation type, or you can set each type via the advanced settings.

Forum: {FORUM_NAME}

-
- +
+ @@ -18,13 +20,13 @@ -
{forum_auth_titles.CELL_TITLE}
- +
{U_SWITCH_MODE}{U_SWITCH_MODE}
{S_HIDDEN_FIELDS}  
+
-
+
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 @@ +
-

Forum Authorisation Control

+

Forum Authorisation Control

- +
@@ -10,4 +11,4 @@
Select a Forum
-
+
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 @@ + +
+

Forum Pruning

Forum: {FORUM_NAME}

-
- {S_HIDDEN_VARS} - +
{S_PRUNE_DATA}
+ {S_HIDDEN_VARS} + - + - - - -
{S_PRUNE_DATA}
Note: This will not prune announcements or sticky topics, these must be removed manually.
-
+ Note: This will not prune announcements or sticky topics, these must be removed manually. + + + +
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 @@ + +
+

Forum Pruning

Here are the results from your forum pruning:

-
+
- + - -
FORUM NAME TOPICS PRUNED POSTS PRUNED
{prune_results.FORUM_NAME} {prune_results.FORUM_TOPICS} {prune_results.FORUM_POSTS}
-
+ + + +
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 @@ -

Forum Pruning

+
- +

Forum Pruning

+ +
-
Select a Forum
{S_FORUMS_SELECT}   
+ -
+
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 @@ -Admin +phpBB Administration - - - - - - + + + + - <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> - + + \ 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 @@ - - - +
- + + + + + + + + + + + + + + + + +
- - - - - - - - - - -
{catrow.CATNAME} 
{catrow.actionrow.ACTIONNAME}
phpBB Admin
{L_ADMIN_INDEX}
{L_BOARD_INDEX}
{catrow.CATNAME}
{catrow.actionrow.ACTIONNAME}
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} - +
-
+ -
- + +
- - - - -
phpBB2 : AdministrationGoto phpBB.com
phpBB2 : AdministrationGoto phpBB.com
+
\ 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;} //--> - + 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 @@ +

{L_USER_OR_GROUP} Authorisation Control

@@ -31,7 +32,7 @@ - + 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 @@ +
-

{L_USER_OR_GROUP} Authorisation Control

+

{L_USER_OR_GROUP} Authorisation Control

-
{U_SWITCH_MODE}{U_SWITCH_MODE}
{S_HIDDEN_FIELDS}   
+
@@ -10,4 +11,4 @@
Select a {L_USER_OR_GROUP}
-
+