Changeset 11398

Timestamp:

2007/01/19 23:01:05 (17 years ago)

Author:

rebelt

Message:

以下のモバイルサイト用ページ・機能を作成いたしました。

• トップページ
• 商品閲覧
• 商品検索
• セッションIDチェック機能
• 簡単ログイン補助機能
• 絵文字変換機能

Location:

temp/branches/mobile

Files:

• data/Smarty/templates/mobile/error.tpl (added)
• data/Smarty/templates/mobile/footer.tpl (added)
• data/Smarty/templates/mobile/frontparts (added)
• data/Smarty/templates/mobile/frontparts/bloc (added)
• data/Smarty/templates/mobile/frontparts/bloc/best5.tpl (added)
• data/Smarty/templates/mobile/frontparts/bloc/category.tpl (added)
• data/Smarty/templates/mobile/frontparts/bloc/news.tpl (added)
• data/Smarty/templates/mobile/products (added)
• data/Smarty/templates/mobile/products/category_list.tpl (added)
• data/Smarty/templates/mobile/products/detail.tpl (added)
• data/Smarty/templates/mobile/products/list.tpl (added)
• data/Smarty/templates/mobile/products/search.tpl (added)
• data/Smarty/templates/mobile/site_frame.tpl (added)
• data/Smarty/templates/mobile/site_main.tpl (added)
• data/Smarty/templates/mobile/top.tpl (added)
• data/Smarty/templates_c (modified) (1 prop)
• data/class/GC_MobileEmoji.php (added)
• data/class/GC_MobileUserAgent.php (added)
• data/class/SC_Customer.php (modified) (1 diff)
• data/conf/mobile.conf (modified) (1 diff, 1 prop)
• data/include/mobile.inc (modified) (1 diff, 1 prop)
• data/include/mobile_emoji_map_docomo.inc (added)
• data/include/mobile_emoji_map_ezweb.inc (added)
• data/include/mobile_emoji_map_softbank.inc (added)
• data/install_mobile.inc (added)
• data/lib/slib.php (modified) (3 diffs)
• data/logs (modified) (1 prop)
• data/module/Net/UserAgent (added)
• data/module/Net/UserAgent/Mobile (added)
• data/module/Net/UserAgent/Mobile.php (added)
• data/module/Net/UserAgent/Mobile/AirHPhone.php (added)
• data/module/Net/UserAgent/Mobile/Common.php (added)
• data/module/Net/UserAgent/Mobile/Display.php (added)
• data/module/Net/UserAgent/Mobile/DoCoMo.php (added)
• data/module/Net/UserAgent/Mobile/DoCoMoDisplayMap.php (added)
• data/module/Net/UserAgent/Mobile/EZweb.php (added)
• data/module/Net/UserAgent/Mobile/NonMobile.php (added)
• data/module/Net/UserAgent/Mobile/Request.php (added)
• data/module/Net/UserAgent/Mobile/Vodafone.php (added)
• data/smarty_extends/modifier.numeric_emoji.php (added)
• html/install/index.php (modified) (2 diffs)
• html/install/sql/column_comment.sql (modified) (previous)
• html/install/sql/create_table_mysql.sql (modified) (previous)
• html/install/sql/create_table_pgsql.sql (modified) (previous)
• html/install/sql/insert_data.sql (modified) (previous)
• html/mobile/.htaccess (added)
• html/mobile/frontparts (added)
• html/mobile/frontparts/bloc (added)
• html/mobile/frontparts/bloc/best5.php (added)
• html/mobile/frontparts/bloc/category.php (added)
• html/mobile/frontparts/bloc/news.php (added)
• html/mobile/index.php (added)
• html/mobile/products (added)
• html/mobile/products/category_list.php (added)
• html/mobile/products/detail.php (added)
• html/mobile/products/list.php (added)
• html/mobile/products/search.php (added)
• html/mobile/require.php (added)
• html/require.php (modified) (2 diffs)
• html/upload (modified) (1 prop)

