geckon01/php-curl-class
1
0
Fork 0
mirror of https://github.com/php-curl-class/php-curl-class.git synced 2026-08-30 20:20:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move http_build_multi_query outside class

Browse Source
This commit is contained in:
Zach Borboa
2014-01-10 23:07:31 -08:00
parent 1028456f17
commit e5e9779132
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Curl.class.php
+24 -24
View File
@@ -162,29 +162,6 @@ class Curl {
$this->_before_send = $function;
}
private function _http_build_multi_query($data, $key=NULL) {
$query = array();
if (empty($data)) {
return $key . '=';
}
$is_array_assoc = is_array_assoc($data);
foreach ($data as $k => $value) {
if (is_string($value) || is_numeric($value)) {
$brackets = $is_array_assoc ? '[' . $k . ']' : '[]';
$query[] = urlencode(is_null($key) ? $k : $key . $brackets) . '=' . rawurlencode($value);
}
else if (is_array($value)) {
$nested = is_null($key) ? $k : $key . '[' . $k . ']';
$query[] = $this->_http_build_multi_query($value, $nested);
}
}
return implode('&', $query);
}
public function success($callback) {
$this->_success = $callback;
}
@@ -204,7 +181,7 @@ class Curl {
private function _postfields($data) {
if (is_array($data)) {
if (is_array_multidim($data)) {
$data = $this->_http_build_multi_query($data);
$data = http_build_multi_query($data);
}
else {
// Fix "Notice: Array to string conversion" when $value in
@@ -288,3 +265,26 @@ function is_array_multidim($array) {
return !(count($array) === count($array, COUNT_RECURSIVE));
}
function http_build_multi_query($data, $key=NULL) {
$query = array();
if (empty($data)) {
return $key . '=';
}
$is_array_assoc = is_array_assoc($data);
foreach ($data as $k => $value) {
if (is_string($value) || is_numeric($value)) {
$brackets = $is_array_assoc ? '[' . $k . ']' : '[]';
$query[] = urlencode(is_null($key) ? $k : $key . $brackets) . '=' . rawurlencode($value);
}
else if (is_array($value)) {
$nested = is_null($key) ? $k : $key . '[' . $k . ']';
$query[] = http_build_multi_query($value, $nested);
}
}
return implode('&', $query);
}