Index: branches/mobile/data/script/send_kara_mail.php
===================================================================
--- branches/mobile/data/script/send_kara_mail.php	(revision 11406)
+++ branches/mobile/data/script/send_kara_mail.php	(revision 11901)
@@ -5,5 +5,5 @@
  */
 
-require_once dirname(__FILE__) . '/../conf/mobile.conf';
+require_once dirname(__FILE__) . '/../conf/mobile_conf.php';
 
 if ($argc != 4) {
Index: branches/mobile/data/script/receive_kara_mail.php
===================================================================
--- branches/mobile/data/script/receive_kara_mail.php	(revision 11406)
+++ branches/mobile/data/script/receive_kara_mail.php	(revision 11901)
@@ -5,5 +5,5 @@
  */
 
-require_once dirname(__FILE__) . '/../conf/mobile.conf';
+require_once dirname(__FILE__) . '/../conf/mobile_conf.php';
 require_once DATA_PATH . '/include/php_ini.inc';
 require_once DATA_PATH . '/include/mobile.inc';
Index: branches/mobile/data/conf/mobile_conf.php
===================================================================
--- branches/mobile/data/conf/mobile_conf.php	(revision 11901)
+++ branches/mobile/data/conf/mobile_conf.php	(revision 11901)
@@ -0,0 +1,77 @@
+<?php
+/**
+ * ¥â¥Ð¥¤¥ë¥µ¥¤¥È¶¦Í­ÀßÄê¥Õ¥¡¥¤¥ë
+ */
+
+// ¥â¥Ð¥¤¥ë¥µ¥¤¥ÈÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤à¡£
+require_once(dirname(__FILE__) . '/../install_mobile.inc');
+
+
+//--------------------------------------------------------------------------------------------------------
+// conf.php ¤ÇÄêµÁ¤µ¤ì¤ëÄê¿ô¤Î¤¦¤Á¡¢¥â¥Ð¥¤¥ë¥µ¥¤¥ÈÍѤËÊѹ¹¤¬É¬Íפʤâ¤Î
+
+define('TEMPLATE_DIR', DATA_PATH . 'Smarty/templates/mobile');	// SMARTY¥Æ¥ó¥×¥ì¡¼¥È
+define('COMPILE_DIR', DATA_PATH . 'Smarty/templates_c/mobile');	// SMARTY¥³¥ó¥Ñ¥¤¥ë
+define('IMAGE_TEMP_DIR', PC_HTML_PATH . 'upload/temp_image/');	// ²èÁü°ì»þÊݸ
+define('IMAGE_SAVE_DIR', PC_HTML_PATH . 'upload/save_image/');	// ²èÁüÊݸÀè
+define('IMAGE_TEMP_URL', PC_URL_DIR . 'upload/temp_image/');	// ²èÁü°ì»þÊݸURL
+define('IMAGE_SAVE_URL', PC_URL_DIR . 'upload/save_image/');	// ²èÁüÊݸÀèURL
+
+
+//--------------------------------------------------------------------------------------------------------
+// ¥â¥Ð¥¤¥ë¥µ¥¤¥ÈÀìÍѤÎÀßÄê
+
+/**
+ * ¥â¥Ð¥¤¥ë¥µ¥¤¥È¤Ç¤¢¤ë¤³¤È¤òɽ¤¹Äê¿ô
+ */
+define('MOBILE_SITE', true);
+
+/**
+ * ¥»¥Ã¥·¥ç¥ó¤Î¸³»þ´Ö (ÉÃ)
+ */
+define('MOBILE_SESSION_LIFETIME', 1800);
+
+/**
+ * ¶õ¥á¡¼¥ëµ¡Ç½¤ò»ÈÍѤ¹¤ë¤«¤É¤¦¤«
+ */
+define('MOBILE_USE_KARA_MAIL', false);
+
+/**
+ * ¶õ¥á¡¼¥ë¼õ¤±ÉÕ¤±¥¢¥É¥ì¥¹¤Î¥æ¡¼¥¶¡¼Ì¾Éôʬ
+ */
+define('MOBILE_KARA_MAIL_ADDRESS_USER', 'eccube');
+
+/**
+ * ¶õ¥á¡¼¥ë¼õ¤±ÉÕ¤±¥¢¥É¥ì¥¹¤Î¥æ¡¼¥¶¡¼Ì¾¤È¥³¥Þ¥ó¥É¤Î´Ö¤Î¶èÀÚ¤êʸ»ú
+ * qmail ¤Î¾ì¹ç¤Ï '-'
+ */
+define('MOBILE_KARA_MAIL_ADDRESS_DELIMITER', '+');
+
+/**
+ * ¶õ¥á¡¼¥ë¼õ¤±ÉÕ¤±¥¢¥É¥ì¥¹¤Î¥É¥á¥¤¥óÉôʬ
+ */
+define('MOBILE_KARA_MAIL_ADDRESS_DOMAIN', 'mobile.ec-cube.net');
+
+/**
+ * ·ÈÂӤΥ᡼¥ë¥¢¥É¥ì¥¹¤Ç¤Ï¤Ê¤¤¤¬¡¢·ÈÂÓ¤À¤È¤ß¤Ê¤¹¥É¥á¥¤¥ó¤Î¥ê¥¹¥È
+ * Ǥ°Õ¤Î¿ô¤Î¡Ö,¡×¡Ö ¡×¤Ç¶èÀڤ롣
+ */
+define('MOBILE_ADDITIONAL_MAIL_DOMAINS', 'lockon.co.jp, rebelt.co.jp');
+
+/**
+ * ·ÈÂÓÅÅÏøþ¤±ÊÑ´¹²èÁüÊݸ¥Ç¥£¥ì¥¯¥È¥ê
+ */
+define('MOBILE_IMAGE_DIR', HTML_PATH . 'converted_images');
+define('MOBILE_IMAGE_URL', URL_DIR . 'converted_images');
+
+
+//--------------------------------------------------------------------------------------------------------
+// conf.php ¤«¤é»Ä¤ê¤ÎÀßÄê¤òÆɤ߹þ¤à¡£
+// Äê¿ô¤ÎÄêµÁ¤¬½ÅÊ£¤¹¤ë¤¿¤á¡¢error_reporting ¤Î¥ì¥Ù¥ë¤òÄ´À°¤¹¤ë¡£
+
+$error_reporting = error_reporting();
+error_reporting($error_reporting & ~E_NOTICE);
+require_once(DATA_PATH . 'conf/conf.php');
+error_reporting($error_reporting);
+unset($error_reporting);
+?>
Index: branches/mobile/data/conf/mobile.conf
===================================================================
--- branches/mobile/data/conf/mobile.conf	(revision 11897)
+++ 	(revision )
@@ -1,77 +1,0 @@
-<?php
-/**
- * ¥â¥Ð¥¤¥ë¥µ¥¤¥È¶¦Í­ÀßÄê¥Õ¥¡¥¤¥ë
- */
-
-// ¥â¥Ð¥¤¥ë¥µ¥¤¥ÈÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤à¡£
-require_once(dirname(__FILE__) . '/../install_mobile.inc');
-
-
-//--------------------------------------------------------------------------------------------------------
-// conf.php ¤ÇÄêµÁ¤µ¤ì¤ëÄê¿ô¤Î¤¦¤Á¡¢¥â¥Ð¥¤¥ë¥µ¥¤¥ÈÍѤËÊѹ¹¤¬É¬Íפʤâ¤Î
-
-define('TEMPLATE_DIR', DATA_PATH . 'Smarty/templates/mobile');	// SMARTY¥Æ¥ó¥×¥ì¡¼¥È
-define('COMPILE_DIR', DATA_PATH . 'Smarty/templates_c/mobile');	// SMARTY¥³¥ó¥Ñ¥¤¥ë
-define('IMAGE_TEMP_DIR', PC_HTML_PATH . 'upload/temp_image/');	// ²èÁü°ì»þÊݸ
-define('IMAGE_SAVE_DIR', PC_HTML_PATH . 'upload/save_image/');	// ²èÁüÊݸÀè
-define('IMAGE_TEMP_URL', PC_URL_DIR . 'upload/temp_image/');	// ²èÁü°ì»þÊݸURL
-define('IMAGE_SAVE_URL', PC_URL_DIR . 'upload/save_image/');	// ²èÁüÊݸÀèURL
-
-
-//--------------------------------------------------------------------------------------------------------
-// ¥â¥Ð¥¤¥ë¥µ¥¤¥ÈÀìÍѤÎÀßÄê
-
-/**
- * ¥â¥Ð¥¤¥ë¥µ¥¤¥È¤Ç¤¢¤ë¤³¤È¤òɽ¤¹Äê¿ô
- */
-define('MOBILE_SITE', true);
-
-/**
- * ¥»¥Ã¥·¥ç¥ó¤Î¸³»þ´Ö (ÉÃ)
- */
-define('MOBILE_SESSION_LIFETIME', 1800);
-
-/**
- * ¶õ¥á¡¼¥ëµ¡Ç½¤ò»ÈÍѤ¹¤ë¤«¤É¤¦¤«
- */
-define('MOBILE_USE_KARA_MAIL', false);
-
-/**
- * ¶õ¥á¡¼¥ë¼õ¤±ÉÕ¤±¥¢¥É¥ì¥¹¤Î¥æ¡¼¥¶¡¼Ì¾Éôʬ
- */
-define('MOBILE_KARA_MAIL_ADDRESS_USER', 'eccube');
-
-/**
- * ¶õ¥á¡¼¥ë¼õ¤±ÉÕ¤±¥¢¥É¥ì¥¹¤Î¥æ¡¼¥¶¡¼Ì¾¤È¥³¥Þ¥ó¥É¤Î´Ö¤Î¶èÀÚ¤êʸ»ú
- * qmail ¤Î¾ì¹ç¤Ï '-'
- */
-define('MOBILE_KARA_MAIL_ADDRESS_DELIMITER', '+');
-
-/**
- * ¶õ¥á¡¼¥ë¼õ¤±ÉÕ¤±¥¢¥É¥ì¥¹¤Î¥É¥á¥¤¥óÉôʬ
- */
-define('MOBILE_KARA_MAIL_ADDRESS_DOMAIN', 'mobile.ec-cube.net');
-
-/**
- * ·ÈÂӤΥ᡼¥ë¥¢¥É¥ì¥¹¤Ç¤Ï¤Ê¤¤¤¬¡¢·ÈÂÓ¤À¤È¤ß¤Ê¤¹¥É¥á¥¤¥ó¤Î¥ê¥¹¥È
- * Ǥ°Õ¤Î¿ô¤Î¡Ö,¡×¡Ö ¡×¤Ç¶èÀڤ롣
- */
-define('MOBILE_ADDITIONAL_MAIL_DOMAINS', 'lockon.co.jp, rebelt.co.jp');
-
-/**
- * ·ÈÂÓÅÅÏøþ¤±ÊÑ´¹²èÁüÊݸ¥Ç¥£¥ì¥¯¥È¥ê
- */
-define('MOBILE_IMAGE_DIR', HTML_PATH . 'converted_images');
-define('MOBILE_IMAGE_URL', URL_DIR . 'converted_images');
-
-
-//--------------------------------------------------------------------------------------------------------
-// conf.php ¤«¤é»Ä¤ê¤ÎÀßÄê¤òÆɤ߹þ¤à¡£
-// Äê¿ô¤ÎÄêµÁ¤¬½ÅÊ£¤¹¤ë¤¿¤á¡¢error_reporting ¤Î¥ì¥Ù¥ë¤òÄ´À°¤¹¤ë¡£
-
-$error_reporting = error_reporting();
-error_reporting($error_reporting & ~E_NOTICE);
-require_once(DATA_PATH . 'conf/conf.php');
-error_reporting($error_reporting);
-unset($error_reporting);
-?>