Fix up the login report too.

Issue still existed sort of, this just addresses it.
FOGProject · Jan 4, 2017 · daf3d28 · daf3d28
1 parent ee62611
commit daf3d28
Show file tree

Hide file tree

Showing 11 changed files with 71 additions and 52 deletions.
diff --git a/packages/web/lib/fog/fogbase.class.php b/packages/web/lib/fog/fogbase.class.php
@@ -1858,7 +1858,26 @@ public static function getSubObjectIDs(
         if (empty($operator)) {
             $operator = 'AND';
         }
-
+        if (is_array($getField)) {
+            foreach ((array)$getField as &$field) {
+                $data[$field] = self::getClass($object)
+                    ->getManager()
+                    ->find(
+                        $findWhere,
+                        $operator,
+                        $orderBy,
+                        '',
+                        '',
+                        $groupBy,
+                        $not,
+                        $field,
+                        '',
+                        $filter
+                    );
+                unset($field);
+            }
+            return $data;
+        }
         return self::getClass($object)->getManager()->find(
             $findWhere,
             $operator,

diff --git a/packages/web/lib/fog/system.class.php b/packages/web/lib/fog/system.class.php
@@ -53,7 +53,7 @@ private static function _versionCompare()
     public function __construct()
     {
         self::_versionCompare();
-        define('FOG_VERSION', '6');
+        define('FOG_VERSION', '7');
         define('FOG_SCHEMA', 245);
         define('FOG_BCACHE_VER', 111);
         define('FOG_SVN_REVISION', 6052);

diff --git a/packages/web/lib/pages/reportmanagementpage.class.php b/packages/web/lib/pages/reportmanagementpage.class.php
@@ -978,7 +978,7 @@ public function usertrack()
         $HostNames = array_values(array_filter(array_unique((array)$HostNames)));
         if (count($UserNames) > 0) {
             ob_start();
-            foreach ((array)$UserNames as $i => &$Username) {
+            foreach ((array)$UserNames as &$Username) {
                 if ($Username) {
                     printf(
                         '<option value="%s">%s</option>',
@@ -999,7 +999,7 @@ public function usertrack()
         }
         if (count($HostNames) > 0) {
             ob_start();
-            foreach ((array)$HostNames as $i => &$Hostname) {
+            foreach ((array)$HostNames as &$Hostname) {
                 if ($Hostname) {
                     printf(
                         '<option value="%s">%s</option>',

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-04 16:10-0500\n"
+"POT-Creation-Date: 2017-01-04 16:19-0500\n"
 "PO-Revision-Date: 2016-05-23 07:36-0400\n"
 "Last-Translator: vspushbullet <vspushbullet@gmail.com>\n"
 "Language-Team: German\n"
@@ -423,7 +423,7 @@ msgid "Array type"
 msgstr "Array mit Daten"
 
 #: /var/www/fog/lib/fog/fogcontroller.class.php:907
-#: /var/www/fog/lib/fog/fogbase.class.php:2125
+#: /var/www/fog/lib/fog/fogbase.class.php:2144
 #: /var/www/fog/lib/fog/fogftp.class.php:370
 #: /var/www/fog/lib/pages/taskmobile.class.php:45
 #: /var/www/fog/lib/pages/taskmanagementpage.class.php:964
@@ -723,12 +723,12 @@ msgstr "Veranstaltung muss eine Zeichenfolge sein."
 msgid "String must be a string"
 msgstr "Veranstaltung muss eine Zeichenfolge sein."
 
-#: /var/www/fog/lib/fog/fogbase.class.php:1887
+#: /var/www/fog/lib/fog/fogbase.class.php:1906
 #, fuzzy
 msgid "Key must be a string"
 msgstr "Veranstaltung muss eine Zeichenfolge sein."
 
-#: /var/www/fog/lib/fog/fogbase.class.php:2127
+#: /var/www/fog/lib/fog/fogbase.class.php:2146
 #: /var/www/fog/lib/fog/fogftp.class.php:372
 #: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2198
 #: /var/www/fog/lib/pages/printermanagementpage.class.php:85
@@ -739,12 +739,12 @@ msgstr "Veranstaltung muss eine Zeichenfolge sein."
 msgid "File"
 msgstr "Datei"
 
-#: /var/www/fog/lib/fog/fogbase.class.php:2129
+#: /var/www/fog/lib/fog/fogbase.class.php:2148
 #: /var/www/fog/lib/fog/fogftp.class.php:374
 msgid "Line"
 msgstr "Linie"
 
-#: /var/www/fog/lib/fog/fogbase.class.php:2131
+#: /var/www/fog/lib/fog/fogbase.class.php:2150
 #: /var/www/fog/lib/fog/fogftp.class.php:376
 #: /var/www/fog/lib/db/mysql.class.php:189
 msgid "Message"

diff --git a/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-04 16:10-0500\n"
+"POT-Creation-Date: 2017-01-04 16:19-0500\n"
 "PO-Revision-Date: 2016-05-22 15:14-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -422,7 +422,7 @@ msgid "Array type"
 msgstr "Array of data"
 
 #: /var/www/fog/lib/fog/fogcontroller.class.php:907
-#: /var/www/fog/lib/fog/fogbase.class.php:2125
+#: /var/www/fog/lib/fog/fogbase.class.php:2144
 #: /var/www/fog/lib/fog/fogftp.class.php:370
 #: /var/www/fog/lib/pages/taskmobile.class.php:45
 #: /var/www/fog/lib/pages/taskmanagementpage.class.php:964
@@ -718,12 +718,12 @@ msgstr "Event must be a string"
 msgid "String must be a string"
 msgstr "Event must be a string"
 
-#: /var/www/fog/lib/fog/fogbase.class.php:1887
+#: /var/www/fog/lib/fog/fogbase.class.php:1906
 #, fuzzy
 msgid "Key must be a string"
 msgstr "Event must be a string"
 
-#: /var/www/fog/lib/fog/fogbase.class.php:2127
+#: /var/www/fog/lib/fog/fogbase.class.php:2146
 #: /var/www/fog/lib/fog/fogftp.class.php:372
 #: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2198
 #: /var/www/fog/lib/pages/printermanagementpage.class.php:85
@@ -734,12 +734,12 @@ msgstr "Event must be a string"
 msgid "File"
 msgstr "File"
 
-#: /var/www/fog/lib/fog/fogbase.class.php:2129
+#: /var/www/fog/lib/fog/fogbase.class.php:2148
 #: /var/www/fog/lib/fog/fogftp.class.php:374
 msgid "Line"
 msgstr "Line"
 
-#: /var/www/fog/lib/fog/fogbase.class.php:2131
+#: /var/www/fog/lib/fog/fogbase.class.php:2150
 #: /var/www/fog/lib/fog/fogftp.class.php:376
 #: /var/www/fog/lib/db/mysql.class.php:189
 msgid "Message"

diff --git a/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-04 16:10-0500\n"
+"POT-Creation-Date: 2017-01-04 16:19-0500\n"
 "PO-Revision-Date: 2016-05-22 15:14-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -425,7 +425,7 @@ msgid "Array type"
 msgstr "Matriz de datos"
 
 #: /var/www/fog/lib/fog/fogcontroller.class.php:907
-#: /var/www/fog/lib/fog/fogbase.class.php:2125
+#: /var/www/fog/lib/fog/fogbase.class.php:2144
 #: /var/www/fog/lib/fog/fogftp.class.php:370
 #: /var/www/fog/lib/pages/taskmobile.class.php:45
 #: /var/www/fog/lib/pages/taskmanagementpage.class.php:964
@@ -721,12 +721,12 @@ msgstr "Evento debe ser una cadena"
 msgid "String must be a string"
 msgstr "Evento debe ser una cadena"
 
-#: /var/www/fog/lib/fog/fogbase.class.php:1887
+#: /var/www/fog/lib/fog/fogbase.class.php:1906
 #, fuzzy
 msgid "Key must be a string"
 msgstr "Evento debe ser una cadena"
 
-#: /var/www/fog/lib/fog/fogbase.class.php:2127
+#: /var/www/fog/lib/fog/fogbase.class.php:2146
 #: /var/www/fog/lib/fog/fogftp.class.php:372
 #: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2198
 #: /var/www/fog/lib/pages/printermanagementpage.class.php:85
@@ -737,12 +737,12 @@ msgstr "Evento debe ser una cadena"
 msgid "File"
 msgstr "Archivo"
 
-#: /var/www/fog/lib/fog/fogbase.class.php:2129
+#: /var/www/fog/lib/fog/fogbase.class.php:2148
 #: /var/www/fog/lib/fog/fogftp.class.php:374
 msgid "Line"
 msgstr "Línea"
 
-#: /var/www/fog/lib/fog/fogbase.class.php:2131
+#: /var/www/fog/lib/fog/fogbase.class.php:2150
 #: /var/www/fog/lib/fog/fogftp.class.php:376
 #: /var/www/fog/lib/db/mysql.class.php:189
 msgid "Message"

diff --git a/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-04 16:10-0500\n"
+"POT-Creation-Date: 2017-01-04 16:19-0500\n"
 "PO-Revision-Date: 2016-05-22 15:14-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -425,7 +425,7 @@ msgid "Array type"
 msgstr "Tableau de données"
 
 #: /var/www/fog/lib/fog/fogcontroller.class.php:907
-#: /var/www/fog/lib/fog/fogbase.class.php:2125
+#: /var/www/fog/lib/fog/fogbase.class.php:2144
 #: /var/www/fog/lib/fog/fogftp.class.php:370
 #: /var/www/fog/lib/pages/taskmobile.class.php:45
 #: /var/www/fog/lib/pages/taskmanagementpage.class.php:964
@@ -723,12 +723,12 @@ msgstr "Événement doit être une chaîne"
 msgid "String must be a string"
 msgstr "Événement doit être une chaîne"
 
-#: /var/www/fog/lib/fog/fogbase.class.php:1887
+#: /var/www/fog/lib/fog/fogbase.class.php:1906
 #, fuzzy
 msgid "Key must be a string"
 msgstr "Événement doit être une chaîne"
 
-#: /var/www/fog/lib/fog/fogbase.class.php:2127
+#: /var/www/fog/lib/fog/fogbase.class.php:2146
 #: /var/www/fog/lib/fog/fogftp.class.php:372
 #: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2198
 #: /var/www/fog/lib/pages/printermanagementpage.class.php:85
@@ -739,12 +739,12 @@ msgstr "Événement doit être une chaîne"
 msgid "File"
 msgstr "Fichier"
 
-#: /var/www/fog/lib/fog/fogbase.class.php:2129
+#: /var/www/fog/lib/fog/fogbase.class.php:2148
 #: /var/www/fog/lib/fog/fogftp.class.php:374
 msgid "Line"
 msgstr "Ligne"
 
-#: /var/www/fog/lib/fog/fogbase.class.php:2131
+#: /var/www/fog/lib/fog/fogbase.class.php:2150
 #: /var/www/fog/lib/fog/fogftp.class.php:376
 #: /var/www/fog/lib/db/mysql.class.php:189
 msgid "Message"

diff --git a/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-04 16:10-0500\n"
+"POT-Creation-Date: 2017-01-04 16:19-0500\n"
 "PO-Revision-Date: 2016-05-22 15:14-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -425,7 +425,7 @@ msgid "Array type"
 msgstr "Array di dati"
 
 #: /var/www/fog/lib/fog/fogcontroller.class.php:907
-#: /var/www/fog/lib/fog/fogbase.class.php:2125
+#: /var/www/fog/lib/fog/fogbase.class.php:2144
 #: /var/www/fog/lib/fog/fogftp.class.php:370
 #: /var/www/fog/lib/pages/taskmobile.class.php:45
 #: /var/www/fog/lib/pages/taskmanagementpage.class.php:964
@@ -719,12 +719,12 @@ msgstr "Evento deve essere una stringa"
 msgid "String must be a string"
 msgstr "Evento deve essere una stringa"
 
-#: /var/www/fog/lib/fog/fogbase.class.php:1887
+#: /var/www/fog/lib/fog/fogbase.class.php:1906
 #, fuzzy
 msgid "Key must be a string"
 msgstr "Evento deve essere una stringa"
 
-#: /var/www/fog/lib/fog/fogbase.class.php:2127
+#: /var/www/fog/lib/fog/fogbase.class.php:2146
 #: /var/www/fog/lib/fog/fogftp.class.php:372
 #: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2198
 #: /var/www/fog/lib/pages/printermanagementpage.class.php:85
@@ -735,12 +735,12 @@ msgstr "Evento deve essere una stringa"
 msgid "File"
 msgstr "File"
 
-#: /var/www/fog/lib/fog/fogbase.class.php:2129
+#: /var/www/fog/lib/fog/fogbase.class.php:2148
 #: /var/www/fog/lib/fog/fogftp.class.php:374
 msgid "Line"
 msgstr "linea"
 
-#: /var/www/fog/lib/fog/fogbase.class.php:2131
+#: /var/www/fog/lib/fog/fogbase.class.php:2150
 #: /var/www/fog/lib/fog/fogftp.class.php:376
 #: /var/www/fog/lib/db/mysql.class.php:189
 msgid "Message"

diff --git a/packages/web/management/languages/messages.pot b/packages/web/management/languages/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-04 16:10-0500\n"
+"POT-Creation-Date: 2017-01-04 16:19-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -389,7 +389,7 @@ msgid "Array type"
 msgstr ""
 
 #: /var/www/fog/lib/fog/fogcontroller.class.php:907
-#: /var/www/fog/lib/fog/fogbase.class.php:2125
+#: /var/www/fog/lib/fog/fogbase.class.php:2144
 #: /var/www/fog/lib/fog/fogftp.class.php:370
 #: /var/www/fog/lib/pages/taskmobile.class.php:45
 #: /var/www/fog/lib/pages/taskmanagementpage.class.php:964
@@ -654,11 +654,11 @@ msgstr ""
 msgid "String must be a string"
 msgstr ""
 
-#: /var/www/fog/lib/fog/fogbase.class.php:1887
+#: /var/www/fog/lib/fog/fogbase.class.php:1906
 msgid "Key must be a string"
 msgstr ""
 
-#: /var/www/fog/lib/fog/fogbase.class.php:2127
+#: /var/www/fog/lib/fog/fogbase.class.php:2146
 #: /var/www/fog/lib/fog/fogftp.class.php:372
 #: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2198
 #: /var/www/fog/lib/pages/printermanagementpage.class.php:85
@@ -669,12 +669,12 @@ msgstr ""
 msgid "File"
 msgstr ""
 
-#: /var/www/fog/lib/fog/fogbase.class.php:2129
+#: /var/www/fog/lib/fog/fogbase.class.php:2148
 #: /var/www/fog/lib/fog/fogftp.class.php:374
 msgid "Line"
 msgstr ""
 
-#: /var/www/fog/lib/fog/fogbase.class.php:2131
+#: /var/www/fog/lib/fog/fogbase.class.php:2150
 #: /var/www/fog/lib/fog/fogftp.class.php:376
 #: /var/www/fog/lib/db/mysql.class.php:189
 msgid "Message"

diff --git a/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-04 16:10-0500\n"
+"POT-Creation-Date: 2017-01-04 16:19-0500\n"
 "PO-Revision-Date: 2016-05-22 15:14-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -424,7 +424,7 @@ msgid "Array type"
 msgstr "Matriz de dados"
 
 #: /var/www/fog/lib/fog/fogcontroller.class.php:907
-#: /var/www/fog/lib/fog/fogbase.class.php:2125
+#: /var/www/fog/lib/fog/fogbase.class.php:2144
 #: /var/www/fog/lib/fog/fogftp.class.php:370
 #: /var/www/fog/lib/pages/taskmobile.class.php:45
 #: /var/www/fog/lib/pages/taskmanagementpage.class.php:964
@@ -720,12 +720,12 @@ msgstr "Evento deve ser uma string"
 msgid "String must be a string"
 msgstr "Evento deve ser uma string"
 
-#: /var/www/fog/lib/fog/fogbase.class.php:1887
+#: /var/www/fog/lib/fog/fogbase.class.php:1906
 #, fuzzy
 msgid "Key must be a string"
 msgstr "Evento deve ser uma string"
 
-#: /var/www/fog/lib/fog/fogbase.class.php:2127
+#: /var/www/fog/lib/fog/fogbase.class.php:2146
 #: /var/www/fog/lib/fog/fogftp.class.php:372
 #: /var/www/fog/lib/pages/fogconfigurationpage.class.php:2198
 #: /var/www/fog/lib/pages/printermanagementpage.class.php:85
@@ -736,12 +736,12 @@ msgstr "Evento deve ser uma string"
 msgid "File"
 msgstr "Arquivo"
 
-#: /var/www/fog/lib/fog/fogbase.class.php:2129
+#: /var/www/fog/lib/fog/fogbase.class.php:2148
 #: /var/www/fog/lib/fog/fogftp.class.php:374
 msgid "Line"
 msgstr "Linha"
 
-#: /var/www/fog/lib/fog/fogbase.class.php:2131
+#: /var/www/fog/lib/fog/fogbase.class.php:2150
 #: /var/www/fog/lib/fog/fogftp.class.php:376
 #: /var/www/fog/lib/db/mysql.class.php:189
 msgid "Message"