Changeset 19029

Timestamp:

2010/11/06 21:19:13 (16 years ago)

Author:

no61

Message:

スマートフォンの判定とリダイレクト

Location:

branches/camp/camp-2_5-E

Files:

• data/class/SC_Display.php (modified) (2 diffs)
• data/class/SC_SmartphoneUserAgent.php (added)
• data/module/Net/UserAgent/Mobile.php (modified) (1 diff)
• data/module/Net/UserAgent/Mobile/Common.php (modified) (1 diff)
• data/require_classes.php (modified) (1 diff)
• html/require.php (modified) (1 diff)

branches/camp/camp-2_5-E/data/class/SC_Display.php

@@ -65 +65 @@
         if($nu->isMobile()){
             $retDevice = 1;
-        }elseif ($this->isSmartphone()){
+        }elseif ($nu->isSmartphone()){
             $retDevice = 2;
         }else{
@@ -77 +77 @@
     }
 
-    function isSmartphone(){
-        $useragents = array(
-            'iPhone',         // Apple iPhone
-    'iPod',           // Apple iPod touch
-    'Android',        // 1.5+ Android
-    'dream',          // Pre 1.5 Android
-    'CUPCAKE',        // 1.5+ Android
-    'blackberry9500', // Storm
-    'blackberry9530', // Storm
-    'blackberry9520', // Storm v2
-    'blackberry9550', // Storm v2
-    'blackberry9800', // Torch
-    'webOS',          // Palm Pre Experimental
-    'incognito',      // Other iPhone browser
-    'webmate'         // Other iPhone browser
-        );
-
-        $pattern = implode("|", $useragents);
-        return preg_match('/['.$pattern.']/', $_SERVER['HTTP_USER_AGENT']);
-
-    }
-
-
     function assign(LC_Page $page){
 

branches/camp/camp-2_5-E/data/module/Net/UserAgent/Mobile.php

@@ -396 +396 @@
     }
 
+    // }}}
+    // {{{ isSmartphone()
+
+    /**
+     * Checks whether or not the user agent is Smartphone by a given user agent string.
+     *
+     * @param string $userAgent
+     * @return boolean
+     * @since Method available since Release 0.31.0
+     */
+    function isSmartphone($userAgent = null)
+    {
+        if (is_null($userAgent)) {
+            $userAgent = @$_SERVER['HTTP_USER_AGENT'];
+        }
+
+        $useragents = array(
+            'iPhone',         // Apple iPhone
+            'iPod',           // Apple iPod touch
+            'Android',        // 1.5+ Android
+            'dream',          // Pre 1.5 Android
+            'CUPCAKE',        // 1.5+ Android
+            'blackberry9500', // Storm
+            'blackberry9530', // Storm
+            'blackberry9520', // Storm v2
+            'blackberry9550', // Storm v2
+            'blackberry9800', // Torch
+            'webOS',          // Palm Pre Experimental
+            'incognito',      // Other iPhone browser
+            'webmate'         // Other iPhone browser
+        );
+
+        $pattern = implode("|", $useragents);
+        return preg_match('/['.$pattern.']/', $userAgent);
+    }
+
     /**#@-*/
 

branches/camp/camp-2_5-E/data/module/Net/UserAgent/Mobile/Common.php

@@ -447 +447 @@
 
     // }}}
+    // {{{ isSmartphone()
+
+    /**
+     * Returns whether the agent is Smartphone or not.
+     *
+     * @return boolean
+     * @since Method available since Release 0.31.0
+     */
+    function isSmartphone()
+    {
+        return false;
+    }
+
+
+    // }}}
     // {{{ getModel()
 

branches/camp/camp-2_5-E/data/require_classes.php

@@ -45 +45 @@
 require_once(CLASS_PATH . "SC_Cookie.php");
 require_once(CLASS_PATH . "SC_MobileUserAgent.php");
+require_once(CLASS_PATH . "SC_SmartphoneUserAgent.php");
 require_once(CLASS_PATH . "SC_MobileEmoji.php");
 require_once(CLASS_PATH . "SC_MobileImage.php");

branches/camp/camp-2_5-E/html/require.php

@@ -33 +33 @@
 SC_MobileUserAgent::sfAutoRedirectMobileSite();
 
+// スマートフォンの場合、リダイレクト
+SC_SmartphoneUserAgent::sfAutoRedirectSmartphoneSite();
+
 // 絵文字変換 (除去) フィルターを組み込む。
 ob_start(array('SC_MobileEmoji', 'handler'));