Index: trunk/kernel/include/parseditem.php =================================================================== diff -u -r80 -r91 --- trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 80) +++ trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 91) @@ -2713,7 +2713,7 @@ else { $this->QueryItemCount = QueryCount($sql); -// echo "SQL: ".$sql."
"; + //echo "SQL: ".$sql."

"; $CountVal[$this->ItemType] = $this->QueryItemCount; } Index: trunk/admin/import/import.php =================================================================== diff -u -r55 -r91 --- trunk/admin/import/import.php (.../import.php) (revision 55) +++ trunk/admin/import/import.php (.../import.php) (revision 91) @@ -458,6 +458,7 @@ $FullPath = $Path.$cat->Get("CategoryId")."|"; $cat->Set("ParentPath",$FullPath); $cat->SetViewPerms("CATEGORY.VIEW",$acl,$allgroups); + $cat->SetViewPerms("LINK.VIEW",$acl,$allgroups); $cat->Update(); $cat->UpdateCachedPath(); Index: trunk/kernel/searchaction.php =================================================================== diff -u -r13 -r91 --- trunk/kernel/searchaction.php (.../searchaction.php) (revision 13) +++ trunk/kernel/searchaction.php (.../searchaction.php) (revision 91) @@ -1,5 +1,9 @@ "; + //print_pre($_REQUEST); + switch($Action) { case "m_SearchWord": /* browse and modify*/ @@ -167,8 +171,21 @@ case "m_rule_search_reset": $objSession->SetVariable("RuleSearchWord",""); $objSession->SetVariable("Page_BanRules",1); - break; + break; - + // Theme List Search + case 'm_theme_search': + echo "in search action (themes)
"; + $searchlist = trim( $objSession->GetVariable("ThemeSearchWord") ); + if(strlen($searchlist) > 0) $searchlist = ","; + $searchlist = $_POST["list_search"]; + $objSession->SetVariable("ThemeSearchWord",$searchlist); + $objSession->SetVariable("Page_LV_Themes",1); + break; + + case 'm_theme_search_reset': + $objSession->SetVariable("ThemeSearchWord",""); + $objSession->SetVariable("Page_LV_Themes",1); + break; } ?> Index: trunk/kernel/include/searchconfig.php =================================================================== diff -u -r80 -r91 --- trunk/kernel/include/searchconfig.php (.../searchconfig.php) (revision 80) +++ trunk/kernel/include/searchconfig.php (.../searchconfig.php) (revision 91) @@ -207,7 +207,7 @@ $checked = Array(1 => '', 2 => ''); $checked[ $FormValues[$Field] ] = ' checked'; if(!$FormValues[$Field]) $checked[1] = ' checked'; - print_pre($checked); + $ret = "".language("lu_and"); $ret .= "".language("lu_or"); return $ret; Index: trunk/kernel/frontaction.php =================================================================== diff -u -r80 -r91 --- trunk/kernel/frontaction.php (.../frontaction.php) (revision 80) +++ trunk/kernel/frontaction.php (.../frontaction.php) (revision 91) @@ -783,7 +783,7 @@ } if(strlen($Verb)>0 && $Verb!="any") { - echo "Adding CAT SearchField: [".$field->Get("TableName")."]; [".$field->Get("FieldName")."]; [$Verb]; [$Value]; [$Conjuction]
"; + //echo "Adding CAT SearchField: [".$field->Get("TableName")."]; [".$field->Get("FieldName")."]; [$Verb]; [$Value]; [$Conjuction]
"; $objAdvSearch->AddAdvancedField($field->Get("TableName"),$field->Get("FieldName"),$Verb,$Value,$Conjuction); } Index: trunk/admin/config/config_theme.php =================================================================== diff -u -r90 -r91 --- trunk/admin/config/config_theme.php (.../config_theme.php) (revision 90) +++ trunk/admin/config/config_theme.php (.../config_theme.php) (revision 91) @@ -156,15 +156,18 @@ if(strlen($order)) $sql .= " ORDER BY ".$order; -$sql .= ' '.GetLimitSQL($objSession->GetVariable("Page_LV_Themes"),$objConfig->Get("Perpage_LV_Themes")); +$objListView = new clsListView($objListToolBar); +$objListView->CurrentPageVar = "Page_LV_Themes"; +$objListView->PerPageVar = "Perpage_LV_Themes"; +$sql .= ' '.$objListView->GetLimitSQL(); $objThemes->Query_Item($sql); $itemcount = TableCount(GetTablePrefix()."Theme", $where,0); if($objSession->HasSystemPermission("DEBUG.LIST")) echo htmlentities($sql,ENT_NOQUOTES)."
\n"; -$objListView = new clsListView($objListToolBar,$objThemes); +$objListView->SetListItems($objThemes); $objListView->IdField = "ThemeId"; $order = $objConfig->Get("Theme_LV_Sortfield"); @@ -177,8 +180,7 @@ $objListView->PrintToolBar = FALSE; $objListView->checkboxes = TRUE; -$objListView->CurrentPageVar = "Page_LV_Themes"; -$objListView->PerPageVar = "Perpage_LV_Themes"; + $objListView->CheckboxName = "itemlist[]"; $objListView->SearchBar = TRUE; $objListView->SearchKeywords = $SearchWords;