From 6ce760ba2e69f829d865bfd2b30ac45616c11e69 Mon Sep 17 00:00:00 2001 From: Cake Date: Wed, 7 Jul 2010 19:52:21 +0900 Subject: [PATCH 1/1] =?utf8?q?Revert=20"=E5=9F=BA=E6=9C=AC=E3=81=AE?= =?utf8?q?=E3=83=93=E3=83=A5=E3=83=BC=E3=82=AD=E3=83=A3=E3=83=83=E3=82=B7?= =?utf8?q?=E3=83=A5=E5=B0=8E=E5=85=A5"?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit 2031ec6d570b074fd4122cefaa09f4ae7419729d. --- app/config/conf/config.php | 16 ------------- app/config/core.php | 4 ++-- app/config/init.php | 1 + app/controllers/app_controller.php | 1 - app/controllers/characters_controller.php | 9 +------ app/controllers/users_controller.php | 6 ----- app/views/elements/pc_mainnav.ctp | 23 ------------------ app/views/layouts/default.ctp | 39 +++++++++++++++++++++++-------- 8 files changed, 33 insertions(+), 66 deletions(-) delete mode 100644 app/views/elements/pc_mainnav.ctp diff --git a/app/config/conf/config.php b/app/config/conf/config.php index 1fdfebf..2efeeef 100644 --- a/app/config/conf/config.php +++ b/app/config/conf/config.php @@ -16,22 +16,6 @@ Configure::write('User.Password.Length', array('min' => 4, 'max' => 12) ); -/* - * キャッシュ - */ -// キャッシュの最大有効期限(秒) -Configure::write('Cache.expire', 7 * 24 * 3600); -// キャッシュを作成しない(常に最新の情報を表示しますが、動作が遅くなる場合があります) -Configure::write('Cache.disable', false); -// キャッシュの詳細設定 -Cache::config('default', array( - 'engine' => 'File', //保存方法 - 'duration'=> Configure::read('Cache.expire'), - 'probability'=> 100, // 期限切れキャッシュの更新率 - 'path' => CACHE, // Fileの保存パス - 'prefix' => 'cake_', - 'serialize' => true, -)); /* * 使用言語(Language) diff --git a/app/config/core.php b/app/config/core.php index 95a523d..94e5e89 100644 --- a/app/config/core.php +++ b/app/config/core.php @@ -38,7 +38,7 @@ * In production mode, flash messages redirect after a time interval. * In development mode, you need to click the flash message to continue. */ - Configure::write('debug', 0); + Configure::write('debug', 2); /** * Application wide charset encoding */ @@ -80,7 +80,7 @@ * or in each action using $this->cacheAction = true. * */ - Configure::write('Cache.check', true); + //Configure::write('Cache.check', true); /** * Defines the default error type when using the log() function. Used for * differentiating error logging and debugging. Currently PHP supports LOG_DEBUG. diff --git a/app/config/init.php b/app/config/init.php index ca0c9f0..9c7b8b8 100644 --- a/app/config/init.php +++ b/app/config/init.php @@ -40,6 +40,7 @@ Configure::write('Qdmailer', array( )); /* Benchmarkコンポーネント使用 */ +// guest UserIDでの操作制限 define('BENCHMARK_MODE', true); /* デモモード */ diff --git a/app/controllers/app_controller.php b/app/controllers/app_controller.php index d4e33ec..270fbc7 100644 --- a/app/controllers/app_controller.php +++ b/app/controllers/app_controller.php @@ -43,7 +43,6 @@ class AppController extends Controller 'Javascript', 'Text', 'Time', - 'Cache', 'Settings', 'Media.Medium', 'Media.Upfile', diff --git a/app/controllers/characters_controller.php b/app/controllers/characters_controller.php index a1976a4..a6d7021 100644 --- a/app/controllers/characters_controller.php +++ b/app/controllers/characters_controller.php @@ -8,8 +8,6 @@ class CharactersController extends AppController { 'Profiledisp', ); - var $cacheAction = array(); - /* テーマ */ var $view = 'View'; var $theme = null; @@ -28,13 +26,8 @@ class CharactersController extends AppController { /* メソッド */ function beforeFilter() { - parent::beforeFilter(); - // Cache - $this->cacheAction = array( - 'index' => Configure::read('Cache.expire'), - 'view/' => Configure::read('Cache.expire') - ); + parent::beforeFilter(); // 認証なしアクセス可 $this->AuthPlus->allow('view'); diff --git a/app/controllers/users_controller.php b/app/controllers/users_controller.php index 5f93634..b52e552 100644 --- a/app/controllers/users_controller.php +++ b/app/controllers/users_controller.php @@ -15,7 +15,6 @@ class UsersController extends ModuleController { /* ACL */ // 追加アクション用 crudMap var $actionMapPlus = array( - 'get_user' => 'read', 'listview' => 'read', 'change_password' => 'update', 'edit_image' => 'update', @@ -49,7 +48,6 @@ class UsersController extends ModuleController { parent::beforeFilter(); // 認証なしアクセス可 - $this->AuthPlus->allow('get_user'); $this->AuthPlus->allow('index'); $this->AuthPlus->allow('view'); $this->AuthPlus->allow('add'); @@ -61,10 +59,6 @@ class UsersController extends ModuleController { } /* PC */ - function get_user() { - return $this->user; - } - function login() { // 現在のセッション削除 $this->AuthPlus->deleteAuth(); diff --git a/app/views/elements/pc_mainnav.ctp b/app/views/elements/pc_mainnav.ctp deleted file mode 100644 index 60b0652..0000000 --- a/app/views/elements/pc_mainnav.ctp +++ /dev/null @@ -1,23 +0,0 @@ - -
  • link(__('Home', true), Configure::read('Routing.basePath')); ?> - -
  • link(__('Characters', true), array('controller' => 'characters', 'action' => 'index')); ?>
    • - - -
  • link(__('Systems', true), array('controller' => 'systems', 'action' => 'index')); ?>
    • - - -
  • link(__('Users', true), array('controller' => 'users', 'action' => 'listview')); ?>
    • - - - -
  • link(__('Configuration', true), array('controller' => 'users', 'action' => 'edit', $user['User']['id'])); ?> - - -
  • - -link(__('Logout', true), array('controller' => 'users', 'action' => 'logout')); ?> - -link(__('Login', true), array('controller' => 'users', 'action' => 'login')); ?> - -
    • diff --git a/app/views/layouts/default.ctp b/app/views/layouts/default.ctp index c25d359..6f976de 100644 --- a/app/views/layouts/default.ctp +++ b/app/views/layouts/default.ctp @@ -62,7 +62,11 @@ echo $site_configs['Design.customCss']['value'];
    +flash('auth'); ?> +flash(); ?> + + +