aboutsummaryrefslogtreecommitdiff
path: root/Wrt3g/Config.php
diff options
context:
space:
mode:
authorChristian Weiske <cweiske@cweiske.de>2010-12-28 22:59:02 +0100
committerChristian Weiske <cweiske@cweiske.de>2010-12-28 22:59:02 +0100
commit7f3b4f1a0dc8d49f225b405f2b4acd8e92e205c2 (patch)
treeedc4da0ff46574ba733bd2133a5da214e57bd9ca /Wrt3g/Config.php
parentcd3b46894c6f014735a7f278a60b9bd234a11ba0 (diff)
downloadlinksys-wrt3g-tools-7f3b4f1a0dc8d49f225b405f2b4acd8e92e205c2.tar.gz
linksys-wrt3g-tools-7f3b4f1a0dc8d49f225b405f2b4acd8e92e205c2.zip
load system config file; document config options
Diffstat (limited to 'Wrt3g/Config.php')
-rw-r--r--Wrt3g/Config.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/Wrt3g/Config.php b/Wrt3g/Config.php
index f8b9649..a8232df 100644
--- a/Wrt3g/Config.php
+++ b/Wrt3g/Config.php
@@ -80,12 +80,17 @@ class Wrt3g_Config
*/
public function load($options = array())
{
+ //system config file
+ $this->loadFromFile('/etc/linksys-wrt3g-tools');
+
+ //user config file
$file = $this->getConfigFilePath();
if ($file) {
$this->loadFromFile($file);
}
$this->loadOptions($options);
+ //commandline options
if (isset($options['save'])) {
$this->save($file);
}