SiteSettingsの変数名変更

diff --git a/app/controllers/app_controller.php b/app/controllers/app_controller.php
index 7d70da4..9c7e41d 100644 (file)
--- a/app/controllers/app_controller.php
+++ b/app/controllers/app_controller.php
@@ -25,7 +25,7 @@ class AppController extends Controller
        var $isAdmin = false;
        var $isMobile = false;
 
-       var $set_settings = array();
+       var $site_configs = array();
 
        var $components = array(
                'AuthPlus',
@@ -117,8 +117,8 @@ class AppController extends Controller
                $this->set('admin', $this->isAdmin);
 
                // サイト設定
-               $this->set_settings = CorePlus::set_db_settings();
-               $this->set('site_configs', $this->set_settings);
+               $this->site_configs = CorePlus::set_db_settings();
+               $this->set('site_configs', $this->site_configs);
 
                if ($this->AuthPlus) {
                        // ACL関連
@@ -453,7 +453,7 @@ class AppController extends Controller
 
        function check_character_picture_max($character_pictures_num)
        {
-               if (!$max_num = intval($this->set_settings['Character.maxPictures']['value'])) {
+               if (!$max_num = intval($this->site_configs['Character.maxPictures']['value'])) {
                        return true;
                }
 

diff --git a/app/controllers/site_configs_controller.php b/app/controllers/site_configs_controller.php
index 5604659..a6a2a2c 100644 (file)
--- a/app/controllers/site_configs_controller.php
+++ b/app/controllers/site_configs_controller.php
@@ -65,7 +65,7 @@ class SiteConfigsController extends AppController {
                }
 
                if (empty($this->data)) {
-                       $site_config = $this->set_settings;
+                       $site_config = $this->site_configs;
                        foreach($site_config as $k => $v) {
                                $site_config[$k] = $this->_restore_html_site_config($v);
                        }

diff --git a/app/controllers/systems_controller.php b/app/controllers/systems_controller.php
index caa0526..c192227 100644 (file)
--- a/app/controllers/systems_controller.php
+++ b/app/controllers/systems_controller.php
@@ -56,7 +56,7 @@ class SystemsController extends AppController {
 
        function index() {
                // SingleSystem
-               if ($this->set_settings['Site.singleSystem']['value']) {
+               if ($this->site_configs['Site.singleSystem']['value']) {
                        $this->Session->setFlash(__('Invalid URL.', true));
                        $this->redirect(array('controller'=>'users', 'action'=>'index'));
                }
@@ -149,7 +149,7 @@ class SystemsController extends AppController {
 
        function admin_delete($id = null) {
                // SingleSystem
-               if ($this->set_settings['Site.singleSystem']['value']) {
+               if ($this->site_configs['Site.singleSystem']['value']) {
                        $this->Session->setFlash(__('Invalid URL.', true));
                        $this->redirect(array('controller'=>'site_configs', 'action'=>'admin_edit'));
                }

diff --git a/app/controllers/users_controller.php b/app/controllers/users_controller.php
index 14a6d9b..6d44a68 100644 (file)
--- a/app/controllers/users_controller.php
+++ b/app/controllers/users_controller.php
@@ -104,7 +104,7 @@ class UsersController extends ModuleController {
 
        function add() {
                // 新規登録停止
-               if (!$this->set_settings['Site.newUserRegist']['value']) {
+               if (!$this->site_configs['Site.newUserRegist']['value']) {
                        $this->Session->setFlash(__('NO AVAILABLE NOW.', true));
                        $this->redirect(array('action'=>'index'));
                }