Mercurial > hg > mgallery

changeset 26:59cf3acc4440

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 14 Oct 2015 10:52:44 +0300
parents c698618e6f67
children b8f8e03f943b
files mgtool.php
diffstat 1 files changed, 11 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/mgtool.php	Wed Oct 14 10:39:38 2015 +0300
+++ b/mgtool.php	Wed Oct 14 10:52:44 2015 +0300
@@ -773,19 +773,6 @@
     break;
 
   case "config":
-    if (mgReadSettings() === FALSE)
-      die("MGallery not configured.\n");
-
-    foreach ($mgDefaults as $key => $dval)
-    {
-      $sval = mgGetSetting($key);
-      printf("%-20s = %s%s\n",
-        $key,
-        mgGetDValStr($dval[0], $sval),
-        ($dval[1] !== NULL && $sval !== $dval[1]) ? " (default: ".mgGetDValStr($dval[0], $dval[1]).")" : "");
-    }
-    break;
-
   case "dump":
     if (mgReadSettings() === FALSE)
       die("MGallery not configured.\n");
@@ -793,7 +780,17 @@
     foreach ($mgDefaults as $key => $dval)
     {
       $sval = mgGetSetting($key);
-      printf("%-20s = %s\n", $key, mgGetDValStr($dval[0], $sval));
+      if ($cmd == "dump")
+      {
+        printf("%-20s = %s\n", $key, mgGetDValStr($dval[0], $sval));
+      }
+      else
+      {
+        printf("%-20s = %s%s\n",
+          $key,
+          mgGetDValStr($dval[0], $sval),
+          ($dval[1] !== NULL && $sval !== $dval[1]) ? " (default: ".mgGetDValStr($dval[0], $dval[1]).")" : "");
+      }
     }
     break;