diff --git a/root/includes/acp/acp_portal.php b/root/includes/acp/acp_portal.php index 066242b3..fb292c72 100644 --- a/root/includes/acp/acp_portal.php +++ b/root/includes/acp/acp_portal.php @@ -106,6 +106,7 @@ class acp_portal { $user->add_lang('mods/portal/' . $c_class->language); } + $module_name = $user->lang[$c_class->name]; $display_vars = $c_class->get_template_acp($module_id); $template->assign_vars(array( 'MODULE_NAME' => $module_data['module_name'], @@ -220,7 +221,14 @@ class acp_portal $db->sql_query($sql); $cache->destroy('sql', CONFIG_TABLE); - add_log('admin', 'LOG_PORTAL_CONFIG', $user->lang['ACP_PORTAL_' . strtoupper($mode) . '_INFO']); + if(isset($module_name)) + { + add_log('admin', 'LOG_PORTAL_CONFIG',$module_name); + } + else + { + add_log('admin', 'LOG_PORTAL_CONFIG', $user->lang['ACP_PORTAL_' . strtoupper($mode) . '_INFO']); + } trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link(($module_id) ? append_sid("{$phpbb_root_path}adm/index.$phpEx", 'i=portal&mode=modules') : $this->u_action)); } diff --git a/root/includes/acp/info/acp_portal.php b/root/includes/acp/info/acp_portal.php index f403b293..a587efb1 100644 --- a/root/includes/acp/info/acp_portal.php +++ b/root/includes/acp/info/acp_portal.php @@ -21,7 +21,7 @@ class acp_portal_info return array( 'filename' => 'acp_portal', 'title' => 'ACP_PORTAL', - 'version' => '1.2.0', + 'version' => '2.0.0', 'modes' => array( 'config' => array('title' => 'ACP_PORTAL_GENERAL_INFO', 'auth' => 'acl_a_portal', 'cat' => array('ACP_PORTAL')), 'modules' => array('title' => 'ACP_PORTAL_MODULES', 'auth' => 'acl_a_portal', 'cat' => array('ACP_PORTAL')), diff --git a/root/language/en/mods/info_acp_portal.php b/root/language/en/mods/info_acp_portal.php index f33be8ae..4698898b 100644 --- a/root/language/en/mods/info_acp_portal.php +++ b/root/language/en/mods/info_acp_portal.php @@ -35,41 +35,9 @@ if (empty($lang) || !is_array($lang)) // @todo: check for unneeded language variables // @todo: change language variables to English ones -// @todo: merge into mods/portal/ +// not possible: merge into mods/portal/ $lang = array_merge($lang, array( - // Manage blocks - 'ACP_PORTAL_BLOCKS' => 'Block-Verwaltung', - 'ACP_PORTAL_BLOCKS_EXPLAIN' => 'Du kannst hier Blöcke anlegen, bearbeiten und löschen.', - 'ADD_BLOCK' => 'Neuer Block hinzufügen', - 'ACP_PORTAL_MANAGE_BLOCKS' => 'Blöcke verwalten', - - // general - 'ACP_PORTAL' => 'Portal', - 'ACP_PORTAL_GENERAL_INFO' => 'Allgemeine Einstellungen', - 'ACP_PORTAL_CONFIG_INFO' => 'Allgemeine Einstellungen', - 'ACP_PORTAL_GENERAL_TITLE' => 'Portal Administration', - 'ACP_PORTAL_GENERAL_TITLE_EXP' => 'Thank you for choosing Board3 Portal! This is where you can manage your portal page. The options below let you customize the various general settings.', - 'PORTAL_ENABLE' => 'Enable Portal', - 'PORTAL_ENABLE_EXP' => 'Turns the whole portal on or off', - 'PORTAL_LEFT_COLUMN' => 'Enable left column', - 'PORTAL_LEFT_COLUMN_EXP' => 'Switch to no if you wish to turn off the left column', - 'PORTAL_RIGHT_COLUMN' => 'Enable right column', - 'PORTAL_RIGHT_COLUMN_EXP' => 'Switch to no if you wish to turn off the right column', - 'PORTAL_VERSION_CHECK' => 'Versioncheck on Portal', - 'PORTAL_FORUM_INDEX' => 'Forum Index (Forum list)', - 'PORTAL_FORUM_INDEX_EXP' => 'Display this block on the portal.', - 'ACP_PORTAL_COLUMN_WIDTH_SETTINGS' => 'Left and right column width settings', - 'PORTAL_LEFT_COLUMN_WIDTH' => 'Width of the left column', - 'PORTAL_LEFT_COLUMN_WIDTH_EXP' => 'Change the width of the left column in pixels; recommended value is 180', - 'PORTAL_RIGHT_COLUMN_WIDTH' => 'Width of the right column', - 'PORTAL_RIGHT_COLUMN_WIDTH_EXP' => 'Change the width of the right column in pixels; recommended value is 180', - - // Install - 'PORTAL_BASIC_INSTALL' => 'Adding basic set of modules', - 'PORTAL_BASIC_UNINSTALL' => 'Removing modules from database', - - // Portal Modules 'ACP_PORTAL_MODULES' => 'Portal Modules', 'ACP_PORTAL_MODULES_EXP' => 'You can manage your portal modules here', @@ -93,29 +61,31 @@ $lang = array_merge($lang, array( 'MODULE_PERMISSIONS' => 'Module permissions', 'MODULE_PERMISSIONS_EXP' => 'Select the groups that should be authorized to view the module. If you want all users to be able to view the module, don’t select anything.
Select/Deselect multiple groups by holding CTRL and clicking.', - // Manage links - /* - 'ACP_EXPRESS_LINKS_EXPLAIN' => 'Using this form you can add, edit, view and delete navigation links on the index page. You can also create special navigation links as categories which aren’t clickable links.', - 'ADD_LINK' => 'Add new navigation link', - 'ACP_PORTAL_MANAGE_LINKS' => 'Links verwalten', - - 'LINK_ADDED' => 'The navigation link was successfully added.', - 'LINK_CAT' => 'Navigation link category', - 'LINK_ICON' => 'Link icon', - 'LINK_ICON_EXPLAIN' => 'Use this to define a small icon associated with the navigation link. The path is relative to the root phpBB directory.', - 'LINK_IS_CAT' => 'Set as special link category', - 'LINK_REMOVED' => 'The navigation link was successfully deleted.', - 'LINK_TITLE' => 'Link title', - 'LINK_UPDATED' => 'The navigation link was successfully updated.', - 'LINK_URL' => 'Link URL', - - 'MUST_SELECT_LINK' => 'You must select a link.', + // general + 'ACP_PORTAL' => 'Portal', + 'ACP_PORTAL_GENERAL_INFO' => 'General settings', + 'ACP_PORTAL_CONFIG_INFO' => 'General settings', + 'ACP_PORTAL_GENERAL_TITLE' => 'Portal Administration', + 'ACP_PORTAL_GENERAL_TITLE_EXP' => 'Thank you for choosing Board3 Portal! This is where you can manage your portal page. The options below let you customize the various general settings.', + 'PORTAL_ENABLE' => 'Enable Portal', + 'PORTAL_ENABLE_EXP' => 'Turns the whole portal on or off', + 'PORTAL_LEFT_COLUMN' => 'Enable left column', + 'PORTAL_LEFT_COLUMN_EXP' => 'Switch to no if you wish to turn off the left column', + 'PORTAL_RIGHT_COLUMN' => 'Enable right column', + 'PORTAL_RIGHT_COLUMN_EXP' => 'Switch to no if you wish to turn off the right column', + 'PORTAL_VERSION_CHECK' => 'Versioncheck on Portal', + 'PORTAL_FORUM_INDEX' => 'Forum Index (Forum list)', + 'PORTAL_FORUM_INDEX_EXP' => 'Display this block on the portal.', + 'ACP_PORTAL_COLUMN_WIDTH_SETTINGS' => 'Left and right column width settings', + 'PORTAL_LEFT_COLUMN_WIDTH' => 'Width of the left column', + 'PORTAL_LEFT_COLUMN_WIDTH_EXP' => 'Change the width of the left column in pixels; recommended value is 180', + 'PORTAL_RIGHT_COLUMN_WIDTH' => 'Width of the right column', + 'PORTAL_RIGHT_COLUMN_WIDTH_EXP' => 'Change the width of the right column in pixels; recommended value is 180', + + // Install + 'PORTAL_BASIC_INSTALL' => 'Adding basic set of modules', + 'PORTAL_BASIC_UNINSTALL' => 'Removing modules from database', - 'NO_LINK_TITLE' => 'You haven’t specified a title for the navigation link.', - 'NO_LINK_URL' => 'You have created clickable navigation link but haven’t entered the URL for this navigation link.', - - 'SELECT_LINK_ICON' => 'Select an icon…', - */ // Logs 'LOG_PORTAL_CONFIG' => 'Altered Portal settings
» %s',