Index: trunk/kernel/admin/include/toolbar/catselect.php =================================================================== diff -u -r101 -r407 --- trunk/kernel/admin/include/toolbar/catselect.php (.../catselect.php) (revision 101) +++ trunk/kernel/admin/include/toolbar/catselect.php (.../catselect.php) (revision 407) @@ -238,25 +238,28 @@ } - function CheckList(tabId) - { - var result=""; + function CheckList(tabId) + { + var result = ""; + var ItemsChecked = 0; + if(toolbar) + { + var tab = document.getElementById(tabId); + if (!tab) return; + var inputs = tab.getElementsByTagName("INPUT"); + for (var j = 0; j < inputs.length; j++) + if( ((inputs[j].type == "checkbox") || (inputs[j].type == "radio")) && (inputs[j].inportalType) ) + { + if(inputs[j].checked) + { + result = result + inputs[j].value+','; + ItemsChecked++; + } + } + return (ItemsChecked == 0) ? 0 : result; + } + } - if(toolbar) - { - var tab = document.getElementById(tabId); - if (!tab) return; - var inputs = tab.getElementsByTagName("INPUT"); - for (var j = 0; j < inputs.length; j++) - if (((inputs[j].type == "checkbox") || (inputs[j].type == "radio")) && (inputs[j].inportalType)) - { - if(inputs[j].checked) - result = result + inputs[j].value+','; - } - return result; - } - } - function select_check_submit() { var formname = ''; Index: trunk/globals.php =================================================================== diff -u -r392 -r407 --- trunk/globals.php (.../globals.php) (revision 392) +++ trunk/globals.php (.../globals.php) (revision 407) @@ -1181,7 +1181,7 @@ if(!$post_priority) // follow gpc_order in php.ini return isset($_REQUEST[$name]) ? $_REQUEST[$name] : false; else // get variable from post 1stly if not found then from get - return isset($_POST[$name]) && $_POST[$name] ? $_POST[$name] : ( isset($_GET[$name]) && $_GET[$name] ? $_GET[$name] : false ); + return isset($_POST[$name]) && $_POST[$name] !== false ? $_POST[$name] : ( isset($_GET[$name]) && $_GET[$name] ? $_GET[$name] : false ); } } Index: trunk/kernel/action.php =================================================================== diff -u -r402 -r407 --- trunk/kernel/action.php (.../action.php) (revision 402) +++ trunk/kernel/action.php (.../action.php) (revision 407) @@ -37,17 +37,26 @@ { case "m_save_import_config": // Set New Import Category - if( GetVar('categorylist', true) ) + if( GetVar('categorylist', true) !== false ) { $cat_id = $_POST['categorylist']; $objSession->SetVariable('categoryid', $cat_id); - $cat = $objCatList->GetByResource($cat_id); - if(is_object($cat)) - { - $navbar = $cat->Get('CachedNavbar'); - $objSession->SetVariable('catnavbar', $navbar); - $objSession->SetVariable('import_category_id', $cat->UniqueId() ); - } + + if($cat_id > 0) + { + $cat = $objCatList->GetByResource($cat_id); + if(is_object($cat)) + { + $navbar = $cat->Get('CachedNavbar'); + $objSession->SetVariable('catnavbar', $navbar); + $objSession->SetVariable('import_category_id', $cat->UniqueId() ); + } + }elseif($cat_id == 0) + { + global $objConfig; + $objSession->SetVariable('import_category_id', 0); + } + $objSession->SetVariable('categorylist', $_POST['categorylist']); }