Merge remote-tracking branch 'origin/master'

Conflicts:
	controllers/User.php
	json-api-user.php
	readme.md

Author: pimedia

controllers/User.php

@@ -488,6 +488,7 @@ public function get_user_meta() {
 
  $meta_key = sanitize_text_field($json_api->query->meta_key);	
 
+<<<<<<< HEAD
 
 		if($meta_key) $data[$meta_key] = get_user_meta(  $user_id, $meta_key);
 		else {
@@ -604,6 +605,111 @@ public function xprofile() {
 
 
 	  }
+=======
+		  
+		if($meta_key) $data[$meta_key] = get_user_meta(  $user_id, $meta_key);
+		else $data = get_user_meta(  $user_id);
+//d($data);
+	   return $data;
+	    
+	  
+	  }
+	  
+public function update_user_meta() {
+	 
+	  global $json_api;
+	  
+	   if (!$json_api->query->cookie) {
+			$json_api->error("You must include a 'cookie' var in your request. Use the `generate_auth_cookie` method.");
+		}
+
+		$user_id = wp_validate_auth_cookie($json_api->query->cookie, 'logged_in');
+
+	if (!$user_id) 	$json_api->error("Invalid cookie. Use the `generate_auth_cookie` method.");
+		
+		
+   if (!$json_api->query->meta_key) $json_api->error("You must include a 'meta_key' var in your request.");
+		
+		else $meta_key = $json_api->query->meta_key;	
+  
+   if (!$json_api->query->meta_value) {
+			$json_api->error("You must include a 'meta_value' var in your request.");
+		}
+		else $meta_value = sanitize_text_field($json_api->query->meta_value);
+  
+		  
+		$data['updated'] = update_user_meta(  $user_id, $meta_key, $meta_value);
+		
+
+	   return $data;	    
+	  
+	  }
+	  
+public function delete_user_meta() {
+	 
+	  global $json_api;
+	  
+	   if (!$json_api->query->cookie) {
+			$json_api->error("You must include a 'cookie' var in your request. Use the `generate_auth_cookie` method.");
+		}
+
+		$user_id = wp_validate_auth_cookie($json_api->query->cookie, 'logged_in');
+
+	if (!$user_id) 	$json_api->error("Invalid cookie. Use the `generate_auth_cookie` method.");
+		
+		
+   if (!$json_api->query->meta_key) $json_api->error("You must include a 'meta_key' var in your request.");
+		
+		else $meta_key = $json_api->query->meta_key;	
+  
+   if (!$json_api->query->meta_value) {
+			$json_api->error("You must include a 'meta_value' var in your request.");
+		}
+		else $meta_value = sanitize_text_field($json_api->query->meta_value);
+  
+
+		$data['deleted'] = delete_user_meta(  $user_id, $meta_key, $meta_value);
+		
+	   return $data;	    
+	  
+	  }
+	  
+public function xprofile() {
+	 
+	  global $json_api;
+	  
+if (function_exists('bp_is_active')) {	
+
+	  if (!$json_api->query->user_id) {
+			$json_api->error("You must include a 'user_id' var in your request.");
+		}
+		else $user_id = $json_api->query->user_id;
+	
+		
+   if (!$json_api->query->field) {
+			$json_api->error("You must include a 'field' var in your request. Use 'field=default' for all default fields.");
+		}
+	  elseif ($json_api->query->field=='default') {
+			$field_label='First Name, Last Name, Bio';/*you should add your own field labels here for quick viewing*/
+		}	
+		else $field_label = sanitize_text_field($json_api->query->field);	
+  
+  
+  $fields = explode(",", $field_label);
+  
+  if(is_array($fields)){
+	  
+	  foreach($fields as $k){
+		  
+		  $fields_data[$k] = xprofile_get_field_data( $k, $user_id );
+		  
+		  }
+	
+	   return $fields_data;
+	    
+	  
+	  }
+>>>>>>> origin/master
 
    }
 

json-api-user.php

@@ -8,7 +8,11 @@
 
   Description: Extends the JSON API for RESTful user registration, authentication, password reset, Facebook Login, user meta and BuddyPress Profile related functions
 
+<<<<<<< HEAD
   Version: 1.4
+=======
+  Version: 1.3
+>>>>>>> origin/master
 
   Author: Ali Qureshi
 

readme.md

@@ -6,7 +6,11 @@ Tags: json api, RESTful user registration, authentication, RESTful Facebook Logi
 
 Contributors: parorrey
 
+<<<<<<< HEAD
 Stable tag: 1.4
+=======
+Stable tag: 1.3
+>>>>>>> origin/master
 
 Requires at least: 3.0.1
 
@@ -46,11 +50,15 @@ My other JSON API Auth plugin has also been integrated with this from version 1.
 
 Hope this will help some.
 
+<<<<<<< HEAD
 =Pro Version - JSON API User Plus=
 
 A pro version of this plugin, JSON API User Plus, is available here http://www.parorrey.com/solutions/json-api-user-plus/ that supports BuddyPress Messages component, BuddyPress avatar upload and other BuddyPress related functions to integrate BuddyPress features in your mobile app via REST.
 
 'JSON API User Plus' includes API key which protects and restricts the endpoint calls. This key can be updated from Settings > User Plus options page. Your app must include this key with every call to get the data from REST API. Please see documentation for calling endpoints examples for 'JSON API User Plus'.
+=======
+For details: http://www.parorrey.com/solutions/json-api-user/ A pro-version of this plugin will be available shortly that will support BuddyPress Messages component, BuddyPress avatar upload and other BuddyPress related functions to integrate BuddyPress features to your mobile app via REST.
+>>>>>>> origin/master
 
 ==Installation==
 
@@ -177,12 +185,19 @@ http://localhost/api/user/delete_user_meta/?cookie=COOKIE-HERE&meta_key=KEY-HERE
 
 = Method: update_user_meta =
 
+<<<<<<< HEAD
 It needs 'cookie' and 'meta_key' var and 'meta_value' to update. You may send multiple values separated by comma.  
 
 http://localhost/api/user/update_user_meta/?cookie=COOKIE-HERE&meta_key=KEY-HERE&meta_value=VALUE-HERE
 
 http://localhost/api/user/update_user_meta/?cookie=COOKIE-HERE&&meta_key=KEY-HERE&meta_value=value1,value2,value3
 
+=======
+It needs 'cookie' and 'meta_key' var and 'meta_value' to update.
+
+http://localhost/api/user/update_user_meta/?cookie=COOKIE-HERE&meta_key=KEY-HERE&meta_value=VALUE-HERE
+
+>>>>>>> origin/master
 = Method: get_user_meta =
 
 It needs 'user_id'. 'meta_key' var is optional.
@@ -231,4 +246,8 @@ It needs 'cookie', 'post_id', 'content', 'comment_status' vars.
 
 http://localhost/api/user/post_comment/?cookie=COOKIE-HERE&post_id=ID&content=Comment contents here&comment_status=1
 
-For additional features, pro version plugin details check here http://www.parorrey.com/solutions/json-api-user-plus/
+<<<<<<< HEAD
+For additional features, pro version plugin details check here http://www.parorrey.com/solutions/json-api-user-plus/
+=======
+For details, check here http://www.parorrey.com/solutions/json-api-user/
+>>>>>>> origin/master