0e96e5b2 by Marty Penner

Promoting r258 to live. refs #1256

1 parent 2d3e57c6
...@@ -27,7 +27,7 @@ const OPTION_NAME = 'tz_auth'; // Database lookup key (`wp_options`.`option_name ...@@ -27,7 +27,7 @@ const OPTION_NAME = 'tz_auth'; // Database lookup key (`wp_options`.`option_name
27 if (empty($wpdb->signups)) { 27 if (empty($wpdb->signups)) {
28 $wpdb->signups = $wpdb->prefix . 'signups'; 28 $wpdb->signups = $wpdb->prefix . 'signups';
29 } 29 }
30 30 //die(var_dump(wp_hash_password('a ')));
31 Vars::$options = new Tools\WP_Option(OPTION_NAME); 31 Vars::$options = new Tools\WP_Option(OPTION_NAME);
32 32
33 if (is_admin()) { 33 if (is_admin()) {
...@@ -137,7 +137,7 @@ function register($username, $email, $password, $meta = Array()) { ...@@ -137,7 +137,7 @@ function register($username, $email, $password, $meta = Array()) {
137 * for whatever reason. 137 * for whatever reason.
138 */ 138 */
139 $wpdb->query("DELETE FROM {$wpdb->signups} WHERE user_email='$email' AND active=0"); 139 $wpdb->query("DELETE FROM {$wpdb->signups} WHERE user_email='$email' AND active=0");
140 140
141 $user_data = Array( 141 $user_data = Array(
142 'username' => $username 142 'username' => $username
143 , 'password' => $password 143 , 'password' => $password
...@@ -255,12 +255,17 @@ class Validation extends Common\Validation { ...@@ -255,12 +255,17 @@ class Validation extends Common\Validation {
255 255
256 /** 256 /**
257 * @rule Not blank 257 * @rule Not blank
258 * @returns Boolean 258 * @rule No spaces
259 * @returns Boolean
259 */ 260 */
260 protected function password($val) { 261 protected function password($val) {
261 if (empty($val)) { 262 if (empty($val)) {
262 throw new Exception('<li>Password can not be blank</li>'); 263 throw new Exception('<li>Password can not be blank</li>');
263 } 264 }
265
266 if (false !== strpos($val, ' ')) {
267 throw new Exception('<li>Password can not contain spaces</li>');
268 }
264 } 269 }
265 270
266 /** 271 /**
......