AdminPrefix設定配列化の対応

diff --git a/app/config/init.php b/app/config/init.php
index a114db3..06e70ac 100644 (file)
--- a/app/config/init.php
+++ b/app/config/init.php
@@ -18,7 +18,10 @@
  */
 // ベースパス
 Configure::write('Routing.basePath', array('controller' => 'users', 'action' => 'index'));
-Configure::write('Routing.adminBasePath', array('controller' => 'systems', 'action' => 'index', Configure::read('Routing.admin') => true, 'plugin' => null));
+
+$prefixs = Configure::read('Routing.prefixes');
+Configure::write('Routing.base_prefixes', $prefixs[0]);
+Configure::write('Routing.adminBasePath', array('controller' => 'systems', 'action' => 'index', Configure::read('Routing.base_prefixes') => true, 'plugin' => null));
 
 // ログインパス
 Configure::write('Routing.loginPath', array('controller' => 'users', 'action' => 'login'));

diff --git a/app/config/routes.php b/app/config/routes.php
index f276ea8..0a0c14b 100644 (file)
--- a/app/config/routes.php
+++ b/app/config/routes.php
@@ -33,10 +33,9 @@
 
 //     Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
        Router::connect('/', Configure::read('Routing.basePath'));
-       Router::connect('/'.Configure::read('Routing.admin'), Configure::read('Routing.adminBasePath'));
+       Router::connect('/'.Configure::read('Routing.base_prefixes'), Configure::read('Routing.adminBasePath'));
 
 /**
  * ...and connect the rest of 'Pages' controller's urls.
  */
 //     Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display'));
-

diff --git a/app/controllers/app_controller.php b/app/controllers/app_controller.php
index 6c049ae..97a3415 100644 (file)
--- a/app/controllers/app_controller.php
+++ b/app/controllers/app_controller.php
@@ -103,7 +103,7 @@ class AppController extends Controller
                $this->disableCache();
 
                if (isset($this->params['prefix'])) {
-                       if ($this->params['prefix'] == Configure::read('Routing.admin')) {
+                       if ($this->params['prefix'] == Configure::read('Routing.base_prefixes')) {
                                $this->isAdmin = true;
                                $this->layout = 'admin_'.$this->layout;
                        }

diff --git a/app/controllers/character_sheets_controller.php b/app/controllers/character_sheets_controller.php
index 75dd65d..4129351 100644 (file)
--- a/app/controllers/character_sheets_controller.php
+++ b/app/controllers/character_sheets_controller.php
@@ -111,7 +111,7 @@ class CharacterSheetsController extends AppController {
                        $view_link = Router::url(array(
                                'controller' => 'characters',
                                'action' => 'view',
-                               'prefix' => Configure::read('Routing.admin'),
+                               'prefix' => Configure::read('Routing.base_prefixes'),
                                $characterSheet['System']['Character'][0]['id'],
                                'mode:'. $characterSheet['CharacterSheet']['key_name']), true
                        );

diff --git a/app/controllers/components/auth_plus.php b/app/controllers/components/auth_plus.php
index e7b97d9..f2849e1 100644 (file)
--- a/app/controllers/components/auth_plus.php
+++ b/app/controllers/components/auth_plus.php
@@ -70,7 +70,7 @@ class AuthPlusComponent extends AuthComponent {
                        // 一般ユーザ
                        } elseif ($this->user('group_id') == Configure::read('Group.member')) {
                                if (isset($this->params['prefix']) 
-                                       && $this->params['prefix'] == Configure::read('Routing.admin')) {
+                                       && $this->params['prefix'] == Configure::read('Routing.base_prefixes')) {
                                        $valid = false;
                                } else {
                                        $valid = true;

diff --git a/app/controllers/components/member_auth.php b/app/controllers/components/member_auth.php
index f2e2e43..44bce8c 100644 (file)
--- a/app/controllers/components/member_auth.php
+++ b/app/controllers/components/member_auth.php
@@ -35,7 +35,7 @@ class MemberAuthComponent extends AuthComponent {
                parent::initialize($controller);
 
                // 管理画面と一般ユーザ識別
-               if (isset($controller->params["prefix"]) && $controller->params["prefix"] == Configure::read('Routing.admin')) {
+               if (isset($controller->params["prefix"]) && $controller->params["prefix"] == Configure::read('Routing.base_prefixes')) {
                        $this->isAdmin = true;
                }