Commit 326e7006 authored by bcosca's avatar bcosca
Browse files

Make all error invocations consistent

parent dc603b15

base.php

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ final class Base { 
			$this->sync('SESSION');

		}

		elseif (!preg_match('/^\w+$/',$parts[0]))

			trigger_error(sprintf(self::E_Hive,$this->stringify($key)));

			user_error(sprintf(self::E_Hive,$this->stringify($key)));

		if ($add)

			$var=&$this->hive;

		else

bcrypt.php

+2 −2
Original line number Diff line number Diff line
@@ -35,11 +35,11 @@ class Bcrypt extends Prefab { 
	**/

	function hash($pw,$salt=NULL,$cost=self::COST) {

		if ($cost<4 || $cost>31)

			trigger_error(self::E_Cost);

			user_error(self::E_Cost);

		$len=22;

		if ($salt) {

			if (!preg_match('/^[[:alnum:]\.\/]{'.$len.',}$/',$salt))

				trigger_error(self::E_Salt);

				user_error(self::E_Salt);

		}

		else {

			$raw=16;