* Added postmessage for communication between iframe and iframe paren…

…t for cases (CORS issue) * Added correct isolation of php calls (document.domain deprecated) * Added version to js files to be able to refresh browser cache with latest versions * Fixed issue with the history dates that were in wrong format * Added default timezone value to Laravel default timezone * Improved global response time for GLPI <-> PM server Set version to 3.3.0-community-RE-2.0
tomolimo · Oct 16, 2023 · 7d4b4c7 · 7d4b4c7
1 parent 59b74f5
commit 7d4b4c7
Show file tree

Hide file tree

Showing 328 changed files with 42,052 additions and 17,610 deletions.
diff --git a/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore
diff --git a/bootstrap/cache/services.php b/bootstrap/cache/services.php
@@ -0,0 +1,107 @@
+<?php return array (
+  'providers' => 
+  array (
+    0 => 'Illuminate\\Filesystem\\FilesystemServiceProvider',
+    1 => 'Illuminate\\Cache\\CacheServiceProvider',
+    2 => 'Illuminate\\View\\ViewServiceProvider',
+    3 => 'Illuminate\\Database\\DatabaseServiceProvider',
+    4 => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    5 => 'Illuminate\\Queue\\QueueServiceProvider',
+    6 => 'Illuminate\\Translation\\TranslationServiceProvider',
+  ),
+  'eager' => 
+  array (
+    0 => 'Illuminate\\Filesystem\\FilesystemServiceProvider',
+    1 => 'Illuminate\\View\\ViewServiceProvider',
+    2 => 'Illuminate\\Database\\DatabaseServiceProvider',
+  ),
+  'deferred' => 
+  array (
+    'cache' => 'Illuminate\\Cache\\CacheServiceProvider',
+    'cache.store' => 'Illuminate\\Cache\\CacheServiceProvider',
+    'memcached.connector' => 'Illuminate\\Cache\\CacheServiceProvider',
+    'command.cache.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.cache.forget' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.clear-compiled' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.auth.resets.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.config.cache' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.config.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.down' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.environment' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.key.generate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.install' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.refresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.reset' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.rollback' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.status' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.optimize' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.queue.failed' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.queue.flush' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.queue.forget' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.queue.listen' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.queue.restart' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.queue.retry' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.queue.work' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.route.cache' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.route.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.route.list' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.seed' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Console\\Scheduling\\ScheduleFinishCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'Illuminate\\Console\\Scheduling\\ScheduleRunCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.storage.link' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.up' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.view.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.app.name' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.auth.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.cache.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.console.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.controller.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.event.generate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.event.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.job.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.listener.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.mail.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.middleware.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.model.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.notification.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.notification.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.policy.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.provider.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.queue.failed-table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.queue.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.request.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.seeder.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.session.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.serve' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.test.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.vendor.publish' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'migrator' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'migration.repository' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'migration.creator' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'composer' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'queue' => 'Illuminate\\Queue\\QueueServiceProvider',
+    'queue.worker' => 'Illuminate\\Queue\\QueueServiceProvider',
+    'queue.listener' => 'Illuminate\\Queue\\QueueServiceProvider',
+    'queue.failer' => 'Illuminate\\Queue\\QueueServiceProvider',
+    'queue.connection' => 'Illuminate\\Queue\\QueueServiceProvider',
+    'translator' => 'Illuminate\\Translation\\TranslationServiceProvider',
+    'translation.loader' => 'Illuminate\\Translation\\TranslationServiceProvider',
+  ),
+  'when' => 
+  array (
+    'Illuminate\\Cache\\CacheServiceProvider' => 
+    array (
+    ),
+    'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider' => 
+    array (
+    ),
+    'Illuminate\\Queue\\QueueServiceProvider' => 
+    array (
+    ),
+    'Illuminate\\Translation\\TranslationServiceProvider' => 
+    array (
+    ),
+  ),
+);
diff --git a/config/database.php b/config/database.php
@@ -40,6 +40,14 @@
             'prefix' => '',
             'strict' => true,
             'engine' => null,
