Changeset 20495

Timestamp:

2011/03/04 21:54:51 (13 years ago)

Author:

shutta

Message:

SC_MobileUserAgentクラスのclass_extends対応

Location:

branches/version-2_5-dev/data

Files:

• class/SC_Customer.php (modified) (2 diffs)
• class/SC_MobileEmoji.php (modified) (1 diff)
• class/SC_MobileImage.php (modified) (1 diff)
• class/SC_MobileUserAgent.php (modified) (1 diff)
• class/SC_Response.php (modified) (1 diff)
• class/helper/SC_Helper_Mobile.php (modified) (4 diffs)
• class/helper/SC_Helper_Purchase.php (modified) (1 diff)
• class/pages/entry/LC_Page_Entry.php (modified) (1 diff)
• class/session/sessionfactory/SC_SessionFactory_UseRequest.php (modified) (3 diffs)
• class_extends/SC_MobileUserAgent_Ex.php (added)
• require_classes.php (modified) (1 diff)

branches/version-2_5-dev/data/class/SC_Customer.php

@@ -111 +111 @@
     function checkMobilePhoneId() {
         //docomo用にデータを取り出す。
-        if(SC_MobileUserAgent::getCarrier() == 'docomo'){
+        if(SC_MobileUserAgent_Ex::getCarrier() == 'docomo'){
             if($_SESSION['mobile']['phone_id'] == "" && strlen($_SESSION['mobile']['phone_id']) == 0)
-                $_SESSION['mobile']['phone_id'] = SC_MobileUserAgent::getId();
+                $_SESSION['mobile']['phone_id'] = SC_MobileUserAgent_Ex::getId();
         }
         if (!isset($_SESSION['mobile']['phone_id']) || $_SESSION['mobile']['phone_id'] === false) {
@@ -136 +136 @@
     function getCustomerDataFromMobilePhoneIdPass($pass) {
         //docomo用にデータを取り出す。
-        if(SC_MobileUserAgent::getCarrier() == 'docomo'){
+        if(SC_MobileUserAgent_Ex::getCarrier() == 'docomo'){
             if($_SESSION['mobile']['phone_id'] == "" && strlen($_SESSION['mobile']['phone_id']) == 0)
-                $_SESSION['mobile']['phone_id'] = SC_MobileUserAgent::getId();
+                $_SESSION['mobile']['phone_id'] = SC_MobileUserAgent_Ex::getId();
         }
         if (!isset($_SESSION['mobile']['phone_id']) || $_SESSION['mobile']['phone_id'] === false) {

branches/version-2_5-dev/data/class/SC_MobileEmoji.php

@@ -51 +51 @@
      */
     function indexToCode($index) {
-        $carrier = SC_MobileUserAgent::getCarrier();
+        $carrier = SC_MobileUserAgent_Ex::getCarrier();
         if ($carrier === false) {
             return MOBILE_EMOJI_SUBSTITUTE;

branches/version-2_5-dev/data/class/SC_MobileImage.php

@@ -41 +41 @@
 
         // 端末情報を取得する
-        $carrier = SC_MobileUserAgent::getCarrier();
-        $model   = SC_MobileUserAgent::getModel();
+        $carrier = SC_MobileUserAgent_Ex::getCarrier();
+        $model   = SC_MobileUserAgent_Ex::getModel();
 
         // 携帯電話の場合のみ処理を行う

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

@@ -117 +117 @@
      */
     function isNonMobile() {
-        return !SC_MobileUserAgent::isMobile();
+        return !SC_MobileUserAgent_Ex::isMobile();
     }
 

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

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

branches/version-2_5-dev/data/class/helper/SC_Helper_Mobile.php

@@ -42 +42 @@
      */
     function lfMobileCheckCompatibility() {
-        if (!SC_MobileUserAgent::isSupported()) {
+        if (!SC_MobileUserAgent_Ex::isSupported()) {
             header('Location: ' . ROOT_URLPATH . 'unsupported/' . DIR_INDEX_PATH);
             exit;
@@ -157 +157 @@
 
         // 携帯端末の機種が一致するかどうかをチェックする。
-        $model = SC_MobileUserAgent::getModel();
+        $model = SC_MobileUserAgent_Ex::getModel();
         if (@$_SESSION['mobile']['model'] != $model) {
             GC_Utils_Ex::gfPrintLog("User agent model mismatch : " .
@@ -187 +187 @@
         if ($sessionId === false || !$this->lfMobileValidateSession()) {
             session_regenerate_id();
-            $_SESSION = array('mobile' => array('model'    => SC_MobileUserAgent::getModel(),
-                                                'phone_id' => SC_MobileUserAgent::getId(),
+            $_SESSION = array('mobile' => array('model'    => SC_MobileUserAgent_Ex::getModel(),
+                                                'phone_id' => SC_MobileUserAgent_Ex::getId(),
                                                 'expires'  => time() + MOBILE_SESSION_LIFETIME));
 
@@ -203 +203 @@
 
         // 携帯端末IDを取得できた場合はセッションデータに保存する。
-        $phoneId = SC_MobileUserAgent::getId();
+        $phoneId = SC_MobileUserAgent_Ex::getId();
         if ($phoneId !== false) {
             $_SESSION['mobile']['phone_id'] = $phoneId;

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

@@ -894 +894 @@
         $mailHelper = new SC_Helper_Mail_Ex();
         $mailHelper->sfSendOrderMail($orderId,
-                                     SC_MobileUserAgent::isMobile() ? 2 : 1);
+                                     SC_MobileUserAgent_Ex::isMobile() ? 2 : 1);
     }
 

branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php

@@ -188 +188 @@
             $arrResults['email_mobile']     = $arrResults['email'];
             // PHONE_IDを取り出す
-            $arrResults['mobile_phone_id']  =  SC_MobileUserAgent::getId();
+            $arrResults['mobile_phone_id']  =  SC_MobileUserAgent_Ex::getId();
         }
         return $arrResults;

branches/version-2_5-dev/data/class/session/sessionfactory/SC_SessionFactory_UseRequest.php

@@ -475 +475 @@
      */
     function updateModel() {
-        $this->setValue('model', SC_MobileUserAgent::getModel());
+        $this->setValue('model', SC_MobileUserAgent_Ex::getModel());
     }
 
@@ -485 +485 @@
     function validateModel() {
         $modelInSession = $this->getModel();
-        $model = SC_MobileUserAgent::getModel();
+        $model = SC_MobileUserAgent_Ex::getModel();
         if (!empty($model)
          && $model === $modelInSession) {
@@ -508 +508 @@
      */
     function updatePhoneId() {
-        $this->setValue('phone_id', SC_MobileUserAgent::getId());
+        $this->setValue('phone_id', SC_MobileUserAgent_Ex::getId());
     }
 

branches/version-2_5-dev/data/require_classes.php

@@ -48 +48 @@
 require_once(CLASS_EX_REALDIR . "SC_CustomerList_Ex.php");
 require_once(CLASS_REALDIR . "SC_Cookie.php");
-require_once(CLASS_REALDIR . "SC_MobileUserAgent.php");
+require_once(CLASS_EX_REALDIR . "SC_MobileUserAgent_Ex.php");
 require_once(CLASS_EX_REALDIR . "SC_SmartphoneUserAgent_Ex.php");
 require_once(CLASS_EX_REALDIR . "SC_MobileEmoji_Ex.php");