Changeset 15306 for branches/rel

Timestamp:

2007/08/17 16:34:06 (16 years ago)

Author:

adachi

Message:

getCustomerDataFromEmailPass()へ渡す引数の順序が誤っていた不具合を修正

File:

• branches/rel/data/class/SC_Customer.php (modified) (11 diffs)

branches/rel/data/class/SC_Customer.php

@@ -10 +10 @@
  */
 class SC_Customer {
-    
+
     var $conn;
     var $email;
-    var $customer_data;     // ²ñ°÷¾ðÊó   
-        
+    var $customer_data;     // ²ñ°÷¾ðÊó
+
     function SC_Customer( $conn = '', $email = '', $pass = '' ) {
         // ¥»¥Ã¥·¥ç¥ó³«»Ï
         /* startSession¤«¤é°ÜÆ° 2005/11/04 ÃæÀî */
         sfDomainSessionStart();
-        
+
         // DBÀܳ¥ª¥Ö¥¸¥§¥¯¥ÈÀ¸À®
         $DB_class_name = "SC_DbConn";
@@ -30 +30 @@
             if (class_exists($DB_class_name)){
                 //$DB_class_name¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤òºîÀ®¤¹¤ë
-                $this->conn = new SC_DbConn();          
-            }
-        }
-            
-        if ( is_object($this->conn) ) { 
+                $this->conn = new SC_DbConn();
+            }
+        }
+
+        if ( is_object($this->conn) ) {
             // Àµ¾ï¤ËDB¤ËÀܳ¤Ç¤­¤ë
             if ( $email ){
@@ -44 +44 @@
             exit;
         }
-        
+
         if ( strlen($email) > 0 && strlen($pass) > 0 ){
-            $this->getCustomerDataFromEmailPass( $email, $pass );
-        }
-    }
-    
+            $this->getCustomerDataFromEmailPass($pass, $email);
+        }
+    }
+
     function getCustomerDataFromEmailPass( $pass, $email, $mobile = false ) {
         $sql_mobile = $mobile ? ' OR email_mobile ILIKE ?' : '';
@@ -60 +60 @@
         $result = $this->conn->getAll($sql, $arrValues);
         $data = $result[0];
-        
+
         // ¥Ñ¥¹¥ï¡¼¥É¤¬¹ç¤Ã¤Æ¤¤¤ì¤Ð¸ÜµÒ¾ðÊó¤òcustomer_data¤Ë¥»¥Ã¥È¤·¤Ætrue¤òÊÖ¤¹
         if ( sha1($pass . ":" . AUTH_MAGIC) == $data['password'] ){
@@ -159 +159 @@
         $this->customer_data['email_mobile'] = $this->customer_data['email'];
     }
-    
+
     // ¥Ñ¥¹¥ï¡¼¥É¤ò³Îǧ¤»¤º¤Ë¥í¥°¥¤¥ó
     function setLogin($email) {
@@ -169 +169 @@
         $this->startSession();
     }
-    
+
     // ¥»¥Ã¥·¥ç¥ó¾ðÊó¤òºÇ¿·¤Î¾ðÊó¤Ë¹¹¿·¤¹¤ë
     function updateSession() {
@@ -178 +178 @@
         $_SESSION['customer'] = $this->customer_data;
     }
-        
+
     // ¥í¥°¥¤¥ó¾ðÊó¤ò¥»¥Ã¥·¥ç¥ó¤ËÅÐÏ¿¤·¡¢¥í¥°¤Ë½ñ¤­¹þ¤à
     function startSession() {
@@ -194 +194 @@
         gfPrintLog("logout : user=".$this->customer_data['customer_id'] ."\t"."ip=". $_SERVER['REMOTE_HOST'], CUSTOMER_LOG_PATH );
     }
-    
+
     // ¥í¥°¥¤¥ó¤ËÀ®¸ù¤·¤Æ¤¤¤ë¤«È½Äꤹ¤ë¡£
     function isLoginSuccess($dont_check_email_mobile = false) {
@@ -213 +213 @@
         return false;
     }
-        
+
     // ¥Ñ¥é¥á¡¼¥¿¤Î¼èÆÀ
     function getValue($keyname) {
         return $_SESSION['customer'][$keyname];
     }
-    
+
     // ¥Ñ¥é¥á¡¼¥¿¤Î¥»¥Ã¥È
     function setValue($keyname, $val) {
@@ -228 +228 @@
         return isset($_SESSION['customer'][$keyname]);
     }
-    
+
     // ÃÂÀ¸Æü·î¤Ç¤¢¤ë¤«¤É¤¦¤«¤ÎȽÄê
     function isBirthMonth() {
@@ -234 +234 @@
         $birth_month = intval($arrRet[1]);
         $now_month = intval(date("m"));
-        
+
         if($birth_month == $now_month) {
             return true;