Changeset 21302

Timestamp:

2011/10/28 18:58:18 (11 years ago)

Author:

shutta

Message:

#1527 (端末種別の判別ルーチンの統一)
Net_UserAgent_Mobile::isMobile()な処理をSC_Display_Ex::detectDevice()に統一。
但し、SC_Mobile_UserAgent::isNonMobile()は、対象から除外した。

Location:

branches/version-2_11-dev/data

Files:

• class/SC_MobileUserAgent.php (modified) (1 diff)
• class/SC_Response.php (modified) (1 diff)
• class/helper/SC_Helper_Mail.php (modified) (1 diff)
• class/helper/SC_Helper_Purchase.php (modified) (2 diffs)
• class/session/SC_SessionFactory.php (modified) (1 diff)
• smarty_extends/modifier.numeric_emoji.php (modified) (1 diff)

branches/version-2_11-dev/data/class/SC_MobileUserAgent.php

@@ -117 +117 @@
      */
     function isNonMobile() {
+        /**
+         * ここは、自クラスのメソッドの逆関数なので、
+         * EC-CUBE標準規約/リファクタリングガイドラインの
+         * SC_Display_Ex::detectDevice()への統一からは除外。
+         */
         return !SC_MobileUserAgent_Ex::isMobile();
     }

branches/version-2_11-dev/data/class/SC_Response.php

@@ -150 +150 @@
 
         $session = SC_SessionFactory::getInstance();
-        if (SC_MobileUserAgent_Ex::isMobile() || $session->useCookie() == false) {
+        if ((SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE)
+            || ($session->useCookie() == false)
+        ) {
             $netUrl->addQueryString(session_name(), session_id());
         }

branches/version-2_11-dev/data/class/helper/SC_Helper_Mail.php

@@ -150 +150 @@
         $arrTplVar->tpl_user_point = $objCustomer->getValue('point');
 
-       if(Net_UserAgent_Mobile::isMobile() === true) {
+       if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) {
             $objMailView = new SC_MobileView_Ex();
        } else {

branches/version-2_11-dev/data/class/helper/SC_Helper_Purchase.php

@@ -431 +431 @@
             }
 
-            if (Net_UserAgent_Mobile::isMobile()
-                && in_array('email', $keys)) {
+            if ((SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE)
+                && in_array('email', $keys)
+            ) {
                 $email_mobile = $objCustomer->getValue('email_mobile');
                 if (empty($email_mobile)) {
@@ -1060 +1061 @@
     function sendOrderMail($orderId) {
         $mailHelper = new SC_Helper_Mail_Ex();
-        $mailHelper->sfSendOrderMail($orderId,
-                                     SC_MobileUserAgent_Ex::isMobile() ? 2 : 1);
+        $template_id =
+            SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE ? 2 : 1;
+        $mailHelper->sfSendOrderMail($orderId, $template_id);
     }
 

branches/version-2_11-dev/data/class/session/SC_SessionFactory.php

@@ -74 +74 @@
         case 'useCookie':
             // モバイルの場合はSC_SessionFactory_UseRequestを使用する
-            if (Net_UserAgent_Mobile::isMobile()===true) {
+            if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) {
                 $session = new SC_SessionFactory_UseRequest;
                 $session->setState('mobile');

branches/version-2_11-dev/data/smarty_extends/modifier.numeric_emoji.php

@@ -13 +13 @@
     static $numeric_emoji_index = array('134', '125', '126', '127', '128', '129', '130', '131', '132', '133');
 
-    if (SC_MobileUserAgent::isMobile() && isset($numeric_emoji_index[$value])) {
+    if ((SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE)
+        && isset($numeric_emoji_index[$value])
+    ) {
         return '[emoji:' . $numeric_emoji_index[$value] . ']';
     } else {