Changeset 12039 for branches/comu/data

Timestamp:

2007/03/31 21:59:45 (17 years ago)

Author:

nanasess

Message:

header("Location: 〜") で相対パスが使用されていたのを絶対パスに変更.
data/lib/slib.php に sfGetCurrentUri(boolean) と sfGetCurrentSchema() を追加

Location:

branches/comu/data

Files:

• conf/conf.php (modified) (2 diffs)
• lib/slib.php (modified) (2 diffs)

branches/comu/data/conf/conf.php

@@ -120 +120 @@
 
 // EC-CUBE¥Ð¡¼¥¸¥ç¥ó¾ðÊó
-<<<<<<< .working
-define("ECCUBE_VERSION", "1.1.1");
-=======
 define("ECCUBE_VERSION", "1.2.0-beta");
->>>>>>> .merge-right.r11982
 
 // ·èºÑ¥â¥¸¥å¡¼¥ëÉÕͿʸ¸À
@@ -213 +209 @@
 define ("ADMIN_MODE", 0);                               // ´ÉÍý¥â¡¼¥É 1:Í­¸ú¡¡0:̵¸ú(ǼÉÊ»þ)
 define ("DAILY_BATCH_MODE", false);                     // Çä¾å½¸·×¥Ð¥Ã¥Á¥â¡¼¥É(true:¥Ð¥Ã¥Á¤Ç½¸·×¤¹¤ë ¢¨Í×cronÀßÄê¡¢false:¥ê¥¢¥ë¥¿¥¤¥à¤Ç½¸·×¤¹¤ë)
-<<<<<<< .working
 define ("MAX_LOG_QUANTITY", 5);                         // ¥í¥°¥Õ¥¡¥¤¥ëºÇÂç¿ô(¥í¥°¥Æ¡¼¥·¥ç¥ó)
 define ("MAX_LOG_SIZE", "10000");                       // 1¤Ä¤Î¥í¥°¥Õ¥¡¥¤¥ë¤ËÊݸ¤¹¤ëºÇÂçÍÆÎÌ(byte)
-=======
-define ("MAX_LOG_QUANTITY", 5);                         // ¥í¥°¥Õ¥¡¥¤¥ëºÇÂç¿ô(¥í¥°¥Æ¡¼¥·¥ç¥ó)
-define ("MAX_LOG_SIZE", "1000000");                     // 1¤Ä¤Î¥í¥°¥Õ¥¡¥¤¥ë¤ËÊݸ¤¹¤ëºÇÂçÍÆÎÌ(byte)
->>>>>>> .merge-right.r11982
 
 define ("FORGOT_MAIL", 0);                              // ¥Ñ¥¹¥ï¡¼¥É˺¤ì¤Î³Îǧ¥á¡¼¥ë¤òÁ÷ÉÕ¤¹¤ë¤«Èݤ«¡£(0:Á÷¿®¤·¤Ê¤¤¡¢1:Á÷¿®¤¹¤ë)

branches/comu/data/lib/slib.php

@@ -261 +261 @@
     if(!defined('ECCUBE_INSTALL')) {
         if(!ereg("/install/", $_SERVER['PHP_SELF'])) {
-            header("Location: ./install/");
+            header("Location: " . sfGetCurrentUri() . "/install/");
         }
     } else {
@@ -2917 +2917 @@
 }
 
+/**
+ * ¸½ºß¤Î URI ¤ò¼èÆÀ¤¹¤ë.
+ * 
+ * <p>
+ * $_SERVER["SERVER_PORT"] ¤¬ 443 ¤Î¾ì¹ç¤Ï, ¥¹¥­¡¼¥Þ¤Ë https:// ¤ò»ÈÍÑ.
+ * ¤½¤ì°Ê³°¤Ï http:// ¤ò»ÈÍѤ¹¤ë.
+ * <strong>URI ËöÈø¤Î / ¤Ïºï½ü¤µ¤ì¤Þ¤¹.</strong>
+ * </p>
+ * @param boolean $hasFileName ¥Õ¥¡¥¤¥ë̾¤ò´Þ¤á¤ë¾ì¹ç true
+ * @return string ¸½ºß¤Î URI
+ */
+function sfGetCurrentUri($hasFileName = false) {
+    $host = $_SERVER["HTTP_HOST"];
+    $path = rtrim(dirname($_SERVER["SCRIPT_NAME"]), "/\\");
+    
+    if ($hasFileName === true) {
+        return sfGetCurrentSchema() . $host . $_SERVER["SCRIPT_NAME"];
+    } else {
+        return sfGetCurrentSchema() . $host . $path;
+    }
+}
+
+/**
+ * ¸½ºß¤Î ¥¹¥­¡¼¥Þ̾¤òÊÖ¤¹.
+ * 
+ * <p>
+ * $_SERVER["SERVER_PORT"] ¤¬ 443 ¤Î¾ì¹ç¤Ï, https:// ¤òÊÖ¤¹.
+ * ¤½¤ì°Ê³°¤Ï http:// ¤òÊÖ¤¹.
+ * </p>
+ * @return string http:// ¤Þ¤¿¤Ï https:// ¤Î string.
+ */
+function sfGetCurrentSchema() {
+    
+    if ($_SERVER["SERVER_PORT"] == 443) {
+        return "https://";
+    } else {
+        return "http://";
+    }
+}
+
 /* ¥Ç¥Ð¥Ã¥°ÍÑ ------------------------------------------------------------------------------------------------*/
 function sfPrintR($obj) {