Update notices about cron

This commit is contained in:
Dmitriy Simushev 2013-05-07 13:20:26 +00:00
parent ba2ede20aa
commit e6a5f9712d
6 changed files with 8 additions and 20 deletions

View File

@ -114,7 +114,6 @@ confirm.take.yes=Yes. I'm sure
content.blocked=Here you can block malicious visitors. content.blocked=Here you can block malicious visitors.
content.history=Search the dialogs history. content.history=Search the dialogs history.
content.logoff=Log out of the system. content.logoff=Log out of the system.
cron.check.setup=Enshure that cron was set up correctly or run it <a href="{0}">manually</a>.
data.saved=Changes saved data.saved=Changes saved
demo.chat.question=There are so many browsers to choose from. Which ones do you recommend? demo.chat.question=There are so many browsers to choose from. Which ones do you recommend?
demo.chat.welcome=Hello. How may I help you? demo.chat.welcome=Hello. How may I help you?
@ -396,7 +395,7 @@ page_login.login=Login:
page_login.password=Password: page_login.password=Password:
page_login.remember=Remember page_login.remember=Remember
page_login.title=Login page_login.title=Login
page_search.intro=Search the chat history for a specified user, an operator or a specified phrase in messages. page_search.intro=Search the chat history for a specified user, an operator or a specified phrase in messages. Last time messages was indexed {0}. You can index them <a href="{1}" target="_blank">manually</a>.
page_search.type.all=everywhere page_search.type.all=everywhere
page_search.search.type.in_system_messages=Search in system messages page_search.search.type.in_system_messages=Search in system messages
page_search.type.message=in messages page_search.type.message=in messages
@ -565,7 +564,7 @@ settings.wrong.threadlifetime="Thread lifetime" field should be a number
site.title=mibew.org site.title=mibew.org
site.url=http://mibew.org site.url=http://mibew.org
statistics.dates=Select dates statistics.dates=Select dates
statistics.description=From this page you can generate a variety of usage reports. statistics.description=From this page you can generate a variety of usage reports. Last time statistics was calculated {0}. You can calculate it <a href="{1}" target="_blank">manually</a>.
statistics.from=From: statistics.from=From:
statistics.till=Till: statistics.till=Till:
statistics.title=Statistics statistics.title=Statistics

View File

@ -114,7 +114,6 @@ confirm.take.yes=
content.blocked=Çäåñü ìîæíî çàùèùàòüñÿ îò ñïàìà è âðåäíûõ ïîñåòèòåëåé. content.blocked=Çäåñü ìîæíî çàùèùàòüñÿ îò ñïàìà è âðåäíûõ ïîñåòèòåëåé.
content.history=Ïîèñê ïî èñòîðèè äèàëîãîâ. content.history=Ïîèñê ïî èñòîðèè äèàëîãîâ.
content.logoff=Ïîêèíóòü ñèñòåìó. content.logoff=Ïîêèíóòü ñèñòåìó.
cron.check.setup=Убедитесь, что cron настроен правильно или запустите его <a href="{0}">вручную</a>.
data.saved=Èçìåíåíèÿ ñîõðàíåíû data.saved=Èçìåíåíèÿ ñîõðàíåíû
demo.chat.question=Ïîñîâåòóéòå ìíå, ïîæàëóéñòà, õîðîøèé áðàóçåð? demo.chat.question=Ïîñîâåòóéòå ìíå, ïîæàëóéñòà, õîðîøèé áðàóçåð?
demo.chat.welcome=Çäðàâñòâóéòå! ×åì ÿ ìîãó Âàì ïîìî÷ü? demo.chat.welcome=Çäðàâñòâóéòå! ×åì ÿ ìîãó Âàì ïîìî÷ü?
@ -396,7 +395,7 @@ page_login.operator.disabled=
page_login.password=Ïàðîëü: page_login.password=Ïàðîëü:
page_login.remember=Çàïîìíèòü page_login.remember=Çàïîìíèòü
page_login.title=Âõîä â ñèñòåìó page_login.title=Âõîä â ñèñòåìó
page_search.intro=На данной странице можно осуществить поиск диалогов по имени пользователя, имени оператора или фразе, встречающейся в сообщении. page_search.intro=На данной странице можно осуществить поиск диалогов по имени пользователя, имени оператора или фразе, встречающейся в сообщении. Последний раз сообщения индексировались {0}. Вы можете выполнить индексацию <a href="{1}" target="_blank">вручную</a>.
page_search.type.all=âåçäå page_search.type.all=âåçäå
page_search.search.type.in_system_messages=Èñêàòü â ñèñòåìíûõ ñîîáùåíèÿõ page_search.search.type.in_system_messages=Èñêàòü â ñèñòåìíûõ ñîîáùåíèÿõ
page_search.type.message=â ñîîáùåíèÿõ page_search.type.message=â ñîîáùåíèÿõ
@ -567,7 +566,7 @@ settings.wrong.threadlifetime=
site.title=mibew.org site.title=mibew.org
site.url=http://mibew.org site.url=http://mibew.org
statistics.dates=Âûáåðèòå äàòû statistics.dates=Âûáåðèòå äàòû
statistics.description=Различные отчеты по посетителям и использованию мессенджера. statistics.description=Различные отчеты по посетителям и использованию мессенджера. Последний раз статистика собиралась {0}. Вы можете собрать ее <a href="{1}" target="_blank">вручную</a>.
statistics.from=Ñ: statistics.from=Ñ:
statistics.till=Ïî: statistics.till=Ïî:
statistics.title=Ñòàòèñòèêà statistics.title=Ñòàòèñòèêà

