public $req;
public $cfg;
+ protected $uploadsInfo = [];
+ protected $dedicatedBody = false;
+
public function __construct($host, $cfg)
{
$this->cfg = $cfg;
- $this->req = new \HTTP_Request2($host->endpoints->micropub, 'POST');
+ $this->req = new MyHttpRequest2($host->endpoints->micropub, 'POST');
$this->req->setHeader('User-Agent: shpub');
if (version_compare(PHP_VERSION, '5.6.0', '<')) {
//correct ssl validation on php 5.5 is a pain, so disable
$this->req->setHeader('authorization', 'Bearer ' . $host->token);
}
- public function send($body)
+ public function send($body = null)
{
- $this->req->setBody($body);
+ if ($body !== null) {
+ $this->dedicatedBody = true;
+ $this->req->setBody($body);
+ }
if ($this->cfg->debug) {
$this->printCurl();
}
return $res;
}
+ /**
+ * @param string $fieldName name of file-upload field
+ * @param string|resource|array $filename full name of local file,
+ * pointer to open file or an array of files
+ */
+ public function addUpload($fieldName, $filename)
+ {
+ $this->uploadsInfo[$fieldName] = $filename;
+ return $this->req->addUpload($fieldName, $filename);
+ }
+
+ /**
+ * Add one or multiple POST parameters.
+ * Automatically adds them as array or as string.
+ *
+ * @param string $key Parameter name
+ * @param string|array $values One or multiple values
+ */
+ public function addPostParameter($key, $values)
+ {
+ if (count($values) == 1) {
+ $values = reset($values);
+ }
+ $this->req->addPostParameter($key, $values);
+ }
+
protected function printCurl()
{
$command = 'curl';
$command .= ' -X ' . $this->req->getMethod();
}
foreach ($this->req->getHeaders() as $key => $val) {
- $command .= ' -H ' . escapeshellarg($key . ': ' . $val);
+ $caseKey = implode('-', array_map('ucfirst', explode('-', $key)));
+ $command .= ' -H ' . escapeshellarg($caseKey . ': ' . $val);
+ }
+
+ $postParams = $this->req->getPostParams();
+
+ if (count($this->uploadsInfo) == 0) {
+ foreach ($postParams as $k => $v) {
+ if (!is_array($v)) {
+ $command .= ' -d ' . escapeshellarg($k . '=' . $v);
+ } else {
+ foreach ($v as $ak => $av) {
+ $command .= ' -d ' . escapeshellarg(
+ $k . '[' . $ak . ']=' . $av
+ );
+ }
+ }
+ }
+ } else {
+ foreach ($postParams as $k => $v) {
+ $command .= ' -F ' . escapeshellarg($k . '=' . $v);
+ }
+ foreach ($this->uploadsInfo as $fieldName => $filename) {
+ if (!is_array($filename)) {
+ $command .= ' -F ' . escapeshellarg(
+ $fieldName . '=@' . $filename
+ );
+ } else {
+ foreach ($filename as $k => $realFilename) {
+ $command .= ' -F ' . escapeshellarg(
+ $fieldName . '[' . $k . ']=@' . $realFilename
+ );
+ }
+ }
+ }
}
- $command .= ' --data ' . escapeshellarg($this->req->getBody());
+
+ if ($this->dedicatedBody) {
+ $command .= ' --data ' . escapeshellarg($this->req->getBody());
+ }
+
$command .= ' ' . escapeshellarg((string) $this->req->getUrl());
- echo $command . "\n";
+ Log::msg($command);
}
}
\ No newline at end of file