diff options
| -rw-r--r-- | it.class | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -275,8 +275,8 @@ function filter_keys($array, $keys) /** - * Construct shell command, log it, execute it and return output as string. - * @param varargs: scalars for cmd and arguments, assoc arrays to specify opts and opt values + * Construct shell command, log it, execute it and return output as string. Options ONLY allowed in assoc arrays + * @param varargs: scalars for cmd and arguments, assoc arrays to specify opts and opt values, "-q"=>true for opts without args * @return output of command. shell errors not detectable, see error_log in /www/server/logs */ function exec(/* ... */) @@ -290,8 +290,12 @@ function exec(/* ... */) { if (it::match('^-', $val)) it::fatal("leading - in value"); + else if ($val === true || $val === false || $val === null) + $parts[] = $val ? escapeshellarg($key) : ""; + else if (is_int($key)) + $parts[] = escapeshellarg($val); else - $parts[] = (is_int($key) ? "" : escapeshellarg($key) . " ") . escapeshellarg($val); + $parts[] = escapeshellarg($key) . " " . escapeshellarg($val); } } |