configファイルの整理

diff --git a/app/config/bootstrap.php b/app/config/bootstrap.php
index ae0abd0..4f1f953 100644 (file)
--- a/app/config/bootstrap.php
+++ b/app/config/bootstrap.php
@@ -43,7 +43,7 @@
 //EOF
 
 require_once ('init.php');
-require_once ('config.php');
+require_once ('conf/config.php');
 
 /* media plugin */
 require_once(APP.'plugins'.DS.'media'.DS.'config'.DS.'core.php');

diff --git a/app/config/config.php b/app/config/conf/config.php
similarity index 100%
rename from app/config/config.php
rename to app/config/conf/config.php

diff --git a/app/config/session_custom.php b/app/config/session_custom.php
deleted file mode 100644 (file)
index 168127d..0000000
--- a/app/config/session_custom.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/* Database保管前提 */
-/* セッション期限:ブラウザを閉じるまで */
-
-if (empty($_SESSION)) {
-       if (Configure::read('Session.table') === null) {
-               trigger_error(__("You must set the all Configure::write('Session.*') in core.php to use database storage"), E_USER_WARNING);
-               exit();
-       } elseif (Configure::read('Session.database') === null) {
-               Configure::write('Session.database', 'default');
-       }
-       if ($iniSet) {
-               ini_set('session.use_trans_sid', 0);
-               ini_set('url_rewriter.tags', '');
-               ini_set('session.save_handler', 'user');
-               ini_set('session.serialize_handler', 'php');
-               ini_set('session.use_cookies', 1);
-               ini_set('session.name', Configure::read('Session.cookie'));
-               ini_set('session.cookie_lifetime', 0); // cake/lib/session.phpから変更
-               ini_set('session.cookie_path', $this->path);
-               ini_set('session.auto_start', 0);
-       }
-}
-session_set_save_handler(array('CakeSession','__open'),
-                       array('CakeSession', '__close'),
-                       array('CakeSession', '__read'),
-                       array('CakeSession', '__write'),
-                       array('CakeSession', '__destroy'),
-                       array('CakeSession', '__gc')
-);

diff --git a/app/config/session_m_custom.php b/app/config/session_m_custom.php
deleted file mode 100644 (file)
index cb7b220..0000000
--- a/app/config/session_m_custom.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/* Database保管前提 */
-/* 携帯用 */
-
-if (empty($_SESSION)) {
-       if (Configure::read('Session.table') === null) {
-               trigger_error(__("You must set the all Configure::write('Session.*') in core.php to use database storage"), E_USER_WARNING);
-               exit();
-       } elseif (Configure::read('Session.database') === null) {
-               Configure::write('Session.database', 'default');
-       }
-       if ($iniSet) {
-               ini_set('session.use_trans_sid', 1); // 携帯用
-               ini_set('url_rewriter.tags', '');
-               ini_set('session.save_handler', 'user');
-               ini_set('session.serialize_handler', 'php');
-               ini_set('session.use_cookies', 0); // 携帯用
-               ini_set('session.name', Configure::read('Session.cookie'));
-               ini_set('session.cookie_lifetime', 0); // cake/lib/session.phpから変更
-               ini_set('session.cookie_path', $this->path);
-               ini_set('session.auto_start', 0);
-       }
-}
-session_set_save_handler(array('CakeSession','__open'),
-                       array('CakeSession', '__close'),
-                       array('CakeSession', '__read'),
-                       array('CakeSession', '__write'),
-                       array('CakeSession', '__destroy'),
-                       array('CakeSession', '__gc')
-);