Index: branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/advanced_view.tpl =================================================================== diff -u --- branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/advanced_view.tpl (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/advanced_view.tpl (revision 5715) @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + +
+ "/> + + + + +
+ + + +
+ + + + + + + + + +
+ _tab" cellpadding="0" cellspacing="0" width="100%" class="catalog-tab-unselected" onclick="$Catalog.switchTab('');"> + + + + + + +
+ + + (_item_count">?) + + + + +
+ +
+ + + + + \ No newline at end of file Index: branches/unlabeled/unlabeled-1.28.2/kernel/units/categories/categories_tag_processor.php =================================================================== diff -u -r5709 -r5715 --- branches/unlabeled/unlabeled-1.28.2/kernel/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5709) +++ branches/unlabeled/unlabeled-1.28.2/kernel/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5715) @@ -284,7 +284,9 @@ $except = $this->SelectParam($params, 'except'); $no_special = isset($params['no_special']) && $params['no_special']; - if ($types.$except.$parent_cat_id == '' || $no_special) { + if ($no_special) return $this->Special; + + if ($types.$except.$parent_cat_id == '') { return parent::BuildListSpecial($params); } @@ -443,6 +445,31 @@ $object =& $this->getObject($params); return $object->IsRoot(); } + + function CatalogItemCount($params) + { + $object =& $this->GetList($params); + if (!$object->Counted) { + $object->CountRecs(); + } + return $object->NoFilterCount != $object->RecordsCount ? $object->RecordsCount.' / '.$object->NoFilterCount : $object->RecordsCount; + } + + /** + * Print grid pagination using + * block names specified + * + * @param Array $params + * @return string + * @access public + */ + function PrintPages($params) + { + if ($this->Application->Parser->GetParam('no_special')) { + $params['no_special'] = $this->Application->Parser->GetParam('no_special'); + } + return parent::PrintPages($params); + } } Index: branches/unlabeled/unlabeled-1.22.2/core/units/categories/categories_event_handler.php =================================================================== diff -u -r5643 -r5715 --- branches/unlabeled/unlabeled-1.22.2/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 5643) +++ branches/unlabeled/unlabeled-1.22.2/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 5715) @@ -51,7 +51,7 @@ } } - if ($parent_cat_id != 'any') { + if ("$parent_cat_id" != 'any') { if ($event->getEventParam('recursive')) { $current_path = $this->Conn->GetOne('SELECT ParentPath FROM '.TABLE_PREFIX.'Category WHERE CategoryId='.$parent_cat_id); $subcats = $this->Conn->GetCol('SELECT CategoryId FROM '.TABLE_PREFIX.'Category WHERE ParentPath LIKE "'.$current_path.'%" '); @@ -62,8 +62,6 @@ } } - $object->addFilter('parent_filter', 'ParentId = '.$parent_cat_id); - $object->addFilter('perm_filter', 'PermId = 1'); // check for CATEGORY.VIEW permission if ($this->Application->GetVar('u_id') > 0) { // apply permission filters to all users except "root" Index: branches/unlabeled/unlabeled-1.28.2/core/units/categories/categories_tag_processor.php =================================================================== diff -u -r5709 -r5715 --- branches/unlabeled/unlabeled-1.28.2/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5709) +++ branches/unlabeled/unlabeled-1.28.2/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5715) @@ -284,7 +284,9 @@ $except = $this->SelectParam($params, 'except'); $no_special = isset($params['no_special']) && $params['no_special']; - if ($types.$except.$parent_cat_id == '' || $no_special) { + if ($no_special) return $this->Special; + + if ($types.$except.$parent_cat_id == '') { return parent::BuildListSpecial($params); } @@ -443,6 +445,31 @@ $object =& $this->getObject($params); return $object->IsRoot(); } + + function CatalogItemCount($params) + { + $object =& $this->GetList($params); + if (!$object->Counted) { + $object->CountRecs(); + } + return $object->NoFilterCount != $object->RecordsCount ? $object->RecordsCount.' / '.$object->NoFilterCount : $object->RecordsCount; + } + + /** + * Print grid pagination using + * block names specified + * + * @param Array $params + * @return string + * @access public + */ + function PrintPages($params) + { + if ($this->Application->Parser->GetParam('no_special')) { + $params['no_special'] = $this->Application->Parser->GetParam('no_special'); + } + return parent::PrintPages($params); + } } Index: branches/unlabeled/unlabeled-1.37.2/core/kernel/event_manager.php =================================================================== diff -u -r5443 -r5715 --- branches/unlabeled/unlabeled-1.37.2/core/kernel/event_manager.php (.../event_manager.php) (revision 5443) +++ branches/unlabeled/unlabeled-1.37.2/core/kernel/event_manager.php (.../event_manager.php) (revision 5715) @@ -267,7 +267,7 @@ array_push($passed, $prefix_special[0]); $event->Special = isset($prefix_special[1]) ? $prefix_special[1] : ''; - $event->redirect_params = Array('opener'=>'s', 'pass'=>'all'); + $event->redirect_params = Array('opener' => 's', 'pass' => 'all'); $event->redirect = true; $event_handler =& $this->Application->recallObject($event->Prefix.'_EventHandler'); Index: branches/unlabeled/unlabeled-1.24.2/kernel/units/admin/admin_tag_processor.php =================================================================== diff -u -r5437 -r5715 --- branches/unlabeled/unlabeled-1.24.2/kernel/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 5437) +++ branches/unlabeled/unlabeled-1.24.2/kernel/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 5715) @@ -340,11 +340,13 @@ { $ret = ''; $special = isset($params['special']) ? $params['special'] : ''; + $replace_main = isset($params['replace_m']) && $params['replace_m']; $skip_prefixes = isset($params['skip_prefixes']) ? explode(',', $params['skip_prefixes']) : Array(); $block_params = Array('name' => $params['render_as']); foreach ($this->Application->ModuleInfo as $module_name => $module_info) { $prefix = $module_info['Var']; if (in_array($prefix, $skip_prefixes)) continue; + if ($prefix == 'm' && $replace_main) $prefix = 'c'; $label = $this->Application->getUnitOption($prefix, $params['title_property']); $block_params['title'] = $label; $block_params['prefix'] = $prefix; Index: branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php =================================================================== diff -u -r5661 -r5715 --- branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php (.../application.php) (revision 5661) +++ branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php (.../application.php) (revision 5715) @@ -1386,14 +1386,16 @@ } else { // no output before -> redirect using HTTP header + +// header('HTTP/1.1 302 Found'); header("$location"); } } } $buffer_content = ob_get_clean(); echo $this->UseOutputCompression() ? gzencode($buffer_content, DBG_COMPRESSION_LEVEL) : $buffer_content; - + $session =& $this->recallObject('Session'); $session->SaveData(); $this->SaveBlocksCache(); Index: branches/unlabeled/unlabeled-1.11.2/kernel/units/general/cat_tag_processor.php =================================================================== diff -u -r5709 -r5715 --- branches/unlabeled/unlabeled-1.11.2/kernel/units/general/cat_tag_processor.php (.../cat_tag_processor.php) (revision 5709) +++ branches/unlabeled/unlabeled-1.11.2/kernel/units/general/cat_tag_processor.php (.../cat_tag_processor.php) (revision 5715) @@ -106,7 +106,10 @@ function CatalogItemCount($params) { - $object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix.'_List', $params); + $object =& $this->GetList($params); + if (!$object->Counted) { + $object->CountRecs(); + } return $object->NoFilterCount != $object->RecordsCount ? $object->RecordsCount.' / '.$object->NoFilterCount : $object->RecordsCount; } @@ -122,6 +125,14 @@ $review_tag_processor =& $this->Application->recallObject('rev.item_TagProcessor'); return $review_tag_processor->TotalRecords($params); } + + function InitCatalogTab($params) + { + $tab_special = $this->Application->GetVar('tab_special'); + $params['name'] = $params['render_as']; + $params['prefix'] = trim($this->Prefix.'.'.($tab_special !== false ? $tab_special : $this->Special), '.'); + return $this->Application->ParseBlock($params, 1); + } } ?> \ No newline at end of file Index: branches/unlabeled/unlabeled-1.24.2/core/units/admin/admin_tag_processor.php =================================================================== diff -u -r5437 -r5715 --- branches/unlabeled/unlabeled-1.24.2/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 5437) +++ branches/unlabeled/unlabeled-1.24.2/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 5715) @@ -340,11 +340,13 @@ { $ret = ''; $special = isset($params['special']) ? $params['special'] : ''; + $replace_main = isset($params['replace_m']) && $params['replace_m']; $skip_prefixes = isset($params['skip_prefixes']) ? explode(',', $params['skip_prefixes']) : Array(); $block_params = Array('name' => $params['render_as']); foreach ($this->Application->ModuleInfo as $module_name => $module_info) { $prefix = $module_info['Var']; if (in_array($prefix, $skip_prefixes)) continue; + if ($prefix == 'm' && $replace_main) $prefix = 'c'; $label = $this->Application->getUnitOption($prefix, $params['title_property']); $block_params['title'] = $label; $block_params['prefix'] = $prefix; Index: branches/unlabeled/unlabeled-1.10.2/core/kernel/utility/params.php =================================================================== diff -u -r4381 -r5715 --- branches/unlabeled/unlabeled-1.10.2/core/kernel/utility/params.php (.../params.php) (revision 4381) +++ branches/unlabeled/unlabeled-1.10.2/core/kernel/utility/params.php (.../params.php) (revision 5715) @@ -17,7 +17,7 @@ */ function SplitParamsStr($params_str) { - preg_match_all('/([\${}a-zA-Z0-9_.-]+)=(["\']{1,1})(.*?)(? $val){ Index: branches/unlabeled/unlabeled-1.11.2/core/units/general/cat_tag_processor.php =================================================================== diff -u -r5709 -r5715 --- branches/unlabeled/unlabeled-1.11.2/core/units/general/cat_tag_processor.php (.../cat_tag_processor.php) (revision 5709) +++ branches/unlabeled/unlabeled-1.11.2/core/units/general/cat_tag_processor.php (.../cat_tag_processor.php) (revision 5715) @@ -106,7 +106,10 @@ function CatalogItemCount($params) { - $object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix.'_List', $params); + $object =& $this->GetList($params); + if (!$object->Counted) { + $object->CountRecs(); + } return $object->NoFilterCount != $object->RecordsCount ? $object->RecordsCount.' / '.$object->NoFilterCount : $object->RecordsCount; } @@ -122,6 +125,14 @@ $review_tag_processor =& $this->Application->recallObject('rev.item_TagProcessor'); return $review_tag_processor->TotalRecords($params); } + + function InitCatalogTab($params) + { + $tab_special = $this->Application->GetVar('tab_special'); + $params['name'] = $params['render_as']; + $params['prefix'] = trim($this->Prefix.'.'.($tab_special !== false ? $tab_special : $this->Special), '.'); + return $this->Application->ParseBlock($params, 1); + } } ?> \ No newline at end of file Index: branches/unlabeled/unlabeled-1.8.2/core/admin_templates/categories/categories_edit_permissions.tpl =================================================================== diff -u -r5613 -r5715 --- branches/unlabeled/unlabeled-1.8.2/core/admin_templates/categories/categories_edit_permissions.tpl (.../categories_edit_permissions.tpl) (revision 5613) +++ branches/unlabeled/unlabeled-1.8.2/core/admin_templates/categories/categories_edit_permissions.tpl (.../categories_edit_permissions.tpl) (revision 5715) @@ -17,16 +17,11 @@ + + + + + + + + + + +
+ + + + + + + + + +
+ _tab" cellpadding="0" cellspacing="0" width="100%" class="catalog-tab-unselected" onclick="$Catalog.switchTab('');"> + + + + + + +
+ + + (_item_count">?) + + + + +
+ +
+ + + + + \ No newline at end of file Index: branches/unlabeled/unlabeled-1.8.2/kernel/admin_templates/categories/categories_edit_permissions.tpl =================================================================== diff -u -r5613 -r5715 --- branches/unlabeled/unlabeled-1.8.2/kernel/admin_templates/categories/categories_edit_permissions.tpl (.../categories_edit_permissions.tpl) (revision 5613) +++ branches/unlabeled/unlabeled-1.8.2/kernel/admin_templates/categories/categories_edit_permissions.tpl (.../categories_edit_permissions.tpl) (revision 5715) @@ -17,16 +17,11 @@ + + + + + + $Catalog.setItemCount('c', ''); + document.getElementById('categories_div').setAttribute('category_id', ); + + + + Grids['c.showall'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline')); + + #separator# + + + + + + _" width="50%"> + " id=""> + ">  + : + + + ( / )
+
+
+ + ParentPath:
+ + () +
+ + + + + + + + + +
+ +
+ + + +
+ + + %">  + + + + + +
+ + + + + + + Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog_tab.tpl =================================================================== diff -u --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog_tab.tpl (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/catalog_tab.tpl (revision 5715) @@ -0,0 +1,67 @@ + +
+ + + + + + + $Catalog.setItemCount('c', ''); + document.getElementById('categories_div').setAttribute('category_id', ); + + + + Grids['c.showall'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline')); + + #separator# + + + + + + _" width="50%"> + " id=""> + ">  + : + + + ( / )
+
+
+ + ParentPath:
+ + () +
+ + + + + + + + + +
+ +
+ + + +
+ + + %">  + + + + + +
+ + + + + + + Index: branches/unlabeled/unlabeled-1.4.2/kernel/admin_templates/config/config_general.tpl =================================================================== diff -u -r5636 -r5715 --- branches/unlabeled/unlabeled-1.4.2/kernel/admin_templates/config/config_general.tpl (.../config_general.tpl) (revision 5636) +++ branches/unlabeled/unlabeled-1.4.2/kernel/admin_templates/config/config_general.tpl (.../config_general.tpl) (revision 5715) @@ -113,6 +113,7 @@ + ', 'ModuleRootCategory');">   Index: branches/unlabeled/unlabeled-1.23.2/kernel/admin_templates/catalog.tpl =================================================================== diff -u -r5711 -r5715 --- branches/unlabeled/unlabeled-1.23.2/kernel/admin_templates/catalog.tpl (.../catalog.tpl) (revision 5711) +++ branches/unlabeled/unlabeled-1.23.2/kernel/admin_templates/catalog.tpl (.../catalog.tpl) (revision 5715) @@ -19,6 +19,7 @@