|
@@ -56,10 +56,10 @@ class Webservice
|
|
|
foreach ($results as $row) {
|
|
|
if (isset($row['name']) && isset($row['id'])) {
|
|
|
$name = $row['name'];
|
|
|
-
|
|
|
- if(isset($row['externalId'])) // Only clients
|
|
|
+
|
|
|
+ if (isset($row['externalId'])) // Only clients
|
|
|
$name = "{$row['externalId']} - {$row['name']}";
|
|
|
-
|
|
|
+
|
|
|
$choices[$name] = $row['id'];
|
|
|
}
|
|
|
}
|
|
@@ -125,7 +125,7 @@ class Webservice
|
|
|
* @param string $url
|
|
|
* @param string $method
|
|
|
* @param array $data
|
|
|
- * @param array $credentials
|
|
|
+ * @param array $credentials If null then the credentials no send.
|
|
|
* @param array $cookies
|
|
|
* @param int $timeout
|
|
|
*
|
|
@@ -140,6 +140,8 @@ class Webservice
|
|
|
$headers[] = 'Authorization: Bearer ' . $token->getAccessToken();
|
|
|
} elseif (!empty($credentials) && isset($credentials['username']) && isset($credentials['password'])) {
|
|
|
$headers[] = 'Authorization: Basic ' . base64_encode($credentials['username'] . ":" . $credentials['password']);
|
|
|
+ } elseif (getenv("CMD_USERNAME") && getenv("CMD_PASSWORD") && !is_null($credentials)) {
|
|
|
+ $headers[] = 'Authorization: Basic ' . base64_encode(getenv("CMD_USERNAME") . ":" . getenv("CMD_PASSWORD"));
|
|
|
}
|
|
|
|
|
|
foreach ($cookies as $cookie => $value) {
|
|
@@ -413,10 +415,10 @@ class Webservice
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * @param $message
|
|
|
- * @param $level
|
|
|
- * @param $monologLoggerId
|
|
|
- */
|
|
|
+ * @param $message
|
|
|
+ * @param $level
|
|
|
+ * @param $monologLoggerId
|
|
|
+ */
|
|
|
public function log($message, $level = 'info', $monologLoggerId = 'monolog.logger.webservice')
|
|
|
{
|
|
|
if ($this->serviceContainer->has($monologLoggerId)) {
|