@@ -117,22 +117,22 @@ discard block |
||
117 | 117 | $o = 1; $l = strlen($t); |
118 | 118 | foreach($p as $k=>$v){ |
119 | 119 | switch($k){ |
120 | - case 'maxlen':if($l > $v){$o = 0;} |
|
121 | - break; case 'minlen': if($l < $v){$o = 0;} |
|
122 | - break; case 'maxval': if((float)($t) > $v){$o = 0;} |
|
123 | - break; case 'minval': if((float)($t) < $v){$o = 0;} |
|
124 | - break; case 'match': if(!preg_match($v, $t)){$o = 0;} |
|
125 | - break; case 'nomatch': if(preg_match($v, $t)){$o = 0;} |
|
126 | - break; case 'oneof': |
|
127 | - $m = 0; |
|
128 | - foreach(explode('|', $v) as $n){if($t == $n){$m = 1; break;}} |
|
129 | - $o = $m; |
|
130 | - break; case 'noneof': |
|
131 | - $m = 1; |
|
132 | - foreach(explode('|', $v) as $n){if($t == $n){$m = 0; break;}} |
|
133 | - $o = $m; |
|
134 | - break; default: |
|
135 | - break; |
|
120 | + case 'maxlen':if($l > $v){$o = 0;} |
|
121 | + break; case 'minlen': if($l < $v){$o = 0;} |
|
122 | + break; case 'maxval': if((float)($t) > $v){$o = 0;} |
|
123 | + break; case 'minval': if((float)($t) < $v){$o = 0;} |
|
124 | + break; case 'match': if(!preg_match($v, $t)){$o = 0;} |
|
125 | + break; case 'nomatch': if(preg_match($v, $t)){$o = 0;} |
|
126 | + break; case 'oneof': |
|
127 | + $m = 0; |
|
128 | + foreach(explode('|', $v) as $n){if($t == $n){$m = 1; break;}} |
|
129 | + $o = $m; |
|
130 | + break; case 'noneof': |
|
131 | + $m = 1; |
|
132 | + foreach(explode('|', $v) as $n){if($t == $n){$m = 0; break;}} |
|
133 | + $o = $m; |
|
134 | + break; default: |
|
135 | + break; |
|
136 | 136 | } |
137 | 137 | if(!$o){break;} |
138 | 138 | } |
@@ -460,24 +460,24 @@ discard block |
||
460 | 460 | while(strlen($a)){ |
461 | 461 | $w = 0; |
462 | 462 | switch($mode){ |
463 | - case 0: // Name |
|
464 | - if(preg_match('`^[a-zA-Z][\-a-zA-Z:]+`', $a, $m)){ |
|
465 | - $nm = strtolower($m[0]); |
|
466 | - $w = $mode = 1; $a = ltrim(substr_replace($a, '', 0, strlen($m[0]))); |
|
467 | - } |
|
468 | - break; case 1: |
|
469 | - if($a[0] == '='){ // = |
|
470 | - $w = 1; $mode = 2; $a = ltrim($a, '= '); |
|
471 | - }else{ // No val |
|
472 | - $w = 1; $mode = 0; $a = ltrim($a); |
|
473 | - $aA[$nm] = ''; |
|
474 | - } |
|
475 | - break; case 2: // Val |
|
476 | - if(preg_match('`^((?:"[^"]*")|(?:\'[^\']*\')|(?:\s*[^\s"\']+))(.*)`', $a, $m)){ |
|
477 | - $a = ltrim($m[2]); $m = $m[1]; $w = 1; $mode = 0; |
|
478 | - $aA[$nm] = trim(str_replace('<', '<', ($m[0] == '"' or $m[0] == '\'') ? substr($m, 1, -1) : $m)); |
|
479 | - } |
|
480 | - break; |
|
463 | + case 0: // Name |
|
464 | + if(preg_match('`^[a-zA-Z][\-a-zA-Z:]+`', $a, $m)){ |
|
465 | + $nm = strtolower($m[0]); |
|
466 | + $w = $mode = 1; $a = ltrim(substr_replace($a, '', 0, strlen($m[0]))); |
|
467 | + } |
|
468 | + break; case 1: |
|
469 | + if($a[0] == '='){ // = |
|
470 | + $w = 1; $mode = 2; $a = ltrim($a, '= '); |
|
471 | + }else{ // No val |
|
472 | + $w = 1; $mode = 0; $a = ltrim($a); |
|
473 | + $aA[$nm] = ''; |
|
474 | + } |
|
475 | + break; case 2: // Val |
|
476 | + if(preg_match('`^((?:"[^"]*")|(?:\'[^\']*\')|(?:\s*[^\s"\']+))(.*)`', $a, $m)){ |
|
477 | + $a = ltrim($m[2]); $m = $m[1]; $w = 1; $mode = 0; |
|
478 | + $aA[$nm] = trim(str_replace('<', '<', ($m[0] == '"' or $m[0] == '\'') ? substr($m, 1, -1) : $m)); |
|
479 | + } |
|
480 | + break; |
|
481 | 481 | } |
482 | 482 | if($w == 0){ // Parse errs, deal with space, " & ' |
483 | 483 | $a = preg_replace('`^(?:"[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*`', '', $a); |
@@ -86,14 +86,14 @@ |
||
86 | 86 | function _mysql_field_attrs($r, $i) { |
87 | 87 | $x = mysqli_fetch_field_direct($r, $i); |
88 | 88 | switch ($x->type) { |
89 | - case 1: $x->type = 'tinyint'; break; |
|
90 | - case 2: $x->type = 'smallint'; break; |
|
91 | - case 3: $x->type = 'int'; break; |
|
92 | - case 5: $x->type = 'double'; break; |
|
93 | - case 7: $x->type = 'timestamp'; break; |
|
94 | - case 252: $x->type = 'blob'; break; |
|
95 | - case 253: $x->type = 'varchar'; break; |
|
96 | - case 254: $x->type = 'char'; break; |
|
89 | + case 1: $x->type = 'tinyint'; break; |
|
90 | + case 2: $x->type = 'smallint'; break; |
|
91 | + case 3: $x->type = 'int'; break; |
|
92 | + case 5: $x->type = 'double'; break; |
|
93 | + case 7: $x->type = 'timestamp'; break; |
|
94 | + case 252: $x->type = 'blob'; break; |
|
95 | + case 253: $x->type = 'varchar'; break; |
|
96 | + case 254: $x->type = 'char'; break; |
|
97 | 97 | } |
98 | 98 | return $x; |
99 | 99 | } |