@@ -90,7 +90,7 @@ |
||
| 90 | 90 | * We need the ability to obtain the user's unhashed plain text password to allow for it to be sent |
| 91 | 91 | * to the correct backend which will hash it |
| 92 | 92 | * |
| 93 | - * @return boolean|string The current password |
|
| 93 | + * @return boolean The current password |
|
| 94 | 94 | */ |
| 95 | 95 | public function getPassword() |
| 96 | 96 | { |
@@ -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 |
@@ -22,6 +22,9 @@ discard block |
||
| 22 | 22 | $this->ldapObj = $this->initializeFromArray($data); |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | + /** |
|
| 26 | + * @param string $dn |
|
| 27 | + */ |
|
| 25 | 28 | private function initializeFromDN($dn) |
| 26 | 29 | { |
| 27 | 30 | $filter = new \Data\Filter("dn eq $dn"); |
@@ -93,7 +96,7 @@ discard block |
||
| 93 | 96 | * |
| 94 | 97 | * @param string $fieldName The name of the field to retrieve |
| 95 | 98 | * |
| 96 | - * @return mixed string the value of the field |
|
| 99 | + * @return string string the value of the field |
|
| 97 | 100 | */ |
| 98 | 101 | protected function getFieldSingleValue($fieldName) |
| 99 | 102 | { |
@@ -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); |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | /** |
| 141 | 141 | * Return an instance to the \LDAP\LDAPServer object instance |
| 142 | 142 | * |
| 143 | - * @param boolean $bind_write Should we be able to write to the server? |
|
| 143 | + * @param boolean $bindWrite Should we be able to write to the server? |
|
| 144 | 144 | * |
| 145 | 145 | * @return \LDAP\LDAPServer|false The server instance if the binding was successful, otherwise false |
| 146 | 146 | * |
@@ -219,7 +219,7 @@ discard block |
||
| 219 | 219 | * |
| 220 | 220 | * @param \stdClass $data The AuthData from the session |
| 221 | 221 | * |
| 222 | - * @return null|\Auth\LDAPUser The LDAPUser represented by this data |
|
| 222 | + * @return LDAPUser The LDAPUser represented by this data |
|
| 223 | 223 | */ |
| 224 | 224 | public function getUser($data) |
| 225 | 225 | { |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | |
| 317 | 317 | |
| 318 | 318 | /** |
| 319 | - * @param boolean|\Data\Filter $filter The filter to user when reading users |
|
| 319 | + * @param \Data\Filter $filter The filter to user when reading users |
|
| 320 | 320 | * @param boolean|array $select The fields to return |
| 321 | 321 | * @param boolean|integer $top The number of records to return |
| 322 | 322 | * @param boolean|integer $skip The number of records to skip |
@@ -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'", '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(); |
@@ -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 | */ |
@@ -116,6 +116,10 @@ discard block |
||
| 116 | 116 | return $sql; |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | + /** |
|
| 120 | + * @param boolean|string $count |
|
| 121 | + * @param boolean|string $skip |
|
| 122 | + */ |
|
| 119 | 123 | private function getLimitClause($count, $skip) |
| 120 | 124 | { |
| 121 | 125 | if($count === false) |
@@ -139,7 +143,7 @@ discard block |
||
| 139 | 143 | * @param string $select The colums to read |
| 140 | 144 | * @param boolean|string $count The number of rows to read |
| 141 | 145 | * @param boolean|string $skip The number of rows to skip over |
| 142 | - * @param boolean|array $sort The array to sort by or false to not sort |
|
| 146 | + * @param boolean $sort The array to sort by or false to not sort |
|
| 143 | 147 | * |
| 144 | 148 | * @return false|array An array of all the returned records |
| 145 | 149 | */ |
@@ -177,6 +181,9 @@ discard block |
||
| 177 | 181 | return $ret; |
| 178 | 182 | } |
| 179 | 183 | |
| 184 | + /** |
|
| 185 | + * @param string $tablename |
|
| 186 | + */ |
|
| 180 | 187 | function update($tablename, $where, $data) |
| 181 | 188 | { |
| 182 | 189 | $set = array(); |
@@ -199,6 +206,9 @@ discard block |
||
| 199 | 206 | return true; |
| 200 | 207 | } |
| 201 | 208 | |
| 209 | + /** |
|
| 210 | + * @param string $tablename |
|
| 211 | + */ |
|
| 202 | 212 | function create($tablename, $data) |
| 203 | 213 | { |
| 204 | 214 | $set = array(); |
@@ -222,6 +232,9 @@ discard block |
||
| 222 | 232 | return true; |
| 223 | 233 | } |
| 224 | 234 | |
| 235 | + /** |
|
| 236 | + * @param string $tablename |
|
| 237 | + */ |
|
| 225 | 238 | function delete($tablename, $where) |
| 226 | 239 | { |
| 227 | 240 | $sql = "DELETE FROM $tablename WHERE $where"; |
@@ -6,7 +6,7 @@ discard block |
||
| 6 | 6 | /** |
| 7 | 7 | * Get the Group's Name |
| 8 | 8 | * |
| 9 | - * @return boolean|string The name of the group or false on error |
|
| 9 | + * @return boolean The name of the group or false on error |
|
| 10 | 10 | */ |
| 11 | 11 | public function getGroupName() |
| 12 | 12 | { |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | /** |
| 17 | 17 | * Get the Group's Description |
| 18 | 18 | * |
| 19 | - * @return boolean|string The description of the group or false on error |
|
| 19 | + * @return boolean The description of the group or false on error |
|
| 20 | 20 | */ |
| 21 | 21 | public function getDescription() |
| 22 | 22 | { |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | * @param string $name The name of the group to get |
| 155 | 155 | * @param mixed $data The data used to help get the Group |
| 156 | 156 | * |
| 157 | - * @return boolean|\Auth\Group The group with the specified name or false otherwise |
|
| 157 | + * @return boolean The group with the specified name or false otherwise |
|
| 158 | 158 | */ |
| 159 | 159 | public static function from_name($name, $data = false) |
| 160 | 160 | { |