|
@@ -2,7 +2,7 @@
|
|
|
// Serve extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/serve
|
|
|
|
|
|
class YellowServe {
|
|
|
- const VERSION = "0.8.18";
|
|
|
+ const VERSION = "0.8.19";
|
|
|
public $yellow; // access to API
|
|
|
|
|
|
// Handle initialisation
|
|
@@ -30,15 +30,21 @@ class YellowServe {
|
|
|
if (empty($url)) $url = "http://localhost:8000";
|
|
|
list($scheme, $address, $base) = $this->yellow->lookup->getUrlInformation($url);
|
|
|
if ($scheme=="http" && !empty($address)) {
|
|
|
- if (!preg_match("/\:\d+$/", $address)) $address .= ":8000";
|
|
|
- echo "Starting built-in web server. Open a web browser and go to $scheme://$address/\n";
|
|
|
- echo "Press Ctrl+C to quit...\n";
|
|
|
- exec("php -S $address yellow.php 2>&1", $outputLines, $returnStatus);
|
|
|
- $statusCode = $returnStatus!=0 ? 500 : 200;
|
|
|
- if ($statusCode!=200) {
|
|
|
- $output = !empty($outputLines) ? end($outputLines) : "Please check arguments!";
|
|
|
- if (preg_match("/^\[(.*?)\]\s*(.*)$/", $output, $matches)) $output = $matches[2];
|
|
|
- echo "ERROR starting web server: $output\n";
|
|
|
+ if ($this->checkServerSettings()) {
|
|
|
+ if (!preg_match("/\:\d+$/", $address)) $address .= ":8000";
|
|
|
+ echo "Starting built-in web server. Open a web browser and go to $scheme://$address/\n";
|
|
|
+ echo "Press Ctrl+C to quit...\n";
|
|
|
+ exec("php -S $address yellow.php 2>&1", $outputLines, $returnStatus);
|
|
|
+ $statusCode = $returnStatus!=0 ? 500 : 200;
|
|
|
+ if ($statusCode!=200) {
|
|
|
+ $output = !empty($outputLines) ? end($outputLines) : "Please check arguments!";
|
|
|
+ if (preg_match("/^\[(.*?)\]\s*(.*)$/", $output, $matches)) $output = $matches[2];
|
|
|
+ echo "ERROR starting web server: $output\n";
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ $statusCode = 400;
|
|
|
+ $fileName = $this->yellow->system->get("coreExtensionDirectory").$this->yellow->system->get("coreSystemFile");
|
|
|
+ echo "ERROR starting web server: Please configure `CoreServerUrl: auto` in file '$fileName'!\n";
|
|
|
}
|
|
|
} else {
|
|
|
$statusCode = 400;
|
|
@@ -46,4 +52,9 @@ class YellowServe {
|
|
|
}
|
|
|
return $statusCode;
|
|
|
}
|
|
|
+
|
|
|
+ // Check server settings
|
|
|
+ public function checkServerSettings() {
|
|
|
+ return $this->yellow->system->get("coreServerUrl")=="auto";
|
|
|
+ }
|
|
|
}
|