fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged master into fixing-broken-features

Browse Source
This commit is contained in:
Veronica Aruquipa
2014-12-09 10:46:35 -04:00
parent 6e6a899acf 8b17effc0e
commit c6eec5b444
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/bin/tasks/cliAddons.php
View File

@@ -18,7 +18,7 @@ EOT
pake_task("addon-install"); pake_task("addon-install");
} }
*/ */
/*----------------------------------********---------------------------------*/
CLI::taskName('change-password-hash-method'); CLI::taskName('change-password-hash-method');
CLI::taskDescription(<<<EOT CLI::taskDescription(<<<EOT
Create .po file for the plugin Create .po file for the plugin
@@ -27,7 +27,7 @@ EOT
CLI::taskArg('workspace', false); CLI::taskArg('workspace', false);
CLI::taskArg('hash', false); CLI::taskArg('hash', false);
CLI::taskRun("change_hash"); CLI::taskRun("change_hash");
/*----------------------------------********---------------------------------*/
//function run_addon_core_install($args, $opts) { //function run_addon_core_install($args, $opts) {
function run_addon_core_install($args) function run_addon_core_install($args)
{ {
@@ -100,7 +100,7 @@ function run_addon_core_install($args)
} }
//echo "** Installation finished\n"; //echo "** Installation finished\n";
} }
/*----------------------------------********---------------------------------*/
function change_hash($command, $opts) function change_hash($command, $opts)
{ {
if (count($command) < 2) { if (count($command) < 2) {
@@ -137,3 +137,4 @@ function change_hash($command, $opts)
} }
} }
} }
/*----------------------------------********---------------------------------*/

13
workflow/engine/classes/class.pluginRegistry.php
View File

@@ -1150,19 +1150,17 @@ class PMPluginRegistry
public function setupPlugins () public function setupPlugins ()
{ {
try { try {
require_once(PATH_CORE . "methods" . PATH_SEP . "enterprise" . PATH_SEP . "enterprise.php");
require_once("class.serverConfiguration.php");
$iPlugins = 0; $iPlugins = 0;
require_once ( 'class.serverConfiguration.php' );
$oServerConf = & serverConf::getSingleton(); $oServerConf = & serverConf::getSingleton();
$oServerConf->addPlugin( SYS_SYS, $this->_aPluginDetails ); $oServerConf->addPlugin( SYS_SYS, $this->_aPluginDetails );
foreach ($this->_aPluginDetails as $namespace => $detail) { foreach ($this->_aPluginDetails as $namespace => $detail) {
if (isset( $detail->enabled ) && $detail->enabled) { if (isset( $detail->enabled ) && $detail->enabled) {
if (! empty( $detail->sFilename ) && file_exists( $detail->sFilename )) { if (! empty( $detail->sFilename ) && file_exists( $detail->sFilename )) {
if (strpos( $detail->sFilename, PATH_SEP ) !== false) { $arrayFileInfo = pathinfo($detail->sFilename);
$aux = explode( PATH_SEP, $detail->sFilename ); $sFilename = (($detail->sNamespace == "enterprise")? PATH_CORE. "methods" . PATH_SEP . "enterprise" . PATH_SEP : PATH_PLUGINS) . $arrayFileInfo["basename"];
} 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];
if (! file_exists( $sFilename )) { if (! file_exists( $sFilename )) {
continue; continue;
} }
@@ -1186,7 +1184,6 @@ class PMPluginRegistry
G::RenderPage( 'publish' ); G::RenderPage( 'publish' );
die(); die();
} }
} }
/** /**

2
workflow/engine/methods/login/retrivePassword.php
View File

@@ -91,7 +91,7 @@ if ($userData['USR_EMAIL'] != '' && $userData['USR_EMAIL'] === $data['USR_EMAIL'
G::SendTemporalMessage ($e->getMessage(), "warning", 'string'); G::SendTemporalMessage ($e->getMessage(), "warning", 'string');
} }
} else { } 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'); $msg = G::LoadTranslation('ID_USER') . ' ' . htmlentities($data['USR_USERNAME'], ENT_QUOTES, 'UTF-8') . ' '. G::LoadTranslation('ID_IS_NOT_REGISTERED');
} else { } else {
$msg = G::LoadTranslation('ID_USER_NOT_FUNCTIONALITY'); $msg = G::LoadTranslation('ID_USER_NOT_FUNCTIONALITY');

2
workflow/engine/templates/installer/installer_cards.js
View File

@@ -61,7 +61,7 @@ Ext.onReady(function(){
Ext.getCmp('memory').setValue (getFieldOutput(response.memory.version, response.memory.result)); Ext.getCmp('memory').setValue (getFieldOutput(response.memory.version, response.memory.result));
dbReq = response.mysql.result || response.mssql.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.onClientValidation(0, dbReq && phpReq);
wizard.showLoadMask(false); wizard.showLoadMask(false);
}, },