diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php index 8fc9433ce..35610322e 100755 --- a/workflow/engine/controllers/installer.php +++ b/workflow/engine/controllers/installer.php @@ -122,6 +122,7 @@ class Installer extends Controller $info->multibyte = new stdclass(); $info->soap = new stdclass(); $info->ldap = new stdclass(); + $info->mcrypt = new stdclass(); $info->memory = new stdclass(); $info->php->version = phpversion(); @@ -196,6 +197,10 @@ class Installer extends Controller $info->soap->version = G::LoadTranslation('ID_ENABLED'); } + //mcrypt info + $info->mcrypt->result = extension_loaded("mcrypt"); + $info->mcrypt->version = ($info->mcrypt->result)? G::LoadTranslation("ID_ENABLED") : G::LoadTranslation("ID_NOT_ENABLED"); + // ldap info $info->ldap->result = false; $info->ldap->version = G::LoadTranslation('ID_NOT_ENABLED'); diff --git a/workflow/engine/methods/setup/systemInfo.php b/workflow/engine/methods/setup/systemInfo.php index 5142a2726..38657d8fa 100644 --- a/workflow/engine/methods/setup/systemInfo.php +++ b/workflow/engine/methods/setup/systemInfo.php @@ -42,6 +42,7 @@ switch ($option) { $oHeadPublisher->assign("SYSINFO_GD", "\"" . $systemInfo->gd->version . "\", " . (($systemInfo->gd->result)? 1 : 0)); $oHeadPublisher->assign("SYSINFO_MULTIBYTESTRING", "\"" . $systemInfo->multibyte->version . "\", " . (($systemInfo->multibyte->result)? 1 : 0)); $oHeadPublisher->assign("SYSINFO_SOAP", "\"" . $systemInfo->soap->version . "\", " . (($systemInfo->soap->result)? 1 : 0)); + $oHeadPublisher->assign("SYSINFO_MCRYPT", "\"" . $systemInfo->mcrypt->version . "\", " . (($systemInfo->mcrypt->result)? 1 : 0)); $oHeadPublisher->assign("SYSINFO_LDAP", "\"" . $systemInfo->ldap->version . "\", " . (($systemInfo->ldap->result)? 1 : 0)); $oHeadPublisher->assign("SYSINFO_MEMORYLIMIT", "\"" . $systemInfo->memory->version . "\", " . (($systemInfo->memory->result)? 1 : 0)); diff --git a/workflow/engine/templates/installer/installer_cards.js b/workflow/engine/templates/installer/installer_cards.js index da1a76130..e8f6e93bb 100644 --- a/workflow/engine/templates/installer/installer_cards.js +++ b/workflow/engine/templates/installer/installer_cards.js @@ -56,6 +56,7 @@ Ext.onReady(function(){ Ext.getCmp('gd').setValue (getFieldOutput(response.gd.version, response.gd.result)); Ext.getCmp('multibyte').setValue (getFieldOutput(response.multibyte.version,response.multibyte.result)); Ext.getCmp('soap').setValue (getFieldOutput(response.soap.version, response.soap.result)); + Ext.getCmp("mcrypt").setValue (getFieldOutput(response.mcrypt.version, response.mcrypt.result)); Ext.getCmp('ldap').setValue (getFieldOutput(response.ldap.version, response.ldap.result)); Ext.getCmp('memory').setValue (getFieldOutput(response.memory.version, response.memory.result)); @@ -204,7 +205,7 @@ Ext.onReady(function(){ var noExistsMsg = '' + _('ID_NO_EXIST') + ''; var response = Ext.util.JSON.decode(response.responseText); Ext.get('wfDatabaseSpan').dom.innerHTML = (response.wfDatabaseExists ? existMsg : noExistsMsg); - + var dbFlag = ((!response.wfDatabaseExists) || Ext.getCmp('deleteDB').getValue()); wizard.onClientValidation(4, dbFlag); @@ -308,6 +309,11 @@ Ext.onReady(function(){ fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_SOAP'), id : 'soap' }, + { + xtype: "displayfield", + id: "mcrypt", + fieldLabel: _("ID_MCRYPT_SUPPORT") + }, { xtype : 'displayfield', fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_LDAP'), diff --git a/workflow/engine/templates/setup/systemInfo.js b/workflow/engine/templates/setup/systemInfo.js index fc7bf796c..5d666ee10 100644 --- a/workflow/engine/templates/setup/systemInfo.js +++ b/workflow/engine/templates/setup/systemInfo.js @@ -144,6 +144,12 @@ systemInfo.application = { fieldLabel: _("ID_PROCESSMAKER_REQUIREMENTS_SOAP"), value: eval("fieldFormatValue(" + SYSINFO_SOAP + ");") }, + { + xtype: "displayfield", + id: "mcrypt ", + fieldLabel: _("ID_MCRYPT_SUPPORT"), + value: eval("fieldFormatValue(" + SYSINFO_MCRYPT + ");") + }, { xtype: "displayfield", id: "ldap",