mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-05-08 13:15:21 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1995 from yesszus/patch-14

Browse Source 
Issue #6 Update e107_languages/English/admin/lan_admin_log.php
This commit is contained in:
Cameron 2016-11-04 17:51:15 -07:00 committed by GitHub
commit cf5bc2b359
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
e107_admin/admin_log.php
View File

@ -162,7 +162,7 @@ class admin_log_ui extends e_admin_ui
'dblog_title' => array ( 'title' => LAN_TITLE, 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'dblog_title' => array ( 'title' => LAN_TITLE, 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'dblog_remarks' => array ( 'title' => RL_LAN_033, 'type' => 'method', 'data' => 'str', 'width' => '35%', 'filter'=>true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'dblog_remarks' => array ( 'title' => RL_LAN_033, 'type' => 'method', 'data' => 'str', 'width' => '35%', 'filter'=>true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'options' => array ( 'title' => 'Options', 'type' => null, 'nolist'=>true, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ), 'options' => array ( 'title' => LAN_OPTIONS, 'type' => null, 'nolist'=>true, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ),
); );
protected $fieldpref = array( 'dblog_datestamp', 'dblog_type', 'dblog_eventcode', 'dblog_user_id', 'dblog_ip', 'dblog_title', 'dblog_remarks'); protected $fieldpref = array( 'dblog_datestamp', 'dblog_type', 'dblog_eventcode', 'dblog_user_id', 'dblog_ip', 'dblog_title', 'dblog_remarks');
@ -549,7 +549,7 @@ class admin_log_form_ui extends e_admin_form_ui
case 'filter': case 'filter':
case 'batch': case 'batch':
return array('Informative','Notice','Warning','Fatal'); return array(RL_LAN_132,RL_LAN_133,RL_LAN_134,RL_LAN_135);
break; break;
} }
} }
@ -639,7 +639,7 @@ class admin_log_form_ui extends e_admin_form_ui
if(strpos($text,'Array')!==false || strlen($text)>300) if(strpos($text,'Array')!==false || strlen($text)>300)
{ {
$id = $this->getController()->getListModel()->get('dblog_id'); $id = $this->getController()->getListModel()->get('dblog_id');
$ret ="<a class='e-expandit' href='#rem-".$id."'>Details</a>"; $ret ="<a class='e-expandit' href='#rem-".$id."'>".RL_LAN_087."</a>";
$ret .= "<div style='display:none' id='rem-".$id."'>"; $ret .= "<div style='display:none' id='rem-".$id."'>";
$text = str_replace("<br />","\n",$text); $text = str_replace("<br />","\n",$text);
$text = str_replace("&#092;","/",$text); $text = str_replace("&#092;","/",$text);
@ -722,7 +722,7 @@ class audit_log_ui extends e_admin_ui
'dblog_ip' => array ( 'title' => LAN_IP, 'type' => 'ip', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'dblog_ip' => array ( 'title' => LAN_IP, 'type' => 'ip', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'dblog_title' => array ( 'title' => LAN_TITLE, 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'dblog_title' => array ( 'title' => LAN_TITLE, 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'dblog_remarks' => array ( 'title' => 'Remarks', 'type' => 'method', 'data' => 'str', 'width' => '30%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'dblog_remarks' => array ( 'title' => 'Remarks', 'type' => 'method', 'data' => 'str', 'width' => '30%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'options' => array ( 'title' => 'Options', 'type' => null, 'nolist'=>true, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ), 'options' => array ( 'title' => LAN_OPTIONS, 'type' => null, 'nolist'=>true, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ),
); );
protected $fieldpref = array('dblog_id', 'dblog_datestamp', 'dblog_microtime', 'dblog_eventcode', 'dblog_user_id', 'dblog_user_name', 'dblog_ip', 'dblog_title','dblog_remarks'); protected $fieldpref = array('dblog_id', 'dblog_datestamp', 'dblog_microtime', 'dblog_eventcode', 'dblog_user_id', 'dblog_user_name', 'dblog_ip', 'dblog_title','dblog_remarks');
@ -777,7 +777,7 @@ class dblog_ui extends e_admin_ui
'dblog_caller' => array ( 'title' => 'Caller', 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), 'dblog_caller' => array ( 'title' => 'Caller', 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ),
'dblog_title' => array ( 'title' => LAN_TITLE, 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'dblog_title' => array ( 'title' => LAN_TITLE, 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'dblog_remarks' => array ( 'title' => 'Remarks', 'type' => 'method', 'data' => 'str', 'width' => '30%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'dblog_remarks' => array ( 'title' => 'Remarks', 'type' => 'method', 'data' => 'str', 'width' => '30%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'options' => array ( 'title' => 'Options', 'type' => null, 'nolist'=>true, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ), 'options' => array ( 'title' => LAN_OPTIONS, 'type' => null, 'nolist'=>true, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ),
); );
protected $fieldpref = array('dblog_id', 'dblog_datestamp', 'dblog_microtime', 'dblog_type', 'dblog_eventcode', 'dblog_user_id', 'dblog_user_name', 'dblog_ip', 'dblog_caller', 'dblog_title', 'dblog_remarks'); protected $fieldpref = array('dblog_id', 'dblog_datestamp', 'dblog_microtime', 'dblog_type', 'dblog_eventcode', 'dblog_user_id', 'dblog_user_name', 'dblog_ip', 'dblog_caller', 'dblog_title', 'dblog_remarks');

16
e107_handlers/admin_ui.php
View File

@ -4475,8 +4475,8 @@ class e_admin_ui extends e_admin_controller_ui
{ {
$this->getTreeModel()->setMessages(); $this->getTreeModel()->setMessages();
// FIXME lan // FIXME lan
if($delcount) e107::getMessage()->addSuccess($tp->lanVars('[x] record(s) successfully deleted.', $delcount, true)); if($delcount) e107::getMessage()->addSuccess($tp->lanVars(RL_LAN_085, $delcount, true));
if($nfcount) e107::getMessage()->addError($tp->lanVars('[x] records not found and not deleted.', $nfcount,true)); if($nfcount) e107::getMessage()->addError($tp->lanVars(RL_LAN_086, $nfcount,true));
} }
//$this->redirect(); //$this->redirect();
@ -6052,7 +6052,7 @@ class e_admin_form_ui extends e_form
".$this->text('searchquery', $current_query[0], 50, $input_options)." ".$this->text('searchquery', $current_query[0], 50, $input_options)."
<i class='fa fa-search searchquery form-control-feedback form-control-feedback-left'></i> <i class='fa fa-search searchquery form-control-feedback form-control-feedback-left'></i>
<span> <span>
".$this->select_open('filter_options', array('class' => 'form-control e-tip tbox select filter', 'id' => false, 'title'=>'Filter the results below'))." ".$this->select_open('filter_options', array('class' => 'form-control e-tip tbox select filter', 'id' => false, 'title'=>RL_LAN_088))."
".$this->option(LAN_FILTER_LABEL_DISPLAYALL, '')." ".$this->option(LAN_FILTER_LABEL_DISPLAYALL, '')."
".$this->option(LAN_FILTER_LABEL_CLEAR, '___reset___')." ".$this->option(LAN_FILTER_LABEL_CLEAR, '___reset___')."
".$this->renderBatchFilter('filter', $current_query[1])." ".$this->renderBatchFilter('filter', $current_query[1])."
@ -6471,11 +6471,11 @@ class e_admin_form_ui extends e_form
//TODO today, yesterday, this-month, last-month . //TODO today, yesterday, this-month, last-month .
$dateFilters = array ( $dateFilters = array (
'hour' => "Past Hour", 'hour' => RL_LAN_127,
"day" => "Past 24 hours", "day" => RL_LAN_128,
"week" => "Past Week", "week" => RL_LAN_129,
"month" => "Past Month", "month" => RL_LAN_130,
"year" => "Past Year" "year" => RL_LAN_131
); );
foreach($dateFilters as $k => $name) foreach($dateFilters as $k => $name)

13
e107_languages/English/admin/lan_admin_log.php
View File

@ -82,6 +82,10 @@ define("RL_LAN_081", "Mail bounces");
define("RL_LAN_082", "User bans"); define("RL_LAN_082", "User bans");
define("RL_LAN_083", "Mail bounce resets"); define("RL_LAN_083", "Mail bounce resets");
define("RL_LAN_084", "Temporary accounts"); define("RL_LAN_084", "Temporary accounts");
define("RL_LAN_085", "[x] record(s) successfully deleted!");
define("RL_LAN_086", "[x] records not found and not deleted!");
define("RL_LAN_087", "Details");
define("RL_LAN_088", "Filter the results below");
// Intentional gap // Intentional gap
define("RL_LAN_090", "Download ID"); define("RL_LAN_090", "Download ID");
define("RL_LAN_091", "Detailed timings"); define("RL_LAN_091", "Detailed timings");
@ -122,5 +126,14 @@ define("RL_LAN_123", "User audit trail class");
define("RL_LAN_124", "User audit trail actions"); define("RL_LAN_124", "User audit trail actions");
define("RL_LAN_125", "System Logs Maintenance"); define("RL_LAN_125", "System Logs Maintenance");
define("RL_LAN_126", "Total [x] entries matching search condition"); define("RL_LAN_126", "Total [x] entries matching search condition");
define("RL_LAN_127", "Past Hour");
define("RL_LAN_128", "Past 24 hours");
define("RL_LAN_129", "Past Week");
define("RL_LAN_130", "Past Month");
define("RL_LAN_131", "Past Year");
define("RL_LAN_132", "Informative");
define("RL_LAN_133", "Notice");
define("RL_LAN_134", "Warning");
define("RL_LAN_135", "Fatal");
// define("RL_LAN_JS_CONFIRM", "Are you sure?"); // define("RL_LAN_JS_CONFIRM", "Are you sure?");
?> ?>