@@ -325,7 +325,7 @@ |
||
| 325 | 325 | |
| 326 | 326 | |
| 327 | 327 | /** |
| 328 | - * @param boolean|\Data\Filter $filter The filter to user when reading users |
|
| 328 | + * @param \Data\Filter $filter The filter to user when reading users |
|
| 329 | 329 | * @param boolean|array $select The fields to return |
| 330 | 330 | * @param boolean|integer $top The number of records to return |
| 331 | 331 | * @param boolean|integer $skip The number of records to skip |
@@ -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 | { |
@@ -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 |
@@ -28,12 +28,18 @@ discard block |
||
| 28 | 28 | return substr($haystack, 0, strlen($needle)) === $needle; |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | + /** |
|
| 32 | + * @param string $string |
|
| 33 | + */ |
|
| 31 | 34 | protected function filterIsFunction($string) |
| 32 | 35 | { |
| 33 | 36 | return (self::str_startswith($string, 'substringof') || self::str_startswith($string, 'contains') || |
| 34 | 37 | self::str_startswith($string, 'indexof')); |
| 35 | 38 | } |
| 36 | 39 | |
| 40 | + /** |
|
| 41 | + * @param string $op |
|
| 42 | + */ |
|
| 37 | 43 | protected function odataOpToStd($op) |
| 38 | 44 | { |
| 39 | 45 | switch($op) |
@@ -146,6 +152,9 @@ discard block |
||
| 146 | 152 | } |
| 147 | 153 | } |
| 148 | 154 | |
| 155 | + /** |
|
| 156 | + * @param string $op |
|
| 157 | + */ |
|
| 149 | 158 | private function getMongoClauseArray($op, $var2) |
| 150 | 159 | { |
| 151 | 160 | return array($this->opToMongo($op)=>$var2); |
@@ -6,7 +6,6 @@ |
||
| 6 | 6 | * @author Chris Wright |
| 7 | 7 | * @version 2.0 |
| 8 | 8 | * @param string $subject The subject string |
| 9 | - * @param bool $dn Treat subject as a DN if TRUE |
|
| 10 | 9 | * @param string|array $ignore Set of characters to leave untouched |
| 11 | 10 | * @return string The escaped string |
| 12 | 11 | */ |
@@ -92,13 +92,13 @@ discard block |
||
| 92 | 92 | /** |
| 93 | 93 | * Get the groups that match the filters |
| 94 | 94 | * |
| 95 | - * @param mixed $filter The filter to use to find a set of groups |
|
| 95 | + * @param boolean $filter The filter to use to find a set of groups |
|
| 96 | 96 | * @param mixed $select The list of fields to select |
| 97 | 97 | * @param mixed $top The number of groups to select |
| 98 | 98 | * @param mixed $skip The number of groups to skip |
| 99 | 99 | * @param mixed $orderby The fields to sort by |
| 100 | 100 | * |
| 101 | - * @return array All groups that fit the filters |
|
| 101 | + * @return boolean All groups that fit the filters |
|
| 102 | 102 | * |
| 103 | 103 | * @SuppressWarnings("UnusedFormalParameter") |
| 104 | 104 | */ |
@@ -110,13 +110,13 @@ discard block |
||
| 110 | 110 | /** |
| 111 | 111 | * Get the users that match the filters |
| 112 | 112 | * |
| 113 | - * @param mixed $filter The filter to use to find a set of users |
|
| 113 | + * @param boolean $filter The filter to use to find a set of users |
|
| 114 | 114 | * @param mixed $select The list of fields to select |
| 115 | 115 | * @param mixed $top The number of users to select |
| 116 | 116 | * @param mixed $skip The number of users to skip |
| 117 | 117 | * @param mixed $orderby The fields to sort by |
| 118 | 118 | * |
| 119 | - * @return array All users that fit the filters |
|
| 119 | + * @return boolean All users that fit the filters |
|
| 120 | 120 | * |
| 121 | 121 | * @SuppressWarnings("UnusedFormalParameter") |
| 122 | 122 | */ |
@@ -128,13 +128,13 @@ discard block |
||
| 128 | 128 | /** |
| 129 | 129 | * Get the pending users that match the filters |
| 130 | 130 | * |
| 131 | - * @param mixed $filter The filter to use to find a set of users |
|
| 131 | + * @param boolean $filter The filter to use to find a set of users |
|
| 132 | 132 | * @param mixed $select The list of fields to select |
| 133 | 133 | * @param mixed $top The number of users to select |
| 134 | 134 | * @param mixed $skip The number of users to skip |
| 135 | 135 | * @param mixed $orderby The fields to sort by |
| 136 | 136 | * |
| 137 | - * @return array All users that fit the filters |
|
| 137 | + * @return boolean All users that fit the filters |
|
| 138 | 138 | * |
| 139 | 139 | * @SuppressWarnings("UnusedFormalParameter") |
| 140 | 140 | */ |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | * |
| 232 | 232 | * @param string $hash The hash to search by |
| 233 | 233 | * |
| 234 | - * @return Auth\User The user whoes hash was specified |
|
| 234 | + * @return boolean The user whoes hash was specified |
|
| 235 | 235 | * |
| 236 | 236 | * @SuppressWarnings("UnusedFormalParameter") |
| 237 | 237 | */ |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | * |
| 246 | 246 | * @param string $hash The hash to search by |
| 247 | 247 | * |
| 248 | - * @return Auth\PendingUser The user whoes hash was specified |
|
| 248 | + * @return boolean The user whoes hash was specified |
|
| 249 | 249 | * |
| 250 | 250 | * @SuppressWarnings("UnusedFormalParameter") |
| 251 | 251 | */ |
@@ -257,7 +257,7 @@ discard block |
||
| 257 | 257 | /** |
| 258 | 258 | * Get the host name this authenticator uses |
| 259 | 259 | * |
| 260 | - * @return string The host name this authenticator uses |
|
| 260 | + * @return boolean The host name this authenticator uses |
|
| 261 | 261 | */ |
| 262 | 262 | public function getHostName() |
| 263 | 263 | { |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | /** |
| 141 | 141 | * Get the data table for Pending Users |
| 142 | 142 | * |
| 143 | - * @return boolean|\Data\DataTable The Pending User Data Table |
|
| 143 | + * @return boolean The Pending User Data Table |
|
| 144 | 144 | */ |
| 145 | 145 | private function getPendingUserDataTable() |
| 146 | 146 | { |
@@ -189,6 +189,10 @@ discard block |
||
| 189 | 189 | return new SQLUser($data, $this); |
| 190 | 190 | } |
| 191 | 191 | |
| 192 | + /** |
|
| 193 | + * @param string $tableName |
|
| 194 | + * @param string $className |
|
| 195 | + */ |
|
| 192 | 196 | private function getEntityByFilter($tableName, $filterStr, $className) |
| 193 | 197 | { |
| 194 | 198 | $dataTable = $this->getDataTable($tableName); |
@@ -211,6 +215,9 @@ discard block |
||
| 211 | 215 | return $this->getEntityByFilter('user', "uid eq '$name'", '\Auth\SQLUser'); |
| 212 | 216 | } |
| 213 | 217 | |
| 218 | + /** |
|
| 219 | + * @param string $dataTableName |
|
| 220 | + */ |
|
| 214 | 221 | private function getDataByFilter($dataTableName, $filter, $select, $top, $skip, $orderby) |
| 215 | 222 | { |
| 216 | 223 | $dataTable = $this->getDataTable($dataTableName); |
@@ -276,6 +283,9 @@ discard block |
||
| 276 | 283 | return $dataTable->count(); |
| 277 | 284 | } |
| 278 | 285 | |
| 286 | + /** |
|
| 287 | + * @param \Data\Filter $filter |
|
| 288 | + */ |
|
| 279 | 289 | private function searchPendingUsers($filter, $select, $top, $skip, $orderby) |
| 280 | 290 | { |
| 281 | 291 | $userDataTable = $this->getPendingUserDataTable(); |
@@ -41,7 +41,10 @@ |
||
| 41 | 41 | { |
| 42 | 42 | $tmp = $this->routeSingle($dest, $rawMessage); |
| 43 | 43 | $ret[] = $tmp; |
| 44 | - if($tmp === false) $error = true; |
|
| 44 | + if($tmp === false) |
|
| 45 | + { |
|
| 46 | + $error = true; |
|
| 47 | + } |
|
| 45 | 48 | } |
| 46 | 49 | if($error === true) |
| 47 | 50 | { |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | |
| 32 | 32 | public function __isset($propName) |
| 33 | 33 | { |
| 34 | - return isset($this->block->{$propName}); |
|
| 34 | + return isset($this->block->{$propName}); |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | public function getHash() |