diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-12-29 17:55:00 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-12-29 17:55:00 +0100 |
| commit | 8383d1f1d3b5f3ac12248920f7cf79d8aa6399fc (patch) | |
| tree | 3ae94bfea0fc1ec44f49ebe1189d9e7983c58e60 /phpBB/phpbb/passwords/driver/salted_md5.php | |
| parent | 141bef75cb924644191c90bd722a250ef60099b7 (diff) | |
| download | forums-8383d1f1d3b5f3ac12248920f7cf79d8aa6399fc.tar forums-8383d1f1d3b5f3ac12248920f7cf79d8aa6399fc.tar.gz forums-8383d1f1d3b5f3ac12248920f7cf79d8aa6399fc.tar.bz2 forums-8383d1f1d3b5f3ac12248920f7cf79d8aa6399fc.tar.xz forums-8383d1f1d3b5f3ac12248920f7cf79d8aa6399fc.zip | |
[feature/passwords] Add missing documentation to docblocks
Also contains some minor spacing changes.
PHPBB3-11610
Diffstat (limited to 'phpBB/phpbb/passwords/driver/salted_md5.php')
| -rw-r--r-- | phpBB/phpbb/passwords/driver/salted_md5.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/phpbb/passwords/driver/salted_md5.php b/phpBB/phpbb/passwords/driver/salted_md5.php index 72db8d200f..5c72726422 100644 --- a/phpBB/phpbb/passwords/driver/salted_md5.php +++ b/phpBB/phpbb/passwords/driver/salted_md5.php @@ -122,8 +122,11 @@ class salted_md5 extends base /** * Get hash settings * - * @return array Array containing the count_log2, salt, and full hash - * settings string + * @param string $hash The hash that contains the settings + * + * @return bool|array Array containing the count_log2, salt, and full + * hash settings string or false if supplied hash is empty + * or contains incorrect settings */ public function get_hash_settings($hash) { @@ -131,6 +134,7 @@ class salted_md5 extends base { return false; } + $count_log2 = strpos($this->helper->itoa64, $hash[3]); $salt = substr($hash, 4, 8); |