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 2019-04-10 20:20:15 +09:00 committed by GitHub
parent e8d5653b7d
commit 12a51ce2ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
helper/webpagetool.php
View File

@ -61,9 +61,9 @@ if(!check_function_exists("get_web_cmd")) {
if(is_array($v)) {
if($k == "Authentication") {
if($v[0] == "Basic" && check_array_length($v, 3) == 0) {
$args[] = sprintf("-u '%s:%s'", $v[1], $v[2]);
$args[] = sprintf("-u '%s:%s'", make_safe_argument($v[1]), make_safe_argument($v[2]));
} else {
$args[] = sprintf("-H '%s: %s'", $k, implode(" ", $v));
$args[] = sprintf("-H '%s: %s'", make_safe_argument($k), make_safe_argument(implode(" ", $v)));
}
}
} else {
@ -80,7 +80,17 @@ if(!check_function_exists("get_web_cmd")) {
$args[] = "-k"; // allow self-signed certificate (the same as --insecure)
foreach($headers as $k=>$v) {
// the same as --header
$args[] = sprintf("-H '%s: %s'", make_safe_argument($k), make_safe_argument($v));
if(is_array($v)) {
if($k == "Authentication") {
if($v[0] == "Basic" && check_array_length($v, 3) == 0) {
$args[] = sprintf("-u '%s:%s'", make_safe_argument($v[1]), make_safe_argument($v[2]));
} else {
$args[] = sprintf("-H '%s: %s'", make_safe_argument($k), make_safe_argument(implode(" ", $v)));
}
}
} else {
$args[] = sprintf("-H '%s: %s'", make_safe_argument($k), make_safe_argument($v));
}
}
foreach($data as $k=>$v) {
if(substr($v, 0, 1) == "@") { // if this is a file
@ -293,9 +303,9 @@ if(!check_function_exists("get_web_curl")) {
if(is_array($v)) {
if($k == "Authentication") {
if($v[0] == "Basic" && check_array_length($v, 3) == 0) {
$options[CURLOPT_USERPWD] = sprintf("%s:%s", $v[1], $v[2]);
$options[CURLOPT_USERPWD] = sprintf("%s:%s", make_safe_argument($v[1]), make_safe_argument($v[2]));
} else {
$args[] = sprintf("%s: %s", $k, make_safe_argument(implode(" ", $v)));
$args[] = sprintf("%s: %s", make_safe_argument($k), make_safe_argument(implode(" ", $v)));
}
}
} else {