Index: trunk/kernel/parser.php =================================================================== diff -u -r1471 -r1566 --- trunk/kernel/parser.php (.../parser.php) (revision 1471) +++ trunk/kernel/parser.php (.../parser.php) (revision 1566) @@ -18,20 +18,22 @@ $m_var_list["lang"] = $pieces[2]; $m_var_list["theme"] = $pieces[3]; + $m_var_list['opener']=$pieces[4]; } else { $m_var_list["cat"]=0; $m_var_list["p"] = 1; $m_var_list["lang"] = $objLanguages->GetPrimary(); $m_var_list["theme"]= $objThemes->GetPrimaryTheme(); + $m_var_list['opener']='s'; } } function m_BuildEnv() { global $m_var_list, $m_var_list_update; - $module_vars = Array('cat','p','lang','theme'); + $module_vars = Array('cat','p','lang','theme','opener'); $ret = GenerateModuleEnv('m', $module_vars); if( isset($GLOBALS['m_var_list_update']['cat']) ) unset($GLOBALS['m_var_list_update']['cat']); return $ret; @@ -495,8 +497,14 @@ { $value = inp_htmlize($_POST[$field],1); } - else - $value = inp_htmlize($FormValues[$form][$field], 1); + elseif(getArrayValue($_GET, 'search_type') == 'advanced') + { + $value = ''; + } + else + { + $value = inp_htmlize($FormValues[$form][$field], 1); + } //echo "
"; print_r($FormValues); echo ""; return $value; } @@ -2063,7 +2071,7 @@ $table = $Item->Get("SourceTable"); //$sql = "SELECT * FROM ".$objSearchConfig->SourceTable." WHERE TableName='$table' AND AdvancedSearch=1 ORDER BY DisplayOrder"; - $sql = "SELECT sc.* FROM ".$objSearchConfig->SourceTable." AS sc LEFT JOIN ".GetTablePrefix()."CustomField AS cf ON sc.CustomFieldId = cf.CustomFieldId WHERE (TableName='$table' OR (TableName='".GetTablePrefix()."CustomField' AND cf.Type = $ItemType)) AND AdvancedSearch=1 ORDER BY sc.DisplayOrder"; + $sql = "SELECT sc.* FROM ".$objSearchConfig->SourceTable." AS sc LEFT JOIN ".GetTablePrefix()."CustomField AS cf ON sc.CustomFieldId = cf.CustomFieldId WHERE (TableName='$table' OR ((TableName='".GetTablePrefix()."CustomField' OR TableName='CustomField') AND cf.Type = $ItemType)) AND AdvancedSearch=1 ORDER BY sc.DisplayOrder"; $objSearchConfig->Query_Item($sql); $row=0; if(is_array($objSearchConfig->Items)) @@ -2469,10 +2477,8 @@ else $cat = $objCatList->CurrentCategoryID(); - if(!strlen($Permission)) - { + //if(!strlen($Permission)) $Permission = strtoupper($attribs["_perm"]); - } $o = ""; $hasperm = FALSE; @@ -2731,24 +2737,22 @@ */ function m_module_stylesheets($attribs) { - global $TemplateRoot; + global $TemplateRoot; - $IncludeList = explode(",",trim($attribs["_modules"])); - $tpath = GetModuleArray("template"); - $ret=''; - for($inc=0;$inc
"; print_r($objSearchCats->Items); echo ""; $ret = 0; @@ -3738,5 +3746,4 @@ $ret = $cat->ParseObject($element); }*/ - ?>