diff --git a/upload/ajax.php b/upload/ajax.php index 87aecf5c5..6e4477481 100644 --- a/upload/ajax.php +++ b/upload/ajax.php @@ -25,6 +25,7 @@ switch ($ajax->action) case 'mod_action': case 'change_tor_status': case 'gen_passkey'; + require(BB_ROOT .'attach_mod/attachment_mod.php'); require(INC_DIR .'functions_torrent.php'); break; diff --git a/upload/ajax/user_register.php b/upload/ajax/user_register.php index 17c84ad2d..a6a8ed377 100644 --- a/upload/ajax/user_register.php +++ b/upload/ajax/user_register.php @@ -52,6 +52,9 @@ switch($mode) } } break; + case 'refresh_captcha'; + $html = CAPTCHA()->get_html(); + break; } $this->response['html'] = $html; diff --git a/upload/config.php b/upload/config.php index 50307d667..fa12ab2f9 100644 --- a/upload/config.php +++ b/upload/config.php @@ -57,8 +57,8 @@ $bb_cfg['css_ver'] = 1; // Increase number of revision after update $bb_cfg['tp_version'] = '2.0.2'; -$bb_cfg['tp_release_state'] = 'TP II r96'; -$bb_cfg['tp_release_date'] = '11-07-2011'; +$bb_cfg['tp_release_state'] = 'TP II r97'; +$bb_cfg['tp_release_date'] = '12-07-2011'; $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger $bb_cfg['srv_overloaded_msg'] = "Извините, в данный момент сервер перегружен\nПопробуйте повторить запрос через несколько минут"; @@ -207,7 +207,6 @@ define('DIR_SEPR', DIRECTORY_SEPARATOR); define('BB_PATH', realpath(BB_ROOT) ); // absolute pathname to the forum root define('ADMIN_DIR', BB_PATH .'/admin/' ); define('CACHE_DIR', BB_PATH .'/cache/' ); -define('CFG_DIR', BB_PATH .'/config/' ); define('DEV_DIR', BB_PATH .'/develop/' ); define('INC_DIR', BB_PATH .'/includes/' ); define('LANG_ROOT_DIR', BB_PATH .'/language/' ); @@ -380,7 +379,7 @@ define('CRON_ALLOWED', TRIGGERS_DIR .'cron_allowed'); define('CRON_RUNNING', TRIGGERS_DIR .'cron_running'); // Cron -$bb_cfg['cron_enabled'] = true; // При отвязки крона старт производить из cron.php +$bb_cfg['cron_enabled'] = false; // При отвязки крона старт производить из cron.php $bb_cfg['cron_check_interval'] = 300; // sec // News diff --git a/upload/includes/captcha/captcha.php b/upload/includes/captcha/captcha.php index 363ed118e..19f520b1d 100644 --- a/upload/includes/captcha/captcha.php +++ b/upload/includes/captcha/captcha.php @@ -7,7 +7,7 @@ class captcha_common { var $cfg = array(); // var $can_bypass = false; // - var $cap_img_total = 100; // + var $cap_img_total = 1000; // var $new_per_minute = 10; // , var $key_ttl = 300; // _code_ var $cap_sid_len = 20; // sid'a @@ -89,10 +89,8 @@ class captcha_common return '
pic
-
- - -
+ + '; } diff --git a/upload/includes/functions_post.php b/upload/includes/functions_post.php index 922f829b4..c8faf827a 100644 --- a/upload/includes/functions_post.php +++ b/upload/includes/functions_post.php @@ -171,7 +171,7 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_ if ($row = DB()->fetch_row($sql)) { - $last_msg = DB()->escape($last_msg); + $last_msg = DB()->escape($row['post_text']); if ($last_msg == $post_message) { diff --git a/upload/includes/init_bb.php b/upload/includes/init_bb.php index 08104c66b..0b309b5c2 100644 --- a/upload/includes/init_bb.php +++ b/upload/includes/init_bb.php @@ -9,7 +9,7 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); if (!defined('BB_SCRIPT')) define('BB_SCRIPT', 'undefined'); // Exit if board is disabled via ON/OFF trigger -if (!defined('IN_ADMIN') && !defined('IN_AJAX') && !defined('IN_SERVICE')) +if (!defined('IN_ADMIN') && !defined('IN_AJAX') && !defined('IN_SERVICE') && !IS_ADMIN) { if (file_exists(BB_DISABLED)) { @@ -524,10 +524,6 @@ define('SQL_LAYER', 'mysql'); $bb_cfg = array_merge(bb_get_config(BB_CONFIG), $bb_cfg); -$bb_cfg['cookie_name'] = $bb_cfg['cookie_prefix']; -$bb_cfg['board_dateformat'] = $bb_cfg['default_dateformat']; -$bb_cfg['board_lang'] = $bb_cfg['default_lang']; - $user = new user_common(); $userdata =& $user->data; @@ -576,7 +572,13 @@ if ((empty($_POST) && !defined('IN_ADMIN') && !defined('IN_AJAX') && !defined('I // Update cron_last_check bb_update_config(array('cron_last_check' => (time() + 10))); - require(CFG_DIR .'cron_cfg.php'); + define('CRON_LOG_ENABLED', true); // global ON/OFF + define('CRON_FORCE_LOG', false); // always log regardless of job settings + + define('CRON_DIR', INC_DIR .'cron/'); + define('CRON_JOB_DIR', CRON_DIR .'jobs/'); + define('CRON_LOG_DIR', 'cron/'); // inside LOG_DIR + define('CRON_LOG_FILE', 'cron'); // without ext bb_log(date('H:i:s - ') . getmypid() .' -x-- DB-LOCK try'. LOG_LF, CRON_LOG_DIR .'cron_check'); diff --git a/upload/includes/ucp/usercp_register.php b/upload/includes/ucp/usercp_register.php index f3f0a5d3f..a3d758e6e 100644 --- a/upload/includes/ucp/usercp_register.php +++ b/upload/includes/ucp/usercp_register.php @@ -86,7 +86,7 @@ switch ($mode) 'user_password' => '', 'user_email' => '', 'user_timezone' => $bb_cfg['board_timezone'], - 'user_lang' => $bb_cfg['board_lang'], + 'user_lang' => $bb_cfg['default_lang'], 'user_opt' => 0, ); break; diff --git a/upload/templates/default/usercp_register.tpl b/upload/templates/default/usercp_register.tpl index 63667271e..e1ad13319 100644 --- a/upload/templates/default/usercp_register.tpl +++ b/upload/templates/default/usercp_register.tpl @@ -54,7 +54,7 @@ ajax.callback.user_register = function(data){ {L_CONFIRM_CODE}: - {CAPTCHA_HTML} + {CAPTCHA_HTML} diff --git a/upload/tracker.php b/upload/tracker.php index 7ffd436dc..14e9523a7 100644 --- a/upload/tracker.php +++ b/upload/tracker.php @@ -497,7 +497,7 @@ if ($allowed_forums) { $curr_set[${"{$name}_key"}] = ${"{$name}_val"}; } - $curr_set_sql = $db->escape(serialize($curr_set)); + $curr_set_sql = DB()->escape(serialize($curr_set)); // Text search $search_match_topics_csv = '';