diff --git a/upload/ajax.php b/upload/ajax.php index da055c832..a87dd9237 100644 --- a/upload/ajax.php +++ b/upload/ajax.php @@ -319,7 +319,7 @@ class ajax_common } DB()->query("UPDATE ". BB_USERS ." SET user_rank = $rank_id WHERE user_id = $user_id LIMIT 1"); - + cache_rm_user_sessions($user_id); $this->response['html'] = ($rank_id != 0) ? $lang['AWARDED_RANK'] . ' '. $ranks[$rank_id]['rank_title'] .'' : $lang['SHOT_RANK']; @@ -451,7 +451,7 @@ class ajax_common function post_mod_comment () { - global $lang, $user; + global $lang, $userdata; $post_id = (int) $this->request['post_id']; $post = DB()->fetch_row("SELECT t.*, f.*, p.*, pt.post_text @@ -466,12 +466,12 @@ class ajax_common $text = (string) $this->request['mc_text']; $text = prepare_message($text); if (!$text) $this->ajax_die('no text'); - DB()->query("UPDATE ". BB_POSTS ." SET post_mod_comment = '". DB()->escape($text) ."', post_mod_comment_type = $type, post_mc_mod_id = ". $user->id .", post_mc_mod_name = '". $user->data['username'] ."' WHERE post_id = $post_id LIMIT 1"); + DB()->query("UPDATE ". BB_POSTS ." SET post_mod_comment = '". DB()->escape($text) ."', post_mod_comment_type = $type, post_mc_mod_id = ". $userdata['user_id'] .", post_mc_mod_name = '". $userdata['username'] ."' WHERE post_id = $post_id LIMIT 1"); $this->response['type'] = $type; $this->response['post_id'] = $post_id; if ($type == 0) $this->response['html'] = ''; - else if ($type == 1) $this->response['html'] = '
K'. $user->data['username'] .' '. $lang['WROTE'] .':

'. bbcode2html($text) .'
'; - else if ($type == 2) $this->response['html'] = '
!'. $user->data['username'] .' '. $lang['WROTE'] .':

'. bbcode2html($text) .'
'; + else if ($type == 1) $this->response['html'] = '
K'. profile_url($userdata) .' '. $lang['WROTE'] .':

'. bbcode2html($text) .'
'; + else if ($type == 2) $this->response['html'] = '
!'. profile_url($userdata) .' '. $lang['WROTE'] .':

'. bbcode2html($text) .'
'; } function view_post () @@ -518,7 +518,7 @@ class ajax_common { require(AJAX_DIR .'topic_tpl.php'); } - + function index_data() { require(AJAX_DIR .'index_data.php'); diff --git a/upload/ajax/manage_user.php b/upload/ajax/manage_user.php index 5d2e57e8c..9fb2fcf2e 100644 --- a/upload/ajax/manage_user.php +++ b/upload/ajax/manage_user.php @@ -95,18 +95,20 @@ switch($mode) break; case "indexer": exec("indexer --config {$bb_cfg['sphinx_config_path']} --all --rotate", $result); - if(!is_file($bb_cfg['sphinx_config_path'].".log")){ - file_put_contents($bb_cfg['sphinx_config_path'].".log", "####Logger from dimka3210.####".date("H:i:s", time())."##############################\r\n\r\n\r\n\r\n", FILE_APPEND); + if(!is_file($bb_cfg['sphinx_config_path'].".log")) + { + file_put_contents($bb_cfg['sphinx_config_path'].".log", "####Logger from dimka3210.####".date("H:i:s", TIMENOW)."##############################\r\n\r\n\r\n\r\n", FILE_APPEND); } - file_put_contents($bb_cfg['sphinx_config_path'].".log", "##############################".date("H:i:s", time())."##############################\r\n", FILE_APPEND); - foreach($result as $row){ + file_put_contents($bb_cfg['sphinx_config_path'].".log", "##############################".date("H:i:s", TIMENOW)."##############################\r\n", FILE_APPEND); + foreach($result as $row) + { file_put_contents($bb_cfg['sphinx_config_path'].".log", $row."\r\n", FILE_APPEND); } file_put_contents($bb_cfg['sphinx_config_path'].".log", "\r\n", FILE_APPEND); file_put_contents($bb_cfg['sphinx_config_path'].".log", "\r\n", FILE_APPEND); - $this->response['indexer'] = ''.$lang['INDEXER'].""; - break; + $this->response['indexer'] = ''. $lang['INDEXER'] .""; + break; } $this->response['mode'] = $mode; diff --git a/upload/includes/functions_post.php b/upload/includes/functions_post.php index 2c6f1aaf6..2a9a75fe9 100644 --- a/upload/includes/functions_post.php +++ b/upload/includes/functions_post.php @@ -663,14 +663,14 @@ function insert_post ($mode, $topic_id, $forum_id = '', $old_forum_id = '', $new } if (!$forum_names) return; - $post_text = sprintf($lang['BOT_TOPIC_MOVED_FROM_TO'], "$forum_names[$old_forum_id]", "$forum_names[$forum_id]", profile_url($userdata)); + $post_text = sprintf($lang['BOT_TOPIC_MOVED_FROM_TO'], '[url='. make_url(FORUM_URL . $old_forum_id) .']'. $forum_names[$old_forum_id] .'[/url]', '[url='. make_url(FORUM_URL . $forum_id) .']'. $forum_names[$forum_id] .'[/url]', profile_url($userdata)); $poster_id = BOT_UID; $poster_ip = '7f000001'; } else if ($mode == 'after_split_to_old') { - $post_text = sprintf($lang['BOT_MESS_SPLITS'], "". htmlCHR($new_topic_title) ."", profile_url($userdata)); + $post_text = sprintf($lang['BOT_MESS_SPLITS'], '[url='. make_url(TOPIC_URL . $new_topic_id) .']'. htmlCHR($new_topic_title) .'[/url]', profile_url($userdata)); $poster_id = BOT_UID; $poster_ip = '7f000001'; @@ -684,10 +684,9 @@ function insert_post ($mode, $topic_id, $forum_id = '', $old_forum_id = '', $new if ($row = DB()->fetch_row($sql)) { - $old_topic_title = $row['topic_title']; $post_time = $row['post_time'] - 1; - $post_text = sprintf($lang['BOT_TOPIC_SPLITS'], "$old_topic_title", profile_url($userdata)); + $post_text = sprintf($lang['BOT_TOPIC_SPLITS'], '[url='. make_url(TOPIC_URL . $old_topic_id) .']'. $row['topic_title'] .'[/url]', profile_url($userdata)); $poster_id = BOT_UID; $poster_ip = '7f000001'; diff --git a/upload/language/lang_english/lang_bot.php b/upload/language/lang_english/lang_bot.php index 9c78f14c2..48a9b7877 100644 --- a/upload/language/lang_english/lang_bot.php +++ b/upload/language/lang_english/lang_bot.php @@ -1,5 +1,5 @@ %s to forum %s

%s'; -$lang['BOT_MESS_SPLITS'] = 'Topic has been split. New topic - %s

%s'; -$lang['BOT_TOPIC_SPLITS'] = 'Topic has been split from %s

%s'; \ No newline at end of file +$lang['BOT_TOPIC_MOVED_FROM_TO'] = 'Topic has been moved from forum [b]%s[/b] to forum [b]%s[/b][br][br]%s'; +$lang['BOT_MESS_SPLITS'] = 'Topic has been split. New topic - [b]%s[/b][br][br]%s'; +$lang['BOT_TOPIC_SPLITS'] = 'Topic has been split from [b]%s[/b][br][br]%s'; \ No newline at end of file diff --git a/upload/language/lang_russian/lang_bot.php b/upload/language/lang_russian/lang_bot.php index a7f9febc1..e5bd8e8c0 100644 --- a/upload/language/lang_russian/lang_bot.php +++ b/upload/language/lang_russian/lang_bot.php @@ -1,5 +1,5 @@ %s в форум %s

%s'; -$lang['BOT_MESS_SPLITS'] = 'Сообщения из этой темы были выделены в отдельный топик %s

%s'; -$lang['BOT_TOPIC_SPLITS'] = 'Тема была выделена из %s

%s'; \ No newline at end of file +$lang['BOT_TOPIC_MOVED_FROM_TO'] = 'Топик был перенесен из форума [b]%s[/b] в форум [b]%s[/b][br][br]%s'; +$lang['BOT_MESS_SPLITS'] = 'Сообщения из этой темы были выделены в отдельный топик [b]%s[/b][br][br]%s'; +$lang['BOT_TOPIC_SPLITS'] = 'Тема была выделена из [b]%s[/b][br][br]%s'; \ No newline at end of file