Index: trunk/admin/toolbar.php =================================================================== diff -u -r13 -r123 --- trunk/admin/toolbar.php (.../toolbar.php) (revision 13) +++ trunk/admin/toolbar.php (.../toolbar.php) (revision 123) @@ -286,7 +286,6 @@ function tabRow() { - $o = ""; $o .= ""; for($i=0;$iTabs);$i++) Index: trunk/admin/category/addcategory_permissions.php =================================================================== diff -u -r18 -r123 --- trunk/admin/category/addcategory_permissions.php (.../addcategory_permissions.php) (revision 18) +++ trunk/admin/category/addcategory_permissions.php (.../addcategory_permissions.php) (revision 123) @@ -162,9 +162,10 @@ $CheckClass = "PermChecks"; /* ------------------------------------- Configure the toolbar ------------------------------------------- */ $saveURL = $admin."/category/category_maint.php"; +$cancelURL = $admin."/".$objSession->GetVariable('ReturnScript'); $objListToolBar = new clsToolBar(); $objListToolBar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","do_edit_save('save_edit_buttons','CatEditStatus','$saveURL',1);","tool_select.gif"); -$objListToolBar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","do_edit_save('save_edit_buttons','CatEditStatus','".$admin."/browse.php',2);","tool_cancel.gif"); +$objListToolBar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","do_edit_save('save_edit_buttons','CatEditStatus','".$cancelURL."',2);","tool_cancel.gif"); if($itemcount == 1) $objListToolBar->Add("divider"); $objListToolBar->Set("section",$section); Index: trunk/kernel/include/parseditem.php =================================================================== diff -u -r120 -r123 --- trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 120) +++ trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 123) @@ -1329,44 +1329,35 @@ $this->adodbConnection->Execute("DROP TABLE IF EXISTS $edit_table"); } - - function AdminSearchWhereClause($SearchList) + function AdminSearchWhereClause($SearchList) { - $sql = ""; - if(!is_array($SearchList)) - { - $SearchList = explode(",",$SearchList); - } - - if(!count($SearchList) || !count($this->AdminSearchFields)) - return ""; + $sql = ""; + if( !is_array($SearchList) ) $SearchList = explode(",",$SearchList); + if( !count($SearchList) || !count($this->AdminSearchFields) ) return ''; - for($f=0;$fAdminSearchFields);$i++) - { - $field = $this->AdminSearchFields[$i]; - - if(strlen(trim($value))) - { - if(strlen($inner_sql)) - $inner_sql .= " OR "; - $inner_sql .= $field." LIKE '%".$value."%'"; - } - } - if(strlen($inner_sql)) - { - $sql .= "(".$inner_sql.") "; - if($fAdminSearchFields); $i++) + { + $field = $this->AdminSearchFields[$i]; + if( strlen( trim($value) ) ) + { + if( strlen($inner_sql) ) $inner_sql .= " OR "; + $inner_sql .= $field." LIKE '%".$value."%'"; + } + } + if( strlen($inner_sql) ) + { + $sql .= '('.$inner_sql.') '; + if($f < count($SearchList) - 1) $sql .= " AND "; + } + } + } + return $sql; } function BackupData($OutFileName,$Start,$Limit) @@ -1569,6 +1560,7 @@ if($objSession->HasSystemPermission("DEBUG.LIST")) echo $sql."
\n"; + return $this->Query_Item($sql); } Index: trunk/kernel/admin/include/toolbar/advanced_view.php =================================================================== diff -u --- trunk/kernel/admin/include/toolbar/advanced_view.php (revision 0) +++ trunk/kernel/admin/include/toolbar/advanced_view.php (revision 123) @@ -0,0 +1,431 @@ +Get("Category_View"); +if(!is_numeric($CategoryView)) +{ + $CategoryView = 127; +} + +$Category_Sortfield = $objConfig->Get("Category_Sortfield"); +if( !strlen($Category_Sortfield) ) $Category_Sortfield = "Name"; + +$Category_Sortorder = $objConfig->Get("Category_Sortorder"); +if( !strlen($Category_Sortorder) ) $Category_Sortorder = "desc"; + +$Perpage_Category = (int)$objConfig->Get("Perpage_Category"); +if(!$Perpage_Category) + $Perpage_Category="'all'"; + + +if($CategoryView == 127) +{ + $Category_ShowAll = 1; +} +else +{ + $Category_ShowAll = 0; + // FILTERING CODE V. 1.1 + $where_clauses = Array(); + + //Group #1: Category Statuses (active,pending,disabled) + $Status = array(-1); + if($CategoryView & $Bit_Pending) $Status[] = STATUS_PENDING; + if($CategoryView & $Bit_Active) $Status[] = STATUS_ACTIVE; + if($CategoryView & $Bit_Disabled) $Status[] = STATUS_DISABLED; + if( count($Status) ) $where_clauses[] = 'Status IN ('.implode(',', $Status).')'; + + //Group #2: Category Statistics (new,pick) + $Status = array(); + if(!($CategoryView & $Bit_New)) + { + $cutoff = adodb_date("U") - ($objConfig->Get("Category_DaysNew") * 86400); + if($cutoff > 0) $q = 'CreatedOn > '.$cutoff; + $q .= (!empty($q) ? ' OR ' : '').'NewItem = 1'; + $Status[] = "NOT ($q)"; + } + if(!($CategoryView & $Bit_Ed)) $Status[] = 'NOT (EditorsPick = 1)'; + + if( count($Status) ) + $where_clauses[] = '('.implode(') AND (', $Status).')'; + + $CategoryFilter = count($where_clauses) ? '('.implode(') AND (', $where_clauses).')' : ''; +} + +// category list filtering stuff: end + + $OrderBy = $objCatList->QueryOrderByClause(TRUE,TRUE,TRUE); + $objCatList->Clear(); + $IsSearch = FALSE; + + $list = $objSession->GetVariable("m_adv_view_search"); + $SearchQuery = $objCatList->AdminSearchWhereClause($list); + if(strlen($SearchQuery)) + { + $SearchQuery = " (".$SearchQuery.")".($CategoryFilter ? 'AND ('.$CategoryFilter.')' : ''); + $objCatList->LoadCategories($SearchQuery,$OrderBy); + $IsSearch = TRUE; + } + else + $objCatList->LoadCategories($CategoryFilter,$OrderBy); + + $TotalItemCount += $objCatList->QueryItemCount; + + +$CatTotal = TableCount($objCatList->SourceTable,null,false); + +$mnuClearSearch = language("la_SearchMenu_Clear"); +$mnuNewSearch = language("la_SearchMenu_New"); +$mnuSearchCategory = language("la_SearchMenu_Categories"); + +$lang_New = language("la_Text_New"); +$lang_Hot = language("la_Text_Hot"); +$lang_EdPick = language("la_prompt_EditorsPick"); +$lang_Pop = language("la_Text_Pop"); + +$lang_Rating = language("la_prompt_Rating"); +$lang_Hits = language("la_prompt_Hits"); +$lang_Votes = language("la_prompt_Votes"); +$lang_Name = language("la_prompt_Name"); + +$lang_Categories = language("la_ItemTab_Categories"); +$lang_Description = language("la_prompt_Description"); +$lang_MetaKeywords = language("la_prompt_MetaKeywords"); +$lang_SubSearch = language("la_prompt_SubSearch"); +$lang_Within = language("la_Text_Within"); +$lang_Current = language("la_Text_Current"); +$lang_Active = language("la_Text_Active"); +$lang_SubCats = language("la_Text_SubCats"); +$lang_SubItems = language("la_Text_Subitems"); + +$ItemTabs->AddTab(language("la_ItemTab_Categories"),"category",$objCatList->QueryItemCount, $m_tab_Categories_hide, $CatTotal); + +print << +var default_tab = "$DefaultTab"; +var Category_Sortfield = '$Category_Sortfield'; +var Category_Sortorder = '$Category_Sortorder'; +var Category_Perpage = $Perpage_Category; +var Category_ShowAll = $Category_ShowAll; +var CategoryView = $CategoryView; + +//JS Language variables +var lang_New = "$lang_New"; +var lang_Hot = "$lang_Hot"; +var lang_EdPick = "$lang_EdPick"; + +var lang_Pop = "$lang_Pop"; +var lang_Rating = "$lang_Rating"; +var lang_Hits = "$lang_Hits"; +var lang_Votes = "$lang_Votes"; +var lang_Name = "$lang_Name"; +var lang_Categories = "$lang_Categories"; +var lang_Description = "$lang_Description"; +var lang_MetaKeywords = "$lang_MetaKeywords"; +var lang_SubSearch = "$lang_SubSearch"; +var lang_Within="$lang_Within"; +var lang_Current = "$lang_Current"; +var lang_Active = "$lang_Active"; +var lang_SubCats = "$lang_SubCats"; +var lang_SubItems = "$lang_SubItems"; + +var hostname = '$rootURL'; +var env = '$envar'; +var actionlist = new Array(); + + // Common function for all "Advanced View" page + function InitPage() + { + addCommonActions(); + initToolbar('mainToolBar', actionHandler); + initCheckBoxes(null, false); + toggleMenu(); + } + + function AddButtonAction(actionname,actionval) + { + var item = new Array(actionname,actionval); + actionlist[actionlist.length] = item; + } + + function actionHandler(button) + { + for(i=0; i + +END; +?> \ No newline at end of file Index: trunk/admin/browse/checkboxes_new.js =================================================================== diff -u -r13 -r123 --- trunk/admin/browse/checkboxes_new.js (.../checkboxes_new.js) (revision 13) +++ trunk/admin/browse/checkboxes_new.js (.../checkboxes_new.js) (revision 123) @@ -13,37 +13,35 @@ var _single_select = false; -function initCheckBoxes(selChangedHandler) +function initCheckBoxes(selChangedHandler, use_cats) { - //theMainScript.InitGrids(); - //return; + if(use_cats == null && typeof(use_cats) == 'undefined') use_cats = true; //set single_select to true to turn on radio-buttons select mode if (typeof(single_select) != 'undefined') _single_select = single_select; - var checkBoxContainers = document.body.getElementsByTagName("DIV"); - for (var i = 0; i < checkBoxContainers.length; i++) - if (checkBoxContainers[i].getAttribute("isTab")) - { - if(tabIDs.length ==0) - start_tab = checkBoxContainers[i].id; - - tabIDs[tabIDs.length] = checkBoxContainers[i].id - - tabSelection[checkBoxContainers[i].id] = 0; - } + var checkBoxContainers = document.body.getElementsByTagName("DIV"); + for (var i = 0; i < checkBoxContainers.length; i++) + if( checkBoxContainers[i].getAttribute("isTab") ) + { + if(tabIDs.length == 0) start_tab = checkBoxContainers[i].id; + tabIDs[tabIDs.length] = checkBoxContainers[i].id + tabSelection[checkBoxContainers[i].id] = 0; + } - tabSelection['categories'] = 0; - - categoriesTab = document.getElementById('categories'); - var catInputs = categoriesTab.getElementsByTagName("INPUT"); - for (var i = 0; i < catInputs.length; i++) - catInputs.checked = false; - if (categoriesTab) - categoriesTab.active = true; - + tabSelection['categories'] = 0; + + if(use_cats == true) + { + categoriesTab = document.getElementById('categories'); + var catInputs = categoriesTab.getElementsByTagName("INPUT"); + for (var i = 0; i < catInputs.length; i++) catInputs.checked = false; + if (categoriesTab) categoriesTab.active = true; + } + var unique_id = 1; for (var i = 0; i < checkBoxContainers.length; i++) { + if (checkBoxContainers[i].getAttribute("inportalType")) { var inputs = checkBoxContainers[i].getElementsByTagName("INPUT"); @@ -78,7 +76,7 @@ checkBox.onclick = checkBoxClick; checkBox.container = checkBoxContainers[i]; - var selNode = (checkBox.container.getAttribute("inportalType") == "categories") ? checkBox.container.parentNode : checkBox.container.parentNode.parentNode; + var selNode = (checkBox.container.getAttribute("inportalType") == "categories" || checkBox.container.getAttribute("inportalType") == "category") ? checkBox.container.parentNode : checkBox.container.parentNode.parentNode; selNode.chB = checkBox; @@ -537,7 +535,7 @@ else tabSelection[checkBox.inportalType]--; } - var selNode = (checkBox.container.getAttribute("inportalType") == "categories") ? checkBox.container.parentNode : checkBox.container.parentNode.parentNode; + var selNode = (checkBox.container.getAttribute("inportalType") == "categories" || checkBox.container.getAttribute("inportalType") == "category") ? checkBox.container.parentNode : checkBox.container.parentNode.parentNode; if (!selNode.oriCN && checkBox.checked || selNode.className != "selectedContainer" && selNode.className != "unselectedContainer") selNode.oriCN = (selNode.className) ? selNode.className : ""; Index: trunk/admin/browse/toolbar.php =================================================================== diff -u -r13 -r123 --- trunk/admin/browse/toolbar.php (.../toolbar.php) (revision 13) +++ trunk/admin/browse/toolbar.php (.../toolbar.php) (revision 123) @@ -196,13 +196,13 @@ $t = $this->Tabs[$i]; $div = $t["divname"]; - $o = "
\n - - + \ No newline at end of file Index: trunk/admin/category/category_maint.php =================================================================== diff -u -r13 -r123 --- trunk/admin/category/category_maint.php (.../category_maint.php) (revision 13) +++ trunk/admin/category/category_maint.php (.../category_maint.php) (revision 123) @@ -211,14 +211,14 @@ $NumCats) { - $target = $adminURL."/browse.php?env=".BuildEnv(); + $target = $adminURL."/".$objSession->GetVariable('ReturnScript').'?env='.BuildEnv(); //$adminURL."/browse.php?env=".BuildEnv(); } else { $next = $CatIndex+$CatsPerLoad; if($next > $NumCats) { - $target = $adminURL."/browse.php?env=".BuildEnv(); + $target = $adminURL."/".$objSession->GetVariable('ReturnScript').'?env='.BuildEnv(); //$adminURL."/browse.php?env=".BuildEnv(); } else $target = $_SERVER["PHP_SELF"]."?env=".BuildEnv()."&CatIndex=".$next."&NumCats=$NumCats"; Index: trunk/admin/help/credits.txt =================================================================== diff -u -r65 -r123 --- trunk/admin/help/credits.txt (.../credits.txt) (revision 65) +++ trunk/admin/help/credits.txt (.../credits.txt) (revision 123) @@ -4,13 +4,14 @@ Dmitry Andrejev
David Chen
Peter Droppa
+Eugene Hohlov
Maris Kocins
Pavel Kharitonov
Jurij Kirilov
Dmitry Kucher
Andrew Kucheriavy
Sergey Mesropyan
-Alexandr Obuhovich
+Alexander Obuhovich
Arnis Pridans
Max Strelchenko
Konstantin Tjuterev
Index: trunk/admin/tree/tree.php =================================================================== diff -u -r65 -r123 --- trunk/admin/tree/tree.php (.../tree.php) (revision 65) +++ trunk/admin/tree/tree.php (.../tree.php) (revision 123) @@ -141,7 +141,7 @@ "; $i=1; - $list = $objSession->GetVariable("SearchWord"); + $list = $objSession->GetVariable($KeywordsVar); if(strlen($list)) $Keywords = explode(",",$list); Index: trunk/admin/category/addcategory.php =================================================================== diff -u -r18 -r123 --- trunk/admin/category/addcategory.php (.../addcategory.php) (revision 18) +++ trunk/admin/category/addcategory.php (.../addcategory.php) (revision 123) @@ -189,7 +189,7 @@ //$saveURL = $admin."/browse.php"; $saveURL = $admin."/category/category_maint.php"; -$cancelURL = $admin."/browse.php"; +$cancelURL = $admin."/".$objSession->GetVariable('ReturnScript'); //Display header $sec = $objSections->GetSection($section); Index: trunk/kernel/admin/advanced_view.php =================================================================== diff -u --- trunk/kernel/admin/advanced_view.php (revision 0) +++ trunk/kernel/admin/advanced_view.php (revision 123) @@ -0,0 +1,57 @@ + + + +
+ + +
  "; +   "; $o .= " "; $o .= $t["caption"]." "; @@ -230,19 +230,15 @@ { global $imagesURL; - $o = "\n"; + $o = '
'."\n"; $o .= "\n"; - for($i=0;$iTabs);$i++) + for($i = 0; $i < count($this->Tabs); $i++) { $o .= $this->TabItem($i); + $o .= ''."\n"; } - $o .= "\n"; + $o .= "
 
\n"; - //$o .= "
\n"; - //$o .= "\n"; - //$o .= "\n"; - //$o .= "
\n"; - //$o .= "
Set("CheckClass",$CheckClass); $objCatToolBar->Set("CheckForm",$ListForm); -$saveURL = $admin."/category/category_maint.php"; +$saveURL = $admin."/category/category_maint.php"; +$cancelURL = $admin."/".$objSession->GetVariable('ReturnScript'); $objCatToolBar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","do_edit_save('category','CatEditStatus','$saveURL',1);","tool_select.gif"); -$objCatToolBar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","do_edit_save('category','CatEditStatus','".$admin."/browse.php',2);","tool_cancel.gif"); +$objCatToolBar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","do_edit_save('category','CatEditStatus','".$cancelURL."',2);","tool_cancel.gif"); if ( isset($en_prev) || isset($en_next) ) { Index: trunk/admin/advanced_view.php =================================================================== diff -u --- trunk/admin/advanced_view.php (revision 0) +++ trunk/admin/advanced_view.php (revision 123) @@ -0,0 +1,377 @@ +

"; + +if(!strlen($pathtoroot)) +{ + $path=dirname(realpath($_SERVER['SCRIPT_FILENAME'])); + if(strlen($path)) + { + /* determine the OS type for path parsing */ + $pos = strpos($path,":"); + if ($pos === false) + { + $gOS_TYPE="unix"; + $pathchar = "/"; + } + else + { + $gOS_TYPE="win"; + $pathchar="\\"; + } + $p = $path.$pathchar; + /*Start looking for the root flag file */ + while(!strlen($pathtoroot) && strlen($p)) + { + $sub = substr($p,strlen($pathchar)*-1); + if($sub==$pathchar) + { + $filename = $p."root.flg"; + } + else + $filename = $p.$pathchar."root.flg"; + if(file_exists($filename)) + { + $pathtoroot = $p; + } + else + { + $parent = realpath($p.$pathchar."..".$pathchar); + if($parent!=$p) + { + $p = $parent; + } + else + $p = ""; + } + } + if(!strlen($pathtoroot)) + $pathtoroot = ".".$pathchar; + } + else + { + $pathtoroot = ".".$pathchar; + } +} + +$sub = substr($pathtoroot,strlen($pathchar)*-1); +if($sub!=$pathchar) +{ + $pathtoroot = $pathtoroot.$pathchar; +} +//echo $pathtoroot; + +require_once($pathtoroot."kernel/startup.php"); + +if (!admin_login()) +{ + if(!headers_sent()) + setcookie("sid"," ",time()-3600); + $objSession->Logout(); + header("Location: ".$adminURL."/login.php"); + die(); + //require_once($pathtoroot."admin/login.php"); +} + +$rootURL="http://".ThisDomain().$objConfig->Get("Site_Path"); +$admin = $objConfig->Get("AdminDirectory"); +if(!strlen($admin)) + $admin = "admin"; + +$localURL=$rootURL."kernel/"; +$adminURL = $rootURL.$admin; +$imagesURL = $adminURL."/images"; +$browseURL = $adminURL."/browse"; +$cssURL = $adminURL."/include"; + +$indexURL = $rootURL."index.php"; + +$m_var_list_update["cat"] = 0; +$homeURL = "javascript:AdminCatNav('".$_SERVER["PHP_SELF"]."?env=".BuildEnv()."');"; +unset($m_var_list_update["cat"]); + +$envar = "env=" . BuildEnv(); + +if($objCatList->CurrentCategoryID()>0) +{ + $c = $objCatList->CurrentCat(); + $upURL = "javascript:AdminCatNav('".$c->Admin_Parent_Link()."');"; +} +else + $upURL = $_SERVER["PHP_SELF"]."?".$envar; + +//admin only util + +$pathtolocal = $pathtoroot."kernel/"; +require_once ($pathtoroot.$admin."/include/elements.php"); +//require_once ($pathtoroot."kernel/admin/include/navmenu.php"); +require_once ($pathtolocal."admin/include/navmenu.php"); +require_once($pathtoroot.$admin."/browse/toolbar.php"); + +$m = GetModuleArray(); +foreach($m as $key=>$value) +{ + $path = $pathtoroot.$value."admin/include/parser.php"; + if(file_exists($path)) + { + //echo ""; + @include_once($path); + } +} +if(!$is_install) +{ + if (!admin_login()) + { + if(!headers_sent()) + setcookie("sid"," ",time()-3600); + $objSession->Logout(); + header("Location: ".$adminURL."/login.php"); + die(); + //require_once($pathtoroot."admin/login.php"); + } +} +//Set Section +$section = 'in-portal:advanced_view'; + +//Set Environment Variable + +// save last category visited +$objSession->SetVariable('prev_category', $objSession->GetVariable('last_category') ); +$objSession->SetVariable('last_category', $objCatList->CurrentCategoryID() ); + +$objSession->SetVariable("HasChanges", 0); +// where should all edit popups submit changes +$objSession->SetVariable("ReturnScript", basename($_SERVER['PHP_SELF']) ); + + +// common "Advanced View" tab php functions: begin +function GetAdvView_SearchWord($prefix) +{ + global $objSession; + return $objSession->GetVariable($prefix.'_adv_view_search'); +} + +function SaveAdvView_SearchWord($prefix) +{ + global $objSession; + $SearchWord = $objSession->GetVariable($prefix.'_adv_view_search'); + if( isset($_REQUEST['SearchWord']) ) + { + $SearchWord = $_REQUEST['SearchWord']; + $objSession->SetVariable($prefix.'_adv_view_search', $SearchWord); + } +} + +function ResetAdvView_SearchWord($prefix) +{ + global $objSession; + $objSession->SetVariable($prefix.'_adv_view_search', ''); +} + +function ShowSearchForm($prefix, $envar) +{ + global $imagesURL; + $btn_prefix = $imagesURL.'/toolbar/icon16_search'; + $SearchWord = GetAdvView_SearchWord($prefix); + echo ''; +} +// common "Advanced View" tab php functions: end + +/* page header */ +print << + + In-portal + + + + +END; + + require_once($pathtoroot.$admin."/include/mainscript.php"); + +print << + if (window.opener != null) { + theMainScript.CloseAndRefreshParent(); + } + +END; + +print << + + + + + +END; +load_module_styles(); +if( !isset($list) ) $list = ''; + +int_SectionHeader(); + +$filter = false; +$sessVars = $objConfig->GetSessionValues(0); +//print_pre($sessVars); +foreach ($sessVars as $key => $value) { + if (strstr($key, '_View')) { + //echo "$value
"; + if ($value != 1) { + $filter = true; + } + } +} + +?> +
+ + + + + + + +
+
+ " ImagePath=""> + " ImagePath=""> + "> + " ImagePath=""> + " ImagePath=""> + "> + " ImagePath=""> + " ImagePath=""> +
+
+ + + + + + +
+ +
+ +
+ + +
+ +
+
+ + + + TabRow(); + + if(count($ItemTabs->Tabs)) + { + ?> +
+ +
+ + $value) + { + $path = $pathtoroot.$value."admin/advanced_view.php"; + //echo "Including File: $path
"; + if(file_exists($path)) + { + //echo "\n\n"; + include_once($path); + } + } + ?> +
+ + + + +
+
+ + + \ No newline at end of file Index: trunk/admin/category/addcategory_images.php =================================================================== diff -u -r13 -r123 --- trunk/admin/category/addcategory_images.php (.../addcategory_images.php) (revision 13) +++ trunk/admin/category/addcategory_images.php (.../addcategory_images.php) (revision 123) @@ -139,8 +139,9 @@ /* ------------------------------------- Configure the toolbar ------------------------------------------- */ $objListToolBar = new clsToolBar(); $saveURL = $admin."/category/category_maint.php"; +$cancelURL = $admin."/".$objSession->GetVariable('ReturnScript'); $objListToolBar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","do_edit_save('save_edit_buttons','CatEditStatus','$saveURL',1);","tool_select.gif"); -$objListToolBar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","do_edit_save('save_edit_buttons','CatEditStatus','".$admin."/browse.php',2);","tool_cancel.gif"); +$objListToolBar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","do_edit_save('save_edit_buttons','CatEditStatus','".$cancelURL."',2);","tool_cancel.gif"); if($itemcount == 1) $objListToolBar->Add("divider"); $objListToolBar->Set("section",$section); $objListToolBar->Set("load_menu_func",""); Index: trunk/admin/templates/cat_tab_element.tpl =================================================================== diff -u --- trunk/admin/templates/cat_tab_element.tpl (revision 0) +++ trunk/admin/templates/cat_tab_element.tpl (revision 123) @@ -0,0 +1,17 @@ +		 +
+ " name="catlist[]"> + + " border="0" align="absMiddle"> + + : + + + ( / ) +
+
+
+ () +
+
+
- Query_Item("SELECT * FROM ".$objLanguages->SourceTable." WHERE Enabled=1"); @@ -150,7 +150,7 @@ $selected = ""; if($l->Get("LanguageId")==$m_var_list["lang"]) $selected = " SELECTED"; - echo "\n"; + echo "\n"; } ?> Index: trunk/admin/category/addcategory_relations.php =================================================================== diff -u -r13 -r123 --- trunk/admin/category/addcategory_relations.php (.../addcategory_relations.php) (revision 13) +++ trunk/admin/category/addcategory_relations.php (.../addcategory_relations.php) (revision 123) @@ -140,12 +140,12 @@ $CheckClass = "PermChecks"; $saveURL = $admin."/category/category_maint.php"; - +$cancelURL = $admin."/".$objSession->GetVariable('ReturnScript'); //echo $envar."
\n"; /* ------------------------------------- Configure the toolbar ------------------------------------------- */ $objListToolBar = new clsToolBar(); $objListToolBar->Add("img_save", "la_Save","","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","do_edit_save('save_edit_buttons','CatEditStatus','$saveURL',1);","tool_select.gif"); -$objListToolBar->Add("img_cancel", "la_Cancel","","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","do_edit_save('save_edit_buttons','CatEditStatus','".$admin."/browse.php',2);","tool_cancel.gif"); +$objListToolBar->Add("img_cancel", "la_Cancel","","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","do_edit_save('save_edit_buttons','CatEditStatus','".$cancelURL."',2);","tool_cancel.gif"); if($itemcount == 1) $objListToolBar->Add("divider"); $objListToolBar->Set("section",$section); $objListToolBar->Set("load_menu_func",""); Index: trunk/kernel/searchaction.php =================================================================== diff -u -r91 -r123 --- trunk/kernel/searchaction.php (.../searchaction.php) (revision 91) +++ trunk/kernel/searchaction.php (.../searchaction.php) (revision 123) @@ -187,5 +187,14 @@ $objSession->SetVariable("ThemeSearchWord",""); $objSession->SetVariable("Page_LV_Themes",1); break; + + // Advanced View Search Actions + case 'm_adv_view_search': + SaveAdvView_SearchWord('m'); + break; + + case 'm_adv_view_search_reset': + ResetAdvView_SearchWord('m'); + break; } ?> Index: trunk/admin/browse.php =================================================================== diff -u -r13 -r123 --- trunk/admin/browse.php (.../browse.php) (revision 13) +++ trunk/admin/browse.php (.../browse.php) (revision 123) @@ -175,6 +175,8 @@ $objSession->SetVariable("HasChanges", 0); +// where should all edit popups submit changes +$objSession->SetVariable("ReturnScript", basename($_SERVER['PHP_SELF']) ); /* page header */ print << Index: trunk/admin/browse/toolbar.js =================================================================== diff -u -r13 -r123 --- trunk/admin/browse/toolbar.js (.../toolbar.js) (revision 13) +++ trunk/admin/browse/toolbar.js (.../toolbar.js) (revision 123) @@ -189,7 +189,6 @@ preloadImages[preloadImages.length] = img; } - function showContextMenu(evt) { initContextMenu(evt.clientX,evt.clientY); window.FW_showMenu(window.contextMenu,evt.clientX,evt.clientY); @@ -199,22 +198,22 @@ } function initContextMenu(){ - window.contextMenu = new Menu("Context"); - contextMenu.addMenuItem("Edit","check_submit('','edit');",""); - contextMenu.addMenuItem("Delete","check_submit('admin/browse','delete');",""); - contextMenu.addMenuSeparator(); - contextMenu.addMenuItem("Approve","check_submit('admin/browse','approve');",""); - contextMenu.addMenuItem("Decline","check_submit('admin/browse','decline');",""); - contextMenu.addMenuSeparator(); - contextMenu.addMenuItem("Cut","check_submit('admin/browse','cut');",""); - contextMenu.addMenuItem("Copy","check_submit('admin/browse','copy');",""); - if (typeof(activeTab) != 'undefined') { - if(TabPasteEnabled(activeTab.title)) { + window.contextMenu = new Menu("Context"); + contextMenu.addMenuItem("Edit","check_submit('','edit');",""); + contextMenu.addMenuItem("Delete","check_submit('admin/browse','delete');",""); + contextMenu.addMenuSeparator(); + contextMenu.addMenuItem("Approve","check_submit('admin/browse','approve');",""); + contextMenu.addMenuItem("Decline","check_submit('admin/browse','decline');",""); + contextMenu.addMenuSeparator(); + contextMenu.addMenuItem("Cut","check_submit('admin/browse','cut');",""); + contextMenu.addMenuItem("Copy","check_submit('admin/browse','copy');",""); + if (typeof(activeTab) != 'undefined') { + if(TabPasteEnabled(activeTab.title)) contextMenu.addMenuItem("Paste","check_submit('admin/browse','paste');",""); - } - } + + } - window.triedToWriteMenus = false; - window.contextMenu.writeMenus(); - return true; + window.triedToWriteMenus = false; + window.contextMenu.writeMenus(); + return true; } Index: trunk/kernel/include/category.php =================================================================== diff -u -r13 -r123 --- trunk/kernel/include/category.php (.../category.php) (revision 13) +++ trunk/kernel/include/category.php (.../category.php) (revision 123) @@ -1083,7 +1083,6 @@ else $ret = ""; break; - case "pick": /* @field:cat.pick @@ -1328,6 +1327,7 @@ global $m_var_list; $this->clsItemCollection(); $this->classname="clsCategory"; + $this->AdminSearchFields = array("Name","Description"); $this->Page=(int)$m_var_list["p"]; $this->PerPageVar = "Perpage_Category"; $this->SourceTable = GetTablePrefix()."Category"; @@ -1500,7 +1500,7 @@ $PerPage = $objConfig->Get($this->PerPageVar); if(!is_numeric($PerPage)) $PerPage = 10; - + $this->QueryItemCount=TableCount($this->SourceTable,$where,0); //echo $this->QueryItemCount." Items Loaded
\n"; if(is_numeric($objConfig->Get($this->PerPageVar))) @@ -1521,7 +1521,6 @@ { global $m_var_list, $objSession, $Errors, $objPermissions; $GroupID = $objSession->Get("GroupID"); - $resultset = array(); $table = $this->SourceTable; @@ -1540,7 +1539,7 @@ } else { - $sql ="SELECT * FROM $table WHERE $whereClause"; + $sql ="SELECT * FROM $table ".($whereClause ? "WHERE $whereClause" : ''); } $sql .=" ".$orderByClause; Index: trunk/kernel/admin/include/parser.php =================================================================== diff -u -r22 -r123 --- trunk/kernel/admin/include/parser.php (.../parser.php) (revision 22) +++ trunk/kernel/admin/include/parser.php (.../parser.php) (revision 123) @@ -1,6 +1,6 @@
+ + + + +
+ + GetAdminPageLinkList($_SERVER["PHP_SELF"]); ?> + + + +

+ + + + + + + +
+ + + \ No newline at end of file