diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:22:27 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:22:27 +0200 |
| commit | c38c79d71c8ef70ef649f83e322f1984b75ee2dd (patch) | |
| tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /util/config | |
| parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
| parent | 45a854762b451dafb882bc56efce054b64420627 (diff) | |
| download | volse-hubzilla-c38c79d71c8ef70ef649f83e322f1984b75ee2dd.tar.gz volse-hubzilla-c38c79d71c8ef70ef649f83e322f1984b75ee2dd.tar.bz2 volse-hubzilla-c38c79d71c8ef70ef649f83e322f1984b75ee2dd.zip | |
Merge branch 'redmatrix-master'
Diffstat (limited to 'util/config')
| -rwxr-xr-x | util/config | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/util/config b/util/config index 67fe14f93..9e90eca56 100755 --- a/util/config +++ b/util/config @@ -8,17 +8,19 @@ require_once('include/cli_startup.php'); cli_startup(); if($argc > 3) { + + set_config($argv[1],$argv[2],$argv[3]); - echo "config[{$argv[1]}][{$argv[2]}] = " . get_config($argv[1],$argv[2]) . "\n"; + echo "config[{$argv[1]}][{$argv[2]}] = " . printable_config(get_config($argv[1],$argv[2])) . "\n"; } if($argc == 3) { - echo "config[{$argv[1]}][{$argv[2]}] = " . get_config($argv[1],$argv[2]) . "\n"; + echo "config[{$argv[1]}][{$argv[2]}] = " . printable_config(get_config($argv[1],$argv[2])) . "\n"; } if($argc == 2) { load_config($argv[1]); - foreach($a->config[$argv[1]] as $k => $x) { + foreach(App::$config[$argv[1]] as $k => $x) { echo "config[{$argv[1]}][{$k}] = " . $x . "\n"; } } @@ -27,8 +29,19 @@ if($argc == 1) { $r = q("select * from config where 1"); if($r) { foreach($r as $rr) { - echo "config[{$rr['cat']}][{$rr['k']}] = " . $rr['v'] . "\n"; + echo "config[{$rr['cat']}][{$rr['k']}] = " . printable_config($rr['v']) . "\n"; } } } +function printable_config($x) { + $s = ''; + if(is_array($x)) { + foreach($x as $v) { + $s .= $v . "\n"; + } + return $s; + } + else + return $x; +}
\ No newline at end of file |