load environment variables by default

1 files changed, 12 insertions, 1 deletions

diff --git a/Wrt3g/Config.php b/Wrt3g/Config.php
index a8232df..5036f7d 100644
--- a/Wrt3g/Config.php
+++ b/Wrt3g/Config.php
@@ -88,9 +88,20 @@ class Wrt3g_Config
         if ($file) {
             $this->loadFromFile($file);
         }
+        //environment variables: we use lowercase options, which should
+        // not collide with the uppercase env variables like USER
+        $this->loadOptions($_SERVER);
+        //commandline options
         $this->loadOptions($options);
 
-        //commandline options
+        $this->logger->log(
+            sprintf(
+                "Configuration: %s:%s@%s",
+                $this->user, $this->password, $this->host
+            ),
+            2
+        );
+
         if (isset($options['save'])) {
             $this->save($file);
         }