dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fixing minor improvements

Browse Source
This commit is contained in:
exodus4d
2015-07-31 15:54:10 +02:00
parent 9826be3275
commit 65cbc9440f
377 changed files with 6077 additions and 3136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/lib/bcrypt.php
View File

@@ -10,7 +10,13 @@
terms of the GNU General Public License as published by the Free Software
Foundation, either version 3 of the License, or later.
Please see the LICENSE file for more information.
Fat-Free Framework is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License along
with Fat-Free Framework. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -36,11 +42,11 @@ class Bcrypt extends Prefab {
**/
function hash($pw,$salt=NULL,$cost=self::COST) {
if ($cost<4 || $cost>31)
user_error(self::E_CostArg);
user_error(self::E_CostArg,E_USER_ERROR);
$len=22;
if ($salt) {
if (!preg_match('/^[[:alnum:]\.\/]{'.$len.',}$/',$salt))
user_error(self::E_SaltArg);
user_error(self::E_SaltArg,E_USER_ERROR);
}
else {
$raw=16;