gnh1201/reasonableframework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update webpagetool.php

Browse Source
This commit is contained in:
Namhyeon Go 2020-03-26 10:20:39 +09:00 committed by GitHub
parent bc4c34c1b4
commit beef878da9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
helper/webpagetool.php
View File

@ -2,7 +2,7 @@
/** /**
* @file webpagetool.php * @file webpagetool.php
* @created_on 2018-06-01 * @created_on 2018-06-01
* @updated_on 2020-02-13 * @updated_on 2020-02-26
* @author Go Namhyeon <gnh1201@gmail.com> * @author Go Namhyeon <gnh1201@gmail.com>
* @brief WebPageTool helper * @brief WebPageTool helper
*/ */
@ -100,6 +100,7 @@ if(!is_fn("get_web_cmd")) {
$args[] = "-X POST"; // set post request (the same as --request) $args[] = "-X POST"; // set post request (the same as --request)
$args[] = sprintf("-A '%s'", get_web_user_agent($ua)); // set agent $args[] = sprintf("-A '%s'", get_web_user_agent($ua)); // set agent
$args[] = "-k"; // allow self-signed certificate (the same as --insecure) $args[] = "-k"; // allow self-signed certificate (the same as --insecure)
foreach($headers as $k=>$v) { foreach($headers as $k=>$v) {
// the same as --header // the same as --header
if(is_array($v)) { if(is_array($v)) {
@ -114,11 +115,15 @@ if(!is_fn("get_web_cmd")) {
$args[] = sprintf("-H '%s: %s'", make_safe_argument($k), make_safe_argument($v)); $args[] = sprintf("-H '%s: %s'", make_safe_argument($k), make_safe_argument($v));
} }
} }
$_data = array();
foreach($data as $k=>$v) { foreach($data as $k=>$v) {
if(substr($v, 0, 1) == "@") { // if this is a file if(substr($v, 0, 1) == "@") { // if this is a file
// the same as --form // the same as --form
$args[] = sprintf("-F %s='%s'", make_safe_argument($k), make_safe_argument($v)); $args[] = sprintf("-F %s='%s'", make_safe_argument($k), make_safe_argument($v));
} else { } else {
$_data[$k] = $v;
/*
if(array_key_equals("Content-Type", $headers, "multipart/form-data")) { if(array_key_equals("Content-Type", $headers, "multipart/form-data")) {
$args[] = sprintf("-F %s='%s'", make_safe_argument($k), make_safe_argument($v)); $args[] = sprintf("-F %s='%s'", make_safe_argument($k), make_safe_argument($v));
} elseif(array_key_equals("Content-Type", $headers, "application/x-www-form-urlencoded")) { } elseif(array_key_equals("Content-Type", $headers, "application/x-www-form-urlencoded")) {
@ -126,8 +131,15 @@ if(!is_fn("get_web_cmd")) {
} else { // the same as --data } else { // the same as --data
$args[] = sprintf("-d %s='%s'", make_safe_argument($k), make_safe_argument($v)); $args[] = sprintf("-d %s='%s'", make_safe_argument($k), make_safe_argument($v));
} }
*/
} }
} }
// #110 [helper/webpagetool] post array data, but (string)`Array` given
if(count($_data)) > 0) {
$args[] = sprintf("--data '%s'", make_safe_argument(http_build_query($_data)));
}
$args[] = $url; $args[] = $url;
} }