@@ -1167,8 +1167,10 @@ protected function convertFilter($field, $comparator, $value) {
1167
1167
case 'le ' : return array ('! <= ? ' ,$ field ,$ value );
1168
1168
case 'ge ' : return array ('! >= ? ' ,$ field ,$ value );
1169
1169
case 'gt ' : return array ('! > ? ' ,$ field ,$ value );
1170
- case 'bt ' : $ v = explode (', ' ,$ value ); if (count ($ v )<2 ) return false ;
1171
- return array ('! BETWEEN ? AND ? ' ,$ field ,$ v [0 ],$ v [1 ]);
1170
+ case 'bt ' :
1171
+ $ v = explode (', ' ,$ value );
1172
+ if (count ($ v )<2 ) return false ;
1173
+ return array ('! BETWEEN ? AND ? ' ,$ field ,$ v [0 ],$ v [1 ]);
1172
1174
case 'in ' : return array ('! IN ? ' ,$ field ,explode (', ' ,$ value ));
1173
1175
case 'is ' : return array ('! IS NULL ' ,$ field );
1174
1176
}
@@ -1204,8 +1206,10 @@ protected function convertFilter($field, $comparator, $value) {
1204
1206
case 'nle ' : return array ('! > ? ' ,$ field ,$ value );
1205
1207
case 'nge ' : return array ('! < ? ' ,$ field ,$ value );
1206
1208
case 'ngt ' : return array ('! <= ? ' ,$ field ,$ value );
1207
- case 'nbt ' : $ v = explode (', ' ,$ value ); if (count ($ v )<2 ) return false ;
1208
- return array ('! NOT BETWEEN ? AND ? ' ,$ field ,$ v [0 ],$ v [1 ]);
1209
+ case 'nbt ' :
1210
+ $ v = explode (', ' ,$ value );
1211
+ if (count ($ v )<2 ) return false ;
1212
+ return array ('! NOT BETWEEN ? AND ? ' ,$ field ,$ v [0 ],$ v [1 ]);
1209
1213
case 'nin ' : return array ('! NOT IN ? ' ,$ field ,explode (', ' ,$ value ));
1210
1214
case 'nis ' : return array ('! IS NOT NULL ' ,$ field );
1211
1215
}
@@ -1518,7 +1522,7 @@ protected function addRelationColumns($columns,$select) {
1518
1522
foreach ($ keys as $ key =>$ other ) {
1519
1523
$ columns .=", $ table. $ key, " .implode ('. ' ,$ other );
1520
1524
}
1521
- }
1525
+ }
1522
1526
}
1523
1527
return $ columns ;
1524
1528
}
@@ -1923,7 +1927,7 @@ public function __construct($config) {
1923
1927
// connect
1924
1928
$ request = trim ($ request ,'/ ' );
1925
1929
if (!$ database ) {
1926
- $ database = $ this ->parseRequestParameter ($ request , 'a-zA-Z0-9\-_ ' );
1930
+ $ database = $ this ->parseRequestParameter ($ request , 'a-zA-Z0-9\-_ ' );
1927
1931
}
1928
1932
if (!$ db ) {
1929
1933
$ db = new $ dbengine ();
0 commit comments