1
0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 12:48:24 +01:00

Issue #6 Missing System-log LANs. Preferences page Menu caption fix.

This commit is contained in:
Cameron 2017-11-16 20:18:11 -08:00
parent c10d350d8b
commit 43f2a70b40
4 changed files with 18 additions and 11 deletions

View File

@ -87,7 +87,7 @@ class adminlog_admin extends e_admin_dispatcher
'main/list' => array('caption'=> RL_LAN_030, 'perm' => '5'),
'audit/list' => array('caption'=> RL_LAN_062, 'perm' => '5'),
'rolling/list' => array('caption'=> RL_LAN_002, 'perm' => '5'),
'divider/01' => array('divider'=>true),
'main/prefs' => array('caption'=> LAN_PREFS, 'perm' => '5'),
'main/maintenance' => array('caption'=> LAN_OPTIONS, 'perm' => '5')
@ -202,7 +202,8 @@ class admin_log_ui extends e_admin_ui
foreach($row as $val)
{
$id = $val['dblog_eventcode'];
$this->eventTypes[$id] = deftrue($val['dblog_title'],$id);
$def = strpos($val['dblog_title'], "LAN") !== false ? $id : $val['dblog_title'];
$this->eventTypes[$id] = str_replace(': [x]', '', deftrue($val['dblog_title'],$def));
}
asort($this->eventTypes);

View File

@ -2016,6 +2016,7 @@ function pref_submit($post_id = '')
function prefs_adminmenu()
{
$var['core-prefs-header1']['header'] = LAN_BASIC_OPTIONS;
$var['core-prefs-main']['text'] = PRFLAN_1;
$var['core-prefs-email']['text'] = PRFLAN_254;
$var['core-prefs-registration']['text'] = PRFLAN_28;
@ -2025,7 +2026,7 @@ function prefs_adminmenu()
$var['core-prefs-comments']['text'] = PRFLAN_210;
$var['core-prefs-uploads']['text'] = PRFLAN_255;
$var['core-prefs-header1']['header'] = PRFLAN_256;
$var['core-prefs-header2']['header'] = PRFLAN_256;
$var['core-prefs-display']['text'] = PRFLAN_13;
$var['core-prefs-admindisp']['text'] = PRFLAN_77;
@ -2034,8 +2035,11 @@ function prefs_adminmenu()
$var['core-prefs-date']['text'] = PRFLAN_21;
$var['core-prefs-javascript']['text'] = PRFLAN_257;
$var['core-prefs-advanced']['text'] = PRFLAN_149;
e107::getNav()->admin(LAN_BASIC_OPTIONS.'--id--prev_nav', 'core-prefs-main', $var);
$icon = e107::getParser()->toIcon('e-prefs-24');
$caption = $icon."<span>".LAN_PREFS."</span>";
e107::getNav()->admin($caption.'--id--prev_nav', 'core-prefs-main', $var);
}
/**

View File

@ -372,7 +372,7 @@ define("LAN_AL_MISC_03", "Login menu settings updated");
define("LAN_AL_MISC_04", "Comment menu settings updated");
define("LAN_AL_MISC_05", "Clock menu settings updated");
define("LAN_AL_MISC_06", "Blog calendar menu settings updated");
define("LAN_AL_MISC_07", "");
//define("LAN_AL_MISC_07", "");
define("LAN_AL_PING_01", "Ping to service");
@ -384,5 +384,7 @@ define("LAN_AL_ADMINUI_04", "Admin-UI DB Error: [x]");
define("LAN_AL_BACKUP", "Database backup");
define("LAN_AL_MEDIA_01", "Media Upload");
?>
define("LAN_AL_USET_100", "Admin logged in as another user");
define("LAN_AL_USET_101", "Admin logged out as another user");

View File

@ -71,8 +71,8 @@ define("POLLAN_44", "Delete this poll?");
// Log messages
//define("LAN_AL_POLL_01","Poll deleted");//CHANGED TO EXISTING LANS
//define("LAN_AL_POLL_02","Poll updated");//NOT USED
//define("LAN_AL_POLL_03","Poll added");//NOT USED
//define("LAN_AL_POLL_04","");//NOT USED
//define("LAN_AL_POLL_05","");//NOT USED
define("LAN_AL_POLL_02","Poll updated");//NOT USED
define("LAN_AL_POLL_03","Poll added");//NOT USED
// define("LAN_AL_POLL_04","");//NOT USED
// define("LAN_AL_POLL_05","");//NOT USED