Index: /branches/version-2/html/mobile/require.php
===================================================================
--- /branches/version-2/html/mobile/require.php (revision 17118)
+++ /branches/version-2/html/mobile/require.php (revision 17439)
@@ -23,65 +23,10 @@
*/
-$include_dir = realpath(dirname( __FILE__));
-require_once($include_dir . "/../define.php");
-if (!defined("CLASS_PATH")) {
- /** クラスパス */
- define("CLASS_PATH", $include_dir . "/.." . HTML2DATA_DIR . "class/");
-}
+$mobile_require_php_dir = realpath(dirname( __FILE__));
+require_once($mobile_require_php_dir . "/../define.php");
-if (!defined("CLASS_EX_PATH")) {
- /** クラスパス */
- define("CLASS_EX_PATH", $include_dir . "/.." . HTML2DATA_DIR . "class_extends/");
-}
+define('MOBILE_SITE', true);
-if (!defined("CACHE_PATH")) {
- /** キャッシュ生成ディレクトリ */
- define("CACHE_PATH", $include_dir . "/.." . HTML2DATA_DIR . "cache/");
-}
-require_once(CLASS_EX_PATH . "SC_Initial_Mobile_Ex.php");
-// アプリケーション初期化処理
-$objInit = new SC_Initial_Mobile_Ex();
-$objInit->init();
-
-require_once($include_dir . "/.." . HTML2DATA_DIR . "include/module.inc");
-require_once(CLASS_EX_PATH . "util_extends/GC_Utils_Ex.php");
-require_once(CLASS_EX_PATH . "util_extends/SC_Utils_Ex.php");
-require_once(CLASS_EX_PATH . "db_extends/SC_DB_MasterData_Ex.php");
-require_once(CLASS_EX_PATH . "db_extends/SC_DB_DBFactory_Ex.php");
-require_once(CLASS_PATH . "SC_View.php");
-require_once(CLASS_PATH . "SC_DbConn.php");
-require_once(CLASS_PATH . "SC_Session.php");
-require_once(CLASS_PATH . "SC_Query.php");
-require_once(CLASS_PATH . "SC_SelectSql.php");
-require_once(CLASS_PATH . "SC_CheckError.php");
-require_once(CLASS_PATH . "SC_PageNavi.php");
-require_once(CLASS_PATH . "SC_Date.php");
-require_once(CLASS_PATH . "SC_Image.php");
-require_once(CLASS_PATH . "SC_UploadFile.php");
-require_once(CLASS_PATH . "SC_SiteInfo.php");
-require_once(CLASS_EX_PATH . "SC_SendMail_Ex.php");
-require_once(CLASS_PATH . "SC_FormParam.php");
-require_once(CLASS_PATH . "SC_CartSession.php");
-require_once(CLASS_PATH . "SC_SiteSession.php");
-require_once(CLASS_PATH . "SC_Customer.php");
-require_once(CLASS_PATH . "SC_Cookie.php");
-require_once(CLASS_PATH . "SC_Pdf.php");
-require_once(CLASS_PATH . "SC_MobileUserAgent.php");
-require_once(CLASS_PATH . "SC_MobileEmoji.php");
-require_once(CLASS_PATH . "SC_MobileImage.php");
-require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_PageLayout_Ex.php");
-require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_DB_Ex.php");
-require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_Mobile_Ex.php");
-require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_Session_Ex.php");
-require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_Mail_Ex.php");
-include_once($include_dir . "/require_plugin.php");
-
-// セッションハンドラ開始
-$objSession = new SC_Helper_Session_Ex();
-
-// セッション初期化・開始
-require_once CLASS_PATH . 'session/SC_SessionFactory.php';
-$sessionFactory = SC_SessionFactory::getInstance();
-$sessionFactory->initSession();
+require_once($mobile_require_php_dir . "/../" . HTML2DATA_DIR . "require_base.php");
// モバイルサイト用の初期処理を実行する。
@@ -95,4 +40,3 @@
sfGetMoba8Param($_GET['a8']);
}
-
?>
Index: /branches/version-2/html/admin/require.php
===================================================================
--- /branches/version-2/html/admin/require.php (revision 17438)
+++ /branches/version-2/html/admin/require.php (revision 17439)
@@ -21,4 +21,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-require_once(realpath(dirname( __FILE__)) . "/../require.php");
+$admin_require_php_dir = realpath(dirname( __FILE__));
+require_once($admin_require_php_dir . "/../define.php");
+require_once($admin_require_php_dir . "/../" . HTML2DATA_DIR . "require_base.php");
?>
Index: /branches/version-2/html/require.php
===================================================================
--- /branches/version-2/html/require.php (revision 17438)
+++ /branches/version-2/html/require.php (revision 17439)
@@ -24,64 +24,5 @@
$require_php_dir = realpath(dirname( __FILE__));
require_once($require_php_dir . "/define.php");
-
-if (!defined("CLASS_PATH")) {
- /** クラスパス */
- define("CLASS_PATH", $require_php_dir . HTML2DATA_DIR . "class/");
-}
-
-if (!defined("CLASS_EX_PATH")) {
- /** クラスパス */
- define("CLASS_EX_PATH", $require_php_dir . HTML2DATA_DIR . "class_extends/");
-}
-
-if (!defined("CACHE_PATH")) {
- /** キャッシュ生成ディレクトリ */
- define("CACHE_PATH", $require_php_dir . HTML2DATA_DIR . "cache/");
-}
-require_once(CLASS_EX_PATH . "SC_Initial_Ex.php");
-// アプリケーション初期化処理
-$objInit = new SC_Initial_Ex();
-$objInit->init();
-
-
-require_once($require_php_dir . HTML2DATA_DIR . "include/module.inc");
-require_once(CLASS_EX_PATH . "util_extends/GC_Utils_Ex.php");
-require_once(CLASS_EX_PATH . "util_extends/SC_Utils_Ex.php");
-require_once(CLASS_EX_PATH . "db_extends/SC_DB_MasterData_Ex.php");
-require_once(CLASS_EX_PATH . "db_extends/SC_DB_DBFactory_Ex.php");
-require_once(CLASS_PATH . "SC_View.php");
-require_once(CLASS_PATH . "SC_DbConn.php");
-require_once(CLASS_PATH . "SC_Session.php");
-require_once(CLASS_PATH . "SC_Query.php");
-require_once(CLASS_PATH . "SC_SelectSql.php");
-require_once(CLASS_PATH . "SC_CheckError.php");
-require_once(CLASS_PATH . "SC_PageNavi.php");
-require_once(CLASS_PATH . "SC_Date.php");
-require_once(CLASS_PATH . "SC_Image.php");
-require_once(CLASS_PATH . "SC_UploadFile.php");
-require_once(CLASS_PATH . "SC_SiteInfo.php");
-require_once(CLASS_EX_PATH . "SC_SendMail_Ex.php");
-require_once(CLASS_PATH . "SC_FormParam.php");
-require_once(CLASS_PATH . "SC_CartSession.php");
-require_once(CLASS_PATH . "SC_SiteSession.php");
-require_once(CLASS_PATH . "SC_CampaignSession.php");
-require_once(CLASS_PATH . "SC_Customer.php");
-require_once(CLASS_PATH . "SC_CustomerList.php");
-require_once(CLASS_PATH . "SC_Cookie.php");
-require_once(CLASS_PATH . "SC_Pdf.php");
-require_once(CLASS_PATH . "SC_MobileUserAgent.php");
-require_once(CLASS_PATH . "SC_MobileEmoji.php");
-require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_PageLayout_Ex.php");
-require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_DB_Ex.php");
-require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_Session_Ex.php");
-require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_Mail_Ex.php");
-require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_Mobile_Ex.php");
-include_once($require_php_dir . "/require_plugin.php");
-
-// セッションハンドラ開始
-$objSession = new SC_Helper_Session_Ex();
-
-// インストールチェック
-SC_Utils_Ex::sfInitInstall();
+require_once($require_php_dir . HTML2DATA_DIR . "require_base.php");
// 携帯端末の場合は mobile 以下へリダイレクトする。
@@ -104,10 +45,3 @@
}
-// セッション初期化・開始
-require_once CLASS_PATH . 'session/SC_SessionFactory.php';
-$sessionFactory = SC_SessionFactory::getInstance();
-$sessionFactory->initSession();
-
-// 絵文字変換 (除去) フィルターを組み込む。
-ob_start(array('SC_MobileEmoji', 'handler'));
?>
Index: anches/version-2/html/require_plugin.php
===================================================================
--- /branches/version-2/html/require_plugin.php (revision 16122)
+++ (revision )
@@ -1,5 +1,0 @@
-
Index: /branches/version-2/data/require_plugin.php
===================================================================
--- /branches/version-2/data/require_plugin.php (revision 17439)
+++ /branches/version-2/data/require_plugin.php (revision 17439)
@@ -0,0 +1,5 @@
+
Index: /branches/version-2/data/require_base.php
===================================================================
--- /branches/version-2/data/require_base.php (revision 17439)
+++ /branches/version-2/data/require_base.php (revision 17439)
@@ -0,0 +1,93 @@
+init();
+
+require_once($require_base_php_dir . "/include/module.inc");
+require_once(CLASS_EX_PATH . "util_extends/GC_Utils_Ex.php");
+require_once(CLASS_EX_PATH . "util_extends/SC_Utils_Ex.php");
+require_once(CLASS_EX_PATH . "db_extends/SC_DB_MasterData_Ex.php");
+require_once(CLASS_EX_PATH . "db_extends/SC_DB_DBFactory_Ex.php");
+require_once(CLASS_PATH . "SC_View.php");
+require_once(CLASS_PATH . "SC_DbConn.php");
+require_once(CLASS_PATH . "SC_Session.php");
+require_once(CLASS_PATH . "SC_Query.php");
+require_once(CLASS_PATH . "SC_SelectSql.php");
+require_once(CLASS_PATH . "SC_CheckError.php");
+require_once(CLASS_PATH . "SC_PageNavi.php");
+require_once(CLASS_PATH . "SC_Date.php");
+require_once(CLASS_PATH . "SC_Image.php");
+require_once(CLASS_PATH . "SC_UploadFile.php");
+require_once(CLASS_PATH . "SC_SiteInfo.php");
+require_once(CLASS_EX_PATH . "SC_SendMail_Ex.php");
+require_once(CLASS_PATH . "SC_FormParam.php");
+require_once(CLASS_PATH . "SC_CartSession.php");
+require_once(CLASS_PATH . "SC_SiteSession.php");
+require_once(CLASS_PATH . "SC_CampaignSession.php");
+require_once(CLASS_PATH . "SC_Customer.php");
+require_once(CLASS_PATH . "SC_CustomerList.php");
+require_once(CLASS_PATH . "SC_Cookie.php");
+require_once(CLASS_PATH . "SC_Pdf.php");
+require_once(CLASS_PATH . "SC_MobileUserAgent.php");
+require_once(CLASS_PATH . "SC_MobileEmoji.php");
+require_once(CLASS_PATH . "SC_MobileImage.php");
+require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_PageLayout_Ex.php");
+require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_DB_Ex.php");
+require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_Session_Ex.php");
+require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_Mail_Ex.php");
+require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_Mobile_Ex.php");
+include_once($require_base_php_dir . "/require_plugin.php");
+
+// セッションハンドラ開始
+$objSession = new SC_Helper_Session_Ex();
+
+// インストールチェック
+SC_Utils_Ex::sfInitInstall();
+
+// セッション初期化・開始
+require_once CLASS_PATH . 'session/SC_SessionFactory.php';
+$sessionFactory = SC_SessionFactory::getInstance();
+$sessionFactory->initSession();
+
+// 絵文字変換 (除去) フィルターを組み込む。
+ob_start(array('SC_MobileEmoji', 'handler'));
+?>
Index: /branches/version-2/data/class/SC_DbConn.php
===================================================================
--- /branches/version-2/data/class/SC_DbConn.php (revision 17345)
+++ /branches/version-2/data/class/SC_DbConn.php (revision 17439)
@@ -24,5 +24,6 @@
$current_dir = realpath(dirname(__FILE__));
require_once($current_dir . "/../module/DB.php");
-
+require_once($current_dir . "/util/SC_Utils.php");
+require_once($current_dir . "/util/GC_Utils.php");
$objDbConn = "";
Index: /branches/version-2/data/class/util/GC_Utils.php
===================================================================
--- /branches/version-2/data/class/util/GC_Utils.php (revision 17371)
+++ /branches/version-2/data/class/util/GC_Utils.php (revision 17439)
@@ -201,5 +201,7 @@
for($i = $count; 1 <= $i; $i--) {
$move_number = $i + 1;
- if(file_exists("$path.$move_number")) unlink("$path.$move_number");
+ if(file_exists("$path.$move_number")) {
+ unlink("$path.$move_number");
+ }
copy("$dirname/" . $arrLog[$i - 1], "$path.$move_number");
}
Index: anches/version-2/data/class/SC_Initial_Mobile.php
===================================================================
--- /branches/version-2/data/class/SC_Initial_Mobile.php (revision 16582)
+++ (revision )
@@ -1,46 +1,0 @@
-