From ffc423bea65eb2442bdd89193b97f9f3b3dd6b66 Mon Sep 17 00:00:00 2001 From: dimka3210 Date: Tue, 29 May 2012 20:56:20 +0000 Subject: [PATCH] r424 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Не много SEO. По умолчанию пока выключил. git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@424 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- upload/config.php | 7 +- upload/includes/page_header.php | 149 ++++++++++++----------- upload/templates/default/page_header.tpl | 4 +- 3 files changed, 83 insertions(+), 77 deletions(-) diff --git a/upload/config.php b/upload/config.php index 9d7912d16..d35ee36cd 100644 --- a/upload/config.php +++ b/upload/config.php @@ -56,8 +56,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do // Increase number of revision after update $bb_cfg['tp_version'] = '2.5 Beta'; -$bb_cfg['tp_release_state'] = 'R423'; -$bb_cfg['tp_release_date'] = '27-05-2012'; +$bb_cfg['tp_release_state'] = 'R424'; +$bb_cfg['tp_release_date'] = '30-05-2012'; // Database $charset = 'utf8'; @@ -525,3 +525,6 @@ $bb_cfg['captcha'] = array( 'img_url' => './images/captcha/', # without '/' 'img_path' => BB_PATH .'/images/captcha/', # without '/' ); + +// SEO +$bb_cfg['seo_link_home_page'] = false; \ No newline at end of file diff --git a/upload/includes/page_header.php b/upload/includes/page_header.php index 1c4764c09..5049d2eba 100644 --- a/upload/includes/page_header.php +++ b/upload/includes/page_header.php @@ -166,100 +166,103 @@ else $report_list = ''; // Report [END] $template->assign_vars(array( - 'SIMPLE_HEADER' => !empty($gen_simple_header), - 'IN_ADMIN' => defined('IN_ADMIN'), - 'QUIRKS_MODE' => !empty($page_cfg['quirks_mode']), - 'SHOW_ADS' => (!$logged_in || isset($bb_cfg['show_ads_users'][$user->id]) || (!($is_admin || $is_mod) && $user->show_ads)), - 'USER_HIDE_CAT' => (BB_SCRIPT == 'index'), + 'SEO_LINK_HOME_PAGE' => ($bb_cfg['seo_link_home_page']) ? ((preg_match('/index\.php/', $_SERVER['SCRIPT_NAME'])) ? false : true) : true, - 'USER_RUS' => ($userdata['user_lang'] != 'english') ? true : false, + 'SIMPLE_HEADER' => !empty($gen_simple_header), - 'INCLUDE_BBCODE_JS' => !empty($page_cfg['include_bbcode_js']), - 'USER_OPTIONS_JS' => ($logged_in) ? bb_json_encode($user->opt_js) : '{}', + 'IN_ADMIN' => defined('IN_ADMIN'), + 'QUIRKS_MODE' => !empty($page_cfg['quirks_mode']), + 'SHOW_ADS' => (!$logged_in || isset($bb_cfg['show_ads_users'][$user->id]) || (!($is_admin || $is_mod) && $user->show_ads)), + 'USER_HIDE_CAT' => (BB_SCRIPT == 'index'), - 'USE_TABLESORTER' => !empty($page_cfg['use_tablesorter']), + 'USER_RUS' => ($userdata['user_lang'] != 'english') ? true : false, - 'SITENAME' => $bb_cfg['sitename'], - 'U_INDEX' => BB_ROOT ."index.php", - 'T_INDEX' => sprintf($lang['FORUM_INDEX'], $bb_cfg['sitename']), + 'INCLUDE_BBCODE_JS' => !empty($page_cfg['include_bbcode_js']), + 'USER_OPTIONS_JS' => ($logged_in) ? bb_json_encode($user->opt_js) : '{}', - 'IS_GUEST' => IS_GUEST, - 'IS_USER' => IS_USER, - 'IS_ADMIN' => IS_ADMIN, - 'IS_MOD' => IS_MOD, - 'IS_AM' => IS_AM, + 'USE_TABLESORTER' => !empty($page_cfg['use_tablesorter']), - 'FORUM_PATH' => FORUM_PATH, - 'FULL_URL' => FULL_URL, + 'SITENAME' => $bb_cfg['sitename'], + 'U_INDEX' => BB_ROOT ."index.php", + 'T_INDEX' => sprintf($lang['FORUM_INDEX'], $bb_cfg['sitename']), - 'LAST_VISIT_DATE' => ($logged_in) ? sprintf($lang['YOU_LAST_VISIT'], bb_date($userdata['user_lastvisit'], $bb_cfg['last_visit_date_format'])) : '', - 'CURRENT_TIME' => sprintf($lang['CURRENT_TIME'], bb_date(TIMENOW, $bb_cfg['last_visit_date_format'])), - 'S_TIMEZONE' => sprintf($lang['ALL_TIMES'], $lang[''.str_replace(',', '.', floatval($bb_cfg['board_timezone'])).'']), + 'IS_GUEST' => IS_GUEST, + 'IS_USER' => IS_USER, + 'IS_ADMIN' => IS_ADMIN, + 'IS_MOD' => IS_MOD, + 'IS_AM' => IS_AM, - 'PM_INFO' => $pm_info, - 'PRIVMSG_IMG' => $icon_pm, + 'FORUM_PATH' => FORUM_PATH, + 'FULL_URL' => FULL_URL, + + 'LAST_VISIT_DATE' => ($logged_in) ? sprintf($lang['YOU_LAST_VISIT'], bb_date($userdata['user_lastvisit'], $bb_cfg['last_visit_date_format'])) : '', + 'CURRENT_TIME' => sprintf($lang['CURRENT_TIME'], bb_date(TIMENOW, $bb_cfg['last_visit_date_format'])), + 'S_TIMEZONE' => sprintf($lang['ALL_TIMES'], $lang[''.str_replace(',', '.', floatval($bb_cfg['board_timezone'])).'']), + + 'PM_INFO' => $pm_info, + 'PRIVMSG_IMG' => $icon_pm, // Report - 'REPORT_LIST' => $report_list, - 'U_REPORT_LIST' => "report.php", + 'REPORT_LIST' => $report_list, + 'U_REPORT_LIST' => "report.php", // Report [END] - 'LOGGED_IN' => $logged_in, - 'SESSION_USER_ID' => $userdata['user_id'], - 'POINTS' => $userdata['user_points'], - 'THIS_USER' => profile_url($userdata), - 'THIS_AVATAR' => get_avatar($userdata['user_avatar'], $userdata['user_avatar_type'], !bf($userdata['user_opt'], 'user_opt', 'allow_avatar')), - 'SHOW_LOGIN_LINK' => !defined('IN_LOGIN'), - 'AUTOLOGIN_DISABLED' => !$bb_cfg['allow_autologin'], - 'S_LOGIN_ACTION' => BB_ROOT ."login.php", + 'LOGGED_IN' => $logged_in, + 'SESSION_USER_ID' => $userdata['user_id'], + 'POINTS' => $userdata['user_points'], + 'THIS_USER' => profile_url($userdata), + 'THIS_AVATAR' => get_avatar($userdata['user_avatar'], $userdata['user_avatar_type'], !bf($userdata['user_opt'], 'user_opt', 'allow_avatar')), + 'SHOW_LOGIN_LINK' => !defined('IN_LOGIN'), + 'AUTOLOGIN_DISABLED' => !$bb_cfg['allow_autologin'], + 'S_LOGIN_ACTION' => BB_ROOT ."login.php", - 'U_CUR_DOWNLOADS' => PROFILE_URL . $userdata['user_id'], - 'U_FAQ' => $bb_cfg['faq_url'], - 'U_FORUM' => "viewforum.php", - 'U_GROUP_CP' => "groupcp.php", - 'U_LOGIN_LOGOUT' => $u_login_logout, - 'U_MEMBERLIST' => "memberlist.php", - 'U_MODCP' => "modcp.php", - 'U_OPTIONS' => "profile.php?mode=editprofile", - 'U_PRIVATEMSGS' => "privmsg.php?folder=inbox", - 'U_PROFILE' => PROFILE_URL . $userdata['user_id'], - 'U_READ_PM' => "privmsg.php?folder=inbox". (($userdata['user_newest_pm_id'] && $userdata['user_new_privmsg'] == 1) ? "&mode=read&p={$userdata['user_newest_pm_id']}" : ''), - 'U_REGISTER' => "profile.php?mode=register", - 'U_SEARCH' => "search.php", - 'U_SEND_PASSWORD' => "profile.php?mode=sendpassword", - 'U_TERMS' => $bb_cfg['terms_and_conditions_url'], - 'U_TRACKER' => "tracker.php", - 'U_GALLERY' => "gallery.php", + 'U_CUR_DOWNLOADS' => PROFILE_URL . $userdata['user_id'], + 'U_FAQ' => $bb_cfg['faq_url'], + 'U_FORUM' => "viewforum.php", + 'U_GROUP_CP' => "groupcp.php", + 'U_LOGIN_LOGOUT' => $u_login_logout, + 'U_MEMBERLIST' => "memberlist.php", + 'U_MODCP' => "modcp.php", + 'U_OPTIONS' => "profile.php?mode=editprofile", + 'U_PRIVATEMSGS' => "privmsg.php?folder=inbox", + 'U_PROFILE' => PROFILE_URL . $userdata['user_id'], + 'U_READ_PM' => "privmsg.php?folder=inbox". (($userdata['user_newest_pm_id'] && $userdata['user_new_privmsg'] == 1) ? "&mode=read&p={$userdata['user_newest_pm_id']}" : ''), + 'U_REGISTER' => "profile.php?mode=register", + 'U_SEARCH' => "search.php", + 'U_SEND_PASSWORD' => "profile.php?mode=sendpassword", + 'U_TERMS' => $bb_cfg['terms_and_conditions_url'], + 'U_TRACKER' => "tracker.php", + 'U_GALLERY' => "gallery.php", - 'SHOW_SIDEBAR1' => (!empty($page_cfg['show_sidebar1'][BB_SCRIPT]) || $bb_cfg['show_sidebar1_on_every_page']), - 'SHOW_SIDEBAR2' => (!empty($page_cfg['show_sidebar2'][BB_SCRIPT]) || $bb_cfg['show_sidebar2_on_every_page']), + 'SHOW_SIDEBAR1' => (!empty($page_cfg['show_sidebar1'][BB_SCRIPT]) || $bb_cfg['show_sidebar1_on_every_page']), + 'SHOW_SIDEBAR2' => (!empty($page_cfg['show_sidebar2'][BB_SCRIPT]) || $bb_cfg['show_sidebar2_on_every_page']), // Common urls - 'CAT_URL' => BB_ROOT . CAT_URL, - 'DOWNLOAD_URL' => BB_ROOT . DOWNLOAD_URL, - 'FORUM_URL' => BB_ROOT . FORUM_URL, - 'GROUP_URL' => BB_ROOT . GROUP_URL, - 'NEWEST_URL' => '&view=newest#newest', - 'POST_URL' => BB_ROOT . POST_URL, - 'PROFILE_URL' => BB_ROOT . PROFILE_URL, - 'TOPIC_URL' => BB_ROOT . TOPIC_URL, + 'CAT_URL' => BB_ROOT . CAT_URL, + 'DOWNLOAD_URL' => BB_ROOT . DOWNLOAD_URL, + 'FORUM_URL' => BB_ROOT . FORUM_URL, + 'GROUP_URL' => BB_ROOT . GROUP_URL, + 'NEWEST_URL' => '&view=newest#newest', + 'POST_URL' => BB_ROOT . POST_URL, + 'PROFILE_URL' => BB_ROOT . PROFILE_URL, + 'TOPIC_URL' => BB_ROOT . TOPIC_URL, - 'AJAX_HTML_DIR' => AJAX_HTML_DIR, + 'AJAX_HTML_DIR' => AJAX_HTML_DIR, - 'ONLY_NEW_POSTS' => ONLY_NEW_POSTS, - 'ONLY_NEW_TOPICS' => ONLY_NEW_TOPICS, + 'ONLY_NEW_POSTS' => ONLY_NEW_POSTS, + 'ONLY_NEW_TOPICS' => ONLY_NEW_TOPICS, // Misc - 'DEBUG' => DEBUG, - 'BOT_UID' => BOT_UID, - 'COOKIE_MARK' => COOKIE_MARK, - 'SID' => $userdata['session_id'], - 'SID_HIDDEN' => '', + 'DEBUG' => DEBUG, + 'BOT_UID' => BOT_UID, + 'COOKIE_MARK' => COOKIE_MARK, + 'SID' => $userdata['session_id'], + 'SID_HIDDEN' => '', - 'CHECKED' => HTML_CHECKED, - 'DISABLED' => HTML_DISABLED, - 'READONLY' => HTML_READONLY, - 'SELECTED' => HTML_SELECTED, + 'CHECKED' => HTML_CHECKED, + 'DISABLED' => HTML_DISABLED, + 'READONLY' => HTML_READONLY, + 'SELECTED' => HTML_SELECTED, 'U_SEARCH_SELF_BY_LAST' => "search.php?uid={$userdata['user_id']}&o=5", )); diff --git a/upload/templates/default/page_header.tpl b/upload/templates/default/page_header.tpl index a4197f308..27690ebc9 100644 --- a/upload/templates/default/page_header.tpl +++ b/upload/templates/default/page_header.tpl @@ -319,7 +319,7 @@ function go_to_page ()
- {L_HOME}| + {L_HOME}| {L_TRACKER}| {L_GALLERY}| {L_SEARCH}| @@ -346,7 +346,7 @@ function go_to_page ()