temp/branches/mobile/data/class/SC_Customer.php

@@ -63 +63 @@
         }
         return false;
+    }
+
+    /**
+     * ·ÈÂÓüËöID¤¬°ìÃפ¹¤ë²ñ°÷¤¬Â¸ºß¤¹¤ë¤«¤É¤¦¤«¤ò¥Á¥§¥Ã¥¯¤¹¤ë¡£
+     *
+     * @return boolean ³ºÅö¤¹¤ë²ñ°÷¤¬Â¸ºß¤¹¤ë¾ì¹ç¤Ï true¡¢¤½¤ì°Ê³°¤Î¾ì¹ç
+     *                 ¤Ï false ¤òÊÖ¤¹¡£
+     */
+    function checkMobilePhoneId() {
+        if (!isset($_SESSION['mobile']['phone_id'])) {
+            return false;
+        }
+
+        // ·ÈÂÓüËöID¤¬°ìÃפ·¡¢ËÜÅÐÏ¿¤µ¤ì¤¿²ñ°÷¤ò¸¡º÷¤¹¤ë¡£
+        $sql = 'SELECT count(*) FROM dtb_customer WHERE mobile_phone_id = ? AND del_flg = 0 AND status = 2';
+        $result = $this->conn->getOne($sql, array($_SESSION['mobile']['phone_id']));
+        return $result > 0;
+    }
+
+    /**
+     * ·ÈÂÓüËöID¤ò»ÈÍѤ·¤Æ²ñ°÷¤ò¸¡º÷¤·¡¢¥Ñ¥¹¥ï¡¼¥É¤Î¾È¹ç¤ò¹Ô¤¦¡£
+     * ¥Ñ¥¹¥ï¡¼¥É¤¬¹ç¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¸ÜµÒ¾ðÊó¤ò¼èÆÀ¤¹¤ë¡£
+     *
+     * @param string $pass ¥Ñ¥¹¥ï¡¼¥É
+     * @return boolean ³ºÅö¤¹¤ë²ñ°÷¤¬Â¸ºß¤·¡¢¥Ñ¥¹¥ï¡¼¥É¤¬¹ç¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï true¡¢
+     *                 ¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï false ¤òÊÖ¤¹¡£
+     */
+    function getCustomerDataFromMobilePhoneIdPass($pass) {
+        if (!isset($_SESSION['mobile']['phone_id'])) {
+            return false;
+        }
+
+        // ·ÈÂÓüËöID¤¬°ìÃפ·¡¢ËÜÅÐÏ¿¤µ¤ì¤¿²ñ°÷¤ò¸¡º÷¤¹¤ë¡£
+        $sql = 'SELECT * FROM dtb_customer WHERE mobile_phone_id = ? AND del_flg = 0 AND status = 2';
+        @list($data) = $this->conn->getAll($sql, array($_SESSION['mobile']['phone_id']));
+
+        // ¥Ñ¥¹¥ï¡¼¥É¤¬¹ç¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¸ÜµÒ¾ðÊó¤òcustomer_data¤Ë³ÊǼ¤·¤Ætrue¤òÊÖ¤¹¡£
+        if (sha1($pass . ':' . AUTH_MAGIC) == @$data['password']) {
+            $this->customer_data = $data;
+            $this->startSession();
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * ·ÈÂÓüËöID¤òÅÐÏ¿¤¹¤ë¡£
+     *
+     * @return void
+     */
+    function updateMobilePhoneId() {
+        if (!isset($_SESSION['mobile']['phone_id'])) {
+            return;
+        }
+
+        if ($this->customer_data['mobile_phone_id'] == $_SESSION['mobile']['phone_id']) {
+            return;
+        }
+
+        $objQuery = new SC_Query;
+        $sqlval = array('mobile_phone_id' => $_SESSION['mobile']['phone_id']);
+        $where = 'customer_id = ? AND del_flg = 0 AND status = 2';
+        $objQuery->update('dtb_customer', $sqlval, $where, array($this->customer_data['customer_id']));
+
+        $this->customer_data['mobile_phone_id'] = $_SESSION['mobile']['phone_id'];
     }
     

temp/branches/mobile/data/conf/mobile.conf

@@ -1 +1 @@
 <?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_SESSION_LIFETIME', 1800);
+
+/**
+ * ¶õ¥á¡¼¥ë¼õ¤±ÉÕ¤±¥¢¥É¥ì¥¹¤Î¥æ¡¼¥¶¡¼Ì¾Éôʬ
+ */
+define('MOBILE_KARA_MAIL_ADDRESS_USER', 'eccube');
+
+/**
+ * ¶õ¥á¡¼¥ë¼õ¤±ÉÕ¤±¥¢¥É¥ì¥¹¤Î¥æ¡¼¥¶¡¼Ì¾¤È¥³¥Þ¥ó¥É¤Î´Ö¤Î¶èÀÚ¤êʸ»ú
+ * qmail ¤Î¾ì¹ç¤Ï '-'
+ */
+define('MOBILE_KARA_MAIL_ADDRESS_DELIMITER', '+');
+
+/**
+ * ¶õ¥á¡¼¥ë¼õ¤±ÉÕ¤±¥¢¥É¥ì¥¹¤Î¥É¥á¥¤¥óÉôʬ
+ */
+define('MOBILE_KARA_MAIL_ADDRESS_DOMAIN', 'example.com');
+
+
+//--------------------------------------------------------------------------------------------------------
+// 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);
 ?>

temp/branches/mobile/data/include/mobile.inc

@@ -1 +1 @@
 <?php
+/**
+ * ¥â¥Ð¥¤¥ë¥µ¥¤¥È¶¦Í­´Ø¿ô¥Õ¥¡¥¤¥ë
+ */
+
+/**
+ * EC-CUBE ¤¬¥µ¥Ý¡¼¥È¤¹¤ë·ÈÂÓüËö¤«¤É¤¦¤«¤ò¥Á¥§¥Ã¥¯¤¹¤ë¡£
+ * ÈóÂбþüËö¤Î¾ì¹ç¤Ï unsupported/index.php ¤Ø¥ê¥À¥¤¥ì¥¯¥È¤¹¤ë¡£
+ *
+ * @return void
+ */
+function lfMobileCheckCompatibility() {
+    if (!GC_MobileUserAgent::isSupported()) {
+        header('Location: ' . URL_DIR . 'unsupported/index.php');
+        exit;
+    }
+}
+
+/**
+ * ÆþÎϥǡ¼¥¿¤òÆâÉô¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ËÊÑ´¹¤·¡¢³¨Ê¸»ú¤ò½üµî¤¹¤ë¡£
+ *
+ * @param string &$value ÆþÎϥǡ¼¥¿¤Ø¤Î»²¾È
+ * @return void
+ */
+function lfMobileConvertInputValue(&$value) {
+    // Shift JIS ¤«¤éÆâÉô¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ËÊÑ´¹¤¹¤ë¡£
+    // SoftBank °Ê³°¤Î³¨Ê¸»ú¤Ï³°»úÎΰè¤Ë´Þ¤Þ¤ì¤ë¤¿¤á¡¢¤³¤ÎÃʳ¬¤Ç½üµî¤µ¤ì¤ë¡£
+    $value = mb_convert_encoding($value, CHAR_CODE, 'SJIS');
+
+    // SoftBank ¤Î³¨Ê¸»ú¤ò½üµî¤¹¤ë¡£
+    $value = preg_replace('/\\x1b\\$[^\\x0f]*\\x0f/', '', $value);
+}
+
+/**
+ * ¥â¥Ð¥¤¥ë¥µ¥¤¥ÈÍѤÎÆþÎϤνé´ü½èÍý¤ò¹Ô¤¦¡£
+ *
+ * @return void
+ */
+function lfMobileInitInput() {
+    array_walk($_GET, 'lfMobileConvertInputValue');
+    array_walk($_POST, 'lfMobileConvertInputValue');
+    array_walk($_REQUEST, 'lfMobileConvertInputValue');
+}
+
+/**
+ * ¥Ñ¥é¥á¡¼¥¿¡¼¤«¤éÍ­¸ú¤Ê¥»¥Ã¥·¥ç¥óID¤ò¼èÆÀ¤¹¤ë¡£
+ *
+ * @return string|false ¼èÆÀ¤·¤¿Í­¸ú¤Ê¥»¥Ã¥·¥ç¥óID¤òÊÖ¤¹¡£
+ *                      ¼èÆÀ¤Ç¤­¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï false ¤òÊÖ¤¹¡£
+ */
+function lfMobileGetSessionId() {
+    // ¥Ñ¥é¥á¡¼¥¿¡¼¤«¤é¥»¥Ã¥·¥ç¥óID¤ò¼èÆÀ¤¹¤ë¡£
+    $sessionId = @$_POST[session_name()];
+    if (!isset($sessionId)) {
+        $sessionId = @$_GET[session_name()];
+    }
+    if (!isset($sessionId)) {
+        return false;
+    }
+
+    // ¥»¥Ã¥·¥ç¥óID¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¤ò¥Á¥§¥Ã¥¯¤¹¤ë¡£
+    if (preg_match('/^[0-9a-zA-Z,-]{32,}$/', $sessionId) < 1) {
+        gfPrintLog("Invalid session id : sid=$sessionId");
+        return false;
+    }
+
+    // ¥»¥Ã¥·¥ç¥óID¤Î¸ºß¤ò¥Á¥§¥Ã¥¯¤¹¤ë¡£
+    if (sfSessRead($sessionId) === null) {
+        gfPrintLog("Non-existent session id : sid=$sessionId");
+        return false;
+    }
+
+    return session_id($sessionId);
+}
+
+/**
+ * ¥»¥Ã¥·¥ç¥ó¥Ç¡¼¥¿¤¬Í­¸ú¤«¤É¤¦¤«¤ò¥Á¥§¥Ã¥¯¤¹¤ë¡£
+ *
+ * @return boolean ¥»¥Ã¥·¥ç¥ó¥Ç¡¼¥¿¤¬Í­¸ú¤Ê¾ì¹ç¤Ï true¡¢Ìµ¸ú¤Ê¾ì¹ç¤Ï false ¤òÊÖ¤¹¡£
+ */
+function lfMobileValidateSession() {
+    // ÇÛÎó mobile ¤¬ÅÐÏ¿¤µ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¤ò¥Á¥§¥Ã¥¯¤¹¤ë¡£
+    if (!is_array(@$_SESSION['mobile'])) {
+        return false;
+    }
+
+    // Í­¸ú´ü¸Â¤ò²á¤®¤Æ¤¤¤Ê¤¤¤«¤É¤¦¤«¤ò¥Á¥§¥Ã¥¯¤¹¤ë¡£
+    if (intval(@$_SESSION['mobile']['expires']) < time()) {
+        gfPrintLog("Session expired at " .
+                   date('Y/m/d H:i:s', @$_SESSION['mobile']['expires']) .
+                   ' : sid=' . session_id());
+
+        return false;
+    }
+
+    // ·ÈÂÓüËö¤Îµ¡¼ï¤¬°ìÃפ¹¤ë¤«¤É¤¦¤«¤ò¥Á¥§¥Ã¥¯¤¹¤ë¡£
+    $model = GC_MobileUserAgent::getModel();
+    if (@$_SESSION['mobile']['model'] != $model) {
+        gfPrintLog("User agent model mismatch : " .
+                   "\"$model\" != \"" . @$_SESSION['mobile']['model'] .
+                   '" (expected), sid=' . session_id());
+        return false;
+    }
+
+    return true;
+}
+
+/**
+ * ¥â¥Ð¥¤¥ë¥µ¥¤¥ÈÍѤΥ»¥Ã¥·¥ç¥ó´ØÏ¢¤Î½é´ü½èÍý¤ò¹Ô¤¦¡£
+ *
+ * @return void
+ */
+function lfMobileInitSession() {
+    // ¥»¥Ã¥·¥ç¥óID¤Î¼õ¤±ÅϤ·¤Ë¥¯¥Ã¥­¡¼¤ò»ÈÍѤ·¤Ê¤¤¡£
+    ini_set('session.use_cookies', '0');
+    ini_set('session.use_trans_sid', '1');
+
+    // ¥Ñ¥é¥á¡¼¥¿¡¼¤«¤éÍ­¸ú¤Ê¥»¥Ã¥·¥ç¥óID¤ò¼èÆÀ¤¹¤ë¡£
+    $sessionId = lfMobileGetSessionId();
+
+    session_start();
+
+    // ¥»¥Ã¥·¥ç¥óID¤Þ¤¿¤Ï¥»¥Ã¥·¥ç¥ó¥Ç¡¼¥¿¤¬Ìµ¸ú¤Ê¾ì¹ç¤Ï¡¢¥»¥Ã¥·¥ç¥óID¤òºÆÀ¸À®
+    // ¤·¡¢¥»¥Ã¥·¥ç¥ó¥Ç¡¼¥¿¤ò½é´ü²½¤¹¤ë¡£
+    if ($sessionId === false || !lfMobileValidateSession()) {
+        session_regenerate_id();
+        $_SESSION = array('mobile' => array('model'    => GC_MobileUserAgent::getModel(),
+                                            'phone_id' => GC_MobileUserAgent::getId(),
+                                            'expires'  => time() + MOBILE_SESSION_LIFETIME));
+
+        // ¿·¤·¤¤¥»¥Ã¥·¥ç¥óID¤òÉղ䷤ƥê¥À¥¤¥ì¥¯¥È¤¹¤ë¡£
+        if ($_SERVER['REQUEST_METHOD'] == 'GET') {
+            // GET ¤Î¾ì¹ç¤ÏƱ¤¸¥Ú¡¼¥¸¤Ë¥ê¥À¥¤¥ì¥¯¥È¤¹¤ë¡£
+            require_once(DATA_PATH . 'module/Net/URL.php');
+            $url = new Net_URL();
+            $url->addQueryString(session_name(), session_id());
+            header('Location: ' . $url->getURL());
+        } else {
+            // GET °Ê³°¤Î¾ì¹ç¤Ï¥È¥Ã¥×¥Ú¡¼¥¸¤Ø¥ê¥À¥¤¥ì¥¯¥È¤¹¤ë¡£
+            header('Location: ' . URL_SITE_TOP . '?' . SID);
+        }
+        exit;
+    }
+
+    // ·ÈÂÓüËöID¤ò¼èÆÀ¤Ç¤­¤¿¾ì¹ç¤Ï¥»¥Ã¥·¥ç¥ó¥Ç¡¼¥¿¤ËÊݸ¤¹¤ë¡£
+    $phoneId = GC_MobileUserAgent::getId();
+    if ($phoneId !== false) {
+        $_SESSION['mobile']['phone_id'] = $phoneId;
+    }
+
+    // ¥»¥Ã¥·¥ç¥ó¤ÎÍ­¸ú´ü¸Â¤ò¹¹¿·¤¹¤ë¡£
+    $_SESSION['mobile']['expires'] = time() + MOBILE_SESSION_LIFETIME;
+}
+
+/**
+ * ¥â¥Ð¥¤¥ë¥µ¥¤¥ÈÍѤνÐÎϤνé´ü½èÍý¤ò¹Ô¤¦¡£
+ *
+ * ½ÐÎϤÎή¤ì
+ * 1. Smarty
+ * 2. ÆâÉô¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤«¤é Shift JIS ¤ËÊÑ´¹¤¹¤ë¡£
+ * 3. Á´³Ñ¥«¥¿¥«¥Ê¤òȾ³Ñ¥«¥¿¥«¥Ê¤ËÊÑ´¹¤¹¤ë¡£
+ * 4. ³¨Ê¸»ú¥¿¥°¤ò³¨Ê¸»ú¥³¡¼¥É¤ËÊÑ´¹¤¹¤ë¡£
+ * 5. ½ÐÎÏ
+ *
+ * @return void
+ */
+function lfMobileInitOutput() {
+    // Smarty ÍѤΥǥ£¥ì¥¯¥È¥ê¡¼¤òºîÀ®¤¹¤ë¡£
+    @mkdir(COMPILE_DIR);
+
+    // ½ÐÎÏÍѤΥ¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò Shift JIS ¤Ë¸ÇÄꤹ¤ë¡£
+    mb_http_output('SJIS-win');
+
+    // ³¨Ê¸»ú¥¿¥°¤ò³¨Ê¸»ú¥³¡¼¥É¤ËÊÑ´¹¤¹¤ë¡£
+    ob_start(array('GC_MobileEmoji', 'handler'));
+
+    // Á´³Ñ¥«¥¿¥«¥Ê¤òȾ³Ñ¥«¥¿¥«¥Ê¤ËÊÑ´¹¤¹¤ë¡£
+    ob_start(create_function('$buffer', 'return mb_convert_kana($buffer, "k", "SJIS-win");'));
+
+    // ÆâÉô¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤«¤é Shift JIS ¤ËÊÑ´¹¤¹¤ë¡£
+    ob_start('mb_output_handler');
+}
+
+/**
+ * ¥â¥Ð¥¤¥ë¥µ¥¤¥ÈÍѤνé´ü½èÍý¤ò¹Ô¤¦¡£
+ *
+ * @return void
+ */
+function sfMobileInit() {
+    lfMobileInitInput();
+
+    if (basename(dirname($_SERVER['SCRIPT_NAME'])) != 'unsupported') {
+        lfMobileCheckCompatibility();
+        lfMobileInitSession();
+    }
+
+    lfMobileInitOutput();
+}
 ?>

temp/branches/mobile/data/lib/slib.php

@@ -2013 +2013 @@
         if(strlen($str) > ($len + 2)) {
             $ret =substr($str, 0, $len);
+            $cut = substr($str, $len);
         } else {
             $ret = $str;
@@ -2020 +2021 @@
         if(mb_strlen($str) > ($len + 1)) {
             $ret = mb_substr($str, 0, $len);
+            $cut = mb_substr($str, $len);
         } else {
             $ret = $str;
@@ -2025 +2027 @@
         }
     }
+
+    // ³¨Ê¸»ú¥¿¥°¤ÎÅÓÃæ¤ÇʬÃǤµ¤ì¤Ê¤¤¤è¤¦¤Ë¤¹¤ë¡£
+    if (isset($cut)) {
+        // ʬ³ä°ÌÃÖ¤è¤êÁ°¤ÎºÇ¸å¤Î [ °Ê¹ß¤ò¼èÆÀ¤¹¤ë¡£
+        $head = strrchr($ret, '[');
+
+        // ʬ³ä°ÌÃÖ¤è¤ê¸å¤ÎºÇ½é¤Î ] °ÊÁ°¤ò¼èÆÀ¤¹¤ë¡£
+        $tail_pos = strpos($cut, ']');
+        if ($tail_pos !== false) {
+            $tail = substr($cut, 0, $tail_pos + 1);
+        }
+
+        // ʬ³ä°ÌÃÖ¤è¤êÁ°¤Ë [¡¢¸å¤Ë ] ¤¬¸«¤Ä¤«¤Ã¤¿¾ì¹ç¤Ï¡¢[ ¤«¤é ] ¤Þ¤Ç¤ò
+        // Àܳ¤·¤Æ³¨Ê¸»ú¥¿¥°1¸Äʬ¤Ë¤Ê¤ë¤«¤É¤¦¤«¤ò¥Á¥§¥Ã¥¯¤¹¤ë¡£
+        if ($head !== false && $tail_pos !== false) {
+            $subject = $head . $tail;
+            if (preg_match('/^\[emoji:e?\d+\]$/', $subject)) {
+                // ³¨Ê¸»ú¥¿¥°¤¬¸«¤Ä¤«¤Ã¤¿¤Î¤Çºï½ü¤¹¤ë¡£
+                $ret = substr($ret, 0, -strlen($head));
+            }
+        }
+    }
+
     if($commadisp){
         $ret = $ret . "...";

temp/branches/mobile/html/install/index.php

@@ -324 +324 @@
     $arrWriteFile = array(
         "../../data/install.inc",
+        "../../data/install_mobile.inc",
         "../user_data",
         "../upload",
@@ -741 +742 @@
         fclose($fp);
     }
+
+    // ¥â¥Ð¥¤¥ëÈǤÎÀßÄê¥Õ¥¡¥¤¥ë install_mobile.inc ¤òºîÀ®¤¹¤ë¡£
+    $filepath = $data_path . "install_mobile.inc";
+    
+    $config_data = 
+    "<?php\n".
+    "    define ('ECCUBE_INSTALL', 'ON');\n" .
+    "    define ('HTML_PATH', '" . $root_dir . "mobile/');\n" .  
+    "    define ('PC_HTML_PATH', '" . $root_dir . "');\n" .  
+    "    define ('SITE_URL', '" . $normal_url . "mobile/');\n" .
+    "    define ('PC_SITE_URL', '" . $normal_url . "');\n" .
+    "    define ('SSL_URL', '" . $secure_url . "mobile/');\n" .
+    "    define ('PC_SSL_URL', '" . $secure_url . "');\n" .
+    "    define ('URL_DIR', '" . $url_dir . "mobile/');\n" .    
+    "    define ('PC_URL_DIR', '" . $url_dir . "');\n" .    
+    "    define ('DOMAIN_NAME', '" . $objWebParam->getValue('domain') . "');\n" .
+    "    define ('DB_TYPE', '" . $objDBParam->getValue('db_type') . "');\n" .
+    "    define ('DB_USER', '" . $objDBParam->getValue('db_user') . "');\n" . 
+    "    define ('DB_PASSWORD', '" . $objDBParam->getValue('db_password') . "');\n" .
+    "    define ('DB_SERVER', '" . $objDBParam->getValue('db_server') . "');\n" .
+    "    define ('DB_NAME', '" . $objDBParam->getValue('db_name') . "');\n" .
+    "    define ('DB_PORT', '" . $objDBParam->getValue('db_port') .  "');\n" .
+    "    define ('DATA_PATH', '".$data_path."');\n" .
+    "?>";
+    
+    if($fp = fopen($filepath,"w")) {
+        fwrite($fp, $config_data);
+        fclose($fp);
+    }
 }
 

temp/branches/mobile/html/require.php

@@ -30 +30 @@
 require_once($include_dir . "/../data/class/SC_Page.php");
 require_once($include_dir . "/../data/class/SC_Pdf.php");
+require_once($include_dir . "/../data/class/GC_MobileUserAgent.php");
+require_once($include_dir . "/../data/class/GC_MobileEmoji.php");
 require_once($include_dir . "/../data/include/page_layout.inc");
 
@@ -35 +37 @@
 sfLoadUpdateModule();
 
+// ·ÈÂÓüËö¤Î¾ì¹ç¤Ï mobile °Ê²¼¤Ø¥ê¥À¥¤¥ì¥¯¥È¤¹¤ë¡£
+if (GC_MobileUserAgent::isMobile()) {
+    header("Location: " . URL_DIR . "mobile/");
+    exit;
+}
+
+// ³¨Ê¸»úÊÑ´¹ (½üµî) ¥Õ¥£¥ë¥¿¡¼¤òÁȤ߹þ¤à¡£
+ob_start(array('GC_MobileEmoji', 'handler'));
 ?>