Push up 1.3.1-RC-2 Continued.

Add schema change to enable users to disable or enable the login information.
FOGProject · Jan 3, 2017 · 354960d · 354960d
1 parent 2a2ccf1
commit 354960d
Show file tree

Hide file tree

Showing 12 changed files with 301 additions and 285 deletions.
diff --git a/packages/web/commons/schema.php b/packages/web/commons/schema.php
@@ -3591,3 +3591,12 @@
     ),
     true
 );
+// 245
+$this->schema[] = array(
+    "INSERT IGNORE INTO `globalSettings` "
+    . "(`settingKey`, `settingDesc`, `settingValue`, `settingCategory`) "
+    . "VALUES "
+    . "('FOG_LOGIN_INFO_DISPLAY', 'This setting defines if the login page"
+    . " should or should not display fog version information. (Default is "
+    . "on)','1','General Settings')"
+);
diff --git a/packages/web/lib/fog/processlogin.class.php b/packages/web/lib/fog/processlogin.class.php
@@ -290,6 +290,22 @@ public function mainLoginForm()
             }
         }
         $this->_getLanguages();
+        $logininfo = self::getSetting('FOG_LOGIN_INFO_DISPLAY');
+        $extra = '';
+        if ($logininfo) {
+            $extra = sprintf(
+                '<div id="login-form-info">'
+                . '<p>%s: <b><i class="icon fa fa-circle-o-notch fa-spin fa-fw">'
+                . '</i></b></p><p>%s: <b><i class="icon fa fa-circle-o-notch fa-'
+                . 'spin fa-fw"></i></b></p><p>%s: <b><i class="icon fa fa-circle-'
+                . 'o-notch fa-spin fa-fw"></i></b></p><p>%s: <b><i class="icon '
+                . 'fa fa-circle-o-notch fa-spin fa-fw"></i></b></p></div>',
+                self::$foglang['FOGSites'],
+                self::$foglang['LatestVer'],
+                self::$foglang['LatestDevVer'],
+                self::$foglang['LatestSvnVer']
+            );
+        }
         printf(
             '<form method="post" action="%s" id="login-form">'
             . '<label for="username">%s</label>'
@@ -300,24 +316,14 @@ public function mainLoginForm()
             . '<select name="ulang" id="language">%s</select>'
             . '<label for="login-form-submit"> </label>'
             . '<input type="submit" value="%s" id="login-form-submit" name="login"/>'
-            . '</form>'
-            . '<div id="login-form-info">'
-            . '<p>%s: <b><i class="icon fa fa-circle-o-notch fa-spin fa-fw"></i></b>'
-            . '</p><p>%s: <b><i class="icon fa fa-circle-o-notch fa-spin fa-fw"></i>'
-            . '</b></p><p>%s: <b>'
-            . '<i class="icon fa fa-circle-o-notch fa-spin fa-fw"></i></b></p>'
-            . '<p>%s: <b><i class="icon fa fa-circle-o-notch fa-spin fa-fw"></i>'
-            . '</b></p></div>',
+            . '</form>%s',
             $this->formAction,
             self::$foglang['Username'],
             self::$foglang['Password'],
             self::$foglang['LanguagePhrase'],
             $this->_langMenu,
             self::$foglang['Login'],
-            self::$foglang['FOGSites'],
-            self::$foglang['LatestVer'],
-            self::$foglang['LatestDevVer'],
-            self::$foglang['LatestSvnVer']
+            $extra
         );
     }
     /**

diff --git a/packages/web/lib/fog/system.class.php b/packages/web/lib/fog/system.class.php
@@ -54,7 +54,7 @@ public function __construct()
     {
         self::_versionCompare();
         define('FOG_VERSION', '1.3.1-RC-2');
-        define('FOG_SCHEMA', 244);
+        define('FOG_SCHEMA', 245);
         define('FOG_BCACHE_VER', 111);
         define('FOG_SVN_REVISION', 6052);
         define('FOG_CLIENT_VERSION', '0.11.7');

diff --git a/packages/web/lib/pages/fogconfigurationpage.class.php b/packages/web/lib/pages/fogconfigurationpage.class.php
@@ -1330,6 +1330,7 @@ public function settings()
             'FOG_FTP_IMAGE_SIZE',
             'FOG_KERNEL_DEBUG',
             'FOG_ENFORCE_HOST_CHANGES',
+            'FOG_LOGIN_INFO_DISPLAY',
         );
         self::$HookManager
             ->processEvent(

diff --git a/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fog-project-2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-02 15:04-0500\n"
+"POT-Creation-Date: 2017-01-03 15:30-0500\n"
 "PO-Revision-Date: 2016-05-23 07:36-0400\n"
 "Last-Translator: vspushbullet <vspushbullet@gmail.com>\n"
 "Language-Team: German\n"
@@ -730,7 +730,7 @@ msgstr "Veranstaltung muss eine Zeichenfolge sein."
 
 #: /var/www/fog/lib/fog/fogbase.class.php:2129
 #: /var/www/fog/lib/fog/fogftp.class.php:372
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2197
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2198
 #: /var/www/fog/lib/pages/printermanagementpage.class.php:85
 #: /var/www/fog/lib/pages/reportmanagementpage.class.php:838
 #: /var/www/fog/lib/pages/reportmanagementpage.class.php:845
@@ -1692,7 +1692,7 @@ msgid "table backup"
 msgstr ""
 
 #: /var/www/fog/lib/fog/fogpage.class.php:3308
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2260
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2261
 #: /var/www/fog/commons/text.php:98
 msgid "Export"
 msgstr "Export"
@@ -1774,7 +1774,7 @@ msgid "Row"
 msgstr "Zeile"
 
 #: /var/www/fog/lib/fog/fogpage.class.php:3600
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2278
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2279
 msgid "Import"
 msgstr "Import"
 
@@ -2887,127 +2887,127 @@ msgstr "Temporäre Datei konnte nicht gelesen werden."
 msgid " mac addresses updated!"
 msgstr " MAC-Adressen aktualisiert!"
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:1341
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:1342
 msgid "FOG System Settings"
 msgstr "Nebel-Systemeinstellungen"
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:1346
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:1347
 msgid "This section allows you to customize or alter "
 msgstr ""
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:1347
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:1348
 msgid "the way in which FOG operates. "
 msgstr ""
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:1348
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:1349
 msgid "Please be very careful changing any of "
 msgstr ""
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:1349
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:1350
 msgid "the following settings, as they can cause "
 msgstr ""
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:1350
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:1351
 msgid "issues that are difficult to troubleshoot."
 msgstr ""
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:1530
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:1531
 msgid "No image specified"
 msgstr "Kein Bild angegeben"
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:1675
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:1676
 #: /var/www/fog/commons/text.php:180
 msgid "Save Changes"
 msgstr "Speichern Sie die Änderungen"
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:1706
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:1707
 msgid "No Image specified"
 msgstr "Kein Bild angegeben"
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:1908
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:1909
 msgid "Width must be 650 pixels."
 msgstr ""
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:1914
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:1915
 msgid "Height must be 120 pixels."
 msgstr ""
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2030
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2031
 msgid "Service Master"
 msgstr "Leistungsstamm"
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2039
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2040
 #: /var/www/fog/lib/service/taskscheduler.class.php:202
 #: /var/www/fog/commons/text.php:102
 msgid "Multicast"
 msgstr "Multicast"
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2048
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2049
 msgid "Scheduler"
 msgstr "Scheduler"
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2057
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2058
 msgid "Image Replicator"
 msgstr "Bild-Replikator"
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2066
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2067
 msgid "Snapin Replicator"
 msgstr "Snap-in-Replikator"
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2075
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2076
 #, fuzzy
 msgid "Snapin Hash"
 msgstr "Snap-in-Pfad"
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2084
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2085
 msgid "Ping Hosts"
 msgstr "Ping-Hosts"
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2126
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2127
 msgid "Image Transfer Log"
 msgstr "Bild-Übertragungsprotokoll"
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2140
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2141
 msgid "Snapin Transfer Log"
 msgstr "Snap-in-Übertragungsprotokoll"
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2192
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2193
 msgid "FOG Log Viewer"
 msgstr "Nebel-Log-Viewer"
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2199
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2200
 msgid "Number of lines"
 msgstr "Anzahl der Zeilen"
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2233
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2234
 msgid "Reverse the file: (newest on top)"
 msgstr "Die Datei rückgängig zu machen: (neueste oben)"
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2257
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2258
 msgid "Click the button to export the database."
 msgstr "Klicken Sie auf die Schaltfläche, um die Datenbank zu exportieren."
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2269
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2270
 msgid "Import a previous backup file."
 msgstr "Eine vorherige backup-Datei zu importieren."
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2311
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2312
 msgid "Database Imported and added successfully"
 msgstr "Datenbank-Import und erfolgreich hinzugefügt"
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2313
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2314
 msgid "Errors detected on import"
 msgstr "Fehler beim import"
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2319
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2320
 msgid "Database changes reverted"
 msgstr "Datenbankänderungen rückgängig gemacht"
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2323
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2324
 msgid "Errors on revert detected"
 msgstr "Fehler auf wiederherstellen erkannt"
 
-#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2329
+#: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2330
 msgid "There were errors during import"
 msgstr "Gab es Fehler beim import"