diff --git a/inc/config.class.php b/inc/config.class.php index 5d08d0f..b0fa6bd 100644 --- a/inc/config.class.php +++ b/inc/config.class.php @@ -101,8 +101,8 @@ class PluginProcessmakerConfig extends CommonDBTM { $glpi = explode( ".", $glpi[2] ); $pm = explode( "/", $url2) ; $pm = explode( ".", $pm[2] ); - $cglpi = array_pop( $glpi ) ; - $cpm = array_pop( $pm) ; + $cglpi = array_shift(explode(":", array_pop( $glpi ))) ; + $cpm = array_shift(explode(":", array_pop( $pm))) ; while( $cglpi && $cpm && $cglpi == $cpm ) { $domain = $cglpi.($domain==''?'':'.'.$domain) ; $cglpi = array_pop( $glpi ) ; @@ -138,12 +138,13 @@ class PluginProcessmakerConfig extends CommonDBTM { echo Html::scriptBlock(" function setCommonDomain() { + //debugger; var domain = ''; try { var glpi= '".$CFG_GLPI['url_base']."'.split('/')[2].split('.') ; var pm = $('input[name=pm_server_URL]').val().split('/')[2].split('.'); - var cglpi = glpi.pop() ; - var cpm = pm.pop() ; + var cglpi = glpi.pop().split(':')[0] ; + var cpm = pm.pop().split(':')[0] ; while( cglpi && cpm && cglpi == cpm ) { domain = cglpi + (domain==''?'':'.' + domain) ; cglpi = glpi.pop() ; diff --git a/processmaker.xml b/processmaker.xml index 793e79b..cde1087 100644 --- a/processmaker.xml +++ b/processmaker.xml @@ -23,7 +23,7 @@ - 3.1.1 + 3.1.2 9.1 diff --git a/setup.php b/setup.php index 42d9ca8..16dcf30 100644 --- a/setup.php +++ b/setup.php @@ -123,7 +123,7 @@ function plugin_version_processmaker(){ global $LANG; return array ('name' => 'Process Maker', - 'version' => '3.1.1', + 'version' => '3.1.2', 'author' => 'Olivier Moron', 'homepage' => '', 'minGlpiVersion' => '9.1');