fernando/tomolino-processmaker
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed an issue with document.domain when PM (or GLPI) URL was using a port

Browse Source
This commit is contained in:
tomolimo
2017-05-03 09:40:19 +02:00
parent cf5f638030
commit 74e7b4300b
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
inc/config.class.php
View File

@@ -101,8 +101,8 @@ class PluginProcessmakerConfig extends CommonDBTM {
$glpi = explode( ".", $glpi[2] ); $glpi = explode( ".", $glpi[2] );
$pm = explode( "/", $url2) ; $pm = explode( "/", $url2) ;
$pm = explode( ".", $pm[2] ); $pm = explode( ".", $pm[2] );
$cglpi = array_pop( $glpi ) ; $cglpi = array_shift(explode(":", array_pop( $glpi ))) ;
$cpm = array_pop( $pm) ; $cpm = array_shift(explode(":", array_pop( $pm))) ;
while( $cglpi && $cpm && $cglpi == $cpm ) { while( $cglpi && $cpm && $cglpi == $cpm ) {
$domain = $cglpi.($domain==''?'':'.'.$domain) ; $domain = $cglpi.($domain==''?'':'.'.$domain) ;
$cglpi = array_pop( $glpi ) ; $cglpi = array_pop( $glpi ) ;
@@ -138,12 +138,13 @@ class PluginProcessmakerConfig extends CommonDBTM {
echo Html::scriptBlock(" echo Html::scriptBlock("
function setCommonDomain() { function setCommonDomain() {
//debugger;
var domain = ''; var domain = '';
try { try {
var glpi= '".$CFG_GLPI['url_base']."'.split('/')[2].split('.') ; var glpi= '".$CFG_GLPI['url_base']."'.split('/')[2].split('.') ;
var pm = $('input[name=pm_server_URL]').val().split('/')[2].split('.'); var pm = $('input[name=pm_server_URL]').val().split('/')[2].split('.');
var cglpi = glpi.pop() ; var cglpi = glpi.pop().split(':')[0] ;
var cpm = pm.pop() ; var cpm = pm.pop().split(':')[0] ;
while( cglpi && cpm && cglpi == cpm ) { while( cglpi && cpm && cglpi == cpm ) {
domain = cglpi + (domain==''?'':'.' + domain) ; domain = cglpi + (domain==''?'':'.' + domain) ;
cglpi = glpi.pop() ; cglpi = glpi.pop() ;

2
processmaker.xml
View File

@@ -23,7 +23,7 @@
</authors> </authors>
<versions> <versions>
<version> <version>
<num>3.1.1</num> <num>3.1.2</num>
<compatibility>9.1</compatibility> <compatibility>9.1</compatibility>
</version> </version>
</versions> </versions>

2
setup.php
View File

@@ -123,7 +123,7 @@ function plugin_version_processmaker(){
global $LANG; global $LANG;
return array ('name' => 'Process Maker', return array ('name' => 'Process Maker',
'version' => '3.1.1', 'version' => '3.1.2',
'author' => 'Olivier Moron', 'author' => 'Olivier Moron',
'homepage' => '', 'homepage' => '',
'minGlpiVersion' => '9.1'); 'minGlpiVersion' => '9.1');