diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php index 53dd87e3ab..4774fe4174 100644 --- a/phpBB/includes/page_header.php +++ b/phpBB/includes/page_header.php @@ -24,8 +24,11 @@ define(HEADER_INC, TRUE); +// // Parse and show the overall header. -$template->set_filenames(array("overall_header" => "overall_header.tpl", +// +$template->set_filenames(array( + "overall_header" => "overall_header.tpl", "overall_footer" => "overall_footer.tpl")); // @@ -34,7 +37,7 @@ $template->set_filenames(array("overall_header" => "overall_header.tpl", if($userdata['session_logged_in']) { $logged_in_status = "You are logged in as ".$userdata["username"]."."; - $logged_in_status .= " [Logout]"; + $logged_in_status .= " [Logout]"; } else { @@ -61,6 +64,7 @@ $template->assign_vars(array( "SITENAME" => $sitename, "PHPEX" => $phpEx, "PHPSELF" => $PHP_SELF, + "L_USERNAME" => $l_username, "L_PASSWORD" => $l_password, "L_WELCOMETO" => $l_welcometo, @@ -87,7 +91,12 @@ $template->assign_vars(array( "L_THEFORUMS" => $l_theforums, "L_NONEWPOSTS" => $l_nonewposts, "L_NEWPOSTS" => $l_newposts, + "S_TIMEZONE" => $s_timezone, + "S_FORUMS_URL" => POST_FORUM_URL, + "S_TOPICS_URL" => POST_TOPIC_URL, + "S_USERS_URL" => POST_USERS_URL, + "PAGE_TITLE" => $page_title, "LOGIN_STATUS" => $logged_in_status, "META_INFO" => $meta_tags)); @@ -122,11 +131,12 @@ switch($pagetype) "jumpbox" => "jumpbox.tpl", "footer" => "viewforum_footer.tpl")); $jumpbox = make_jumpbox(); - $template->assign_var_from_handle("JUMPBOX", "jumpbox"); $template->assign_vars(array( "JUMPBOX_LIST" => $jumpbox, - "JUMPBOX_ACTION" => "viewforum.".$phpEx, - "SELECT_NAME" => POST_FORUM_URL, + "JUMPBOX_ACTION" => "viewforum.".$phpEx, + "SELECT_NAME" => POST_FORUM_URL)); + $template->assign_var_from_handle("JUMPBOX", "jumpbox"); + $template->assign_vars(array( "FORUM_ID" => $forum_id, "FORUM_NAME" => $forum_name, "MODERATORS" => $forum_moderators)); @@ -140,11 +150,12 @@ switch($pagetype) "jumpbox" => "jumpbox.tpl", "footer" => "viewtopic_footer.tpl")); $jumpbox = make_jumpbox(); - $template->assign_var_from_handle("JUMPBOX", "jumpbox"); $template->assign_vars(array( "JUMPBOX_LIST" => $jumpbox, "JUMPBOX_ACTION" => "viewforum.".$phpEx, - "SELECT_NAME" => POST_FORUM_URL, + "SELECT_NAME" => POST_FORUM_URL)); + $template->assign_var_from_handle("JUMPBOX", "jumpbox"); + $template->assign_vars(array( "FORUM_ID" => $forum_id, "FORUM_NAME" => $forum_name, "TOPIC_ID" => $topic_id, @@ -154,16 +165,18 @@ switch($pagetype) break; case 'viewonline': - $template->set_filenames(array("header" => "viewonline_header.tpl", + $template->set_filenames(array( + "header" => "viewonline_header.tpl", "body" => "viewonline_body.tpl", "jumpbox" => "jumpbox.tpl", "footer" => "viewonline_footer.tpl")); $jumpbox = make_jumpbox(); - $template->assign_var_from_handle("JUMPBOX", "jumpbox"); $template->assign_vars(array( "JUMPBOX_LIST" => $jumpbox, - "JUMPBOX_ACTION" => "viewforum.".$phpEx, - "SELECT_NAME" => POST_FORUM_URL, + "JUMPBOX_ACTION" => "viewforum.".$phpEx, + "SELECT_NAME" => POST_FORUM_URL)); + $template->assign_var_from_handle("JUMPBOX", "jumpbox"); + $template->assign_vars(array( "TOTAL_POSTS" => $total_posts, "TOTAL_USERS" => $total_users, "POST_USER_URL" => POST_USERS_URL, @@ -181,11 +194,12 @@ switch($pagetype) "header" => "newtopic_header.tpl", "body" => "posting_body.tpl")); $jumpbox = make_jumpbox(); - $template->assign_var_from_handle("JUMPBOX", "jumpbox"); $template->assign_vars(array( "JUMPBOX_LIST" => $jumpbox, - "JUMPBOX_ACTION" => "viewforum.".$phpEx, - "SELECT_NAME" => POST_FORUM_URL, + "JUMPBOX_ACTION" => "viewforum.".$phpEx, + "SELECT_NAME" => POST_FORUM_URL)); + $template->assign_var_from_handle("JUMPBOX", "jumpbox"); + $template->assign_vars(array( "L_POSTNEWIN" => $l_postnewin, "FORUM_ID" => $forum_id, "FORUM_NAME" => $forum_name)); diff --git a/phpBB/index.php b/phpBB/index.php index 1c9c1a0738..171d77eb36 100644 --- a/phpBB/index.php +++ b/phpBB/index.php @@ -108,7 +108,6 @@ if($total_categories) $template->assign_block_vars("catrow", array( "CAT_ID" => $category_rows[$i]["cat_id"], - "POST_FORUM_URL" => POST_FORUM_URL, "CAT_DESC" => stripslashes($category_rows[$i]["cat_title"]) ) ); diff --git a/phpBB/templates/Default/index_body.tpl b/phpBB/templates/Default/index_body.tpl index d110ec2ee6..e2fadd0f3c 100644 --- a/phpBB/templates/Default/index_body.tpl +++ b/phpBB/templates/Default/index_body.tpl @@ -19,7 +19,7 @@ {catrow.forumrow.FOLDER} - {catrow.forumrow.FORUM_NAME}
{catrow.forumrow.FORUM_DESC} + {catrow.forumrow.FORUM_NAME}
{catrow.forumrow.FORUM_DESC} {catrow.forumrow.TOPICS} {catrow.forumrow.POSTS} {catrow.forumrow.LAST_POST} diff --git a/phpBB/templates/Default/newtopic_header.tpl b/phpBB/templates/Default/newtopic_header.tpl index 3e3d70a706..0e032ec54c 100644 --- a/phpBB/templates/Default/newtopic_header.tpl +++ b/phpBB/templates/Default/newtopic_header.tpl @@ -7,7 +7,7 @@ {L_POSTNEWIN}
- {FORUM_NAME} + {FORUM_NAME} diff --git a/phpBB/templates/Default/viewforum_body.tpl b/phpBB/templates/Default/viewforum_body.tpl index 3b84fbddc9..b9d952a9cf 100644 --- a/phpBB/templates/Default/viewforum_body.tpl +++ b/phpBB/templates/Default/viewforum_body.tpl @@ -15,7 +15,7 @@ {topicrow.FOLDER} - {topicrow.TOPIC_TITLE}{topicrow.GOTO_PAGE} + {topicrow.TOPIC_TITLE}{topicrow.GOTO_PAGE} {topicrow.REPLIES} {topicrow.TOPIC_POSTER} {topicrow.VIEWS} @@ -28,18 +28,16 @@ - - - - - - -
- - - - -
{PAGINATION}
-
- - + + + + + + +
+ + + + +
{S_TIMEZONE}{PAGINATION}
+ diff --git a/phpBB/templates/Default/viewforum_footer.tpl b/phpBB/templates/Default/viewforum_footer.tpl index 6b70389d0a..c55d8ce53b 100644 --- a/phpBB/templates/Default/viewforum_footer.tpl +++ b/phpBB/templates/Default/viewforum_footer.tpl @@ -8,11 +8,7 @@ - +
- - Post New Topic - - Post New Topic
@@ -24,7 +20,7 @@ - +
{JUMPBOX}{JUMPBOX}
diff --git a/phpBB/templates/Default/viewforum_header.tpl b/phpBB/templates/Default/viewforum_header.tpl index 8709741bfa..76435867ef 100644 --- a/phpBB/templates/Default/viewforum_header.tpl +++ b/phpBB/templates/Default/viewforum_header.tpl @@ -24,7 +24,7 @@ diff --git a/phpBB/templates/Default/viewonline_body.tpl b/phpBB/templates/Default/viewonline_body.tpl index 1093f74eed..08bca63aed 100644 --- a/phpBB/templates/Default/viewonline_body.tpl +++ b/phpBB/templates/Default/viewonline_body.tpl @@ -12,7 +12,7 @@ - + diff --git a/phpBB/templates/Default/viewonline_footer.tpl b/phpBB/templates/Default/viewonline_footer.tpl index bb22397c56..93e69a36f5 100644 --- a/phpBB/templates/Default/viewonline_footer.tpl +++ b/phpBB/templates/Default/viewonline_footer.tpl @@ -1,15 +1,17 @@ + - + diff --git a/phpBB/templates/Default/viewtopic_body.tpl b/phpBB/templates/Default/viewtopic_body.tpl index 546f8c620d..3844cac500 100644 --- a/phpBB/templates/Default/viewtopic_body.tpl +++ b/phpBB/templates/Default/viewtopic_body.tpl @@ -5,8 +5,8 @@ @@ -49,18 +49,22 @@ - diff --git a/phpBB/templates/Default/viewtopic_footer.tpl b/phpBB/templates/Default/viewtopic_footer.tpl index 4de01bcef3..f4277d2cf5 100644 --- a/phpBB/templates/Default/viewtopic_footer.tpl +++ b/phpBB/templates/Default/viewtopic_footer.tpl @@ -9,9 +9,9 @@
- + Post New Topic
 {userrow.USERNAME}  {userrow.USERNAME}   {userrow.LASTUPDATE}    {userrow.LOCATION} 
