Index: branches/dev/data/class/SC_FormParam.php =================================================================== --- branches/dev/data/class/SC_FormParam.php (revision 17) +++ branches/dev/data/class/SC_FormParam.php (revision 11460) @@ -155,4 +155,5 @@ case 'DOMAIN_CHECK': case 'FILE_NAME_CHECK': + case 'MOBILE_EMAIL_CHECK': if(!is_array($this->param[$cnt])) { Index: branches/dev/data/class/SC_CheckError.php =================================================================== --- branches/dev/data/class/SC_CheckError.php (revision 17) +++ branches/dev/data/class/SC_CheckError.php (revision 11460) @@ -378,5 +378,5 @@ return; } - if(strlen($this->arrParam[$value[1]]) > 0 && ! mb_ereg("^([¥¡-¥ö]|[¡¼])+$", $this->arrParam[$value[1]])) { + if(strlen($this->arrParam[$value[1]]) > 0 && ! mb_ereg("^[¥¡-¥öŽ¦-Žß¡¼]+$", $this->arrParam[$value[1]])) { $this->arrErr[$value[1]] = "¢¨ " . $value[0] . "¤Ï¥«¥¿¥«¥Ê¤ÇÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£
"; } @@ -780,4 +780,15 @@ } } + + /*¡¡·ÈÂӥ᡼¥ë¥¢¥É¥ì¥¹¤ÎȽÄê¡¡*/ + // value[0] = ¹àÌÜ̾ value[1] = ȽÄêÂоݥ᡼¥ë¥¢¥É¥ì¥¹ + function MOBILE_EMAIL_CHECK( $value ){ //¡¡¥á¡¼¥ë¥¢¥É¥ì¥¹¤òÀµµ¬É½¸½¤ÇȽÄꤹ¤ë + if(isset($this->arrErr[$value[1]])) { + return; + } + if(strlen($this->arrParam[$value[1]]) > 0 && !gfIsMobileMailAddress($this->arrParam[$value[1]])) { + $this->arrErr[$value[1]] = "¢¨ " . $value[0] . "¤Ï·ÈÂÓÅÅÏäΤâ¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
"; + } + } } ?> Index: branches/dev/data/class/GC_MobileKaraMail.php =================================================================== --- branches/dev/data/class/GC_MobileKaraMail.php (revision 11460) +++ branches/dev/data/class/GC_MobileKaraMail.php (revision 11460) @@ -0,0 +1,200 @@ +parsed) { + return; + } + + require_once DATA_PATH . '/module/Mail/mimeDecode.php'; + + $fp = fopen('php://stdin', 'r'); + + // From ¹Ô¤ò²òÀϤ¹¤ë¡£ + $from_line = rtrim(fgets($fp)); + if (preg_match('/^From\\s+"?([^\\s"@]+)"?@([^\\s@]+)/', $from_line, $matches)) { + $this->sender = $matches[1] . '@' . $matches[2]; + } else { + trigger_error("Invalid from line: $from_line"); + $this->sender = null; + } + + // »Ä¤ê¤Î¥Ø¥Ã¥À¡¼¤ò²òÀϤ¹¤ë¡£ + $data = ''; + while (!feof($fp)) { + $data .= fgets($fp); + if (rtrim($data, "\r\n") == '') { + break; + } + } + $structure = Mail_mimeDecode::decode(array('input' => $data)); + $this->recipient = @$structure->headers['to']; + + // °¸À襢¥É¥ì¥¹¤«¤é³ÈÄ¥Éôʬ¤ò¼èÆÀ¤¹¤ë¡£ + $pos = strpos($this->recipient, MOBILE_KARA_MAIL_ADDRESS_DELIMITER); + if ($pos !== false) { + $extension_and_domain = substr($this->recipient, $pos + 1); + $pos = strpos($extension_and_domain, '@'); + if ($pos !== false) { + $this->extension = substr($extension_and_domain, 0, $pos); + } else { + $this->extension = $extension_and_domain; + } + } else { + trigger_error("Invalid recipient: {$this->recipient}"); + $this->extension = null; + } + + $this->parsed = true; + } + + /** + * ÇÛ¿®¤¬´°Î»¤·¤¿¤³¤È¤ò¼¨¤¹½ªÎ»¥¹¥Æ¡¼¥¿¥¹¤Ç¥×¥í¥°¥é¥à¤ò½ªÎ»¤¹¤ë¡£ + * + * @return void + */ + function success() { + exit(0); + } + + /** + * °ì»þŪ¤Ê¥¨¥é¡¼¤ò¼¨¤¹½ªÎ»¥¹¥Æ¡¼¥¿¥¹¤Ç¥×¥í¥°¥é¥à¤ò½ªÎ»¤¹¤ë¡£ + * + * @return void + */ + function temporaryFailure() { + exit(75); + } + + /** + * Á÷¿®¼Ô¤Î¥á¡¼¥ë¥¢¥É¥ì¥¹¤ò¼èÆÀ¤¹¤ë¡£ + * + * parse() ¼Â¹Ô¸å¤Ë»ÈÍѤ¹¤ë¤³¤È¡£ + * + * @return string|false Á÷¿®¼Ô¤Î¥á¡¼¥ë¥¢¥É¥ì¥¹¤òÊÖ¤¹¡£¼èÆÀ¤Ç¤­¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï false ¤òÊÖ¤¹¡£ + */ + function getSender() { + return isset($this->sender) ? $this->sender : false; + } + + /** + * °¸Àè¤Î¥á¡¼¥ë¥¢¥É¥ì¥¹¤Î³ÈÄ¥Éôʬ¤«¤é¥³¥Þ¥ó¥É̾¤ò¼èÆÀ¤¹¤ë¡£ + * + * parse() ¼Â¹Ô¸å¤Ë»ÈÍѤ¹¤ë¤³¤È¡£ + * + * @return string|false ¥³¥Þ¥ó¥É̾¤òÊÖ¤¹¡£¼èÆÀ¤Ç¤­¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï false ¤òÊÖ¤¹¡£ + */ + function getCommand() { + if (!isset($this->extension)) { + return false; + } + + $pos = strpos($this->extension, MOBILE_KARA_MAIL_EXTENSION_DELIMITER); + if ($pos === false) { + return false; + } + + return substr($this->extension, 0, $pos); + } + + /** + * °¸Àè¤Î¥á¡¼¥ë¥¢¥É¥ì¥¹¤Î³ÈÄ¥Éôʬ¤«¤é¥È¡¼¥¯¥ó¤ò¼èÆÀ¤¹¤ë¡£ + * + * parse() ¼Â¹Ô¸å¤Ë»ÈÍѤ¹¤ë¤³¤È¡£ + * + * @return string|false ¥È¡¼¥¯¥ó¤òÊÖ¤¹¡£¼èÆÀ¤Ç¤­¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï false ¤òÊÖ¤¹¡£ + */ + function getToken() { + if (!isset($this->extension)) { + return false; + } + + $pos = strpos($this->extension, MOBILE_KARA_MAIL_EXTENSION_DELIMITER); + if ($pos === false) { + return false; + } + + return substr($this->extension, $pos + 1); + } +} + +/** + * ¥â¥Ð¥¤¥ë¥µ¥¤¥È¤Î¶õ¥á¡¼¥ë¤ò°·¤¦¥¯¥é¥¹ (PostfixÍÑ) + */ +class GC_MobileKaraMail_Postfix extends GC_MobileKaraMail { + /** + * @see GC_MobileKaraMail::parse() + */ + function parse() { + if (@$this->parsed) { + return; + } + + $this->sender = $_ENV['SENDER']; + $this->recipient = $_ENV['RECIPIENT']; + $this->extension = $_ENV['EXTENSION']; + + $this->parsed = true; + } +} + +/** + * ¥â¥Ð¥¤¥ë¥µ¥¤¥È¤Î¶õ¥á¡¼¥ë¤ò°·¤¦¥¯¥é¥¹ (qmailÍÑ) + */ +class GC_MobileKaraMail_Qmail extends GC_MobileKaraMail { + /** + * @see GC_MobileKaraMail::parse() + */ + function parse() { + if (@$this->parsed) { + return; + } + + $this->sender = $_ENV['SENDER']; + $this->recipient = $_ENV['RECIPIENT']; + $this->extension = $_ENV['DEFAULT']; + + $this->parsed = true; + } + + /** + * °ì»þŪ¤Ê¥¨¥é¡¼¤ò¼¨¤¹½ªÎ»¥¹¥Æ¡¼¥¿¥¹¤Ç¥×¥í¥°¥é¥à¤ò½ªÎ»¤¹¤ë¡£ + * + * @return void + */ + function temporaryFailure() { + exit(111); + } +} +?> Index: branches/dev/data/class/GC_MobileImage.php =================================================================== --- branches/dev/data/class/GC_MobileImage.php (revision 11460) +++ branches/dev/data/class/GC_MobileImage.php (revision 11460) @@ -0,0 +1,77 @@ +"]+)[\'"]\s*\/*>/i'; + $result = preg_match_all($pattern, $buffer, $images); + + // üËö¤Î¾ðÊó¤ò¼èÆÀ¤¹¤ë + $fp = fopen(MOBILE_IMAGE_INC_PATH . "/mobile_image_map_$carrier.csv", "r"); + while (($data = fgetcsv($fp, 1000, ",")) !== FALSE) { + if ($data[1] == $model || $data[1] == '*') { + $cacheSize = $data[2]; + $imageFileSize = $data[7]; + $imageType = $data[6]; + $imageWidth = $data[5]; + break; + } + } + fclose($fp); + + // docomo¤Èsoftbank¤Î¾ì¹ç¤Ï²èÁü¥Õ¥¡¥¤¥ë°ì¤Ä¤ËÍøÍѲÄǽ¤Ê¥µ¥¤¥º¤Î¾å¸Â¤ò·×»»¤¹¤ë + // au¤ÏHTML¤Îbyte¿ô¾å¸Â¤Ë²èÁü¥Õ¥¡¥¤¥ë¥µ¥¤¥º¤¬´Þ¤Þ¤ì¤Ê¤¤¤Î¤ÇimageFileSize¤Î¤Þ¤Þ¡£ + if ($carrier == "docomo" or $carrier == "softbank") { + // ·×»»¼°¡§(ÍøÍÑüËö¤Çɽ¼¨²Äǽ¤Êcache¥µ¥¤¥º - HTML¤Î¥Ð¥¤¥È¿ô - ÊÑ´¹¸å¤Î²èÁü̾¤Î¥Ð¥¤¥È¿ô(ÌÜ°ÂÃÍ) ) / HTMLÃæ¤Î²èÁü¿ô + $temp_imagefilesize = ($cacheSize - strlen($buffer) - (140 * $result) ) / $result; + // ·×»»·ë²Ì¤¬Ã¼Ëö¤Îɽ¼¨²Äǽ¥Õ¥¡¥¤¥ë¥µ¥¤¥º¾å¸Â¤è¤ê¾®¤µ¤¤¾ì¹ç¤Ï·×»»·ë²Ì¤ÎÃͤòÍ­¸ú¤Ë¤¹¤ë + if ($temp_imagefilesize < $imageFileSize) { + $imageFileSize = $temp_imagefilesize; + } + } + + // ²èÁüÊÑ´¹¤Î¾ðÊó¤ò¥»¥Ã¥È¤¹¤ë + $imageConverter = New ImageConverter(); + $imageConverter->setOutputDir(MOBILE_IMAGE_DIR); + $imageConverter->setImageType($imageType); + $imageConverter->setImageWidth($imageWidth); + $imageConverter->setFileSize($imageFileSize); + + // HTMLÃæ¤ÎIMG¥¿¥°¤òÊÑ´¹¸å¤Î¥Õ¥¡¥¤¥ë¥Ñ¥¹¤ËÃÖ´¹¤¹¤ë + foreach ($images[1] as $key => $value) { + $converted = $imageConverter->execute(preg_replace('|^' . PC_URL_DIR . '|', PC_HTML_PATH, $value)); + if (isset($converted['outputImageName'])) { + $buffer = str_replace($value, MOBILE_IMAGE_URL . '/' . $converted['outputImageName'], $buffer); + } else { + $buffer = str_replace($images[0][$key], '', $buffer); + } + } + } + return $buffer; + } +} +?> Index: branches/dev/data/class/SC_Customer.php =================================================================== --- branches/dev/data/class/SC_Customer.php (revision 17) +++ branches/dev/data/class/SC_Customer.php (revision 11460) @@ -50,8 +50,13 @@ } - function getCustomerDataFromEmailPass( $pass, $email ) { + function getCustomerDataFromEmailPass( $pass, $email, $mobile = false ) { + $sql_mobile = $mobile ? ' OR email_mobile ILIKE ?' : ''; + $arrValues = array($email); + if ($mobile) { + $arrValues[] = $email; + } // ËÜÅÐÏ¿¤µ¤ì¤¿²ñ°÷¤Î¤ß - $sql = "SELECT * FROM dtb_customer WHERE email ILIKE ? AND del_flg = 0 AND status = 2"; - $result = $this->conn->getAll($sql, array($email)); + $sql = "SELECT * FROM dtb_customer WHERE (email ILIKE ?" . $sql_mobile . ") AND del_flg = 0 AND status = 2"; + $result = $this->conn->getAll($sql, $arrValues); $data = $result[0]; @@ -63,4 +68,94 @@ } return false; + } + + /** + * ·ÈÂÓüËöID¤¬°ìÃפ¹¤ë²ñ°÷¤¬Â¸ºß¤¹¤ë¤«¤É¤¦¤«¤ò¥Á¥§¥Ã¥¯¤¹¤ë¡£ + * + * @return boolean ³ºÅö¤¹¤ë²ñ°÷¤¬Â¸ºß¤¹¤ë¾ì¹ç¤Ï true¡¢¤½¤ì°Ê³°¤Î¾ì¹ç + * ¤Ï false ¤òÊÖ¤¹¡£ + */ + function checkMobilePhoneId() { + if (!isset($_SESSION['mobile']['phone_id']) || $_SESSION['mobile']['phone_id'] === false) { + 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']) || $_SESSION['mobile']['phone_id'] === false) { + 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']) || $_SESSION['mobile']['phone_id'] === false) { + 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']; + } + + /** + * email ¤«¤é email_mobile ¤Ø·ÈÂӤΥ᡼¥ë¥¢¥É¥ì¥¹¤ò¥³¥Ô¡¼¤¹¤ë¡£ + * + * @return void + */ + function updateEmailMobile() { + // ¤¹¤Ç¤Ë email_mobile ¤ËÃͤ¬Æþ¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï²¿¤â¤·¤Ê¤¤¡£ + if ($this->customer_data['email_mobile'] != '') { + return; + } + + // email ¤¬·ÈÂӤΥ᡼¥ë¥¢¥É¥ì¥¹¤Ç¤Ï¤Ê¤¤¾ì¹ç¤Ï²¿¤â¤·¤Ê¤¤¡£ + if (!gfIsMobileMailAddress($this->customer_data['email'])) { + return; + } + + // email ¤«¤é email_mobile ¤Ø¥³¥Ô¡¼¤¹¤ë¡£ + $objQuery = new SC_Query; + $sqlval = array('email_mobile' => $this->customer_data['email']); + $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['email_mobile'] = $this->customer_data['email']; } @@ -101,5 +196,5 @@ // ¥í¥°¥¤¥ó¤ËÀ®¸ù¤·¤Æ¤¤¤ë¤«È½Äꤹ¤ë¡£ - function isLoginSuccess() { + function isLoginSuccess($dont_check_email_mobile = false) { // ¥í¥°¥¤¥ó»þ¤Î¥á¡¼¥ë¥¢¥É¥ì¥¹¤ÈDB¤Î¥á¡¼¥ë¥¢¥É¥ì¥¹¤¬°ìÃפ·¤Æ¤¤¤ë¾ì¹ç if(sfIsInt($_SESSION['customer']['customer_id'])) { @@ -107,4 +202,10 @@ $email = $objQuery->get("dtb_customer", "email", "customer_id = ?", array($_SESSION['customer']['customer_id'])); if($email == $_SESSION['customer']['email']) { + // ¥â¥Ð¥¤¥ë¥µ¥¤¥È¤Î¾ì¹ç¤Ï·ÈÂӤΥ᡼¥ë¥¢¥É¥ì¥¹¤¬ÅÐÏ¿¤µ¤ì¤Æ¤¤¤ë¤³¤È¤â¥Á¥§¥Ã¥¯¤¹¤ë¡£ + // ¤¿¤À¤· $dont_check_email_mobile ¤¬ true ¤Î¾ì¹ç¤Ï¥Á¥§¥Ã¥¯¤·¤Ê¤¤¡£ + if (defined('MOBILE_SITE') && !$dont_check_email_mobile) { + $email_mobile = $objQuery->get("dtb_customer", "email_mobile", "customer_id = ?", array($_SESSION['customer']['customer_id'])); + return isset($email_mobile); + } return true; } @@ -121,4 +222,9 @@ function setValue($keyname, $val) { $_SESSION['customer'][$keyname] = $val; + } + + // ¥Ñ¥é¥á¡¼¥¿¤¬NULL¤«¤É¤¦¤«¤ÎȽÄê + function hasValue($keyname) { + return isset($_SESSION['customer'][$keyname]); } Index: branches/dev/data/class/GC_MobileUserAgent.php =================================================================== --- branches/dev/data/class/GC_MobileUserAgent.php (revision 11460) +++ branches/dev/data/class/GC_MobileUserAgent.php (revision 11460) @@ -0,0 +1,127 @@ +getCarrierShortName()) { + case 'I': + return 'docomo'; + case 'E': + return 'ezweb'; + case 'V': + return 'softbank'; + default: + return false; + } + } + + /** + * ¾¡¼ê¥µ¥¤¥È¤ÇÍøÍѲÄǽ¤Ê·ÈÂÓüËö/ÍøÍѼԤÎID¤ò¼èÆÀ¤¹¤ë¡£ + * + * ³Æ¥­¥ã¥ê¥¢¤Ç»ÈÍѤ¹¤ëID¤Î¼ïÎà: + * + docomo ... UTN + * + ezweb ... EZÈÖ¹æ + * + softbank ... üËö¥·¥ê¥¢¥ëÈÖ¹æ + * + * @return string|false ¼èÆÀ¤·¤¿ID¤òÊÖ¤¹¡£¼èÆÀ¤Ç¤­¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï false ¤òÊÖ¤¹¡£ + */ + function getId() { + $objAgent =& Net_UserAgent_Mobile::singleton(); + if (Net_UserAgent_Mobile::isError($objAgent)) { + return false; + } elseif ($objAgent->isDoCoMo() || $objAgent->isVodafone()) { + $id = $objAgent->getSerialNumber(); + } elseif ($objAgent->isEZweb()) { + $id = @$_SERVER['HTTP_X_UP_SUBNO']; + } + return isset($id) ? $id : false; + } + + /** + * ·ÈÂÓüËö¤Îµ¡¼ï¤òɽ¤¹Ê¸»úÎó¤ò¼èÆÀ¤¹¤ë¡£ + * ·ÈÂÓüËö¤Ç¤Ï¤Ê¤¤¾ì¹ç¤Ï¥æ¡¼¥¶¡¼¥¨¡¼¥¸¥§¥ó¥È¤Î̾Á°¤ò¼èÆÀ¤¹¤ë¡£(Îã: "Mozilla") + * + * @return string ·ÈÂÓüËö¤Î¥â¥Ç¥ë¤òɽ¤¹Ê¸»úÎó¤òÊÖ¤¹¡£ + */ + function getModel() { + $objAgent =& Net_UserAgent_Mobile::singleton(); + if (Net_UserAgent_Mobile::isError($objAgent)) { + return 'Unknown'; + } elseif ($objAgent->isNonMobile()) { + return $objAgent->getName(); + } else { + return $objAgent->getModel(); + } + } + + /** + * EC-CUBE ¤¬¥µ¥Ý¡¼¥È¤¹¤ë·ÈÂÓ¥­¥ã¥ê¥¢¤«¤É¤¦¤«¤òȽÊ̤¹¤ë¡£ + * + * @return boolean ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¾ì¹ç¤Ï true¡¢¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï false ¤òÊÖ¤¹¡£ + */ + function isMobile() { + $objAgent =& Net_UserAgent_Mobile::singleton(); + if (Net_UserAgent_Mobile::isError($objAgent)) { + return false; + } else { + return $objAgent->isDoCoMo() || $objAgent->isEZweb() || $objAgent->isVodafone(); + } + } + + /** + * EC-CUBE ¤¬¥µ¥Ý¡¼¥È¤¹¤ë·ÈÂÓ¥­¥ã¥ê¥¢¤«¤É¤¦¤«¤òȽÊ̤¹¤ë¡£ + * + * @return boolean ·ÈÂÓüËö¤Ç¤Ï¤Ê¤¤¾ì¹ç¤Ï true¡¢¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï false ¤òÊÖ¤¹¡£ + */ + function isNonMobile() { + return !GC_MobileUserAgent::isMobile(); + } + + /** + * EC-CUBE ¤¬¥µ¥Ý¡¼¥È¤¹¤ë·ÈÂÓüËö¤«¤É¤¦¤«¤òȽÊ̤¹¤ë¡£ + * + * @return boolean ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¾ì¹ç¤Ï true¡¢¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï false ¤òÊÖ¤¹¡£ + */ + function isSupported() { + $objAgent =& Net_UserAgent_Mobile::singleton(); + + // ·ÈÂÓüËö¤À¤Èǧ¼±¤µ¤ì¤¿¤¬¡¢User-Agent ¤Î·Á¼°¤¬Ì¤ÃΤξì¹ç + if (Net_UserAgent_Mobile::isError($objAgent)) { + gfPrintLog($objAgent->toString()); + return false; + } + + if ($objAgent->isDoCoMo()) { + $arrUnsupportedSeries = array('501i', '502i', '209i', '210i'); + $arrUnsupportedModels = array('SH821i', 'N821i', 'P821i ', 'P651ps', 'R691i', 'F671i', 'SH251i', 'SH251iS'); + return !in_array($objAgent->getSeries(), $arrUnsupportedSeries) && !in_array($objAgent->getModel(), $arrUnsupportedModels); + } elseif ($objAgent->isEZweb()) { + return $objAgent->isWAP2(); + } elseif ($objAgent->isVodafone()) { + return $objAgent->isPacketCompliant(); + } else { + // ·ÈÂÓüËö¤Ç¤Ï¤Ê¤¤¾ì¹ç¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¤³¤È¤Ë¤¹¤ë¡£ + return true; + } + } +} +?> Index: branches/dev/data/class/GC_MobileEmoji.php =================================================================== --- branches/dev/data/class/GC_MobileEmoji.php (revision 11460) +++ branches/dev/data/class/GC_MobileEmoji.php (revision 11460) @@ -0,0 +1,45 @@ +