@@ -145,6 +145,9 @@ |
||
145 | 145 | } |
146 | 146 | } |
147 | 147 | |
148 | + /** |
|
149 | + * @param integer $active |
|
150 | + */ |
|
148 | 151 | public function setActive($active) |
149 | 152 | { |
150 | 153 | $this->active = $active; |
@@ -6,7 +6,6 @@ |
||
6 | 6 | |
7 | 7 | namespace Admin\Model; |
8 | 8 | use Phalcon\Validation; |
9 | -use Phalcon\Validation\Validator\Email as EmailValidator; |
|
10 | 9 | use Phalcon\Validation\Validator\Uniqueness as UniquenessValidator; |
11 | 10 | use stdClass; |
12 | 11 |
@@ -45,20 +45,20 @@ |
||
45 | 45 | public function validation() |
46 | 46 | { |
47 | 47 | |
48 | - $validator = new Validation(); |
|
49 | - $validator->add('login', new UniquenessValidator( |
|
50 | - [ |
|
51 | - "model" => $this, |
|
52 | - "message" => $this->getDi()->get('helper')->translate("The Login must be unique") |
|
53 | - ] |
|
54 | - )); |
|
55 | - $validator->add('email', new UniquenessValidator( |
|
56 | - [ |
|
57 | - "model" => $this, |
|
58 | - "message" => $this->getDi()->get('helper')->translate("The Email must be unique") |
|
59 | - ] |
|
60 | - )); |
|
61 | - return $this->validate($validator); |
|
48 | + $validator = new Validation(); |
|
49 | + $validator->add('login', new UniquenessValidator( |
|
50 | + [ |
|
51 | + "model" => $this, |
|
52 | + "message" => $this->getDi()->get('helper')->translate("The Login must be unique") |
|
53 | + ] |
|
54 | + )); |
|
55 | + $validator->add('email', new UniquenessValidator( |
|
56 | + [ |
|
57 | + "model" => $this, |
|
58 | + "message" => $this->getDi()->get('helper')->translate("The Email must be unique") |
|
59 | + ] |
|
60 | + )); |
|
61 | + return $this->validate($validator); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | public function getId() |
@@ -21,7 +21,8 @@ discard block |
||
21 | 21 | * |
22 | 22 | * @return string|false The hashed password, or false on error. |
23 | 23 | */ |
24 | - function password_hash($password, $algo, array $options = array()) { |
|
24 | + function password_hash($password, $algo, array $options = array()) |
|
25 | + { |
|
25 | 26 | if (!function_exists('crypt')) { |
26 | 27 | trigger_error("Crypt must be loaded for password_hash to function", E_USER_WARNING); |
27 | 28 | return null; |
@@ -149,7 +150,8 @@ discard block |
||
149 | 150 | * |
150 | 151 | * @return array The array of information about the hash. |
151 | 152 | */ |
152 | - function password_get_info($hash) { |
|
153 | + function password_get_info($hash) |
|
154 | + { |
|
153 | 155 | $return = array( |
154 | 156 | 'algo' => 0, |
155 | 157 | 'algoName' => 'unknown', |
@@ -175,7 +177,8 @@ discard block |
||
175 | 177 | * |
176 | 178 | * @return boolean True if the password needs to be rehashed. |
177 | 179 | */ |
178 | - function password_needs_rehash($hash, $algo, array $options = array()) { |
|
180 | + function password_needs_rehash($hash, $algo, array $options = array()) |
|
181 | + { |
|
179 | 182 | $info = password_get_info($hash); |
180 | 183 | if ($info['algo'] != $algo) { |
181 | 184 | return true; |
@@ -199,7 +202,8 @@ discard block |
||
199 | 202 | * |
200 | 203 | * @return boolean If the password matches the hash |
201 | 204 | */ |
202 | - function password_verify($password, $hash) { |
|
205 | + function password_verify($password, $hash) |
|
206 | + { |
|
203 | 207 | if (!function_exists('crypt')) { |
204 | 208 | trigger_error("Crypt must be loaded for password_verify to function", E_USER_WARNING); |
205 | 209 | return false; |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Page\Model; |
4 | 4 | |
5 | 5 | use Application\Mvc\Model\Model; |
6 | -use Phalcon\Validation; |
|
7 | 6 | use Phalcon\Validation\Validator\Uniqueness as UniquenessValidator; |
8 | 7 | use Application\Localization\Transliterator; |
9 | 8 |
@@ -54,13 +54,13 @@ |
||
54 | 54 | |
55 | 55 | public function validation() |
56 | 56 | { |
57 | - $validator->add('slug', new UniquenessValidator( |
|
58 | - [ |
|
59 | - "model" => $this, |
|
60 | - "message" => $this->getDi()->get('helper')->translate("Page with slug is already exists") |
|
61 | - ] |
|
62 | - )); |
|
63 | - return $this->validate($validator); |
|
57 | + $validator->add('slug', new UniquenessValidator( |
|
58 | + [ |
|
59 | + "model" => $this, |
|
60 | + "message" => $this->getDi()->get('helper')->translate("Page with slug is already exists") |
|
61 | + ] |
|
62 | + )); |
|
63 | + return $this->validate($validator); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | public static function findCachedBySlug($slug) |
@@ -252,6 +252,9 @@ |
||
252 | 252 | } |
253 | 253 | } |
254 | 254 | |
255 | + /** |
|
256 | + * @param integer $preview_inner |
|
257 | + */ |
|
255 | 258 | public function setPreviewInner($preview_inner) |
256 | 259 | { |
257 | 260 | $this->preview_inner = $preview_inner; |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Publication\Model; |
4 | 4 | |
5 | 5 | use Application\Mvc\Model\Model; |
6 | -use Phalcon\Validation; |
|
7 | 6 | use Phalcon\Validation\Validator\Uniqueness as UniquenessValidator; |
8 | 7 | use Application\Localization\Transliterator; |
9 | 8 |
@@ -62,13 +62,13 @@ |
||
62 | 62 | |
63 | 63 | public function validation() |
64 | 64 | { |
65 | - $validator->add('slug', new UniquenessValidator( |
|
66 | - [ |
|
67 | - "model" => $this, |
|
68 | - "message" => $this->getDi()->get('helper')->translate("Publishcation with slug is already exists") |
|
69 | - ] |
|
70 | - )); |
|
71 | - return $this->validate($validator); |
|
65 | + $validator->add('slug', new UniquenessValidator( |
|
66 | + [ |
|
67 | + "model" => $this, |
|
68 | + "message" => $this->getDi()->get('helper')->translate("Publishcation with slug is already exists") |
|
69 | + ] |
|
70 | + )); |
|
71 | + return $this->validate($validator); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | public function afterValidation() |