Minahito
minah****@users*****
2006年 7月 13日 (木) 19:59:24 JST
Index: xoops2jp/html/include/common.php
diff -u xoops2jp/html/include/common.php:1.4.8.13 xoops2jp/html/include/common.php:1.4.8.14
--- xoops2jp/html/include/common.php:1.4.8.13 Wed Nov 30 13:30:09 2005
+++ xoops2jp/html/include/common.php Thu Jul 13 19:59:24 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: common.php,v 1.4.8.13 2005/11/30 04:30:09 minahito Exp $
+// $Id: common.php,v 1.4.8.14 2006/07/13 10:59:24 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPSCube - PHP Content Management System //
// Copyright (c) 2005 XOOPS Cube.org //
@@ -28,24 +28,25 @@
//
// Prohibition of a direct kick
//
-if (!defined("XOOPS_MAINFILE_INCLUDED"))
+if (!defined("XOOPS_MAINFILE_INCLUDED")) {
die();
+}
-require_once XOOPS_ROOT_PATH."/kernel/XCube_Root.class.php";
-require_once XOOPS_ROOT_PATH."/kernel/XCube_Controller.class.php";
+require_once XOOPS_ROOT_PATH . "/kernel/XCube_Root.class.php";
+require_once XOOPS_ROOT_PATH . "/kernel/XCube_Controller.class.php";
//
// TODO We have to move the following lines to an appropriate place.
// (We may not need the following constants)
//
-define("XCUBE_SITE_SETTING_FILE",XOOPS_ROOT_PATH."/settings/site_default.ini.php");
-define("XCUBE_SITE_CUSTOM_FILE",XOOPS_ROOT_PATH."/settings/site_custom.ini.php");
+define("XCUBE_SITE_SETTING_FILE", XOOPS_ROOT_PATH . "/settings/site_default.ini.php");
+define("XCUBE_SITE_CUSTOM_FILE", XOOPS_ROOT_PATH . "/settings/site_custom.ini.php");
//
//@todo How does the system decide the main controller?
//
$root=&XCube_Root::getSingleton();
-$root->loadSiteConfig(XCUBE_SITE_SETTING_FILE,XCUBE_SITE_CUSTOM_FILE);
+$root->loadSiteConfig(XCUBE_SITE_SETTING_FILE, XCUBE_SITE_CUSTOM_FILE);
$root->setupController();
$xoopsController=&$root->getController();