diff --git a/upload/ajax/manage_user.php b/upload/ajax/manage_user.php index fcca0f878..5d2e57e8c 100644 --- a/upload/ajax/manage_user.php +++ b/upload/ajax/manage_user.php @@ -2,7 +2,7 @@ if (!defined('IN_AJAX')) die(basename(__FILE__)); -global $userdata, $lang; +global $userdata, $lang, $bb_cfg; $mode = (string) $this->request['mode']; $user_id = $this->request['user_id']; @@ -93,6 +93,20 @@ switch($mode) $this->response['info'] = $lang['USER_ACTIVATE_OFF']; 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); + } + 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", $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['mode'] = $mode; diff --git a/upload/config.php b/upload/config.php index 641889572..dff30055c 100644 --- a/upload/config.php +++ b/upload/config.php @@ -56,8 +56,9 @@ $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'] = 'R469'; -$bb_cfg['tp_release_date'] = '05-11-2012'; + +$bb_cfg['tp_release_date'] = '07-11-2012'; +$bb_cfg['tp_release_state'] = 'R470'; // Database $charset = 'utf8'; @@ -433,6 +434,7 @@ $bb_cfg['use_ajax_posts'] = true; $bb_cfg['search_engine_type'] = 'mysql'; // none, mysql, sphinx $bb_cfg['sphinx_topic_titles_host'] = '127.0.0.1'; $bb_cfg['sphinx_topic_titles_port'] = 3312; +$bb_cfg['sphinx_config_path'] = realpath("../install/sphinx/sphinx.conf"); $bb_cfg['disable_ft_search_in_posts'] = false; // disable searching in post bodies $bb_cfg['disable_search_for_guest'] = true; $bb_cfg['allow_search_in_bool_mode'] = true; diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index cca89e428..9a450da44 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -1742,3 +1742,4 @@ $lang['PROFILE_EDIT_RETURN'] = 'Return to editing'; $lang['PROFILE_RETURN'] = 'Go to the Profile'; $lang['WARNING'] = 'Warning'; +$lang['INDEXER'] = "Reindex search"; \ No newline at end of file diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index 35aaa647e..9ec587c81 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -1754,3 +1754,4 @@ $lang['PROFILE_EDIT_RETURN'] = 'Вернуться к редактировани $lang['PROFILE_RETURN'] = 'Перейти к просмотру профиля'; $lang['WARNING'] = 'Предупреждение'; +$lang['INDEXER'] = "Переиндексировать поиск"; \ No newline at end of file diff --git a/upload/templates/admin/index.tpl b/upload/templates/admin/index.tpl index 4f0c52b55..d5882a226 100644 --- a/upload/templates/admin/index.tpl +++ b/upload/templates/admin/index.tpl @@ -66,12 +66,13 @@ ajax.manage_user = function(mode) { ajax.exec({ action : 'manage_user', mode : mode, - user_id : '', + user_id : '' }); } ajax.callback.manage_user = function(data) { $('#cache').html(data.cache_html); $('#datastore').html(data.datastore_html); + $('#indexer').html(data.indexer); }
@@ -88,7 +89,8 @@ ajax.callback.manage_user = function(data) { {L_UPDATE}: - {L_USER_LEVELS}  + {L_USER_LEVELS},  + {L_INDEXER}