Index: trunk/kernel/units/email_events/email_events_event_handler.php =================================================================== diff -u -r4674 -r4675 --- trunk/kernel/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 4674) +++ trunk/kernel/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 4675) @@ -12,7 +12,7 @@ parent::mapPermissions(); $permissions = Array( 'OnFrontOnly' => Array('self' => 'edit'), - 'OnSaveSelected' => Array('self' => 'add|edit'), + 'OnSaveSelected' => Array('self' => 'view'), ); $this->permMapping = array_merge($this->permMapping, $permissions); } @@ -26,6 +26,7 @@ { $module = $this->Application->GetVar('module'); $module = explode(':', $module, 2); + if (count($module) == 1) { $main_prefix = $this->Application->findModule('Name', $module[0], 'Var'); } @@ -34,6 +35,7 @@ $main_prefix = $exceptions[ $module[1] ]; } $section = $this->Application->getUnitOption($main_prefix.'.email', 'PermSection'); + $event->setEventParam('PermSection', $section); return parent::CheckPermission($event); } Index: trunk/core/units/email_events/email_events_event_handler.php =================================================================== diff -u -r4674 -r4675 --- trunk/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 4674) +++ trunk/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 4675) @@ -12,7 +12,7 @@ parent::mapPermissions(); $permissions = Array( 'OnFrontOnly' => Array('self' => 'edit'), - 'OnSaveSelected' => Array('self' => 'add|edit'), + 'OnSaveSelected' => Array('self' => 'view'), ); $this->permMapping = array_merge($this->permMapping, $permissions); } @@ -26,6 +26,7 @@ { $module = $this->Application->GetVar('module'); $module = explode(':', $module, 2); + if (count($module) == 1) { $main_prefix = $this->Application->findModule('Name', $module[0], 'Var'); } @@ -34,6 +35,7 @@ $main_prefix = $exceptions[ $module[1] ]; } $section = $this->Application->getUnitOption($main_prefix.'.email', 'PermSection'); + $event->setEventParam('PermSection', $section); return parent::CheckPermission($event); } Index: trunk/core/units/users/users_config.php =================================================================== diff -u -r4670 -r4675 --- trunk/core/units/users/users_config.php (.../users_config.php) (revision 4670) +++ trunk/core/units/users/users_config.php (.../users_config.php) (revision 4675) @@ -81,7 +81,7 @@ ), - 'PermSection' => Array('main' => 'in-portal:user_list', 'custom' => 'in-portal:user_custom'), + 'PermSection' => Array('main' => 'in-portal:user_list', 'email' => 'in-portal:user_email', 'custom' => 'in-portal:user_custom'), 'Sections' => Array( 'in-portal:users' => Array( @@ -118,7 +118,7 @@ 'parent' => 'in-portal:users', 'icon' => 'settings_email', 'label' => 'la_tab_ConfigE-mail', - 'url' => Array('index_file' => 'config/module_email.php', 'module' => 'In-Portal:Users', 'pass_section' => true, 'lpn' => 1, 'pass' => 'm'), + 'url' => Array('t' => 'config/config_email', 'module' => 'In-Portal:Users', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view', 'edit'), 'priority' => 4, 'type' => stTREE, Index: trunk/core/units/categories/categories_config.php =================================================================== diff -u -r4670 -r4675 --- trunk/core/units/categories/categories_config.php (.../categories_config.php) (revision 4670) +++ trunk/core/units/categories/categories_config.php (.../categories_config.php) (revision 4675) @@ -53,7 +53,7 @@ 'tree_site' => Array('format' => '!la_selecting_categories!'), ), - 'PermSection' => Array(/*'search' => 'in-portal:configuration_search',*/ 'custom' => 'in-portal:configuration_custom'), + 'PermSection' => Array(/*'search' => 'in-portal:configuration_search',*/ 'email' => 'in-portal:configuration_email', 'custom' => 'in-portal:configuration_custom'), 'Sections' => Array( // "Structure & Data" section @@ -122,7 +122,7 @@ 'parent' => 'in-portal:site', 'icon' => 'settings_email', 'label' => 'la_tab_ConfigE-mail', - 'url' => Array('index_file' => 'config/module_email.php', 'module' => 'In-Portal:Category', 'pass_section' => true, 'lpn' => 1, 'pass' => 'm'), + 'url' => Array('t' => 'config/config_email', 'module' => 'In-Portal:Category', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view', 'edit'), 'priority' => 6, 'type' => stTREE, Index: trunk/kernel/units/users/users_config.php =================================================================== diff -u -r4670 -r4675 --- trunk/kernel/units/users/users_config.php (.../users_config.php) (revision 4670) +++ trunk/kernel/units/users/users_config.php (.../users_config.php) (revision 4675) @@ -81,7 +81,7 @@ ), - 'PermSection' => Array('main' => 'in-portal:user_list', 'custom' => 'in-portal:user_custom'), + 'PermSection' => Array('main' => 'in-portal:user_list', 'email' => 'in-portal:user_email', 'custom' => 'in-portal:user_custom'), 'Sections' => Array( 'in-portal:users' => Array( @@ -118,7 +118,7 @@ 'parent' => 'in-portal:users', 'icon' => 'settings_email', 'label' => 'la_tab_ConfigE-mail', - 'url' => Array('index_file' => 'config/module_email.php', 'module' => 'In-Portal:Users', 'pass_section' => true, 'lpn' => 1, 'pass' => 'm'), + 'url' => Array('t' => 'config/config_email', 'module' => 'In-Portal:Users', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view', 'edit'), 'priority' => 4, 'type' => stTREE, Fisheye: Tag 4675 refers to a dead (removed) revision in file `trunk/admin/config/edit_config.php'. Fisheye: No comparison available. Pass `N' to diff? Index: trunk/kernel/units/categories/categories_config.php =================================================================== diff -u -r4670 -r4675 --- trunk/kernel/units/categories/categories_config.php (.../categories_config.php) (revision 4670) +++ trunk/kernel/units/categories/categories_config.php (.../categories_config.php) (revision 4675) @@ -53,7 +53,7 @@ 'tree_site' => Array('format' => '!la_selecting_categories!'), ), - 'PermSection' => Array(/*'search' => 'in-portal:configuration_search',*/ 'custom' => 'in-portal:configuration_custom'), + 'PermSection' => Array(/*'search' => 'in-portal:configuration_search',*/ 'email' => 'in-portal:configuration_email', 'custom' => 'in-portal:configuration_custom'), 'Sections' => Array( // "Structure & Data" section @@ -122,7 +122,7 @@ 'parent' => 'in-portal:site', 'icon' => 'settings_email', 'label' => 'la_tab_ConfigE-mail', - 'url' => Array('index_file' => 'config/module_email.php', 'module' => 'In-Portal:Category', 'pass_section' => true, 'lpn' => 1, 'pass' => 'm'), + 'url' => Array('t' => 'config/config_email', 'module' => 'In-Portal:Category', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view', 'edit'), 'priority' => 6, 'type' => stTREE, Fisheye: Tag 4675 refers to a dead (removed) revision in file `trunk/admin/config/module_email.php'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4675 refers to a dead (removed) revision in file `trunk/admin/config/config_general.php'. Fisheye: No comparison available. Pass `N' to diff?