Changeset 6066

Timestamp:

2006/10/12 12:13:08 (20 years ago)

Author:

naka

Message:

* empty log message *

Location:

temp/trunk

Files:

• data/Smarty/templates/admin/main_frame.tpl (modified) (previous)
• data/conf/conf.php (modified) (1 diff)
• html/install/index.php (modified) (2 diffs)

temp/trunk/data/conf/conf.php

@@ -186 +186 @@
 define ("IMAGE_TEMP_DIR", ROOT_DIR . "upload/temp_image/");             // ²èÁü°ì»þÊݸ
 define ("IMAGE_SAVE_DIR", ROOT_DIR . "upload/save_image/");             // ²èÁüÊݸÀè
-define ("IMAGE_TEMP_URL", "/upload/temp_image/");                               // ²èÁü°ì»þÊݸURL
-define ("IMAGE_SAVE_URL", "/upload/save_image/");                               // ²èÁüÊݸÀèURL
+define ("IMAGE_TEMP_URL", URL_DIR . "upload/temp_image/");                              // ²èÁü°ì»þÊݸURL
+define ("IMAGE_SAVE_URL", URL_DIR . "upload/save_image/");                              // ²èÁüÊݸÀèURL
 define ("CSV_TEMP_DIR", ROOT_DIR. "../upload/csv/");                            // ¥¨¥ó¥³¡¼¥ÉCSV¤Î°ì»þÊݸÀè
-define ("NO_IMAGE_URL", "/misc/blank.gif");                                     // ²èÁü¤¬¤Ê¤¤¾ì¹ç¤Ëɽ¼¨
+define ("NO_IMAGE_URL", URL_DIR . "misc/blank.gif");                                        // ²èÁü¤¬¤Ê¤¤¾ì¹ç¤Ëɽ¼¨
 
 /* URL¥Ñ¥¹ */

temp/trunk/html/install/index.php

@@ -601 +601 @@
         $secure_url = $secure_url . "/";
     }
+    
+    // ¥Ç¥£¥ì¥¯¥È¥ê¤Î¼èÆÀ
+    $url_dir = ereg_replace("^https?://[a-zA-Z0-9_~=&\?\.\-]+", "", $normal_url);
             
     $filepath = $root_dir . "../data/install.inc";
@@ -610 +613 @@
     "    define ('SITE_URL', '" . $normal_url . "');\n" .
     "    define ('SSL_URL', '" . $secure_url . "');\n" .
+    "    define ('URL_DIR', '" . $url_dir . "');\n" .   
     "    define ('DOMAIN_NAME', '" . $objWebParam->getValue('domain') . "');\n" .
     "    define ('DB_TYPE', '" . $objDBParam->getValue('db_type') . "');\n" .