@@ -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 | |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | * |
| 44 | 44 | * @param string $fieldName The name of the field to retrieve |
| 45 | 45 | * |
| 46 | - * @return mixed string the value of the field |
|
| 46 | + * @return string string the value of the field |
|
| 47 | 47 | */ |
| 48 | 48 | protected function getFieldSingleValue($fieldName) |
| 49 | 49 | { |
@@ -311,7 +311,7 @@ |
||
| 311 | 311 | * |
| 312 | 312 | * @param stdClass $data The user's new data |
| 313 | 313 | * |
| 314 | - * @return boolean true if the user's data was changed, false otherwise |
|
| 314 | + * @return boolean|null true if the user's data was changed, false otherwise |
|
| 315 | 315 | */ |
| 316 | 316 | public function editUser($data) |
| 317 | 317 | { |
@@ -253,10 +253,10 @@ |
||
| 253 | 253 | * Get an array of Auth\PendingUser from a filtered set |
| 254 | 254 | * |
| 255 | 255 | * @param Data\Filter|boolean $filter The filter conditions or false to retreive all |
| 256 | - * @param array|boolean $select The user fields to obtain or false to obtain all |
|
| 257 | - * @param integer|boolean $top The number of users to obtain or false to obtain all |
|
| 258 | - * @param integer|boolean $skip The number of users to skip or false to skip none |
|
| 259 | - * @param array|boolean $orderby The field to sort by and the method to sort or false to not sort |
|
| 256 | + * @param boolean $select The user fields to obtain or false to obtain all |
|
| 257 | + * @param boolean $top The number of users to obtain or false to obtain all |
|
| 258 | + * @param boolean $skip The number of users to skip or false to skip none |
|
| 259 | + * @param boolean $orderby The field to sort by and the method to sort or false to not sort |
|
| 260 | 260 | * @param string|boolean $methodName The AuthMethod if information is desired only from a particular Auth\Authenticator |
| 261 | 261 | * |
| 262 | 262 | * @return array|boolean An array of Auth\PendingUser objects or false if no pending users were found |
@@ -78,7 +78,7 @@ |
||
| 78 | 78 | { |
| 79 | 79 | if(isset($res['extended']) && isset($res['extended']['jpegphoto'])) |
| 80 | 80 | { |
| 81 | - $res['extended']['jpegphoto']=true; |
|
| 81 | + $res['extended']['jpegphoto'] = true; |
|
| 82 | 82 | } |
| 83 | 83 | FlipSession::setVar('AuthMethod', get_class($this->methods[$i])); |
| 84 | 84 | FlipSession::setVar('AuthData', $res); |
@@ -176,7 +176,7 @@ |
||
| 176 | 176 | * Convert the right hand side of the filter clause into an Mongo array |
| 177 | 177 | * |
| 178 | 178 | * @param string $op The standard operator |
| 179 | - * @param string $var The second variable in the operator |
|
| 179 | + * @param string $var2 The second variable in the operator |
|
| 180 | 180 | * |
| 181 | 181 | * @return array An array of mongo operations |
| 182 | 182 | */ |
@@ -150,7 +150,7 @@ |
||
| 150 | 150 | * @param string $select The colums to read |
| 151 | 151 | * @param boolean|string $count The number of rows to read |
| 152 | 152 | * @param boolean|string $skip The number of rows to skip over |
| 153 | - * @param boolean|array $sort The array to sort by or false to not sort |
|
| 153 | + * @param boolean $sort The array to sort by or false to not sort |
|
| 154 | 154 | * |
| 155 | 155 | * @return false|array An array of all the returned records |
| 156 | 156 | */ |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | $stmt = $this->pdo->query($sql); |
| 248 | 248 | if($stmt === false) |
| 249 | 249 | { |
| 250 | - if (php_sapi_name() !== "cli") { |
|
| 250 | + if(php_sapi_name() !== "cli") { |
|
| 251 | 251 | error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); |
| 252 | 252 | } |
| 253 | 253 | return false; |
@@ -296,7 +296,7 @@ discard block |
||
| 296 | 296 | $sql = "INSERT INTO $tablename ($cols) VALUES ($set);"; |
| 297 | 297 | if($this->pdo->exec($sql) === false) |
| 298 | 298 | { |
| 299 | - if (php_sapi_name() !== "cli") { |
|
| 299 | + if(php_sapi_name() !== "cli") { |
|
| 300 | 300 | error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); |
| 301 | 301 | } |
| 302 | 302 | return false; |
@@ -11,6 +11,9 @@ |
||
| 11 | 11 | $this->setTemplateName('admin.html'); |
| 12 | 12 | } |
| 13 | 13 | |
| 14 | + /** |
|
| 15 | + * @param string $adminGroup |
|
| 16 | + */ |
|
| 14 | 17 | protected function userIsAdmin($adminGroup) |
| 15 | 18 | { |
| 16 | 19 | if($this->user === false || $this->user === null) |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | /** |
| 16 | 16 | * Create the DataTableAPI for the given DataTable info |
| 17 | 17 | * |
| 18 | - * @param string $datSetName The name of the DataSet used in the Settings |
|
| 18 | + * @param string $dataSetName The name of the DataSet used in the Settings |
|
| 19 | 19 | * @param string $dataTableName The name of the table in the DataSet |
| 20 | 20 | * @param string|false $primaryKeyName The table primary key. Must be specified for update/delete capable tables |
| 21 | 21 | */ |
@@ -24,6 +24,9 @@ |
||
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | + /** |
|
| 28 | + * @param string $param |
|
| 29 | + */ |
|
| 27 | 30 | private function getParamFromArrayIfSet($array, $param, $default = null) |
| 28 | 31 | { |
| 29 | 32 | if(isset($array[$param])) |