+            'modes'  => [
+               'ONLY_FULL_GROUP_BY',
+               'STRICT_TRANS_TABLES',
+               'NO_ZERO_IN_DATE',
+               'NO_ZERO_DATE',
+               'ERROR_FOR_DIVISION_BY_ZERO',
+               'NO_ENGINE_SUBSTITUTION',
+               ],
         ]
     ],
     /*

diff --git a/framework/src/Maveriks/WebApplication.php b/framework/src/Maveriks/WebApplication.php
@@ -285,9 +285,9 @@ protected function initRest($uri, $version, $multipart = false)
                     Util\Common::mk_dir(dirname($cachedConfig));
                 }
                 file_put_contents($cachedConfig, "<?php return " . var_export($config, true) . ";");
-                Util\Logger::log("Configuration cache was loaded and cached to: $cachedConfig");
+                //Util\Logger::log("Configuration cache was loaded and cached to: $cachedConfig");
             } else {
-                Util\Logger::log("Loading Api Configuration from: $cachedConfig");
+                //Util\Logger::log("Loading Api Configuration from: $cachedConfig");
             }
         }
 
@@ -300,7 +300,7 @@ protected function initRest($uri, $version, $multipart = false)
         \Luracast\Restler\Defaults::$cacheDirectory = $cacheDir;
         $productionMode = (bool) !(isset($sysConfig["service_api_debug"]) && $sysConfig["service_api_debug"]);
 
-        Util\Logger::log("Serving API mode: " . ($productionMode ? "production" : "development"));
+        //Util\Logger::log("Serving API mode: " . ($productionMode ? "production" : "development"));
 
         // create a new Restler instance
         //$rest = new \Luracast\Restler\Restler();

diff --git a/gulliver/js/codemirror/.gitattributes b/gulliver/js/codemirror/.gitattributes
diff --git a/gulliver/js/codemirror/.gitignore b/gulliver/js/codemirror/.gitignore
diff --git a/gulliver/system/class.headPublisher.php b/gulliver/system/class.headPublisher.php
@@ -330,19 +330,19 @@ public function includeExtJs()
         $this->clearScripts();
 
         $head = "";
-        $head = $head . "  <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/ext-base.js") . "\"></script>\n";
-        $head = $head . "  <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/ext-all.js") . "\"></script>\n";
-        $head = $head . "  <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/jscore/src/PM.js") . "\"></script>\n";
-        $head = $head . "  <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/jscore/src/Sessions.js") . "\"></script>\n";
+        $head = $head . "  <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/ext-base.js") . "?v=" . PM_VERSION . "\"></script>\n";
+        $head = $head . "  <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/ext-all.js") . "?v=" . PM_VERSION . "\"></script>\n";
+        $head = $head . "  <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/jscore/src/PM.js") . "?v=" . PM_VERSION . "\"></script>\n";
+        $head = $head . "  <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/jscore/src/Sessions.js") . "?v=" . PM_VERSION . "\"></script>\n";
 
         if (SYS_LANG != 'en') {
             $tempLang = str_replace('-', '_', SYS_LANG);
             if (file_exists(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'ext' . PATH_SEP . 'locale' . PATH_SEP . 'ext-lang-' . $tempLang . '.js')) {
-                $head = $head . "  <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/locale/ext-lang-" . $tempLang . ".js") . "\"></script>\n";
+                $head = $head . "  <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/locale/ext-lang-" . $tempLang . ".js") . "?v=" . PM_VERSION . "\"></script>\n";
             } else {
                 $aux = explode('-', strtolower(SYS_LANG));
                 if (file_exists(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'ext' . PATH_SEP . 'locale' . PATH_SEP . 'ext-lang-' . $aux[0] . '.js')) {
-                    $head = $head . "  <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/locale/ext-lang-" . $aux[0] . ".js") . "\"></script>\n";
+                    $head = $head . "  <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/locale/ext-lang-" . $aux[0] . ".js") . "?v=" . PM_VERSION . "\"></script>\n";
                 }
             }
         }
@@ -362,7 +362,7 @@ public function includeExtJs()
         $head .= $this->getExtJsVariablesScript();
         $oServerConf = ServerConf::getSingleton();
         if ($oServerConf->isRtl(SYS_LANG)) {
-            $head = $head . "  <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/extjs_rtl.js") . "\"></script>\n";
+            $head = $head . "  <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/extjs_rtl.js") . "?v=" . PM_VERSION . "\"></script>\n";
         }
 
         return $head;
@@ -404,7 +404,7 @@ public function getExtJsScripts()
         $script = '';
         if (isset($this->extJsScript) && is_array($this->extJsScript)) {
             foreach ($this->extJsScript as $key => $file) {
-                $script = $script . "  <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl($file . ".js") . "\"></script>\n";
+                $script = $script . "  <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl($file . ".js") . "?v=" . $_SESSION['PM_VERSION']. "\"></script>\n";
             }
         }
         return $script;

diff --git a/rbac/engine/data/mysql/insert.sql b/rbac/engine/data/mysql/insert.sql
@@ -225,8 +225,8 @@ INSERT INTO `RBAC_SYSTEMS` VALUES
 ('00000000000000000000000000000002','PROCESSMAKER','2007-07-31 19:10:22','2007-08-03 12:24:36',1);
 
 INSERT INTO `RBAC_USERS` VALUES
-('00000000000000000000000000000001','admin','21232f297a57a5a743894a0e4a801fc3','Administrator','','[email protected]','2020-01-01','2007-08-03 12:24:36','2008-02-13 07:24:07',1,'MYSQL','00000000000000000000000000000000','',''),
-('00000000000000000000000000000002','guest','$2y$10$rasFC.VNv9TLStNtFVJu6OjxhCi6FezdwkLrBzTFwmXsNnfW0/YZm','Guest','','[email protected]','2030-01-01','2009-02-01 12:24:36','2009-02-01 12:24:36',0,'MYSQL','00000000000000000000000000000000','','');
+('00000000000000000000000000000001','admin','21232f297a57a5a743894a0e4a801fc3','Administrator','','[email protected]','2040-01-01','2007-08-03 12:24:36','2008-02-13 07:24:07',1,'MYSQL','00000000000000000000000000000000','',''),
+('00000000000000000000000000000002','guest','$2y$10$rasFC.VNv9TLStNtFVJu6OjxhCi6FezdwkLrBzTFwmXsNnfW0/YZm','Guest','','[email protected]','2040-01-01','2009-02-01 12:24:36','2009-02-01 12:24:36',0,'MYSQL','00000000000000000000000000000000','','');
 
 INSERT INTO `RBAC_USERS_ROLES` VALUES
 ('00000000000000000000000000000001','00000000000000000000000000000002'),

diff --git a/thirdparty/html2ps_pdf/cache/.gitignore b/thirdparty/html2ps_pdf/cache/.gitignore
diff --git a/vendor/bshaffer/oauth2-server-php/.gitignore b/vendor/bshaffer/oauth2-server-php/.gitignore
diff --git a/vendor/chumper/zipper/.gitignore b/vendor/chumper/zipper/.gitignore
diff --git a/vendor/colosa/MichelangeloFE/build/js/mafe.js b/vendor/colosa/MichelangeloFE/build/js/mafe.js
@@ -26672,10 +26672,14 @@ FullScreen.prototype.toggle = function (action) {
 };
 FullScreen.prototype.attachListeners = function () {
     var el, self = this;
-    if (parent.document.documentElement === document.documentElement) {
-        el = document;
-    } else {
-        el = parent.document;
+    try {
+       if (parent.document.documentElement === document.documentElement) {
+           el = document;
+       } else {
+           el = parent.document;
+       }
+    } catch (e) {
+       el = document;
     }
 
     el.addEventListener("fullscreenchange", function () {

diff --git a/vendor/colosa/MichelangeloFE/src/fullScreen.js b/vendor/colosa/MichelangeloFE/src/fullScreen.js
@@ -103,10 +103,14 @@ FullScreen.prototype.toggle = function (action) {
 };
 FullScreen.prototype.attachListeners = function () {
     var el, self = this;
-    if (parent.document.documentElement === document.documentElement) {
-        el = document;
-    } else {
-        el = parent.document;
+    try {
+       if (parent.document.documentElement === document.documentElement) {
+           el = document;
+       } else {
+           el = parent.document;
+       }
+    } catch (e) {
+       el = document;
     }
 
     el.addEventListener("fullscreenchange", function () {

diff --git a/vendor/dapphp/securimage/.gitattributes b/vendor/dapphp/securimage/.gitattributes
diff --git a/vendor/doctrine/inflector/.gitignore b/vendor/doctrine/inflector/.gitignore
diff --git a/vendor/geshi/geshi/.gitignore b/vendor/geshi/geshi/.gitignore
diff --git a/vendor/google/apiclient/.gitignore b/vendor/google/apiclient/.gitignore
diff --git a/vendor/luracast/restler/.gitignore b/vendor/luracast/restler/.gitignore