\nのunescape対応

diff --git a/app/controllers/app_controller.php b/app/controllers/app_controller.php
index f1f9507..ca1be58 100644 (file)
--- a/app/controllers/app_controller.php
+++ b/app/controllers/app_controller.php
@@ -30,6 +30,7 @@ class AppController extends Controller
                'AuthPlus',
                'Acl',
                'DebugKit.Toolbar',
+               'Cakeplus.HtmlEscape',
                'Token'
        );
 

diff --git a/app/models/app_model.php b/app/models/app_model.php
index 958bf57..51d45d1 100644 (file)
--- a/app/models/app_model.php
+++ b/app/models/app_model.php
@@ -53,6 +53,10 @@ class AppModel extends Model {
 
        function beforeSave($options = array())
        {
+               // $fieldsの設定でSanitize
+               foreach($this->data[$this->name] as $field => $value) {
+                       $this->data[$this->name][$field]  = $this->escapeByFields($field, $value);
+               }
                // Sanitize(不正コード、SQL Injection)
                $this->data = Sanitize::clean(
                        $this->data,

diff --git a/app/models/user.php b/app/models/user.php
index 94ea677..1367e6a 100644 (file)
--- a/app/models/user.php
+++ b/app/models/user.php
@@ -4,6 +4,9 @@ class User extends AppModel {
        var $name = 'User';
        var $belongsTo = array('Group');
        var $actsAs = array(
+               'Cakeplus.ValidationErrorI18n',
+               'Cakeplus.AddValidationRule',
+               'SanitizePlus',
                'Acl' => 'requester', // ARO自動登録用
                'Containable',
        );
@@ -116,12 +119,6 @@ class User extends AppModel {
        }
        function beforeSave($options = array())
        {
-
-               // $fieldsの設定でSanitize
-               foreach($this->data['User'] as $field => $value) {
-                       $this->data['User'][$field]  = $this->escapeByFields($field, $value);
-               }
-
                return parent::beforeSave($options);
        }