github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-22 06:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r55

Browse source 
Исправлена ошибка при очистке кеша шаблонов git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@55 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
nanosimbiot 2011-07-01 11:03:17 +00:00
commit ec7a284567
6 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
upload/admin/xs_cache.php
View file

@ -117,6 +117,14 @@ if(isset($_GET['clear']) && !defined('DEMO_MODE'))
$data .= str_replace('{NUM}', $num_error, $lang['XS_CACHE_LOG_COUNT2']) . "<br />\n";
}
}
if(!defined('NO_XS_HEADER'))
{
$template->set_filenames(array(
'xs_header' => XS_TPL_PATH . 'xs_header.tpl',
'xs_footer' => XS_TPL_PATH . 'xs_footer.tpl',
));
}
}
}

4
upload/admin/xs_include.php
View file

@ -174,10 +174,6 @@ $template->assign_vars(array(
if(!defined('NO_XS_HEADER'))
{
$template->set_filenames(array(
'xs_header' => XS_TPL_PATH . 'xs_header.tpl',
'xs_footer' => XS_TPL_PATH . 'xs_footer.tpl',
));
$template->preparse = 'xs_header';
$template->postparse = 'xs_footer';
$template->assign_block_vars('nav_left',array('ITEM' => '<a href="' . append_sid('xs_index.php') . '">' . $lang['XS_MENU'] . '</a>'));

1
upload/includes/db/mysql.php
View file

@ -95,7 +95,6 @@ class sql_db
{
$server = (DBG_USER) ? $this->cfg['dbhost'] : '';
header("HTTP/1.0 503 Service Unavailable");
bb_log(' ', "db_err/connect_failed_{$this->cfg['dbhost']}");
die("Could not connect to the server $server");
}

7
upload/includes/functions.php
View file

@ -2974,14 +2974,17 @@ function get_path_from_id ($id, $ext_id, $base_path, $first_div, $sec_div)
}
function send_pm($user_id, $subject, $message)
{ $subject = DB()->escape($subject);
{ global $userdata;
$subject = DB()->escape($subject);
$message = DB()->escape($message);
DB()->sql_query("INSERT INTO ". BB_PRIVMSGS ." (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip)
VALUES (". PRIVMSGS_NEW_MAIL .", '$subject', {$userdata['user_id']}, $user_id, ". TIMENOW .", '". USER_IP ."')");
$pm_id = DB()->sql_nextid();
DB()->sql_query("INSERT INTO ". BB_PRIVMSGS_TEXT ." VALUES($pm_id, '$text')");
DB()->sql_query("INSERT INTO " . BB_PRIVMSGS_TEXT . " (privmsgs_text_id, privmsgs_text)
VALUES ($privmsg_sent_id, '$message')");
DB()->sql_query("UPDATE ". BB_USERS ." SET
user_new_privmsg = user_new_privmsg + 1,

2
upload/includes/init_bb.php
View file

@ -615,7 +615,7 @@ switch ($bb_cfg['datastore_type'])
$datastore = new datastore_mysql();
}
// Cron
if ((empty($_POST) && !defined('IN_ADMIN') && !defined('IN_AJAX') && !defined('IN_SERVICE') && !file_exists(CRON_RUNNING) && ($bb_cfg['cron_enabled'] || defined('START_CRON'))) || defined('FORCE_CRON') /* && !empty($_GET['cron_test_9gndjk']) */)
if ((empty($_POST) && !defined('IN_ADMIN') && !defined('IN_AJAX') && !defined('IN_SERVICE') && !file_exists(CRON_RUNNING) && ($bb_cfg['cron_enabled'] || defined('START_CRON'))) || defined('FORCE_CRON'))
{
if (TIMENOW - $bb_cfg['cron_last_check'] > $bb_cfg['cron_check_interval'])
{

4
upload/privmsg.php
View file

@ -279,8 +279,8 @@ if ( $mode == 'read' )
// not the most DB friendly way but a lot easier to manage, besides the admin will be able to
// set limits on numbers of storable posts for users ... hopefully!
//
$sql = "INSERT INTO " . BB_PRIVMSGS . " (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip, privmsgs_enable_bbcode, privmsgs_enable_smilies)
VALUES (" . PRIVMSGS_SENT_MAIL . ", '" . str_replace("\'", "''", addslashes($privmsg['privmsgs_subject'])) . "', " . $privmsg['privmsgs_from_userid'] . ", " . $privmsg['privmsgs_to_userid'] . ", " . $privmsg['privmsgs_date'] . ", '" . $privmsg['privmsgs_ip'] . "', " . $privmsg['privmsgs_enable_bbcode'] . ", " . $privmsg['privmsgs_enable_smilies'] . ")";
$sql = "INSERT INTO " . BB_PRIVMSGS . " (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip)
VALUES (" . PRIVMSGS_SENT_MAIL . ", '" . str_replace("\'", "''", addslashes($privmsg['privmsgs_subject'])) . "', " . $privmsg['privmsgs_from_userid'] . ", " . $privmsg['privmsgs_to_userid'] . ", " . $privmsg['privmsgs_date'] . ", '" . $privmsg['privmsgs_ip'] . "')";
if ( !DB()->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Could not insert private message sent info', '', __LINE__, __FILE__, $sql);