cleanup

src/Model/Behavior/PasswordableBehavior.php

@@ -28,18 +28,15 @@ if (!defined('PWD_MAX_LENGTH')) {
  * $this->Users->addBehavior('Tools.Passwordable', array(SETTINGSARRAY));
  * as first line in any action where you want to allow the user to change his password
  * also add the two form fields in the form (pwd, PWD_confirm)
- * the rest is cake automagic :)
+ * the rest is CakePHP automagic :)
  *
  * Also note that you can apply global settings via Configure key 'Passwordable', as well,
  * if you don't want to manually pass them along each time you use the behavior. This also
  * keeps the code clean and lean.
  *
- * Now also is capable of:
+ * Also capable of:
  * - Require current password prior to altering it (current=>true)
  * - Don't allow the same password it was before (allowSame=>false)
- * - Support different auth types and password hashing algorythms
- * - PasswordHasher support
- * - Tools.Modern PasswordHasher and password_hash()/password_verify() support
  *
  * @author Mark Scherer
  * @link http://www.dereuromark.de/2011/08/25/working-with-passwords-in-cakephp
@@ -325,7 +322,7 @@ class PasswordableBehavior extends Behavior {
 	}
 
 	/**
-	 * If not implemented in AppModel
+	 * If not implemented in Table class
 	 *
 	 * Note: requires the used Auth component to be App::uses() loaded.
 	 * It also reqires the same Auth setup as in your AppController's beforeFilter().
@@ -355,7 +352,7 @@ class PasswordableBehavior extends Behavior {
 	}
 
 	/**
-	 * If not implemented in AppModel
+	 * If not implemented in Table class
 	 *
 	 * @param Model $Model
 	 * @param array $data
@@ -372,7 +369,7 @@ class PasswordableBehavior extends Behavior {
 	}
 
 	/**
-	 * If not implemented in AppModel
+	 * If not implemented in Table class
 	 *
 	 * @return bool Success
 	 */
@@ -387,7 +384,7 @@ class PasswordableBehavior extends Behavior {
 	}
 
 	/**
-	 * If not implemented in AppModel
+	 * If not implemented in Table class
 	 *
 	 * @return bool Success
 	 */

src/Model/Behavior/ResetBehavior.php

@@ -87,7 +87,6 @@ class ResetBehavior extends Behavior {
 			'fields' => array(),
 			'order' => $this->_table->alias() . '.' . $this->_table->primaryKey() . ' ASC',
 			'conditions' => $this->_config['scope'],
-			//'recursive' => $this->_config['recursive'],
 		);
 		if (!empty($this->_config['fields'])) {
 			foreach ((array)$this->_config['fields'] as $field) {

src/Model/Behavior/SluggedBehavior.php

@@ -107,7 +107,7 @@ class SluggedBehavior extends Behavior {
 	 */
 	public function initialize(array $config) {
 		if ($this->_config['length'] === null) {
-			$length = $table->schema()->column($this->_config['field'])['length'];
+			$length = $this->_table->schema()->column($this->_config['field'])['length'];
 			$this->_config['length'] = $length ?: 0;
 		}
 	}
@@ -353,45 +353,43 @@ class SluggedBehavior extends Behavior {
 	 * Regenerate all slugs. On large dbs this can take more than 30 seconds - a time
 	 * limit is set to allow a minimum 100 updates per second as a preventative measure.
 	 *
-	 * @param AppModel $Model
+	 * Note that you should use the Reset behavior if you need additional functionality such
+	 * as callbacks or timeouts.
+	 *
 	 * @param array $conditions
-	 * @param integer $recursive
-	 * @return boolean Success
+	 * @return bool Success
 	 */
 	public function resetSlugs($params = array()) {
-		$recursive = -1;
-		extract($this->_config);
-		if (!$Model->hasField($slugField)) {
-			return false;
+		if (!$this->_table->hasField($this->_config['slugField'])) {
+			throw new \Exception('Table does not have field ' . $this->_config['slugField']);
 		}
 		$defaults = array(
 			'page' => 1,
 			'limit' => 100,
-			'fields' => array_merge(array($this->_table->primaryKey()), $label),
-			'order' => $Model->displayField . ' ASC',
-			'conditions' => $scope,
-			'recursive' => $recursive,
+			'fields' => array_merge(array($this->_table->primaryKey()), $this->_config['label']),
+			'order' => $this->_table->displayField() . ' ASC',
+			'conditions' => $this->_config['scope'],
 			'overwrite' => true,
 		);
 		$params = array_merge($defaults, $params);
-		$count = $Model->find('count', compact('conditions'));
+		$count = $this->_table->find('count', compact('conditions'));
 		$max = ini_get('max_execution_time');
 		if ($max) {
 			set_time_limit(max($max, $count / 100));
 		}
 
-		$settings = $Model->Behaviors->Slugged->settings[$this->_table->alias()];
-		$Model->Behaviors->load('Tools.Slugged', $params + $settings);
+		$config = $this->_table->behaviors()->Slugged->config();
+		$this->_table->addBehavior('Tools.Slugged', $params + $config);
 
-		while ($rows = $Model->find('all', $params)) {
-			foreach ($rows as $row) {
-				$Model->create();
+		while (($records = $this->_table->find('all', $params)->toArray())) {
+			foreach ($records as $record) {
+				//$Model->create();
 				$options = array(
 					'validate' => true,
-					'fieldList' => array_merge(array($this->_table->primaryKey(), $slugField), $label)
+					'fieldList' => array_merge(array($this->_table->primaryKey(), $this->_config['slugField']), $this->_config['label'])
 				);
-				if (!$Model->save($row, $options)) {
-					throw new \Exception(print_r($row[$this->_table->alias()], true) . ': ' . print_r($Model->validationErrors, true));
+				if (!$Model->save($record, $options)) {
+					throw new \Exception(print_r($this->_table->errors(), true));
 				}
 			}
 			$params['page']++;