| @@ -14,8 +14,8 @@ | ||
| 14 | 14 | /** | 
| 15 | 15 | * This cron script recompiles the Browscap cache | 
| 16 | 16 | */ | 
| 17 | -ini_set('memory_limit','-1');      // turn off memory limit for this script | |
| 18 | -set_time_limit(120); // change to 2 minutes for this script | |
| 17 | +ini_set('memory_limit', '-1'); // turn off memory limit for this script | |
| 18 | +set_time_limit(120); // change to 2 minutes for this script | |
| 19 | 19 | |
| 20 | 20 |  require('vendor/autoload.php'); | 
| 21 | 21 | |
| @@ -35,20 +35,20 @@ | ||
| 35 | 35 |      { | 
| 36 | 36 | if(isset($this->labeleduri)) | 
| 37 | 37 |          { | 
| 38 | - //Have multiple emails | |
| 39 | - if($propName === 'mail') | |
| 40 | -             { | |
| 41 | -                 return $this->getFieldSingleValue('labeleduri'); | |
| 42 | - } | |
| 43 | - if($propName === 'allMail') | |
| 44 | -             { | |
| 45 | -                 $tmp = $this->getField('mail'); | |
| 46 | - if(isset($tmp['count'])) | |
| 47 | -                 { | |
| 48 | - unset($tmp['count']); | |
| 49 | - } | |
| 50 | - return $tmp; | |
| 51 | - } | |
| 38 | + //Have multiple emails | |
| 39 | + if($propName === 'mail') | |
| 40 | +                { | |
| 41 | +                    return $this->getFieldSingleValue('labeleduri'); | |
| 42 | + } | |
| 43 | + if($propName === 'allMail') | |
| 44 | +                { | |
| 45 | +                    $tmp = $this->getField('mail'); | |
| 46 | + if(isset($tmp['count'])) | |
| 47 | +                    { | |
| 48 | + unset($tmp['count']); | |
| 49 | + } | |
| 50 | + return $tmp; | |
| 51 | + } | |
| 52 | 52 | } | 
| 53 | 53 | $tmp = $this->getValueWithDefault($propName); | 
| 54 | 54 | if($tmp !== false) | 
| @@ -72,7 +72,7 @@ | ||
| 72 | 72 | public function getDataSetData($dataSetName) | 
| 73 | 73 |      { | 
| 74 | 74 | if(!isset(\FlipsideSettings::$dataset) || !isset(\FlipsideSettings::$dataset[$dataSetName])) | 
| 75 | -	{ | |
| 75 | +        { | |
| 76 | 76 | return false; | 
| 77 | 77 | } | 
| 78 | 78 | return \FlipsideSettings::$dataset[$dataSetName]; | 
| @@ -30,7 +30,7 @@ discard block | ||
| 30 | 30 |          { | 
| 31 | 31 | require $GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php'; | 
| 32 | 32 | return; | 
| 33 | - } | |
| 33 | + } | |
| 34 | 34 |          if(file_exists('/var/www/secure_settings/class.FlipsideSettings.php')) | 
| 35 | 35 |          { | 
| 36 | 36 | require '/var/www/secure_settings/class.FlipsideSettings.php'; | 
| @@ -72,7 +72,7 @@ discard block | ||
| 72 | 72 | public function getDataSetData($dataSetName) | 
| 73 | 73 |      { | 
| 74 | 74 | if(!isset(\FlipsideSettings::$dataset) || !isset(\FlipsideSettings::$dataset[$dataSetName])) | 
| 75 | -	{ | |
| 75 | +    { | |
| 76 | 76 | return false; | 
| 77 | 77 | } | 
| 78 | 78 | return \FlipsideSettings::$dataset[$dataSetName]; | 
| @@ -12,7 +12,7 @@ discard block | ||
| 12 | 12 | \Psr\Log\LogLevel::WARNING, | 
| 13 | 13 | \Psr\Log\LogLevel::NOTICE); | 
| 14 | 14 | |
| 15 | - public function __construct($params=false) | |
| 15 | + public function __construct($params = false) | |
| 16 | 16 |      { | 
| 17 | 17 | if(isset($params['defaultLogLevels'])) | 
| 18 | 18 |          { | 
| @@ -27,10 +27,10 @@ discard block | ||
| 27 | 27 |      { | 
| 28 | 28 | // build a replacement array with braces around the context keys | 
| 29 | 29 | $replace = array(); | 
| 30 | -        foreach ($context as $key => $val) { | |
| 30 | +        foreach($context as $key => $val) { | |
| 31 | 31 | // check that the value can be casted to string | 
| 32 | -            if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) { | |
| 33 | -                $replace['{' . $key . '}'] = $val; | |
| 32 | +            if(!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) { | |
| 33 | +                $replace['{'.$key.'}'] = $val; | |
| 34 | 34 | } | 
| 35 | 35 | } | 
| 36 | 36 | |
| @@ -27,9 +27,11 @@ | ||
| 27 | 27 |      { | 
| 28 | 28 | // build a replacement array with braces around the context keys | 
| 29 | 29 | $replace = array(); | 
| 30 | -        foreach ($context as $key => $val) { | |
| 30 | + foreach ($context as $key => $val) | |
| 31 | +        { | |
| 31 | 32 | // check that the value can be casted to string | 
| 32 | -            if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) { | |
| 33 | + if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) | |
| 34 | +            { | |
| 33 | 35 |                  $replace['{' . $key . '}'] = $val; | 
| 34 | 36 | } | 
| 35 | 37 | } | 
| @@ -3,7 +3,7 @@ | ||
| 3 | 3 | |
| 4 | 4 | class PHPLog extends LogService | 
| 5 | 5 |  { | 
| 6 | - public function __construct($params=false) | |
| 6 | + public function __construct($params = false) | |
| 7 | 7 |      { | 
| 8 | 8 | parent::__construct($params); | 
| 9 | 9 | } | 
| @@ -48,7 +48,7 @@ | ||
| 48 | 48 | $objCount = count($res); | 
| 49 | 49 | for($i = 0; $i < $objCount; $i++) | 
| 50 | 50 |          { | 
| 51 | - $res[$i] = new $this->className($res[$i]); | |
| 51 | + $res[$i] = new $this->className($res[$i]); | |
| 52 | 52 | } | 
| 53 | 53 | return $res; | 
| 54 | 54 | } | 
| @@ -34,7 +34,7 @@ discard block | ||
| 34 | 34 | return $this->dataTable->create($data); | 
| 35 | 35 | } | 
| 36 | 36 | |
| 37 | - public function read($filter=false, $select=false, $count=false, $skip=false, $sort=false, $params=false, $returnObj=false) | |
| 37 | + public function read($filter = false, $select = false, $count = false, $skip = false, $sort = false, $params = false, $returnObj = false) | |
| 38 | 38 |      { | 
| 39 | 39 | $res = $this->dataTable->read($filter, $select, $count, $skip, $sort, $params); | 
| 40 | 40 | if($res === false) | 
| @@ -67,7 +67,7 @@ discard block | ||
| 67 | 67 | return $this->dataTable->delete($filter); | 
| 68 | 68 | } | 
| 69 | 69 | |
| 70 | - public function count($filter=false) | |
| 70 | + public function count($filter = false) | |
| 71 | 71 |      { | 
| 72 | 72 | return $this->dataTable->count($filter); | 
| 73 | 73 | } | 
| @@ -9,33 +9,33 @@ | ||
| 9 | 9 | public function __construct($file) | 
| 10 | 10 |      { | 
| 11 | 11 |          $this->data = array_map('str_getcsv', file($file)); | 
| 12 | - $titles = array_shift($this->data); | |
| 13 | - $count = count($this->data); | |
| 14 | - for($i = 0; $i < $count; $i++) | |
| 15 | -	{ | |
| 12 | + $titles = array_shift($this->data); | |
| 13 | + $count = count($this->data); | |
| 14 | + for($i = 0; $i < $count; $i++) | |
| 15 | +    { | |
| 16 | 16 | $this->data[$i] = array_combine($titles, $this->data[$i]); | 
| 17 | - } | |
| 17 | + } | |
| 18 | 18 | } | 
| 19 | 19 | |
| 20 | 20 | public function count($filter = false) | 
| 21 | 21 |      { | 
| 22 | 22 | if($filter) | 
| 23 | -	{ | |
| 23 | +    { | |
| 24 | 24 | $res = $this->data; | 
| 25 | - $res = $filter->filter_array($res); | |
| 26 | - return count($res); | |
| 27 | - } | |
| 28 | - return count($this->data); | |
| 25 | + $res = $filter->filter_array($res); | |
| 26 | + return count($res); | |
| 27 | + } | |
| 28 | + return count($this->data); | |
| 29 | 29 | } | 
| 30 | 30 | |
| 31 | 31 | public function read($filter = false, $select = false, $count = false, $skip = false, $sort = false, $params = false) | 
| 32 | 32 |      { | 
| 33 | 33 | $res = $this->data; | 
| 34 | - if($filter !== false) | |
| 35 | -	{ | |
| 34 | + if($filter !== false) | |
| 35 | +    { | |
| 36 | 36 | $res = $filter->filter_array($res); | 
| 37 | - } | |
| 38 | - return $res; | |
| 37 | + } | |
| 38 | + return $res; | |
| 39 | 39 | } | 
| 40 | 40 | |
| 41 | 41 | public function create($data) | 
| @@ -20,7 +20,7 @@ | ||
| 20 | 20 | public function count($filter = false) | 
| 21 | 21 |      { | 
| 22 | 22 | if($filter) | 
| 23 | -	{ | |
| 23 | +        { | |
| 24 | 24 | $res = $this->data; | 
| 25 | 25 | $res = $filter->filter_array($res); | 
| 26 | 26 | return count($res); | 
| @@ -248,7 +248,7 @@ | ||
| 248 | 248 | if($stmt === false) | 
| 249 | 249 |          { | 
| 250 | 250 |              if (php_sapi_name() !== "cli") { | 
| 251 | -              error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); | |
| 251 | +                error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); | |
| 252 | 252 | } | 
| 253 | 253 | return false; | 
| 254 | 254 | } | 
| @@ -254,7 +254,7 @@ discard block | ||
| 254 | 254 | $stmt = $this->pdo->query($sql); | 
| 255 | 255 | if($stmt === false) | 
| 256 | 256 |          { | 
| 257 | -            if (php_sapi_name() !== "cli") { | |
| 257 | +            if(php_sapi_name() !== "cli") { | |
| 258 | 258 |                error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); | 
| 259 | 259 | } | 
| 260 | 260 | return false; | 
| @@ -304,7 +304,7 @@ discard block | ||
| 304 | 304 | $sql = "INSERT INTO `$tablename` ($cols) VALUES ($set);"; | 
| 305 | 305 | if($this->pdo->exec($sql) === false) | 
| 306 | 306 |          { | 
| 307 | -            if (php_sapi_name() !== "cli") { | |
| 307 | +            if(php_sapi_name() !== "cli") { | |
| 308 | 308 |                  error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); | 
| 309 | 309 | } | 
| 310 | 310 | return false; | 
| @@ -254,7 +254,8 @@ discard block | ||
| 254 | 254 | $stmt = $this->pdo->query($sql); | 
| 255 | 255 | if($stmt === false) | 
| 256 | 256 |          { | 
| 257 | -            if (php_sapi_name() !== "cli") { | |
| 257 | + if (php_sapi_name() !== "cli") | |
| 258 | +            { | |
| 258 | 259 |                error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); | 
| 259 | 260 | } | 
| 260 | 261 | return false; | 
| @@ -304,7 +305,8 @@ discard block | ||
| 304 | 305 | $sql = "INSERT INTO `$tablename` ($cols) VALUES ($set);"; | 
| 305 | 306 | if($this->pdo->exec($sql) === false) | 
| 306 | 307 |          { | 
| 307 | -            if (php_sapi_name() !== "cli") { | |
| 308 | + if (php_sapi_name() !== "cli") | |
| 309 | +            { | |
| 308 | 310 |                  error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); | 
| 309 | 311 | } | 
| 310 | 312 | return false; | 
| @@ -140,9 +140,9 @@ | ||
| 140 | 140 | $case = true; | 
| 141 | 141 | } | 
| 142 | 142 | if($case) | 
| 143 | -	{ | |
| 143 | +        { | |
| 144 | 144 |              if(class_exists('MongoRegex')) | 
| 145 | -	    { | |
| 145 | +            { | |
| 146 | 146 |                  return array($field=>array('$regex'=>new \MongoRegex('/'.$this->var2.'/i'))); | 
| 147 | 147 | } | 
| 148 | 148 | else | 
| @@ -140,9 +140,9 @@ discard block | ||
| 140 | 140 | $case = true; | 
| 141 | 141 | } | 
| 142 | 142 | if($case) | 
| 143 | -	{ | |
| 143 | +    { | |
| 144 | 144 |              if(class_exists('MongoRegex')) | 
| 145 | -	    { | |
| 145 | +        { | |
| 146 | 146 |                  return array($field=>array('$regex'=>new \MongoRegex('/'.$this->var2.'/i'))); | 
| 147 | 147 | } | 
| 148 | 148 | else | 
| @@ -236,15 +236,15 @@ discard block | ||
| 236 | 236 |          { | 
| 237 | 237 | case '=': | 
| 238 | 238 | return array($this->var1=>$this->var2); | 
| 239 | - case 'substringof': | |
| 240 | -		if(class_exists('MongoRegex')) | |
| 241 | -		{ | |
| 242 | -		    return array($this->var1=>array('$regex'=>new \MongoRegex('/'.$this->var2.'/i'))); | |
| 243 | - } | |
| 244 | - else | |
| 245 | -		{ | |
| 239 | + case 'substringof': | |
| 240 | +        if(class_exists('MongoRegex')) | |
| 241 | +        { | |
| 242 | +            return array($this->var1=>array('$regex'=>new \MongoRegex('/'.$this->var2.'/i'))); | |
| 243 | + } | |
| 244 | + else | |
| 245 | +        { | |
| 246 | 246 |                      return array($this->var1=>array('$regex'=>new \MongoDB\BSON\Regex($this->var2, 'i'))); | 
| 247 | - } | |
| 247 | + } | |
| 248 | 248 | case 'indexof': | 
| 249 | 249 | return $this->getMongoIndexOfOperator(); | 
| 250 | 250 | default: | 
| @@ -265,18 +265,18 @@ | ||
| 265 | 265 | } | 
| 266 | 266 | switch($this->op) | 
| 267 | 267 |          { | 
| 268 | - case '!=': | |
| 269 | - return $value != $this->var2; | |
| 270 | - case '=': | |
| 271 | - return $value == $this->var2; | |
| 272 | - case '<': | |
| 273 | - return $value < $this->var2; | |
| 274 | - case '<=': | |
| 275 | - return $value <= $this->var2; | |
| 276 | - case '>': | |
| 277 | - return $value > $this->var2; | |
| 278 | - case '>=': | |
| 279 | - return $value >= $this->var2; | |
| 268 | + case '!=': | |
| 269 | + return $value != $this->var2; | |
| 270 | + case '=': | |
| 271 | + return $value == $this->var2; | |
| 272 | + case '<': | |
| 273 | + return $value < $this->var2; | |
| 274 | + case '<=': | |
| 275 | + return $value <= $this->var2; | |
| 276 | + case '>': | |
| 277 | + return $value > $this->var2; | |
| 278 | + case '>=': | |
| 279 | + return $value >= $this->var2; | |
| 280 | 280 | } | 
| 281 | 281 | } | 
| 282 | 282 | } |