From 3dec0d997b80a288693a7ecb486d646c5098869b Mon Sep 17 00:00:00 2001
From: Noud de Brouwer <noud4@home.nl>
Date: Thu, 10 Jan 2013 12:37:07 +0000
Subject: [PATCH] Behavior

Use settings, par-example, name a field to Import Blacklist.
---
 app/Model/Behavior/BlacklistBehavior.php | 6 ++----
 app/Model/Behavior/RegexpBehavior.php    | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/Model/Behavior/BlacklistBehavior.php b/app/Model/Behavior/BlacklistBehavior.php
index ab18fe578..07a628188 100755
--- a/app/Model/Behavior/BlacklistBehavior.php
+++ b/app/Model/Behavior/BlacklistBehavior.php
@@ -18,7 +18,6 @@ class BlacklistBehavior extends ModelBehavior {
 	public function setup(Model $Model, $settings = array()) {
 		if (!isset($this->settings[$Model->alias])) {
 			$this->settings[$Model->alias] = array(
-				'fields' => array(),
 			);
 		}
 		$this->settings[$Model->alias] = array_merge(
@@ -46,8 +45,7 @@ class BlacklistBehavior extends ModelBehavior {
 	public function blacklistStringFields(Model $Model) {
 		$returnValue = true;
 		foreach ($Model->data[$Model->name] as $key => $field) {
-			if ($returnValue && is_string($field)) {
-			//if ($returnValue && in_array($key, $this->settings[$Model->alias]['fields']) && is_string($field)) { // TODO fields
+			if ($returnValue && in_array($key, $this->settings[$Model->alias]['fields']) && is_string($field)) { // TODO fields
 				$returnValue = $this->replaceWindowsSpecific($Model, $field);
 			}
 		}
@@ -64,7 +62,7 @@ class BlacklistBehavior extends ModelBehavior {
 	public function replaceWindowsSpecific(Model $Model, $string) {
 		$returnValue = true;
 		$blacklist = new Blacklist();
-		$allBlacklist = $blacklist->find('all'); // TODO REGEXP INIT LOAD ARRAY
+		$allBlacklist = $blacklist->find('all'); // TODO INIT LOAD ARRAY
 		foreach ($allBlacklist as $item) {
 			if ($item['Blacklist']['name'] == $string) {
 				App::uses('SessionComponent', 'Controller/Component');
diff --git a/app/Model/Behavior/RegexpBehavior.php b/app/Model/Behavior/RegexpBehavior.php
index f1927dfa7..7c16f932b 100755
--- a/app/Model/Behavior/RegexpBehavior.php
+++ b/app/Model/Behavior/RegexpBehavior.php
@@ -66,7 +66,7 @@ class RegexpBehavior extends ModelBehavior {
 	public function replaceWindowsSpecific(Model $Model, $string) {
 		$returnValue = true;
 		$regexp = new Regexp();
-		$allRegexp = $regexp->find('all'); // TODO REGEXP INIT LOAD ARRAY
+		$allRegexp = $regexp->find('all'); // TODO INIT LOAD ARRAY
 		foreach ($allRegexp as $regexp) {
 			if (strlen($regexp['Regexp']['replacement'] && strlen($regexp['Regexp']['regexp']))) {
 				$string = preg_replace($regexp['Regexp']['regexp'], $regexp['Regexp']['replacement'], $string);