From e2750f806eb22adc411022caab881a802e51f846 Mon Sep 17 00:00:00 2001 From: Freddy Daniel Rojas Valda Date: Mon, 8 Dec 2014 11:07:55 -0400 Subject: [PATCH 1/4] PM-1040. Remove code from the Community version. Change password hash method --- workflow/engine/bin/tasks/cliAddons.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/workflow/engine/bin/tasks/cliAddons.php b/workflow/engine/bin/tasks/cliAddons.php index beac69878..e47e0fe42 100644 --- a/workflow/engine/bin/tasks/cliAddons.php +++ b/workflow/engine/bin/tasks/cliAddons.php @@ -18,7 +18,7 @@ EOT pake_task("addon-install"); } */ - +/*----------------------------------********---------------------------------*/ CLI::taskName('change-password-hash-method'); CLI::taskDescription(<< Date: Mon, 8 Dec 2014 11:22:41 -0400 Subject: [PATCH 2/4] Adicion de requerimiento de mcrypt par ala instalacion de PM --- workflow/engine/templates/installer/installer_cards.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/templates/installer/installer_cards.js b/workflow/engine/templates/installer/installer_cards.js index e8f6e93bb..7737a3950 100644 --- a/workflow/engine/templates/installer/installer_cards.js +++ b/workflow/engine/templates/installer/installer_cards.js @@ -61,7 +61,7 @@ Ext.onReady(function(){ Ext.getCmp('memory').setValue (getFieldOutput(response.memory.version, response.memory.result)); dbReq = response.mysql.result || response.mssql.result; - phpReq = response.php.result && response.curl.result && response.dom.result && response.gd.result && response.multibyte.result && response.soap.result && response.memory.result; + phpReq = response.php.result && response.curl.result && response.dom.result && response.gd.result && response.multibyte.result && response.soap.result && response.memory.result && response.mcrypt.result; wizard.onClientValidation(0, dbReq && phpReq); wizard.showLoadMask(false); }, From 9519916804ec30f4d47416cd6708e1e1b9cbfca0 Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Mon, 8 Dec 2014 11:44:54 -0400 Subject: [PATCH 3/4] PM-1066 "Al actualizar PM 2.5.2.3 a 2.8 no se puede crear..." SOLVED Issue: - PM-1066: Al actualizar PM 2.5.2.3 a 2.8 no se puede crear dashlets del advanced dashboard - PM-998: Review Batch routing en Enterprise Trial Cause: Este problema es a causa de que cada plugin enterprise requiere que este cargado la clase "enterprisePlugin" Solution: Se ha agregado un "require_once" para cargar clase "enterprisePlugin" --- workflow/engine/classes/class.pluginRegistry.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/workflow/engine/classes/class.pluginRegistry.php b/workflow/engine/classes/class.pluginRegistry.php index 01ce7de33..c95d22407 100755 --- a/workflow/engine/classes/class.pluginRegistry.php +++ b/workflow/engine/classes/class.pluginRegistry.php @@ -1150,19 +1150,17 @@ class PMPluginRegistry public function setupPlugins () { try { + require_once(PATH_CORE . "methods" . PATH_SEP . "enterprise" . PATH_SEP . "enterprise.php"); + require_once("class.serverConfiguration.php"); + $iPlugins = 0; - require_once ( 'class.serverConfiguration.php' ); $oServerConf = & serverConf::getSingleton(); $oServerConf->addPlugin( SYS_SYS, $this->_aPluginDetails ); foreach ($this->_aPluginDetails as $namespace => $detail) { if (isset( $detail->enabled ) && $detail->enabled) { if (! empty( $detail->sFilename ) && file_exists( $detail->sFilename )) { - if (strpos( $detail->sFilename, PATH_SEP ) !== false) { - $aux = explode( PATH_SEP, $detail->sFilename ); - } else { - $aux = explode( chr( 92 ), $detail->sFilename ); - } - $sFilename = (($detail->sNamespace == 'enterprise') ? PATH_CORE. 'methods' . PATH_SEP . 'enterprise' . PATH_SEP : PATH_PLUGINS) . $aux[count( $aux ) - 1]; + $arrayFileInfo = pathinfo($detail->sFilename); + $sFilename = (($detail->sNamespace == "enterprise")? PATH_CORE. "methods" . PATH_SEP . "enterprise" . PATH_SEP : PATH_PLUGINS) . $arrayFileInfo["basename"]; if (! file_exists( $sFilename )) { continue; } @@ -1186,7 +1184,6 @@ class PMPluginRegistry G::RenderPage( 'publish' ); die(); } - } /** From 106841b8c0b652cd746f8a3f6ae753aa9cd10b79 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Tue, 9 Dec 2014 09:59:41 -0400 Subject: [PATCH 4/4] Little improvement in the message displayed when a a user wants to change his password --- workflow/engine/methods/login/retrivePassword.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/methods/login/retrivePassword.php b/workflow/engine/methods/login/retrivePassword.php index f5d5dd739..09b805123 100755 --- a/workflow/engine/methods/login/retrivePassword.php +++ b/workflow/engine/methods/login/retrivePassword.php @@ -91,7 +91,7 @@ if ($userData['USR_EMAIL'] != '' && $userData['USR_EMAIL'] === $data['USR_EMAIL' G::SendTemporalMessage ($e->getMessage(), "warning", 'string'); } } else { - if ($userData['USR_AUTH_TYPE'] === '') { + if ($userData['USR_AUTH_TYPE'] === '' || $userData['USR_AUTH_TYPE'] === 'MYSQL') { $msg = G::LoadTranslation('ID_USER') . ' ' . htmlentities($data['USR_USERNAME'], ENT_QUOTES, 'UTF-8') . ' '. G::LoadTranslation('ID_IS_NOT_REGISTERED'); } else { $msg = G::LoadTranslation('ID_USER_NOT_FUNCTIONALITY');