| @@ -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 | 
| @@ -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 | */ | 
| @@ -7,6 +7,9 @@ | ||
| 7 | 7 |  { | 
| 8 | 8 |      protected $types = array('xlsx', 'xls', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/vnd.ms-excel'); | 
| 9 | 9 | |
| 10 | + /** | |
| 11 | + * @param integer $row | |
| 12 | + */ | |
| 10 | 13 | protected function setRowFromArray(&$sheat, $row, $array, $count = 0) | 
| 11 | 14 |      { | 
| 12 | 15 | if($count === 0) | 
| @@ -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,8 @@ 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 | 252 |                error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); | 
| 252 | 253 | } | 
| 253 | 254 | return false; | 
| @@ -296,7 +297,8 @@ discard block | ||
| 296 | 297 | $sql = "INSERT INTO $tablename ($cols) VALUES ($set);"; | 
| 297 | 298 | if($this->pdo->exec($sql) === false) | 
| 298 | 299 |          { | 
| 299 | -            if (php_sapi_name() !== "cli") { | |
| 300 | + if (php_sapi_name() !== "cli") | |
| 301 | +            { | |
| 300 | 302 |                  error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); | 
| 301 | 303 | } | 
| 302 | 304 | return false; | 
| @@ -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 |      { | 
| @@ -300,7 +300,7 @@ discard block | ||
| 300 | 300 | /** | 
| 301 | 301 | * Search all the pending users | 
| 302 | 302 | * | 
| 303 | - * @param boolean|\Data\Filter $filter The filter to use while searching the table | |
| 303 | + * @param \Data\Filter $filter The filter to use while searching the table | |
| 304 | 304 | * @param boolean|array $select The array of properties to read | 
| 305 | 305 | * @param boolean|integer $top The number of records to read | 
| 306 | 306 | * @param boolean|integer $skip The number of records to skip | 
| @@ -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 | */ | 
| @@ -329,7 +329,7 @@ | ||
| 329 | 329 | } | 
| 330 | 330 | |
| 331 | 331 | /** | 
| 332 | - * @param boolean|\Data\Filter $filter The filter to user when reading users | |
| 332 | + * @param \Data\Filter $filter The filter to user when reading users | |
| 333 | 333 | * @param boolean|array $select The fields to return | 
| 334 | 334 | * @param boolean|integer $top The number of records to return | 
| 335 | 335 | * @param boolean|integer $skip The number of records to skip | 
| @@ -44,8 +44,14 @@ | ||
| 44 | 44 | return parent::getSubject(); | 
| 45 | 45 | } | 
| 46 | 46 | |
| 47 | + /** | |
| 48 | + * @return string | |
| 49 | + */ | |
| 47 | 50 | public abstract function getSubstituteVars(); | 
| 48 | 51 | |
| 52 | + /** | |
| 53 | + * @param boolean $html | |
| 54 | + */ | |
| 49 | 55 | protected function getRawBodyText($html) | 
| 50 | 56 |      { | 
| 51 | 57 | if(isset($this->dbData['body'])) |