Index: trunk/kernel/admin_templates/img/icons/icon24_reviews.gif =================================================================== diff -u -N Binary files differ Index: trunk/kernel/admin_templates/user_selector.tpl =================================================================== diff -u -N -r4287 -r4457 --- trunk/kernel/admin_templates/user_selector.tpl (.../user_selector.tpl) (revision 4287) +++ trunk/kernel/admin_templates/user_selector.tpl (.../user_selector.tpl) (revision 4457) @@ -5,7 +5,7 @@ - + Index: trunk/admin/relation_select.php =================================================================== diff -u -N -r4309 -r4457 --- trunk/admin/relation_select.php (.../relation_select.php) (revision 4309) +++ trunk/admin/relation_select.php (.../relation_select.php) (revision 4457) @@ -33,8 +33,8 @@ $application->Init(); $application->ProcessRequest(); -$main_processor =& $application->recallTagProcessor('m'); -$main_processor->StoreMainPrefix(Array()); +$application->InitParser(); +$application->ProcessParsedTag('adm', 'StoreMainPrefix', Array()); if( $application->GetVar('CatId') ) $application->SetVar('m_cat_id', $application->GetVar('CatId') ); //KERNEL4 END Index: trunk/kernel/admin_templates/incs/footer.tpl =================================================================== diff -u -N -r2500 -r4457 --- trunk/kernel/admin_templates/incs/footer.tpl (.../footer.tpl) (revision 2500) +++ trunk/kernel/admin_templates/incs/footer.tpl (.../footer.tpl) (revision 4457) @@ -1,5 +1,5 @@

