Skip to content

Commit 7d4b4c7

Browse files
tomolimotomolimo
committed
* Added postmessage for communication between iframe and iframe parent 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
1 parent 59b74f5 commit 7d4b4c7

File tree

328 files changed

+42052
-17610
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

328 files changed

+42052
-17610
lines changed

‎bootstrap/cache/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎bootstrap/cache/services.php

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
<?php return array (
2+
'providers' =>
3+
array (
4+
0 => 'Illuminate\\Filesystem\\FilesystemServiceProvider',
5+
1 => 'Illuminate\\Cache\\CacheServiceProvider',
6+
2 => 'Illuminate\\View\\ViewServiceProvider',
7+
3 => 'Illuminate\\Database\\DatabaseServiceProvider',
8+
4 => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
9+
5 => 'Illuminate\\Queue\\QueueServiceProvider',
10+
6 => 'Illuminate\\Translation\\TranslationServiceProvider',
11+
),
12+
'eager' =>
13+
array (
14+
0 => 'Illuminate\\Filesystem\\FilesystemServiceProvider',
15+
1 => 'Illuminate\\View\\ViewServiceProvider',
16+
2 => 'Illuminate\\Database\\DatabaseServiceProvider',
17+
),
18+
'deferred' =>
19+
array (
20+
'cache' => 'Illuminate\\Cache\\CacheServiceProvider',
21+
'cache.store' => 'Illuminate\\Cache\\CacheServiceProvider',
22+
'memcached.connector' => 'Illuminate\\Cache\\CacheServiceProvider',
23+
'command.cache.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
24+
'command.cache.forget' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
25+
'command.clear-compiled' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
26+
'command.auth.resets.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
27+
'command.config.cache' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
28+
'command.config.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
29+
'command.down' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
30+
'command.environment' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
31+
'command.key.generate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
32+
'command.migrate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
33+
'command.migrate.install' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
34+
'command.migrate.refresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
35+
'command.migrate.reset' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
36+
'command.migrate.rollback' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
37+
'command.migrate.status' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
38+
'command.optimize' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
39+
'command.queue.failed' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
40+
'command.queue.flush' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
41+
'command.queue.forget' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
42+
'command.queue.listen' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
43+
'command.queue.restart' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
44+
'command.queue.retry' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
45+
'command.queue.work' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
46+
'command.route.cache' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
47+
'command.route.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
48+
'command.route.list' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
49+
'command.seed' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
50+
'Illuminate\\Console\\Scheduling\\ScheduleFinishCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
51+
'Illuminate\\Console\\Scheduling\\ScheduleRunCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
52+
'command.storage.link' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
53+
'command.up' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
54+
'command.view.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
55+
'command.app.name' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
56+
'command.auth.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
57+
'command.cache.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
58+
'command.console.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
59+
'command.controller.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
60+
'command.event.generate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
61+
'command.event.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
62+
'command.job.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
63+
'command.listener.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
64+
'command.mail.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
65+
'command.middleware.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
66+
'command.migrate.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
67+
'command.model.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
68+
'command.notification.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
69+
'command.notification.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
70+
'command.policy.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
71+
'command.provider.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
72+
'command.queue.failed-table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
73+
'command.queue.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
74+
'command.request.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
75+
'command.seeder.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
76+
'command.session.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
77+
'command.serve' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
78+
'command.test.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
79+
'command.vendor.publish' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
80+
'migrator' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
81+
'migration.repository' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
82+
'migration.creator' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
83+
'composer' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
84+
'queue' => 'Illuminate\\Queue\\QueueServiceProvider',
85+
'queue.worker' => 'Illuminate\\Queue\\QueueServiceProvider',
86+
'queue.listener' => 'Illuminate\\Queue\\QueueServiceProvider',
87+
'queue.failer' => 'Illuminate\\Queue\\QueueServiceProvider',
88+
'queue.connection' => 'Illuminate\\Queue\\QueueServiceProvider',
89+
'translator' => 'Illuminate\\Translation\\TranslationServiceProvider',
90+
'translation.loader' => 'Illuminate\\Translation\\TranslationServiceProvider',
91+
),
92+
'when' =>
93+
array (
94+
'Illuminate\\Cache\\CacheServiceProvider' =>
95+
array (
96+
),
97+
'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider' =>
98+
array (
99+
),
100+
'Illuminate\\Queue\\QueueServiceProvider' =>
101+
array (
102+
),
103+
'Illuminate\\Translation\\TranslationServiceProvider' =>
104+
array (
105+
),
106+
),
107+
);

