Index: trunk/kernel/units/statistics/statistics_event_handler.php =================================================================== diff -u -N -r4524 -r4687 --- trunk/kernel/units/statistics/statistics_event_handler.php (.../statistics_event_handler.php) (revision 4524) +++ trunk/kernel/units/statistics/statistics_event_handler.php (.../statistics_event_handler.php) (revision 4687) @@ -9,10 +9,19 @@ */ function SetCustomQuery(&$event) { + $object =& $event->getObject(); + if ($event->Special == 'summary') { - $object =& $event->getObject(); $object->addFilter('summary_filter', '%1$s.AdminSummary = 1'); } + + $module_list = ''; + foreach ($this->Application->ModuleInfo as $module_name => $module_info) { + $module_list .= $this->Conn->qstr($module_name).','; + } + $module_list = preg_replace('/(.*),$/', '\\1', $module_list); + + $object->addFilter('status_filter', '%1$s.Module IN ('.$module_list.')'); } } Index: trunk/kernel/admin_templates/modules/modules_list.tpl =================================================================== diff -u -N -r4578 -r4687 --- trunk/kernel/admin_templates/modules/modules_list.tpl (.../modules_list.tpl) (revision 4578) +++ trunk/kernel/admin_templates/modules/modules_list.tpl (.../modules_list.tpl) (revision 4687) @@ -31,6 +31,13 @@ } ) ); + a_toolbar.AddButton( new ToolBarSeparator('sep1') ); + + a_toolbar.AddButton( new ToolBarButton('view', '', function() { + show_viewmenu(a_toolbar,'view'); + } + ) ); + a_toolbar.Render(); Index: trunk/core/units/statistics/statistics_event_handler.php =================================================================== diff -u -N -r4524 -r4687 --- trunk/core/units/statistics/statistics_event_handler.php (.../statistics_event_handler.php) (revision 4524) +++ trunk/core/units/statistics/statistics_event_handler.php (.../statistics_event_handler.php) (revision 4687) @@ -9,10 +9,19 @@ */ function SetCustomQuery(&$event) { + $object =& $event->getObject(); + if ($event->Special == 'summary') { - $object =& $event->getObject(); $object->addFilter('summary_filter', '%1$s.AdminSummary = 1'); } + + $module_list = ''; + foreach ($this->Application->ModuleInfo as $module_name => $module_info) { + $module_list .= $this->Conn->qstr($module_name).','; + } + $module_list = preg_replace('/(.*),$/', '\\1', $module_list); + + $object->addFilter('status_filter', '%1$s.Module IN ('.$module_list.')'); } } Index: trunk/core/units/admin/admin_config.php =================================================================== diff -u -N -r4670 -r4687 --- trunk/core/units/admin/admin_config.php (.../admin_config.php) (revision 4670) +++ trunk/core/units/admin/admin_config.php (.../admin_config.php) (revision 4687) @@ -15,8 +15,6 @@ 'tree_tools' => Array('format' => '!la_section_overview!'), - 'tree_modules' => Array('format' => '!la_section_overview!'), - 'no_permissions' => Array('format' => '!la_title_NoPermissions!'), ), @@ -112,47 +110,6 @@ 'priority' => 1, 'type' => stTREE, ), - - // "Configuration" -> "Modules and Settings" - 'in-portal:modules' => Array( - 'parent' => 'in-portal:system', - 'icon' => 'modules', - 'label' => 'la_tab_ModulesManagement', - 'url' => Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'), - 'permissions' => Array('view'), - 'priority' => 1.1, - 'type' => stTREE, - ), - - 'in-portal:mod_status' => Array( - 'parent' => 'in-portal:modules', - 'icon' => 'modules', - 'label' => 'la_title_Module_Status', - 'url' => Array('t' => 'modules/modules_list', 'pass' => 'm'), - 'permissions' => Array('view', 'edit', 'advanced:approve', 'advanced:decline'), - 'priority' => 1, - 'type' => stTREE, - ), - - 'in-portal:addmodule' => Array( - 'parent' => 'in-portal:modules', - 'icon' => 'modules', - 'label' => 'la_title_Add_Module', - 'url' => Array('index_file' => 'modules/addmodule.php', 'pass' => 'm'), - 'permissions' => Array('view', 'add', 'edit'), - 'priority' => 2, - 'type' => stTREE, - ), - - 'in-portal:tag_library' => Array( - 'parent' => 'in-portal:modules', - 'icon' => 'modules', - 'label' => 'la_tab_TagLibrary', - 'url' => Array('index_file' => 'tag_listing.php', 'pass' => 'm'), - 'permissions' => Array('view'), - 'priority' => 3, - 'type' => stTREE, - ), // "Tools" section 'in-portal:tools' => Array( Index: trunk/core/units/modules/modules_config.php =================================================================== diff -u -N -r4577 -r4687 --- trunk/core/units/modules/modules_config.php (.../modules_config.php) (revision 4577) +++ trunk/core/units/modules/modules_config.php (.../modules_config.php) (revision 4687) @@ -7,7 +7,6 @@ 'EventHandlerClass' => Array('class'=>'ModulesEventHandler','file'=>'modules_event_handler.php','build_event'=>'OnBuild'), 'TagProcessorClass' => Array('class'=>'ModulesTagProcessor','file'=>'modules_tag_processor.php','build_event'=>'OnBuild'), 'AutoLoad' => true, - 'hooks' => Array(), 'QueryString' => Array( 1 => 'id', 2 => 'page', @@ -20,13 +19,68 @@ 'StatusField' => Array('Loaded'), 'TitlePresets' => Array( - - 'modules_list' => Array( 'prefixes' => Array('mod_List'), 'format' => "!la_title_Configuration! - !la_title_Module_Status! (#mod_recordcount#)"), - + 'modules_list' => Array( 'prefixes' => Array('mod_List'), 'format' => "!la_title_Configuration! - !la_title_Module_Status! (#mod_recordcount#)"), + + 'tree_modules' => Array('format' => '!la_section_overview!'), ), + 'PermSection' => Array('main' => 'in-portal:mod_status'), + + 'Sections' => Array( + // "Configuration" -> "Modules and Settings" + 'in-portal:modules' => Array( + 'parent' => 'in-portal:system', + 'icon' => 'modules', + 'label' => 'la_tab_ModulesManagement', + 'url' => Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'), + 'permissions' => Array('view'), + 'priority' => 1.1, + 'type' => stTREE, + ), + + 'in-portal:mod_status' => Array( + 'parent' => 'in-portal:modules', + 'icon' => 'modules', + 'label' => 'la_title_Module_Status', + 'url' => Array('t' => 'modules/modules_list', 'pass' => 'm'), + 'permissions' => Array('view', 'edit', 'advanced:approve', 'advanced:decline'), + 'priority' => 1, + 'type' => stTREE, + ), + + 'in-portal:addmodule' => Array( + 'parent' => 'in-portal:modules', + 'icon' => 'modules', + 'label' => 'la_title_Add_Module', + 'url' => Array('index_file' => 'modules/addmodule.php', 'pass' => 'm'), + 'permissions' => Array('view', 'add', 'edit'), + 'priority' => 2, + 'type' => stTREE, + ), + + 'in-portal:tag_library' => Array( + 'parent' => 'in-portal:modules', + 'icon' => 'modules', + 'label' => 'la_tab_TagLibrary', + 'url' => Array('index_file' => 'tag_listing.php', 'pass' => 'm'), + 'permissions' => Array('view'), + 'priority' => 3, + 'type' => stTREE, + ), + ), + 'TableName' => TABLE_PREFIX.'Modules', - + + 'FilterMenu' => Array( + 'Groups' => Array( + Array('mode' => 'AND', 'filters' => Array('enabled', 'disabled'), 'type' => WHERE_FILTER), + ), + 'Filters' => Array( + 'enabled' => Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Loaded != 1'), + 'disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Loaded != 0'), + ) + ), + 'ListSQLs' => Array( ''=>'SELECT * FROM %s', ), // key - special, value - list select sql 'ItemSQLs' => Array( ''=>'SELECT * FROM %s', Index: trunk/kernel/units/admin/admin_config.php =================================================================== diff -u -N -r4670 -r4687 --- trunk/kernel/units/admin/admin_config.php (.../admin_config.php) (revision 4670) +++ trunk/kernel/units/admin/admin_config.php (.../admin_config.php) (revision 4687) @@ -15,8 +15,6 @@ 'tree_tools' => Array('format' => '!la_section_overview!'), - 'tree_modules' => Array('format' => '!la_section_overview!'), - 'no_permissions' => Array('format' => '!la_title_NoPermissions!'), ), @@ -112,47 +110,6 @@ 'priority' => 1, 'type' => stTREE, ), - - // "Configuration" -> "Modules and Settings" - 'in-portal:modules' => Array( - 'parent' => 'in-portal:system', - 'icon' => 'modules', - 'label' => 'la_tab_ModulesManagement', - 'url' => Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'), - 'permissions' => Array('view'), - 'priority' => 1.1, - 'type' => stTREE, - ), - - 'in-portal:mod_status' => Array( - 'parent' => 'in-portal:modules', - 'icon' => 'modules', - 'label' => 'la_title_Module_Status', - 'url' => Array('t' => 'modules/modules_list', 'pass' => 'm'), - 'permissions' => Array('view', 'edit', 'advanced:approve', 'advanced:decline'), - 'priority' => 1, - 'type' => stTREE, - ), - - 'in-portal:addmodule' => Array( - 'parent' => 'in-portal:modules', - 'icon' => 'modules', - 'label' => 'la_title_Add_Module', - 'url' => Array('index_file' => 'modules/addmodule.php', 'pass' => 'm'), - 'permissions' => Array('view', 'add', 'edit'), - 'priority' => 2, - 'type' => stTREE, - ), - - 'in-portal:tag_library' => Array( - 'parent' => 'in-portal:modules', - 'icon' => 'modules', - 'label' => 'la_tab_TagLibrary', - 'url' => Array('index_file' => 'tag_listing.php', 'pass' => 'm'), - 'permissions' => Array('view'), - 'priority' => 3, - 'type' => stTREE, - ), // "Tools" section 'in-portal:tools' => Array( Index: trunk/kernel/units/modules/modules_config.php =================================================================== diff -u -N -r4577 -r4687 --- trunk/kernel/units/modules/modules_config.php (.../modules_config.php) (revision 4577) +++ trunk/kernel/units/modules/modules_config.php (.../modules_config.php) (revision 4687) @@ -7,7 +7,6 @@ 'EventHandlerClass' => Array('class'=>'ModulesEventHandler','file'=>'modules_event_handler.php','build_event'=>'OnBuild'), 'TagProcessorClass' => Array('class'=>'ModulesTagProcessor','file'=>'modules_tag_processor.php','build_event'=>'OnBuild'), 'AutoLoad' => true, - 'hooks' => Array(), 'QueryString' => Array( 1 => 'id', 2 => 'page', @@ -20,13 +19,68 @@ 'StatusField' => Array('Loaded'), 'TitlePresets' => Array( - - 'modules_list' => Array( 'prefixes' => Array('mod_List'), 'format' => "!la_title_Configuration! - !la_title_Module_Status! (#mod_recordcount#)"), - + 'modules_list' => Array( 'prefixes' => Array('mod_List'), 'format' => "!la_title_Configuration! - !la_title_Module_Status! (#mod_recordcount#)"), + + 'tree_modules' => Array('format' => '!la_section_overview!'), ), + 'PermSection' => Array('main' => 'in-portal:mod_status'), + + 'Sections' => Array( + // "Configuration" -> "Modules and Settings" + 'in-portal:modules' => Array( + 'parent' => 'in-portal:system', + 'icon' => 'modules', + 'label' => 'la_tab_ModulesManagement', + 'url' => Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'), + 'permissions' => Array('view'), + 'priority' => 1.1, + 'type' => stTREE, + ), + + 'in-portal:mod_status' => Array( + 'parent' => 'in-portal:modules', + 'icon' => 'modules', + 'label' => 'la_title_Module_Status', + 'url' => Array('t' => 'modules/modules_list', 'pass' => 'm'), + 'permissions' => Array('view', 'edit', 'advanced:approve', 'advanced:decline'), + 'priority' => 1, + 'type' => stTREE, + ), + + 'in-portal:addmodule' => Array( + 'parent' => 'in-portal:modules', + 'icon' => 'modules', + 'label' => 'la_title_Add_Module', + 'url' => Array('index_file' => 'modules/addmodule.php', 'pass' => 'm'), + 'permissions' => Array('view', 'add', 'edit'), + 'priority' => 2, + 'type' => stTREE, + ), + + 'in-portal:tag_library' => Array( + 'parent' => 'in-portal:modules', + 'icon' => 'modules', + 'label' => 'la_tab_TagLibrary', + 'url' => Array('index_file' => 'tag_listing.php', 'pass' => 'm'), + 'permissions' => Array('view'), + 'priority' => 3, + 'type' => stTREE, + ), + ), + 'TableName' => TABLE_PREFIX.'Modules', - + + 'FilterMenu' => Array( + 'Groups' => Array( + Array('mode' => 'AND', 'filters' => Array('enabled', 'disabled'), 'type' => WHERE_FILTER), + ), + 'Filters' => Array( + 'enabled' => Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Loaded != 1'), + 'disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Loaded != 0'), + ) + ), + 'ListSQLs' => Array( ''=>'SELECT * FROM %s', ), // key - special, value - list select sql 'ItemSQLs' => Array( ''=>'SELECT * FROM %s',