CharactersHasProfilesの改行など修正

diff --git a/app/controllers/characters_controller.php b/app/controllers/characters_controller.php
index 752abf3..0088a0e 100644 (file)
--- a/app/controllers/characters_controller.php
+++ b/app/controllers/characters_controller.php
@@ -697,19 +697,28 @@ class CharactersController extends AppController {
                        if (!empty($character_id)) {
                                $characters_has_profiles[$k]['character_id'] = $character_id;
                        }
-
                        // 配列valueの処理
                        if (is_array($v['value'])) {
                                $characters_has_profiles[$k]['value'] = $v['value'][0];
                        }
 
+                       // データ処理
+                       $characters_has_profiles[$k]['value'] = Sanitize::html($characters_has_profiles[$k]['value']);
+                       // textarea改行処理
+                       if (isset($v['is_textarea']) && $v['is_textarea'] == 1) {
+                               $characters_has_profiles[$k]['value'] = Sanitize::stripImages($characters_has_profiles[$k]['value']);
+                               $characters_has_profiles[$k]['value'] = Sanitize::stripScripts($characters_has_profiles[$k]['value']);
+                       } else {
+                               $characters_has_profiles[$k]['value'] = Sanitize::stripAll($characters_has_profiles[$k]['value']);
+                       }
+
                        // 空の値処理
                        // table: 一時保管して全項目空の場合行削除
                        if (CorePlus::is_valid($v, 'profile_table_id')) {
                                if (isset($profileTable_tmp[$v['profile_id']][$i][$v['profile_table_id']])) {
                                        $i++;
                                }
-                               $profileTable_tmp[$v['profile_id']][$i][$v['profile_table_id']] = array($v, $k);
+                               $profileTable_tmp[$v['profile_id']][$i][$v['profile_table_id']] = array($characters_has_profiles[$k], $k);
                        // それ以外は削除
                        } elseif (empty($v['value'])) {
                                        unset($characters_has_profiles[$k]);

diff --git a/app/models/characters_has_profile.php b/app/models/characters_has_profile.php
index 81c1fd3..ea36941 100644 (file)
--- a/app/models/characters_has_profile.php
+++ b/app/models/characters_has_profile.php
@@ -6,10 +6,6 @@ class CharactersHasProfile extends AppModel {
        var $fields = array(
                'add' => array('character_id', 'profile_id', 'profile_select_id', 'profile_table_id', 'profile_table_static_id', 'value', 'public_flag', 'link_value'),
                'escape' => array(
-                       'value' => array(
-                               'html' => true,
-                               'all' => true, 
-                       ),
                ),
        );