- - - - -
- - - - -
{JUMPBOX}
-
- 		+ + + + +
{S_TIMEZONE} + + + +
+ + + +
{JUMPBOX}
- - + +
This topic is {PAGES} long. {PAGINATION}View previous topicView next topicView previous topicView next topic
- + +
-
- - - + + + +
This topic is {PAGES} long. {PAGINATION}View previous topicView next topic
+ + + + +
{S_TIMEZONE}This topic is {PAGES} long. {PAGINATION}
View previous topicView next topic
-
diff --git a/phpBB/templates/Default/viewtopic_header.tpl b/phpBB/templates/Default/viewtopic_header.tpl index c524d8e746..323162b098 100644 --- a/phpBB/templates/Default/viewtopic_header.tpl +++ b/phpBB/templates/Default/viewtopic_header.tpl @@ -9,7 +9,7 @@
- + Post New Topic  - + Reply to this topic
- {SITENAME} - Forum Index >> {FORUM_NAME} >> {TOPIC_TITLE} + {SITENAME} - Forum Index >> {FORUM_NAME} >> {TOPIC_TITLE}
@@ -22,9 +22,9 @@ diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index d862d7750c..91295ebc89 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -158,16 +158,16 @@ if($total_topics) $last_post_time = date($date_format, $topic_rowset[$x]["post_time"]); $last_post_user = $topic_rowset[$x]["user2"]; $folder_img = ""; - $template->assign_block_vars("topicrow", array("FORUM_ID" => $forum_id, - "POST_TOPIC_URL" => POST_TOPIC_URL, - "TOPIC_ID" => $topic_id, - "FOLDER" => $folder_img, - "TOPIC_POSTER" => "".$topic_poster."", - "GOTO_PAGE" => $goto_page, - "REPLIES" => $replies, - "TOPIC_TITLE" => $topic_title, - "VIEWS" => $views, - "LAST_POST" => $last_post_time . "
" . $last_post_user ."")); + $template->assign_block_vars( + "topicrow", array("FORUM_ID" => $forum_id, + "TOPIC_ID" => $topic_id, + "FOLDER" => $folder_img, + "TOPIC_POSTER" => "".$topic_poster."", + "GOTO_PAGE" => $goto_page, + "REPLIES" => $replies, + "TOPIC_TITLE" => $topic_title, + "VIEWS" => $views, + "LAST_POST" => $last_post_time . "
" . $last_post_user ."")); } $count = 1; diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index cada2b70c4..f4d2ce99cc 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -62,8 +62,6 @@ if(!$onlinerow) } $template->assign_vars(array( - "POST_FORUM_URL" => POST_FORUM_URL, - "POST_USER_URL" => POST_USERS_URL, "L_WHOSONLINE" => $l_whosonline, "L_USERNAME" => $l_username, "L_LOCATION" => $l_forum_location,
- + Post New Topic  - + Reply to this topic