aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Weiske <cweiske@cweiske.de>2014-02-21 06:33:36 +0100
committerChristian Weiske <cweiske@cweiske.de>2014-02-21 06:33:36 +0100
commit2e18a05a2cedf343b0d0f5fd3e4e6a8d65e2647e (patch)
tree8b61dc2db3bc601d126f53327afc8e0d2c89ec0f /src
parent58718ac761b64c5d093a135d6735300835f5d47c (diff)
downloadbdrem-2e18a05a2cedf343b0d0f5fd3e4e6a8d65e2647e.tar.gz
bdrem-2e18a05a2cedf343b0d0f5fd3e4e6a8d65e2647e.zip
Show help even when config file does not exist
Diffstat (limited to 'src')
-rw-r--r--src/bdrem/Config.php10
-rw-r--r--src/bdrem/UserInterface.php8
2 files changed, 12 insertions, 6 deletions
diff --git a/src/bdrem/Config.php b/src/bdrem/Config.php
index 37c4c64..65e353d 100644
--- a/src/bdrem/Config.php
+++ b/src/bdrem/Config.php
@@ -5,19 +5,21 @@ class Config
{
public $source;
public $date;
- public $daysPrev;
- public $daysNext;
+ public $daysPrev = 3;
+ public $daysNext = 7;
public $locale;
- public $stopOnEmpty;
+ public $stopOnEmpty = false;
+ public $cfgFileExists;
public function load()
{
$f = __DIR__ . '/../../data/bdrem.config.php';
if (file_exists($f)) {
+ $this->cfgFileExists = true;
return $this->loadFile($f);
}
- throw new \Exception('No config file found');
+ $this->cfgFileExists = false;
}
protected function loadFile($filename)
diff --git a/src/bdrem/UserInterface.php b/src/bdrem/UserInterface.php
index 7e6bf9a..8fa001f 100644
--- a/src/bdrem/UserInterface.php
+++ b/src/bdrem/UserInterface.php
@@ -11,11 +11,15 @@ abstract class UserInterface
$this->config = new Config();
$this->config->load();
setlocale(LC_TIME, $this->config->locale);
- $source = $this->config->loadSource();
$parser = $this->loadParameters();
$this->parseParameters($parser);
+ if (!$this->config->cfgFileExists) {
+ throw new \Exception('No config file found');
+ }
+
+ $source = $this->config->loadSource();
$arEvents = $source->getEvents(
$this->config->date,
$this->config->daysPrev, $this->config->daysNext
@@ -24,7 +28,7 @@ abstract class UserInterface
$this->render($arEvents);
} catch (\Exception $e) {
$this->preRenderParameterError();
- echo 'Exception: ' . $e->getCode() . ' ' . $e->getMessage() . "\n";
+ echo 'Exception: ' . $e->getCode() . ' - ' . $e->getMessage() . "\n";
exit(1);
}
}