Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #155 from marc1706/fix/acp_logs

Browse Source 
[fix/acp-logs] Do not create duplicate acp logs and fix custom module logs
This commit is contained in:
Marc Alexander
2013-10-26 06:01:54 -07:00
parent ee38238199 58ced7a6e7
commit 0f7ae90fb6
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
root/includes/acp/acp_portal.php
View File

@@ -263,10 +263,14 @@ class acp_portal
$this->cache->destroy('portal_modules'); $this->cache->destroy('portal_modules');
$this->cache->destroy('sql', CONFIG_TABLE); $this->cache->destroy('sql', CONFIG_TABLE);
if(isset($module_name)) if(isset($module_name))
{
if ($module_data['module_classname'] !== 'custom')
{ {
add_log('admin', 'LOG_PORTAL_CONFIG', $module_name); add_log('admin', 'LOG_PORTAL_CONFIG', $module_name);
} }
}
else else
{ {
add_log('admin', 'LOG_PORTAL_CONFIG', $this->user->lang['ACP_PORTAL_' . strtoupper($mode) . '_INFO']); add_log('admin', 'LOG_PORTAL_CONFIG', $this->user->lang['ACP_PORTAL_' . strtoupper($mode) . '_INFO']);

11
root/portal/modules/portal_custom.php
View File

@@ -169,7 +169,16 @@ class portal_custom_module
$custom_permission = array_intersect($custom_permission, $groups_ary); $custom_permission = array_intersect($custom_permission, $groups_ary);
$custom_permission = implode(',', $custom_permission); $custom_permission = implode(',', $custom_permission);
add_log('admin', 'LOG_PORTAL_CONFIG', $user->lang['PORTAL_CUSTOM'] . ' - ' . $config['board3_custom_' . $module_id . '_title']); if (isset($user->lang[$custom_title]))
{
$log_title = $user->lang[$custom_title];
}
else
{
$log_title = $custom_title;
}
add_log('admin', 'LOG_PORTAL_CONFIG', $user->lang['PORTAL_CUSTOM'] . ': ' . $log_title);
// set_portal_config will take care of escaping the welcome message // set_portal_config will take care of escaping the welcome message
set_portal_config('board3_custom_' . $module_id . '_code', $custom_code); set_portal_config('board3_custom_' . $module_id . '_code', $custom_code);