This section provides the statistical information +about your In-portal platform and all installed modules. All of the +values are automatically updated as you enter the section. If you +want to see the most current value of any statistics, please use the +�Refresh� button (icon with two revolving green arrows). +
\ No newline at end of file Index: trunk/admin/icons/icon46_list_server_info.gif =================================================================== diff -u -N -r377 -r4471 Binary files differ Index: trunk/kernel/units/admin/admin_config.php =================================================================== diff -u -N -r4457 -r4471 --- trunk/kernel/units/admin/admin_config.php (.../admin_config.php) (revision 4457) +++ trunk/kernel/units/admin/admin_config.php (.../admin_config.php) (revision 4471) @@ -5,12 +5,23 @@ 'EventHandlerClass' => Array('class' => 'kEventHandler', 'file' => '', 'build_event' => 'OnBuild'), 'TagProcessorClass' => Array('class' => 'AdminTagProcessor', 'file' => 'admin_tag_processor.php', 'build_event' => 'OnBuild'), + + 'TitlePresets' => Array( + 'tree_root' => Array('format' => '!la_section_overview!'), + + 'tree_reports' => Array('format' => '!la_section_overview!'), + + 'tree_system' => Array('format' => '!la_section_overview!'), + + 'tree_tools' => Array('format' => '!la_section_overview!'), + ), + 'Sections' => Array( 'in-portal:root' => Array( 'parent' => null, 'icon' => 'site', 'label' => $this->Application->ConfigValue('Site_Name'), - 'url' => Array('index_file' => 'subitems.php', 'pass' => 'm'), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm', 'no_amp' => 1), 'permissions' => Array('view'), 'priority' => 0, 'type' => stTREE, @@ -21,7 +32,7 @@ 'parent' => 'in-portal:root', 'icon' => 'summary_logs', 'label' => 'la_tab_Reports', - 'url' => Array('index_file' => 'subitems.php', 'pass' => 'm'), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 4, 'type' => stTREE, @@ -82,7 +93,7 @@ 'parent' => 'in-portal:root', 'icon' => 'conf', 'label' => 'la_tab_Sys_Config', - 'url' => Array('index_file' => 'subitems.php', 'pass' => 'm'), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 5, 'type' => stTREE, @@ -103,7 +114,7 @@ 'parent' => 'in-portal:root', 'icon' => 'tools', 'label' => 'la_tab_Tools', - 'url' => Array('index_file' => 'subitems.php', 'pass' => 'm'), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 6, 'type' => stTREE, Index: trunk/kernel/module_help/tree_system.txt =================================================================== diff -u -N --- trunk/kernel/module_help/tree_system.txt (revision 0) +++ trunk/kernel/module_help/tree_system.txt (revision 4471) @@ -0,0 +1,2 @@ +This section allows the administrator to update +the system settings of the In-portal platform.
\ No newline at end of file Index: trunk/kernel/admin/include/help/system.txt =================================================================== diff -u -N --- trunk/kernel/admin/include/help/system.txt (revision 2868) +++ trunk/kernel/admin/include/help/system.txt (revision 0) @@ -1,2 +0,0 @@ -This section allows the administrator to update -the system settings of the In-portal platform.
\ No newline at end of file Index: trunk/kernel/admin_templates/img/icons/icon46_list_orders.gif =================================================================== diff -u -N -r1566 -r4471 Binary files differ Index: trunk/admin/icons/icon46_list_settings_contacts.gif =================================================================== diff -u -N -r1566 -r4471 Binary files differ Index: trunk/kernel/admin_templates/img/icons/icon46_list_server_info.gif =================================================================== diff -u -N Binary files differ Index: trunk/core/units/phrases/phrases_config.php =================================================================== diff -u -N -r2210 -r4471 --- trunk/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 2210) +++ trunk/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 4471) @@ -40,8 +40,6 @@ ), 'IDField' => 'PhraseId', - 'StatusField' => Array('Type'), - 'TitleField' => 'Phrase', 'TitlePresets' => Array( Index: trunk/core/kernel/application.php =================================================================== diff -u -N -r4457 -r4471 --- trunk/core/kernel/application.php (.../application.php) (revision 4457) +++ trunk/core/kernel/application.php (.../application.php) (revision 4471) @@ -137,20 +137,24 @@ * * @param string $field * @param mixed $value + * @param string field value to returns, if not specified, then return all fields * @return Array */ - function findModule($field, $value) + function findModule($field, $value, $return_field = null) { $found = false; - foreach ($this->ModuleInfo as $module_name => $module_info) - { - if ($module_info[$field] == $value) - { + foreach ($this->ModuleInfo as $module_name => $module_info) { + if ($module_info[$field] == $value) { $found = true; break; } } - return $found ? $module_info : false; + + if ($found) { + return isset($return_field) ? $module_info[$return_field] : $module_info; + } + + return false; } /** Index: trunk/kernel/admin_templates/tree.tpl =================================================================== diff -u -N -r4466 -r4471 --- trunk/kernel/admin_templates/tree.tpl (.../tree.tpl) (revision 4466) +++ trunk/kernel/admin_templates/tree.tpl (.../tree.tpl) (revision 4471) @@ -117,7 +117,11 @@ Index: trunk/kernel/admin_templates/img/icons/icon46_list_shipping.gif =================================================================== diff -u -N -r1566 -r4471 Binary files differ Index: trunk/kernel/admin_templates/img/icons/icon46_list_currencies.gif =================================================================== diff -u -N -r1566 -r4471 Binary files differ Index: trunk/kernel/units/users/users_config.php =================================================================== diff -u -N -r4457 -r4471 --- trunk/kernel/units/users/users_config.php (.../users_config.php) (revision 4457) +++ trunk/kernel/units/users/users_config.php (.../users_config.php) (revision 4471) @@ -66,6 +66,8 @@ 'users_edit' => Array('prefixes' => Array('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_General!"), 'users_select' => Array('prefixes' => Array('u_List'), 'format' => "!la_title_Users! (#u_recordcount#) - !la_title_SelectUser!"), + + 'tree_users' => Array('format' => '!la_section_overview!'), ), @@ -74,7 +76,7 @@ 'parent' => 'in-portal:root', 'icon' => 'community', 'label' => 'la_tab_Community', - 'url' => Array('index_file' => 'subitems.php', 'pass' => 'm'), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 2, 'type' => stTREE, Index: trunk/core/kernel/db/db_event_handler.php =================================================================== diff -u -N -r4380 -r4471 --- trunk/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 4380) +++ trunk/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 4471) @@ -1398,7 +1398,15 @@ { foreach ($search_keywords as $keyword => $sign) { $pattern = '#'.$keyword.'#i'; - if (!preg_match($pattern, $use_phrases ? $this->Application->Phrase($val) : $val)) continue; + if (!preg_match($pattern, $use_phrases ? $this->Application->Phrase($val) : $val)) { + if ($sign == '+') { + $filter_value = $table_name.'`'.$search_field.'` = NULL'; + break; + } + else { + continue; + } + } if ($sign == '+' || $sign == '') { $search_keys[$key] = $this->Conn->qstr($key); Index: trunk/kernel/units/admin/admin_tag_processor.php =================================================================== diff -u -N -r4466 -r4471 --- trunk/kernel/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 4466) +++ trunk/kernel/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 4471) @@ -141,8 +141,7 @@ */ function ModuleVersion($params) { - $module_info = $this->Application->findModule('Name', $params['module']); - return $module_info['Version']; + return $this->Application->findModule('Name', $params['module'], 'Version'); } /** @@ -256,13 +255,14 @@ $params['section_name'] = $section_name; $section_data =& $this->Tree[$section_name]; $params['children_count'] = count($section_data['children']); + $template = $section_data['url']['t']; unset($section_data['url']['t']); $section_data['section_url'] = $this->Application->HREF($template, '', $section_data['url']); - if (getArrayValue($section_data, 'late_load')) { - $late_load = getArrayValue($section_data, 'late_load'); + $late_load = getArrayValue($section_data, 'late_load'); + if ($late_load) { $t = $late_load['t']; unset($late_load['t']); $section_data['late_load'] = $this->Application->HREF($t, '', $late_load); Index: trunk/core/module_help/tree_root.txt =================================================================== diff -u -N --- trunk/core/module_help/tree_root.txt (revision 0) +++ trunk/core/module_help/tree_root.txt (revision 4471) @@ -0,0 +1 @@ +This section will provide you with a page-by-page walkthrough of the Administrative Console of the In-portal platform, describing the purpose of each page and the fields on it.
\ No newline at end of file Index: trunk/kernel/module_help/tree_site.txt =================================================================== diff -u -N --- trunk/kernel/module_help/tree_site.txt (revision 0) +++ trunk/kernel/module_help/tree_site.txt (revision 4471) @@ -0,0 +1 @@ +This section will provide you with a page-by-page walkthrough of the administrative console of the In-portal platform, describing the purpose of each page and the fields on it. \ No newline at end of file Index: trunk/kernel/admin/include/help/site.txt =================================================================== diff -u -N --- trunk/kernel/admin/include/help/site.txt (revision 49) +++ trunk/kernel/admin/include/help/site.txt (revision 0) @@ -1 +0,0 @@ -This section will provide you with a page-by-page walkthrough of the administrative console of the In-portal platform, describing the purpose of each page and the fields on it. \ No newline at end of file Index: trunk/admin/icons/icon46_list_settings_search.gif =================================================================== diff -u -N -r13 -r4471 Binary files differ Index: trunk/kernel/admin_templates/img/icons/icon46_list_payment_types.gif =================================================================== diff -u -N -r1566 -r4471 Binary files differ Index: trunk/core/module_help/tree_reports.txt =================================================================== diff -u -N --- trunk/core/module_help/tree_reports.txt (revision 0) +++ trunk/core/module_help/tree_reports.txt (revision 4471) @@ -0,0 +1,6 @@ +This section provides the statistical information +about your In-portal platform and all installed modules. All of the +values are automatically updated as you enter the section. If you +want to see the most current value of any statistics, please use the +�Refresh� button (icon with two revolving green arrows). +
\ No newline at end of file Index: trunk/kernel/admin/include/help/reports.txt =================================================================== diff -u -N --- trunk/kernel/admin/include/help/reports.txt (revision 2868) +++ trunk/kernel/admin/include/help/reports.txt (revision 0) @@ -1,6 +0,0 @@ -This section provides the statistical information -about your In-portal platform and all installed modules. All of the -values are automatically updated as you enter the section. If you -want to see the most current value of any statistics, please use the -�Refresh� button (icon with two revolving green arrows). -
\ No newline at end of file Index: trunk/kernel/admin_templates/img/icons/icon46_list_manufacturers.gif =================================================================== diff -u -N -r1566 -r4471 Binary files differ Index: trunk/core/units/admin/admin_config.php =================================================================== diff -u -N -r4457 -r4471 --- trunk/core/units/admin/admin_config.php (.../admin_config.php) (revision 4457) +++ trunk/core/units/admin/admin_config.php (.../admin_config.php) (revision 4471) @@ -5,12 +5,23 @@ 'EventHandlerClass' => Array('class' => 'kEventHandler', 'file' => '', 'build_event' => 'OnBuild'), 'TagProcessorClass' => Array('class' => 'AdminTagProcessor', 'file' => 'admin_tag_processor.php', 'build_event' => 'OnBuild'), + + 'TitlePresets' => Array( + 'tree_root' => Array('format' => '!la_section_overview!'), + + 'tree_reports' => Array('format' => '!la_section_overview!'), + + 'tree_system' => Array('format' => '!la_section_overview!'), + + 'tree_tools' => Array('format' => '!la_section_overview!'), + ), + 'Sections' => Array( 'in-portal:root' => Array( 'parent' => null, 'icon' => 'site', 'label' => $this->Application->ConfigValue('Site_Name'), - 'url' => Array('index_file' => 'subitems.php', 'pass' => 'm'), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm', 'no_amp' => 1), 'permissions' => Array('view'), 'priority' => 0, 'type' => stTREE, @@ -21,7 +32,7 @@ 'parent' => 'in-portal:root', 'icon' => 'summary_logs', 'label' => 'la_tab_Reports', - 'url' => Array('index_file' => 'subitems.php', 'pass' => 'm'), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 4, 'type' => stTREE, @@ -82,7 +93,7 @@ 'parent' => 'in-portal:root', 'icon' => 'conf', 'label' => 'la_tab_Sys_Config', - 'url' => Array('index_file' => 'subitems.php', 'pass' => 'm'), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 5, 'type' => stTREE, @@ -103,7 +114,7 @@ 'parent' => 'in-portal:root', 'icon' => 'tools', 'label' => 'la_tab_Tools', - 'url' => Array('index_file' => 'subitems.php', 'pass' => 'm'), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 6, 'type' => stTREE, Index: trunk/kernel/admin_templates/img/icons/icon46_list_in-commerce.gif =================================================================== diff -u -N -r1715 -r4471 Binary files differ Index: trunk/kernel/admin_templates/img/icons/icon46_in-commerce.gif =================================================================== diff -u -N -r1715 -r4471 Binary files differ Index: trunk/kernel/units/categories/categories_config.php =================================================================== diff -u -N -r4464 -r4471 --- trunk/kernel/units/categories/categories_config.php (.../categories_config.php) (revision 4464) +++ trunk/kernel/units/categories/categories_config.php (.../categories_config.php) (revision 4471) @@ -28,13 +28,15 @@ 'ViewMenuPhrase' => 'la_text_Categories', 'TitlePresets' => Array( - 'default' => Array( 'new_status_labels' => Array('c' => '!la_title_Adding_Category!'), - 'edit_status_labels' => Array('c' => '!la_title_Editing_Category!'), - 'new_titlefield' => Array('c' => '!la_title_New_Category!'), - ), - 'category_list' => Array('prefixes' => Array('c_List'), 'format' => "!la_title_Categories! (#c_recordcount#)"), - - 'category_items' => Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Items!"), + 'default' => Array( 'new_status_labels' => Array('c' => '!la_title_Adding_Category!'), + 'edit_status_labels' => Array('c' => '!la_title_Editing_Category!'), + 'new_titlefield' => Array('c' => '!la_title_New_Category!'), + ), + 'category_list' => Array('prefixes' => Array('c_List'), 'format' => "!la_title_Categories! (#c_recordcount#)"), + + 'category_items'=> Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Items!"), + + 'tree_site' => Array('format' => '!la_selecting_categories!'), ), 'Sections' => Array( @@ -43,7 +45,7 @@ 'parent' => 'in-portal:root', 'icon' => 'struct', 'label' => 'la_tab_Site_Structure', - 'url' => Array('index_file' => 'subitems.php', 'pass' => 'm'), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 1, 'type' => stTREE, Index: trunk/core/module_help/tree_system.txt =================================================================== diff -u -N --- trunk/core/module_help/tree_system.txt (revision 0) +++ trunk/core/module_help/tree_system.txt (revision 4471) @@ -0,0 +1,2 @@ +This section allows the administrator to update +the system settings of the In-portal platform.
\ No newline at end of file Index: trunk/admin/icons/icon46_list_settings_custom.gif =================================================================== diff -u -N -r13 -r4471 Binary files differ Index: trunk/admin/icons/icon46_list_settings_email.gif =================================================================== diff -u -N -r13 -r4471 Binary files differ Index: trunk/kernel/admin_templates/img/icons/icon46_list_affiliates.gif =================================================================== diff -u -N -r2399 -r4471 Binary files differ Index: trunk/kernel/admin_templates/img/icons/icon46_list_payment_log.gif =================================================================== diff -u -N -r2458 -r4471 Binary files differ Index: trunk/kernel/units/phrases/phrases_config.php =================================================================== diff -u -N -r2210 -r4471 --- trunk/kernel/units/phrases/phrases_config.php (.../phrases_config.php) (revision 2210) +++ trunk/kernel/units/phrases/phrases_config.php (.../phrases_config.php) (revision 4471) @@ -40,8 +40,6 @@ ), 'IDField' => 'PhraseId', - 'StatusField' => Array('Type'), - 'TitleField' => 'Phrase', 'TitlePresets' => Array( Index: trunk/kernel/admin_templates/img/icons/icon46_list_download_log.gif =================================================================== diff -u -N -r2343 -r4471 Binary files differ Index: trunk/core/units/users/users_config.php =================================================================== diff -u -N -r4457 -r4471 --- trunk/core/units/users/users_config.php (.../users_config.php) (revision 4457) +++ trunk/core/units/users/users_config.php (.../users_config.php) (revision 4471) @@ -66,6 +66,8 @@ 'users_edit' => Array('prefixes' => Array('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_General!"), 'users_select' => Array('prefixes' => Array('u_List'), 'format' => "!la_title_Users! (#u_recordcount#) - !la_title_SelectUser!"), + + 'tree_users' => Array('format' => '!la_section_overview!'), ), @@ -74,7 +76,7 @@ 'parent' => 'in-portal:root', 'icon' => 'community', 'label' => 'la_tab_Community', - 'url' => Array('index_file' => 'subitems.php', 'pass' => 'm'), + 'url' => Array('t' => 'sections_list', 'index_file' => 'index4.php', 'pass' => 'm'), 'permissions' => Array('view'), 'priority' => 2, 'type' => stTREE, Index: trunk/kernel/admin_templates/img/icons/icon46_list_discounts.gif =================================================================== diff -u -N -r1566 -r4471 Binary files differ Index: trunk/admin/icons/icon46_list_settings_general.gif =================================================================== diff -u -N -r13 -r4471 Binary files differ Index: trunk/core/units/admin/admin_tag_processor.php =================================================================== diff -u -N -r4466 -r4471 --- trunk/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 4466) +++ trunk/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 4471) @@ -141,8 +141,7 @@ */ function ModuleVersion($params) { - $module_info = $this->Application->findModule('Name', $params['module']); - return $module_info['Version']; + return $this->Application->findModule('Name', $params['module'], 'Version'); } /** @@ -256,13 +255,14 @@ $params['section_name'] = $section_name; $section_data =& $this->Tree[$section_name]; $params['children_count'] = count($section_data['children']); + $template = $section_data['url']['t']; unset($section_data['url']['t']); $section_data['section_url'] = $this->Application->HREF($template, '', $section_data['url']); - if (getArrayValue($section_data, 'late_load')) { - $late_load = getArrayValue($section_data, 'late_load'); + $late_load = getArrayValue($section_data, 'late_load'); + if ($late_load) { $t = $late_load['t']; unset($late_load['t']); $section_data['late_load'] = $this->Application->HREF($t, '', $late_load); Index: trunk/admin/icons/icon46_list_settings_output.gif =================================================================== diff -u -N -r13 -r4471 Binary files differ Index: trunk/kernel/module_help/tree_root.txt =================================================================== diff -u -N --- trunk/kernel/module_help/tree_root.txt (revision 0) +++ trunk/kernel/module_help/tree_root.txt (revision 4471) @@ -0,0 +1 @@ +This section will provide you with a page-by-page walkthrough of the Administrative Console of the In-portal platform, describing the purpose of each page and the fields on it.
\ No newline at end of file Index: trunk/kernel/admin/include/help/root.txt =================================================================== diff -u -N --- trunk/kernel/admin/include/help/root.txt (revision 1231) +++ trunk/kernel/admin/include/help/root.txt (revision 0) @@ -1 +0,0 @@ -This section will provide you with a page-by-page walkthrough of the Administrative Console of the In-portal platform, describing the purpose of each page and the fields on it.
\ No newline at end of file Index: trunk/kernel/admin_templates/sections_list.tpl =================================================================== diff -u -N -r4466 -r4471 --- trunk/kernel/admin_templates/sections_list.tpl (.../sections_list.tpl) (revision 4466) +++ trunk/kernel/admin_templates/sections_list.tpl (.../sections_list.tpl) (revision 4471) @@ -10,7 +10,11 @@|
- |