View File

@ -93,6 +93,7 @@ if ($query !== false) {
$page['formtype'] = $searchType; $page['formtype'] = $searchType;
$page['forminsystemmessages'] = $searchInSystemMessages; $page['forminsystemmessages'] = $searchInSystemMessages;
$page['cron_path'] = cron_get_uri(Settings::get('cron_key')); $page['cron_path'] = cron_get_uri(Settings::get('cron_key'));
$page['last_cron_run'] = Settings::get('_last_cron_run');
prepare_menu($operator); prepare_menu($operator);
start_html_output(); start_html_output();

View File

@ -37,8 +37,8 @@ $page['showbydate'] = ($statisticstype == 'bydate');
$page['showbyagent'] = ($statisticstype == 'byagent'); $page['showbyagent'] = ($statisticstype == 'byagent');
$page['showbypage'] = ($statisticstype == 'bypage'); $page['showbypage'] = ($statisticstype == 'bypage');
$page['noresults'] = false;
$page['cron_path'] = cron_get_uri(Settings::get('cron_key')); $page['cron_path'] = cron_get_uri(Settings::get('cron_key'));
$page['last_cron_run'] = Settings::get('_last_cron_run');
$errors = array(); $errors = array();
@ -96,8 +96,6 @@ if ($statisticstype == 'bydate') {
array('return_rows' => Database::RETURN_ALL_ROWS) array('return_rows' => Database::RETURN_ALL_ROWS)
); );
$page['noresults'] = empty($page['reportByDate']);
$page['reportByDateTotal'] = $db->query( $page['reportByDateTotal'] = $db->query(
"SELECT DATE(FROM_UNIXTIME(date)) AS date, " . "SELECT DATE(FROM_UNIXTIME(date)) AS date, " .
"SUM(threads) AS threads, " . "SUM(threads) AS threads, " .
@ -133,7 +131,6 @@ if ($statisticstype == 'bydate') {
), ),
array('return_rows' => Database::RETURN_ALL_ROWS) array('return_rows' => Database::RETURN_ALL_ROWS)
); );
$page['noresults'] = empty($page['reportByAgent']);
$activetab = 1; $activetab = 1;
} elseif($statisticstype == 'bypage') { } elseif($statisticstype == 'bypage') {
$page['reportByPage'] = $db->query( $page['reportByPage'] = $db->query(
@ -147,7 +144,6 @@ if ($statisticstype == 'bydate') {
array(':start' => $start, ':end' => $end), array(':start' => $start, ':end' => $end),
array('return_rows' => Database::RETURN_ALL_ROWS) array('return_rows' => Database::RETURN_ALL_ROWS)
); );
$page['noresults'] = empty($page['reportByPage']);
$activetab = 2; $activetab = 2;
} }
$page['showresults'] = count($errors) == 0; $page['showresults'] = count($errors) == 0;

View File

@ -24,11 +24,7 @@ $page['menuid'] = "statistics";
function tpl_content() { global $page, $webimroot, $errors; function tpl_content() { global $page, $webimroot, $errors;
?> ?>
<?php if($page['noresults']) { ?> <?php echo getlocal2("statistics.description", array(date_to_text($page['last_cron_run']), $page['cron_path'])) ?>
<div id="formmessage"><?php echo getlocal2("cron.check.setup", array($page['cron_path'])) ?></div>
<?php } ?>
<?php echo getlocal("statistics.description") ?>
<br /> <br />
<br /> <br />
<?php <?php

View File

@ -21,11 +21,8 @@ $page['menuid'] = "history";
function tpl_content() { global $page, $webimroot; function tpl_content() { global $page, $webimroot;
?> ?>
<?php if ($page['pagination'] && !$page['pagination.items']) { ?>
<div id="formmessage"><?php echo getlocal2("cron.check.setup", array($page['cron_path'])) ?></div>
<?php } ?>
<?php echo getlocal("page_search.intro") ?> <?php echo getlocal2("page_search.intro", array(date_to_text($page['last_cron_run']), $page['cron_path'])) ?>
<br /> <br />
<br /> <br />