rock.ru/forum
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://bitbucket.org/rusty_angel/rock-site

Browse Source
This commit is contained in:
Aleksei Miheev
2014-01-05 23:54:42 +04:00
parent 12fc012e9b b80cc53461
commit 04c90648c8
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Themes/default/index.template.php
View File

@@ -30,16 +30,23 @@ function template_main_above()
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta property="fb:admins" content="1137870918" />
<meta property="fb:admins" content="1137870918" />';
/*
<meta property="og:type" content="website"/>
<meta property="og:title" content="Российский Рок-портал"/>
<meta property="og:image" content="http://img.rock.ru/images/logo-square.jpg"/>
<meta property="og:url" content="http://rock.ru/"/>
*/
echo'
<script type="text/javascript" src="http://yandex.st/jquery/1.7.2/jquery.min.js"></script>
<script language="JavaScript" type="text/javascript" src="http://yandex.st/jquery/cookie/1.0/jquery.cookie.min.js"></script>
<script language="JavaScript" type="text/javascript" src="', $settings['default_theme_url'], '/script.js"></script>
<script type="text/javascript" src="http://rock.ru/ads/www/delivery/spcjs.php?id=1"></script>
<script type="text/javascript" src="http://img.rock.ru/js/bar.minified.js"></script>
<script type="text/javascript" src="http://ads.rock.ru/www/delivery/spcjs.php?id=1"></script>
<script type="text/javascript" src="http://img.rock.ru/js/bar.minified.js"></script>';
if (! defined('MOBILE'))
echo '
<script type="text/javascript" src="http://img.rock.ru/js/snowstorm.js"></script>';
echo '
<link type="text/css" href="http://img.rock.ru/css/bar/default/jx.stylesheet.css?v=1" rel="stylesheet" media="screen"/>
@@ -74,7 +81,7 @@ function template_main_above()
}
echo '
<link id="style-width" rel="stylesheet" type="text/css" href="', $settings['theme_url'], '/' . $style_width .'?v5" />';
<link id="style-width" rel="stylesheet" type="text/css" href="', $settings['theme_url'], '/' . $style_width .'?v8" />';
// Show all the relative links, such as help, search, contents, and the like.
echo '
@@ -146,12 +153,12 @@ function template_main_above()
// This part is the logo and forum name. You should be able to change this to whatever you want...
echo '
<a href="http://www.rock.ru/"><img src="', $settings['images_url'], '/logo.gif" width="198" height="76" alt="На главную страница форума" border="0" /></a>';
<a href="http://rock.ru/"><img src="', $settings['images_url'], '/logo.gif" width="198" height="76" alt="Российский рок-портал" border="0" /></a>';
echo '
</td>
<td style="text-align:center; font-weight:bold;">
<a href="http://rock.ru/">Главная</a> - <a href="http://rock.ru/news/">Новости</a> - <a href="http://lyrics.rock.ru/">Тексты&nbsp;песен</a> - <a href="http://rock.ru/reviews/">Рецензии</a> - <a href="http://rock.ru/chat/">Чат</a> - <a href="http://photo.rock.ru/">Хостинг для картинок</a><br />
<a href="http://rock.ru/">Главная</a> - <a href="http://rock.ru/news/">Новости</a> - <a href="http://rock.ru/lyrics/">Тексты&nbsp;песен</a> - <a href="http://rock.ru/reviews/">Рецензии</a> - <a href="http://rock.ru/chat/">Чат</a> - <a href="http://photo.rock.ru/">Хостинг для картинок</a><br />
<div style="text-align: center;"> ';
?>

4
index.php
View File

@@ -196,12 +196,14 @@ function smf_main()
if (empty($board) && empty($topic))
{
require_once($sourcedir . '/BoardIndex.php');
pinba_script_name_set("/forum/BoardIndex.php");
return 'BoardIndex';
}
// Topic is empty, and action is empty.... MessageIndex!
elseif (empty($topic))
{
require_once($sourcedir . '/MessageIndex.php');
pinba_script_name_set("/forum/MessageIndex.php");
return 'MessageIndex';
}
// Board is not empty... topic is not empty... action is empty.. Display!
@@ -209,6 +211,7 @@ function smf_main()
{
require_once($sourcedir . '/Subs-Post.php');
require_once($sourcedir . '/Display.php');
pinba_script_name_set("/forum/Display.php");
return 'Display';
}
}
@@ -358,6 +361,7 @@ function smf_main()
return 'BoardIndex';
}
pinba_script_name_set("/forum/{$actionArray[$_REQUEST['action']][0]}/{$actionArray[$_REQUEST['action']][1]}"); # . isset($_REQUEST['sa']) ? "/{$_REQUEST['sa']}/" : "");
// Otherwise, it was set - so let's go to that action.
require_once($sourcedir . '/' . $actionArray[$_REQUEST['action']][0]);
return $actionArray[$_REQUEST['action']][1];