Index: trunk/kernel/frontaction.php =================================================================== diff -u -r1080 -r1108 --- trunk/kernel/frontaction.php (.../frontaction.php) (revision 1080) +++ trunk/kernel/frontaction.php (.../frontaction.php) (revision 1108) @@ -896,8 +896,19 @@ $FormError["m_simplesearch"]["keywords"] = language("lu_no_keyword"); } break; - case "m_adv_search": - if( !is_object($objSearchConfig) ) $objSearchConfig = new clsSearchConfigList(); + case "m_adv_search": + + if ($_GET['type']) + { + $modules = Array(1 => 'In-Portal', 2 => 'In-News', + 3 => 'In-Bulletin', 4 => 'In-Link'); + $module = $modules[$_GET["type"]]; + } + else + { + $module = 0; + } + if( !is_object($objSearchConfig) ) $objSearchConfig = new clsSearchConfigList($module); switch($_GET["type"]) { case 1: /* category */ @@ -933,6 +944,12 @@ $Conjuction = ""; break; } + + if (strlen($Value) && $Verb=="any") + { + $Verb = 'contains'; + } + if(strlen($Verb)>0 && $Verb!="any") { //echo "Adding CAT SearchField: [".$field->Get("TableName")."]; [".$field->Get("FieldName")."]; [$Verb]; [$Value]; [$Conjuction]
";