Subversion Repositories SmartDukaan

Rev

Rev 14425 | Rev 14685 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 14425 Rev 14561
Line 77... Line 77...
77 
					if(!empty($user)) {
 77 
					if(!empty($user)) {
78 
						//Existing user
 78 
						//Existing user
79 
						if(!empty($user['User']['mobile_number'])){
 79 
						if(!empty($user['User']['mobile_number'])){
80 
							$mobileRequired = false;
 80 
							$mobileRequired = false;
81 
						}
 81 
						}
- 
 
 82 
						//Don't update referrer
82 
						if(strlen(trim($this->request->data['referrer']))>0) {
 83 
						// if(strlen(trim($this->request->data['referrer']))>0) {
83 
							$userData = array('id'=>$user['User']['id'],'email'=>$this->request->data['email'],'username'=>$this->request->data['email'],'first_name'=>$this->request->data['name'],'gender'=>$this->request->data['gender'],'referrer'=>$this->request->data['referrer'],'profile_pic'=> $this->request->data['profile_pic']);
 84 
							// $userData = array('id'=>$user['User']['id'],'email'=>$this->request->data['email'],'username'=>$this->request->data['email'],'first_name'=>$this->request->data['name'],'gender'=>$this->request->data['gender'],'referrer'=>$this->request->data['referrer'],'profile_pic'=> $this->request->data['profile_pic']);
84 
						} else{
 85 
						// } else{
85 
							$userData = array('id'=>$user['User']['id'],'email'=>$this->request->data['email'],'username'=>$this->request->data['email'],'first_name'=>$this->request->data['name'],'gender'=>$this->request->data['gender'],'profile_pic'=> $this->request->data['profile_pic']);
 86 
							$userData = array('id'=>$user['User']['id'],'email'=>$this->request->data['email'],'username'=>$this->request->data['email'],'first_name'=>$this->request->data['name'],'gender'=>$this->request->data['gender'],'profile_pic'=> $this->request->data['profile_pic']);
86 
						}
 87 
						// }
87 
						$this->SocialProfile->User->save($userData);
 88 
						$this->SocialProfile->User->save($userData);
88 
						$data['user_id'] = $user['User']['id'];
89 
						$data['user_id'] = $user['User']['id'];
89 
					}else{
 90 
					}else{
90 
						//Create a new user and then insert user_id in social_profiles table
 91 
						//Create a new user and then insert user_id in social_profiles table
91 
						$userData = array('profile_pic'=> $this->request->data['profile_pic'], 'email'=>$this->request->data['email'],'username'=>$this->request->data['email'],'first_name'=>$this->request->data['name'],'gender'=>$this->request->data['gender'],'referrer'=>$this->request->data['referrer']);
 92 
						$userData = array('profile_pic'=> $this->request->data['profile_pic'], 'email'=>$this->request->data['email'],'username'=>$this->request->data['email'],'first_name'=>$this->request->data['name'],'gender'=>$this->request->data['gender'],'referrer'=>$this->request->data['referrer']);
Line 105... Line 106...
105 
				} else {
 106 
				} else {
106 
					$result = array('success' => false, 'message' => "Email is missing",'mobileRequired'=>$mobileRequired);
 107 
					$result = array('success' => false, 'message' => "Email is missing",'mobileRequired'=>$mobileRequired);
107 
					break;
 108 
					break;
108 
				}
109 
				}
109 
			} else {
 110 
			} else {
- 
 
 111 
				//Don't update referrer
110 
				if(strlen(trim($this->request->data['referrer']))>0) {
 112 
				// if(strlen(trim($this->request->data['referrer']))>0) {
111 
					$userData = array('id'=>$socialProfile['SocialProfile']['user_id'],'email'=>$this->request->data['email'],'username'=>$this->request->data['email'],'first_name'=>$this->request->data['name'],'gender'=>$this->request->data['gender'],'referrer'=>$this->request->data['referrer'],'profile_pic'=> $this->request->data['profile_pic']);
 113 
					// $userData = array('id'=>$socialProfile['SocialProfile']['user_id'],'email'=>$this->request->data['email'],'username'=>$this->request->data['email'],'first_name'=>$this->request->data['name'],'gender'=>$this->request->data['gender'],'referrer'=>$this->request->data['referrer'],'profile_pic'=> $this->request->data['profile_pic']);
112 
				} else{
 114 
				// } else{
113 
					$userData = array('id'=>$socialProfile['SocialProfile']['user_id'],'email'=>$this->request->data['email'],'username'=>$this->request->data['email'],'first_name'=>$this->request->data['name'],'gender'=>$this->request->data['gender'],'profile_pic'=> $this->request->data['profile_pic']);
 115 
					$userData = array('id'=>$socialProfile['SocialProfile']['user_id'],'email'=>$this->request->data['email'],'username'=>$this->request->data['email'],'first_name'=>$this->request->data['name'],'gender'=>$this->request->data['gender'],'profile_pic'=> $this->request->data['profile_pic']);
114 
				}
 116 
				// }
115 
				$this->SocialProfile->User->save($userData);
 117 
				$this->SocialProfile->User->save($userData);
116 
				//Check for mobile number
 118 
				//Check for mobile number
117 
				$mobilenumber = $this->SocialProfile->User->find('first',array('conditions'=>array('id'=>$socialProfile['SocialProfile']['user_id']),'recursive'=>-1));
 119 
				$mobilenumber = $this->SocialProfile->User->find('first',array('conditions'=>array('id'=>$socialProfile['SocialProfile']['user_id']),'recursive'=>-1));
118 
				if(!empty($mobilenumber['User']['mobile_number'])){
 120 
				if(!empty($mobilenumber['User']['mobile_number'])){
119 
					$mobileRequired = false;
 121 
					$mobileRequired = false;