Merge pull request #5 from vipinslit/master

SendinBlue · SendinBlue · commit 95ab1a836556 · 2015-03-09T11:18:29.000+05:30
PLAT-677: change param name from list_parent to folder_id
diff --git a/V1.0/mailin.php b/V1.0/mailin.php
@@ -245,9 +245,9 @@ public function update_user($email,$attributes,$blacklisted,$listid,$listid_unli
         {
                 return $this->put("user/".$email,json_encode(array("attributes"=>$attributes,"blacklisted"=>$blacklisted,"listid"=>$listid,"listid_unlink"=>$listid_unlink)));
         }
-        public function import_users($url,$listids,$notify_url,$name,$list_parent)
+        public function import_users($url,$listids,$notify_url,$name,$folder_id)
         {
-                return $this->post("user/import",json_encode(array("url"=>$url,"listids"=>$listids,"notify_url"=>$notify_url,"name"=>$name,"list_parent"=>$list_parent)));
+                return $this->post("user/import",json_encode(array("url"=>$url,"listids"=>$listids,"notify_url"=>$notify_url,"name"=>$name,"list_parent"=>$folder_id)));
         }
         public function export_users($export_attrib,$filter,$notify_url)
         {
diff --git a/V2.0/Mailin.php b/V2.0/Mailin.php
@@ -236,9 +236,9 @@ public function update_user($email,$attributes,$blacklisted,$listid,$listid_unli
         {
                 return $this->put("user/".$email,json_encode(array("attributes"=>$attributes,"blacklisted"=>$blacklisted,"listid"=>$listid,"listid_unlink"=>$listid_unlink)));
         }
-        public function import_users($url,$listids,$notify_url,$name,$list_parent)
+        public function import_users($url,$listids,$notify_url,$name,$folder_id)
         {
-                return $this->post("user/import",json_encode(array("url"=>$url,"listids"=>$listids,"notify_url"=>$notify_url,"name"=>$name,"list_parent"=>$list_parent)));
+                return $this->post("user/import",json_encode(array("url"=>$url,"listids"=>$listids,"notify_url"=>$notify_url,"name"=>$name,"list_parent"=>$folder_id)));
         }
         public function export_users($export_attrib,$filter,$notify_url)
         {
diff --git a/src/Sendinblue/Mailin.php b/src/Sendinblue/Mailin.php
@@ -238,9 +238,9 @@ public function update_user($email,$attributes,$blacklisted,$listid,$listid_unli
         {
                 return $this->put("user/".$email,json_encode(array("attributes"=>$attributes,"blacklisted"=>$blacklisted,"listid"=>$listid,"listid_unlink"=>$listid_unlink)));
         }
-        public function import_users($url,$listids,$notify_url,$name,$list_parent)
+        public function import_users($url,$listids,$notify_url,$name,$folder_id)
         {
-                return $this->post("user/import",json_encode(array("url"=>$url,"listids"=>$listids,"notify_url"=>$notify_url,"name"=>$name,"list_parent"=>$list_parent)));
+                return $this->post("user/import",json_encode(array("url"=>$url,"listids"=>$listids,"notify_url"=>$notify_url,"name"=>$name,"list_parent"=>$folder_id)));
         }
         public function export_users($export_attrib,$filter,$notify_url)
         {

Original file line number	Diff line number	Diff line change
`@@ -245,9 +245,9 @@ public function update_user($email,$attributes,$blacklisted,$listid,$listid_unli`
`245`	`245`	`{`
`246`	`246`	`return $this->put("user/".$email,json_encode(array("attributes"=>$attributes,"blacklisted"=>$blacklisted,"listid"=>$listid,"listid_unlink"=>$listid_unlink)));`
`247`	`247`	`}`
`248`		`- public function import_users($url,$listids,$notify_url,$name,$list_parent)`
	`248`	`+ public function import_users($url,$listids,$notify_url,$name,$folder_id)`
`249`	`249`	`{`
`250`		`- return $this->post("user/import",json_encode(array("url"=>$url,"listids"=>$listids,"notify_url"=>$notify_url,"name"=>$name,"list_parent"=>$list_parent)));`
	`250`	`+ return $this->post("user/import",json_encode(array("url"=>$url,"listids"=>$listids,"notify_url"=>$notify_url,"name"=>$name,"list_parent"=>$folder_id)));`
`251`	`251`	`}`
`252`	`252`	`public function export_users($export_attrib,$filter,$notify_url)`
`253`	`253`	`{`
Original file line number	Diff line number	Diff line change
`@@ -236,9 +236,9 @@ public function update_user($email,$attributes,$blacklisted,$listid,$listid_unli`
`236`	`236`	`{`
`237`	`237`	`return $this->put("user/".$email,json_encode(array("attributes"=>$attributes,"blacklisted"=>$blacklisted,"listid"=>$listid,"listid_unlink"=>$listid_unlink)));`
`238`	`238`	`}`
`239`		`- public function import_users($url,$listids,$notify_url,$name,$list_parent)`
	`239`	`+ public function import_users($url,$listids,$notify_url,$name,$folder_id)`
`240`	`240`	`{`
`241`		`- return $this->post("user/import",json_encode(array("url"=>$url,"listids"=>$listids,"notify_url"=>$notify_url,"name"=>$name,"list_parent"=>$list_parent)));`
	`241`	`+ return $this->post("user/import",json_encode(array("url"=>$url,"listids"=>$listids,"notify_url"=>$notify_url,"name"=>$name,"list_parent"=>$folder_id)));`
`242`	`242`	`}`
`243`	`243`	`public function export_users($export_attrib,$filter,$notify_url)`
`244`	`244`	`{`
Original file line number	Diff line number	Diff line change
`@@ -238,9 +238,9 @@ public function update_user($email,$attributes,$blacklisted,$listid,$listid_unli`
`238`	`238`	`{`
`239`	`239`	`return $this->put("user/".$email,json_encode(array("attributes"=>$attributes,"blacklisted"=>$blacklisted,"listid"=>$listid,"listid_unlink"=>$listid_unlink)));`
`240`	`240`	`}`
`241`		`- public function import_users($url,$listids,$notify_url,$name,$list_parent)`
	`241`	`+ public function import_users($url,$listids,$notify_url,$name,$folder_id)`
`242`	`242`	`{`
`243`		`- return $this->post("user/import",json_encode(array("url"=>$url,"listids"=>$listids,"notify_url"=>$notify_url,"name"=>$name,"list_parent"=>$list_parent)));`
	`243`	`+ return $this->post("user/import",json_encode(array("url"=>$url,"listids"=>$listids,"notify_url"=>$notify_url,"name"=>$name,"list_parent"=>$folder_id)));`
`244`	`244`	`}`
`245`	`245`	`public function export_users($export_attrib,$filter,$notify_url)`
`246`	`246`	`{`