Changeset 893
- Timestamp:
- 07/24/08 06:41:09 (1 month ago)
- Files:
-
- trunk/common/lib/Form/Class.FormHandler.inc.php (modified) (6 diffs)
- trunk/common/lib/Misc.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/common/lib/Form/Class.FormHandler.inc.php
r830 r893 550 550 foreach ($this->_vars as $key => $value) { 551 551 $this->_processed[$key] = $this -> sanitize_data($value); 552 if($key=='username')$this->_processed[$key] = trim($this->_processed[$key]); 552 553 } 553 554 return $this->_processed; … … 957 958 } 958 959 959 function do_field($sql,$fld, $simple=0 ){960 function do_field($sql,$fld, $simple=0,$processed=null){ 960 961 $fldtype = $fld.'type'; 961 962 if (isset($_POST[$fld]) && ($_POST[$fld]!='')){ 962 if(!empty($processed)){ 963 $parameters=$processed; 964 }else{ 965 $parameters =$_POST ; 966 } 967 968 if (isset($parameters[$fld]) && ($parameters[$fld]!='')){ 963 969 if (strpos($sql,'WHERE') > 0){ 964 970 $sql = "$sql AND "; … … 968 974 $sql = "$sql $fld"; 969 975 if ($simple==0){ 970 if (isset ($ _POST[$fldtype])){971 switch ($ _POST[$fldtype]) {972 case 1: $sql = "$sql='".$ _POST[$fld]."'"; break;973 case 2: $sql = "$sql LIKE '".$ _POST[$fld]."%'"; break;974 case 3: $sql = "$sql LIKE '%".$ _POST[$fld]."%'"; break;975 case 4: $sql = "$sql LIKE '%".$ _POST[$fld]."'";976 if (isset ($parameters[$fldtype])){ 977 switch ($parameters[$fldtype]) { 978 case 1: $sql = "$sql='".$parameters[$fld]."'"; break; 979 case 2: $sql = "$sql LIKE '".$parameters[$fld]."%'"; break; 980 case 3: $sql = "$sql LIKE '%".$parameters[$fld]."%'"; break; 981 case 4: $sql = "$sql LIKE '%".$parameters[$fld]."'"; 976 982 } 977 983 }else{ 978 $sql = "$sql LIKE '%".$ _POST[$fld]."%'";984 $sql = "$sql LIKE '%".$parameters[$fld]."%'"; 979 985 } 980 986 }else{ 981 $sql = "$sql ='".$ _POST[$fld]."'";987 $sql = "$sql ='".$parameters[$fld]."'"; 982 988 } 983 989 } … … 1080 1086 function prepare_list_subselection($form_action) 1081 1087 { 1082 1083 1088 1084 1089 $processed = $this->getProcessed(); //$processed['firstname'] … … 1108 1113 $arr_session_var = split("\|", $_SESSION[$this->FG_FILTER_SEARCH_SESSION_NAME]); 1109 1114 foreach ($arr_session_var as $arr_val){ 1110 list($namevar,$valuevar) = split("=", $arr_val); 1115 list($namevar,$valuevar) = split("=", $arr_val); 1111 1116 $this->_processed[$namevar]=$valuevar; 1112 1117 $processed[$namevar]=$valuevar; … … 1129 1134 foreach ($this->FG_FILTER_SEARCH_FORM_1C as $r){ 1130 1135 $search_parameters .= "|$r[1]=".$processed[$r[1]]."|$r[2]=".$processed[$r[2]]; 1131 $SQLcmd = $this->do_field($SQLcmd, $r[1] );1136 $SQLcmd = $this->do_field($SQLcmd, $r[1],0,$processed); 1132 1137 } 1133 1138 trunk/common/lib/Misc.php
r824 r893 152 152 $$test_var = $_POST[$test_var]; 153 153 $$test_var = sanitize_data($$test_var); 154 if($test_var =='username'){echo 'POST'.$test_var; $$test_var = trim($$test_var);} 154 155 } elseif (isset($_GET[$test_var])) { 155 156 global $$test_var; 156 157 $$test_var = $_GET[$test_var]; 157 158 $$test_var = sanitize_data($$test_var); 159 if($test_var =='username'){echo 'GET'.$test_var; $$test_var = trim($$test_var);} 158 160 } 159 161 }