- + Index: trunk/admin/icons/icon24_reviews.gif =================================================================== diff -u -N -r983 -r4457 Binary files differ Index: trunk/core/units/themes/themes_config.php =================================================================== diff -u -N -r1566 -r4457 --- trunk/core/units/themes/themes_config.php (.../themes_config.php) (revision 1566) +++ trunk/core/units/themes/themes_config.php (.../themes_config.php) (revision 4457) @@ -23,6 +23,20 @@ 'TableName' => TABLE_PREFIX.'Theme', 'SubItems' => Array('themefiles'), + + 'Sections' => Array( + 'in-portal:configure_themes' => Array( + 'parent' => 'in-portal:system', + 'icon' => 'conf_themes', + 'label' => 'la_tab_Themes', + 'url' => Array('index_file' => 'config/config_theme.php', 'pass' => 'm'), + 'permissions' => Array('view', 'edit', 'delete'), + 'priority' => 2, + 'type' => stTREE, + ), + + ), + 'FilterMenu' => Array( 'Groups' => Array( Array('mode' => 'AND', 'filters' => Array(0,1), 'type' => WHERE_FILTER), Index: trunk/core/units/categories/categories_config.php =================================================================== diff -u -N -r4446 -r4457 --- trunk/core/units/categories/categories_config.php (.../categories_config.php) (revision 4446) +++ trunk/core/units/categories/categories_config.php (.../categories_config.php) (revision 4457) @@ -37,7 +37,90 @@ 'category_items' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Items!"), ), - + 'Sections' => Array( + // "Structure & Data" section + 'in-portal:site' => Array( + 'parent' => 'in-portal:root', + 'icon' => 'struct', + 'label' => 'la_tab_Site_Structure', + 'url' => Array('index_file' => 'subitems.php', 'pass' => 'm'), + 'permissions' => Array('view'), + 'priority' => 1, + 'type' => stTREE, + ), + + 'in-portal:browse' => Array( + 'parent' => 'in-portal:site', + 'icon' => 'catalog', + 'label' => 'la_tab_Browse', + 'url' => Array('index_file' => 'browse.php', 'pass' => 'm'), + 'permissions' => Array('view'), + 'priority' => 1, + 'type' => stTREE, + ), + + 'in-portal:advanced_view' => Array( + 'parent' => 'in-portal:site', + 'icon' => 'advanced_view', + 'label' => 'la_tab_AdvancedView', + 'url' => Array('index_file' => 'advanced_view.php', 'pass' => 'm'), + 'permissions' => Array('view'), + 'priority' => 2, + 'type' => stTREE, + ), + + 'in-portal:reviews' => Array( + 'parent' => 'in-portal:site', + 'icon' => 'reviews', + 'label' => 'la_tab_Reviews', + 'url' => Array('index_file' => 'reviews.php', 'pass' => 'm'), + 'permissions' => Array('view'), + 'priority' => 3, + 'type' => stTREE, + ), + + 'in-portal:configure_categories' => Array( + 'parent' => 'in-portal:site', + 'icon' => 'cat_settings', + 'label' => 'la_tab_Settings', + 'url' => Array('index_file' => 'config/edit_config.php', 'pass' => 'm'), + 'permissions' => Array('view', 'edit'), + 'priority' => 4, + 'type' => stTREE, + ), + + 'in-portal:configuration_search' => Array( + 'parent' => 'in-portal:site', + 'icon' => 'settings_search', + 'label' => 'la_tab_ConfigSearch', + 'url' => Array('t' => 'config/config_search', 'index_file' => 'index4.php', 'module_key' => 'category', 'pass' => 'm'), + 'permissions' => Array('view', 'edit'), + 'priority' => 5, + 'type' => stTREE, + ), + + 'in-portal:configuration_email' => Array( + 'parent' => 'in-portal:site', + 'icon' => 'settings_email', + 'label' => 'la_tab_ConfigE-mail', + 'url' => Array('index_file' => 'config/module_email.php', 'module' => 'In-Portal:Category', 'lpn' => 1, 'pass' => 'm'), + 'permissions' => Array('view'), + 'priority' => 6, + 'type' => stTREE, + ), + + 'in-portal:configuration_custom' => Array( + 'parent' => 'in-portal:site', + 'icon' => 'settings_custom', + 'label' => 'la_tab_ConfigCustom', + 'url' => Array('t' => 'custom_fields/custom_fields_list', 'index_file' => 'index4.php', 'cf_type' => 1, 'pass' => 'm,cf'), + 'permissions' => Array('view', 'edit', 'delete'), + 'priority' => 7, + 'type' => stTREE, + ), + + ), + 'ListSQLs' => Array( ''=> ' SELECT %1$s.* %2$s FROM %1$s LEFT JOIN '.TABLE_PREFIX.'PermCache ON '.TABLE_PREFIX.'PermCache.CategoryId = %1$s.CategoryId Index: trunk/kernel/admin_templates/img/icons/icon24_email_log.gif =================================================================== diff -u -N Binary files differ Index: trunk/kernel/admin_templates/img/icons/icon24_advanced_view.gif =================================================================== diff -u -N Binary files differ Index: trunk/kernel/units/admin/admin_config.php =================================================================== diff -u -N --- trunk/kernel/units/admin/admin_config.php (revision 0) +++ trunk/kernel/units/admin/admin_config.php (revision 4457) @@ -0,0 +1,186 @@ + 'adm', + 'EventHandlerClass' => Array('class' => 'kEventHandler', 'file' => '', 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array('class' => 'AdminTagProcessor', 'file' => 'admin_tag_processor.php', 'build_event' => 'OnBuild'), + + 'Sections' => Array( + 'in-portal:root' => Array( + 'parent' => null, + 'icon' => 'site', + 'label' => $this->Application->ConfigValue('Site_Name'), + 'url' => Array('index_file' => 'subitems.php', 'pass' => 'm'), + 'permissions' => Array('view'), + 'priority' => 0, + 'type' => stTREE, + ), + + // "Summary & Logs" section + 'in-portal:reports' => Array( + 'parent' => 'in-portal:root', + 'icon' => 'summary_logs', + 'label' => 'la_tab_Reports', + 'url' => Array('index_file' => 'subitems.php', 'pass' => 'm'), + 'permissions' => Array('view'), + 'priority' => 4, + 'type' => stTREE, + ), + + 'in-portal:log_summary' => Array( + 'parent' => 'in-portal:reports', + 'icon' => 'summary', + 'label' => 'la_tab_Summary', + 'url' => Array('index_file' => 'logs/summary.php', 'pass' => 'm'), + 'permissions' => Array('view'), + 'priority' => 1, + 'type' => stTREE, + ), + + 'in-portal:searchlog' => Array( + 'parent' => 'in-portal:reports', + 'icon' => 'search_log', + 'label' => 'la_tab_SearchLog', + 'url' => Array('index_file' => 'logs/searchlog.php', 'pass' => 'm'), + 'permissions' => Array('view', 'delete'), + 'priority' => 2, + 'type' => stTREE, + ), + + 'in-portal:sessionlog' => Array( + 'parent' => 'in-portal:reports', + 'icon' => 'sessions_log', + 'label' => 'la_tab_SessionLog', + 'url' => Array('index_file' => 'logs/session_list.php', 'pass' => 'm'), + 'permissions' => Array('view', 'reset'), + 'priority' => 3, + 'type' => stTREE, + ), + + 'in-portal:emaillog' => Array( + 'parent' => 'in-portal:reports', + 'icon' => 'email_log', + 'label' => 'la_tab_EmailLog', + 'url' => Array('index_file' => 'logs/email_log.php', 'pass' => 'm'), + 'permissions' => Array('view', 'delete'), + 'priority' => 4, + 'type' => stTREE, + ), + + 'in-portal:visits' => Array( + 'parent' => 'in-portal:reports', + 'icon' => 'visits', + 'label' => 'la_tab_Visits', + 'url' => Array('t' => 'visits/visits_list', 'index_file' => 'index4.php', 'pass' => 'm'), + 'permissions' => Array('view', 'delete'), + 'priority' => 5, + 'type' => stTREE, + ), + + // "Configuration" section + 'in-portal:system' => Array( + 'parent' => 'in-portal:root', + 'icon' => 'conf', + 'label' => 'la_tab_Sys_Config', + 'url' => Array('index_file' => 'subitems.php', 'pass' => 'm'), + 'permissions' => Array('view'), + 'priority' => 5, + 'type' => stTREE, + ), + + 'in-portal:configure_general' => Array( + 'parent' => 'in-portal:system', + 'icon' => 'conf_general', + 'label' => 'la_tab_General', + 'url' => Array('index_file' => 'config/edit_config.php', 'pass' => 'm'), + 'permissions' => Array('view'), + 'priority' => 1, + 'type' => stTREE, + ), + + // "Tools" section + 'in-portal:tools' => Array( + 'parent' => 'in-portal:root', + 'icon' => 'tools', + 'label' => 'la_tab_Tools', + 'url' => Array('index_file' => 'subitems.php', 'pass' => 'm'), + 'permissions' => Array('view'), + 'priority' => 6, + 'type' => stTREE, + ), + + 'in-portal:backup' => Array( + 'parent' => 'in-portal:tools', + 'icon' => 'tool_backup', + 'label' => 'la_tab_Backup', + 'url' => Array('index_file' => 'backup/backup1.php', 'pass' => 'm'), + 'permissions' => Array('view'), + 'priority' => 1, + 'type' => stTREE, + ), + + 'in-portal:restore' => Array( + 'parent' => 'in-portal:tools', + 'icon' => 'tool_restore', + 'label' => 'la_tab_Restore', + 'url' => Array('index_file' => 'backup/restore1.php', 'pass' => 'm'), + 'permissions' => Array('view'), + 'priority' => 2, + 'type' => stTREE, + ), + + 'in-portal:export' => Array( + 'parent' => 'in-portal:tools', + 'icon' => 'tool_export', + 'label' => 'la_tab_ExportData', + 'url' => Array('index_file' => 'backup/export1.php', 'pass' => 'm'), + 'permissions' => Array('view'), + 'priority' => 3, + 'type' => stTREE, + ), + + 'in-portal:main_import' => Array( + 'parent' => 'in-portal:tools', + 'icon' => 'tool_import', + 'label' => 'la_tab_ImportData', + 'url' => Array('index_file' => 'import/step1.php', 'pass' => 'm'), + 'permissions' => Array('view'), + 'priority' => 4, + 'type' => stTREE, + ), + + 'in-portal:sql_query' => Array( + 'parent' => 'in-portal:tools', + 'icon' => 'tool_import', + 'label' => 'la_tab_QueryDB', + 'url' => Array('index_file' => 'tools/sql_query.php', 'pass' => 'm'), + 'permissions' => Array('view'), + 'priority' => 5, + 'type' => stTREE, + ), + + 'in-portal:server_info' => Array( + 'parent' => 'in-portal:tools', + 'icon' => 'server_info', + 'label' => 'la_tab_ServerInfo', + 'url' => Array('index_file' => 'tools/server_info.php', 'pass' => 'm'), + 'permissions' => Array('view'), + 'priority' => 6, + 'type' => stTREE, + ), + + // "Help" section + 'in-portal:help' => Array( + 'parent' => 'in-portal:root', + 'icon' => 'help', + 'label' => 'la_tab_Help', + 'url' => Array('index_file' => 'help/manual.pdf', 'pass' => 'm'), + 'permissions' => Array('view'), + 'priority' => 7, + 'type' => stTREE, + ), + ), + + ); + +?> \ No newline at end of file Index: trunk/kernel/admin_templates/img/icons/icon24_settings_censor.gif =================================================================== diff -u -N -r1566 -r4457 Binary files differ Index: trunk/kernel/admin_templates/img/icons/icon24_affiliates.gif =================================================================== diff -u -N -r2399 -r4457 Binary files differ Index: trunk/admin/icons/icon24_advanced_view.gif =================================================================== diff -u -N -r165 -r4457 Binary files differ Index: trunk/core/units/languages/languages_config.php =================================================================== diff -u -N -r4169 -r4457 --- trunk/core/units/languages/languages_config.php (.../languages_config.php) (revision 4169) +++ trunk/core/units/languages/languages_config.php (.../languages_config.php) (revision 4457) @@ -87,7 +87,20 @@ 'new_titlefield' => Array('emailmessages' => '!la_NoSubject!'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_EditingEmailEvent! '#emailmessages_titlefield#'"), ), + + 'Sections' => Array( + 'in-portal:configure_lang' => Array( + 'parent' => 'in-portal:system', + 'icon' => 'conf_regional', + 'label' => 'la_tab_Regional', + 'url' => Array('t' => 'regional/languages_list', 'index_file' => 'index4.php', 'pass' => 'm'), + 'permissions' => Array('view', 'edit', 'delete'), + 'priority' => 4, + 'type' => stTREE, + ), + ), + 'TableName' => TABLE_PREFIX.'Language', 'SubItems' => Array('phrases','emailmessages'), Index: trunk/kernel/admin_templates/img/icons/icon24_server_info.gif =================================================================== diff -u -N Binary files differ Index: trunk/kernel/admin_templates/popups/translator.tpl =================================================================== diff -u -N -r4287 -r4457 --- trunk/kernel/admin_templates/popups/translator.tpl (.../translator.tpl) (revision 4287) +++ trunk/kernel/admin_templates/popups/translator.tpl (.../translator.tpl) (revision 4457) @@ -52,7 +52,7 @@ - +
Index: trunk/admin/icons/icon24_settings_censor.gif =================================================================== diff -u -N -r13 -r4457 Binary files differ Index: trunk/core/kernel/application.php =================================================================== diff -u -N -r4446 -r4457 --- trunk/core/kernel/application.php (.../application.php) (revision 4446) +++ trunk/core/kernel/application.php (.../application.php) (revision 4457) @@ -936,6 +936,9 @@ */ function getPassInfo($pass = 'all') { + if (!$pass) { + return Array(); + } $pass = str_replace('all', trim($this->GetVar('passed'), ','), $pass); $pass_info = array_unique( explode(',', $pass) ); // array( prefix[.special], prefix[.special] ... Index: trunk/kernel/admin_templates/custom_fields/custom_fields_list.tpl =================================================================== diff -u -N -r4008 -r4457 --- trunk/kernel/admin_templates/custom_fields/custom_fields_list.tpl (.../custom_fields_list.tpl) (revision 4008) +++ trunk/kernel/admin_templates/custom_fields/custom_fields_list.tpl (.../custom_fields_list.tpl) (revision 4457) @@ -2,7 +2,7 @@ - + Index: trunk/kernel/admin_templates/tree.tpl =================================================================== diff -u -N --- trunk/kernel/admin_templates/tree.tpl (revision 0) +++ trunk/kernel/admin_templates/tree.tpl (revision 4457) @@ -0,0 +1,95 @@ + + + + + + + + + +
+ + + + + + + + + + + + + +
+  ');">In-Portal v + + +
+ + + + +
-> + " title="" target="main"> + .gif" border="0" alt="" align="absmiddle"/> + () +
+ + + + + +
ParentChild
+ + + + + + + img/icons/icon24_.gif + + + + + + + + + + + + + + + \ No newline at end of file Index: trunk/kernel/admin_templates/img/icons/icon24_download_log.gif =================================================================== diff -u -N -r2343 -r4457 Binary files differ Index: trunk/admin/icons/icon24_server_info.gif =================================================================== diff -u -N -r361 -r4457 Binary files differ Index: trunk/admin/icons/icon24_validate.gif =================================================================== diff -u -N -r13 -r4457 Binary files differ Index: trunk/kernel/units/users/users_config.php =================================================================== diff -u -N -r4287 -r4457 --- trunk/kernel/units/users/users_config.php (.../users_config.php) (revision 4287) +++ trunk/kernel/units/users/users_config.php (.../users_config.php) (revision 4457) @@ -68,6 +68,79 @@ 'users_select' => Array('prefixes' => Array('u_List'), 'format' => "!la_title_Users! (#u_recordcount#) - !la_title_SelectUser!"), ), + + 'Sections' => Array( + 'in-portal:users' => Array( + 'parent' => 'in-portal:root', + 'icon' => 'community', + 'label' => 'la_tab_Community', + 'url' => Array('index_file' => 'subitems.php', 'pass' => 'm'), + 'permissions' => Array('view'), + 'priority' => 2, + 'type' => stTREE, + ), + + 'in-portal:user_list' => Array( + 'parent' => 'in-portal:users', + 'icon' => 'users', + 'label' => 'la_tab_User_List', + 'url' => Array('index_file' => 'users/user_list.php', 'pass' => 'm', 'resetpage' => 1), + 'permissions' => Array('view', 'edit', 'delete', 'advanced:ban', 'advanced:send_email'), + 'priority' => 1, + 'type' => stTREE, + ), + + 'in-portal:user_groups' => Array( + 'parent' => 'in-portal:users', + 'icon' => 'usergroups', + 'label' => 'la_tab_User_Groups', + 'url' => Array('index_file' => 'users/user_groups.php', 'pass' => 'm', 'resetpage' => 1), + 'permissions' => Array('view', 'edit', 'delete', 'advanced:send_email'), + 'priority' => 2, + 'type' => stTREE, + ), + + 'in-portal:configure_users' => Array( + 'parent' => 'in-portal:users', + 'icon' => 'users_settings', + 'label' => 'la_tab_ConfigSettings', + 'url' => Array('index_file' => 'config/edit_config.php', 'module' => 'In-Portal:Users', 'pass' => 'm'), + 'permissions' => Array('view', 'edit'), + 'priority' => 3, + 'type' => stTREE, + ), + + 'in-portal:user_email' => Array( + 'parent' => 'in-portal:users', + 'icon' => 'settings_email', + 'label' => 'la_tab_ConfigE-mail', + 'url' => Array('index_file' => 'config/module_email.php', 'module' => 'In-Portal:Users', 'lpn' => 1, 'pass' => 'm'), + 'permissions' => Array('view', 'edit'), + 'priority' => 4, + 'type' => stTREE, + ), + + 'in-portal:user_custom' => Array( + 'parent' => 'in-portal:users', + 'icon' => 'settings_custom', + 'label' => 'la_tab_ConfigCustom', + 'url' => Array('t' => 'custom_fields/custom_fields_list', 'index_file' => 'index4.php', 'cf_type' => 6, 'pass' => 'm,cf'), + 'permissions' => Array('view', 'edit'), + 'priority' => 5, + 'type' => stTREE, + ), + + 'in-portal:user_banlist' => Array( + 'parent' => 'in-portal:users', + 'icon' => 'banlist', + 'label' => 'la_tab_BanList', + 'url' => Array('index_file' => 'config/edit_banlist.php', 'DataType' => 6, 'pass' => 'm'), + 'permissions' => Array('view', 'edit'), + 'priority' => 6, + 'type' => stTREE, + ), + ), + 'TableName' => TABLE_PREFIX.'PortalUser', 'ListSQLs' => Array( '' => ' SELECT %1$s.* %2$s FROM %1$s Index: trunk/kernel/admin/include/navmenu.php =================================================================== diff -u -N -r4452 -r4457 --- trunk/kernel/admin/include/navmenu.php (.../navmenu.php) (revision 4452) +++ trunk/kernel/admin/include/navmenu.php (.../navmenu.php) (revision 4457) @@ -169,7 +169,7 @@ NULL, "in-portal:users", NULL, "in-portal:user_groups",0,"",1, NULL,NULL,NULL,$admin."/icons/icon46_list_users.gif"); -$objSections->AddSection("in-portal:user_groups","la_tab_User_Groups","la_tab_User_Groups", $admin."/users/", "user_groups.php?resetpage=1", $admin."/icons/icon46_usergroups.gif",$admin."/icons/icon24_usergroups.gif", +$objSections->AddSection("in-portal:user_groups","la_tab_User_Groups","la_tab_User_Groups", $admin."/users/", "user_groups.php?resetpage=1", $admin."/icons/icon46_usergroups.gif",$admin."/icons/icon24_usergroups.gif", NULL, "in-portal:users", "in-portal:user_list","in-portal:configure_users",0,"",1, NULL,NULL,NULL,$admin."/icons/icon46_list_usergroups.gif"); Index: trunk/core/kernel/utility/unit_config_reader.php =================================================================== diff -u -N -r4418 -r4457 --- trunk/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 4418) +++ trunk/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 4457) @@ -67,10 +67,9 @@ */ function processFolder($folderPath, $cached) { - $fh=opendir($folderPath); - while(($sub_folder=readdir($fh))) - { - $full_path=$folderPath.'/'.$sub_folder; + $fh = opendir($folderPath); + while (($sub_folder = readdir($fh))) { + $full_path = $folderPath.'/'.$sub_folder; if( $this->isDir($full_path) && file_exists($this->getConfigName($full_path)) ) { if (filemtime($full_path) > $cached) { Index: trunk/kernel/admin_templates/stylesheets/style_editor.tpl =================================================================== diff -u -N -r4287 -r4457 --- trunk/kernel/admin_templates/stylesheets/style_editor.tpl (.../style_editor.tpl) (revision 4287) +++ trunk/kernel/admin_templates/stylesheets/style_editor.tpl (.../style_editor.tpl) (revision 4457) @@ -5,7 +5,7 @@ - +