‎config/database.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,14 @@
4040
'prefix' => '',
4141
'strict' => true,
4242
'engine' => null,
43+
'modes' => [
44+
'ONLY_FULL_GROUP_BY',
45+
'STRICT_TRANS_TABLES',
46+
'NO_ZERO_IN_DATE',
47+
'NO_ZERO_DATE',
48+
'ERROR_FOR_DIVISION_BY_ZERO',
49+
'NO_ENGINE_SUBSTITUTION',
50+
],
4351
]
4452
],
4553
/*

‎framework/src/Maveriks/WebApplication.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,9 @@ protected function initRest($uri, $version, $multipart = false)
285285
Util\Common::mk_dir(dirname($cachedConfig));
286286
}
287287
file_put_contents($cachedConfig, "<?php return " . var_export($config, true) . ";");
288-
Util\Logger::log("Configuration cache was loaded and cached to: $cachedConfig");
288+
//Util\Logger::log("Configuration cache was loaded and cached to: $cachedConfig");
289289
} else {
290-
Util\Logger::log("Loading Api Configuration from: $cachedConfig");
290+
//Util\Logger::log("Loading Api Configuration from: $cachedConfig");
291291
}
292292
}
293293

@@ -300,7 +300,7 @@ protected function initRest($uri, $version, $multipart = false)
300300
\Luracast\Restler\Defaults::$cacheDirectory = $cacheDir;
301301
$productionMode = (bool) !(isset($sysConfig["service_api_debug"]) && $sysConfig["service_api_debug"]);
302302

303-
Util\Logger::log("Serving API mode: " . ($productionMode ? "production" : "development"));
303+
//Util\Logger::log("Serving API mode: " . ($productionMode ? "production" : "development"));
304304

305305
// create a new Restler instance
306306
//$rest = new \Luracast\Restler\Restler();

‎gulliver/js/codemirror/.gitattributes

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎gulliver/js/codemirror/.gitignore

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎gulliver/system/class.headPublisher.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -330,19 +330,19 @@ public function includeExtJs()
330330
$this->clearScripts();
331331

332332
$head = "";
333-
$head = $head . " <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/ext-base.js") . "\"></script>\n";
334-
$head = $head . " <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/ext-all.js") . "\"></script>\n";
335-
$head = $head . " <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/jscore/src/PM.js") . "\"></script>\n";
336-
$head = $head . " <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/jscore/src/Sessions.js") . "\"></script>\n";
333+
$head = $head . " <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/ext-base.js") . "?v=" . PM_VERSION . "\"></script>\n";
334+
$head = $head . " <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/ext-all.js") . "?v=" . PM_VERSION . "\"></script>\n";
335+
$head = $head . " <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/jscore/src/PM.js") . "?v=" . PM_VERSION . "\"></script>\n";
336+
$head = $head . " <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/jscore/src/Sessions.js") . "?v=" . PM_VERSION . "\"></script>\n";
337337

338338
if (SYS_LANG != 'en') {
339339
$tempLang = str_replace('-', '_', SYS_LANG);
340340
if (file_exists(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'ext' . PATH_SEP . 'locale' . PATH_SEP . 'ext-lang-' . $tempLang . '.js')) {
341-
$head = $head . " <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/locale/ext-lang-" . $tempLang . ".js") . "\"></script>\n";
341+
$head = $head . " <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/locale/ext-lang-" . $tempLang . ".js") . "?v=" . PM_VERSION . "\"></script>\n";
342342
} else {
343343
$aux = explode('-', strtolower(SYS_LANG));
344344
if (file_exists(PATH_GULLIVER_HOME . 'js' . PATH_SEP . 'ext' . PATH_SEP . 'locale' . PATH_SEP . 'ext-lang-' . $aux[0] . '.js')) {
345-
$head = $head . " <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/locale/ext-lang-" . $aux[0] . ".js") . "\"></script>\n";
345+
$head = $head . " <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/locale/ext-lang-" . $aux[0] . ".js") . "?v=" . PM_VERSION . "\"></script>\n";
346346
}
347347
}
348348
}
@@ -362,7 +362,7 @@ public function includeExtJs()
362362
$head .= $this->getExtJsVariablesScript();
363363
$oServerConf = ServerConf::getSingleton();
364364
if ($oServerConf->isRtl(SYS_LANG)) {
365-
$head = $head . " <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/extjs_rtl.js") . "\"></script>\n";
365+
$head = $head . " <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/extjs_rtl.js") . "?v=" . PM_VERSION . "\"></script>\n";
366366
}
367367

368368
return $head;
@@ -404,7 +404,7 @@ public function getExtJsScripts()
404404
$script = '';
405405
if (isset($this->extJsScript) && is_array($this->extJsScript)) {
406406
foreach ($this->extJsScript as $key => $file) {
407-
$script = $script . " <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl($file . ".js") . "\"></script>\n";
407+
$script = $script . " <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl($file . ".js") . "?v=" . $_SESSION['PM_VERSION']. "\"></script>\n";
408408
}
409409
}
410410
return $script;

‎rbac/engine/data/mysql/insert.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,8 @@ INSERT INTO `RBAC_SYSTEMS` VALUES
225225
('00000000000000000000000000000002','PROCESSMAKER','2007-07-31 19:10:22','2007-08-03 12:24:36',1);
226226

227227
INSERT INTO `RBAC_USERS` VALUES
228-
('00000000000000000000000000000001','admin','21232f297a57a5a743894a0e4a801fc3','Administrator','','admin@processmaker.com','2020-01-01','2007-08-03 12:24:36','2008-02-13 07:24:07',1,'MYSQL','00000000000000000000000000000000','',''),
229-
('00000000000000000000000000000002','guest','$2y$10$rasFC.VNv9TLStNtFVJu6OjxhCi6FezdwkLrBzTFwmXsNnfW0/YZm','Guest','','guest@processmaker.com','2030-01-01','2009-02-01 12:24:36','2009-02-01 12:24:36',0,'MYSQL','00000000000000000000000000000000','','');
228+
('00000000000000000000000000000001','admin','21232f297a57a5a743894a0e4a801fc3','Administrator','','admin@processmaker.com','2040-01-01','2007-08-03 12:24:36','2008-02-13 07:24:07',1,'MYSQL','00000000000000000000000000000000','',''),
229+
('00000000000000000000000000000002','guest','$2y$10$rasFC.VNv9TLStNtFVJu6OjxhCi6FezdwkLrBzTFwmXsNnfW0/YZm','Guest','','guest@processmaker.com','2040-01-01','2009-02-01 12:24:36','2009-02-01 12:24:36',0,'MYSQL','00000000000000000000000000000000','','');
230230

231231
INSERT INTO `RBAC_USERS_ROLES` VALUES
232232
('00000000000000000000000000000001','00000000000000000000000000000002'),

‎thirdparty/html2ps_pdf/cache/.gitignore

Whitespace-only changes.

‎vendor/bshaffer/oauth2-server-php/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)