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

PM-2430 "Admin > Users > Authentication Sources > New: Se..." SOLVED

Browse Source 
Issue:
    Admin > Users > Authentication Sources > New: Se muestra la opcion del plugin
    ldapAdvanced aun cuando este esta en estado "Disable" en el workspace
Cause:
    No se verifica si el plugin esta enabled/disabled
Solution:
    Se verifica si el plugin esta enabled/disabled
This commit is contained in:
Victor Saisa Lopez
2015-04-24 12:45:30 -04:00
parent 9e0c462247
commit 92b4b028be
2 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -399,22 +399,19 @@ class PMPluginRegistry
} }
/** /**
* get status plugin in the singleton * Get status plugin in the singleton
* *
* @param unknown_type $sNamespace * @param string $name Plugin name
*
* return mixed Return a string with status plugin, 0 otherwise
*/ */
public function getStatusPlugin ($sNamespace) public function getStatusPlugin($name)
{ {
foreach ($this->_aPluginDetails as $namespace => $detail) { try {
if ($sNamespace == $namespace) { return (isset($this->_aPluginDetails[$name]))? (($this->_aPluginDetails[$name]->enabled)? "enabled" : "disabled") : 0;
if ($this->_aPluginDetails[$sNamespace]->enabled) { } catch (Excepton $e) {
return 'enabled'; throw $e;
} else {
return 'disabled';
}
}
} }
return 0;
} }
/** /**

24
workflow/engine/methods/authSources/authSources_Ajax.php
View File

@@ -149,16 +149,30 @@ try {
} }
break; break;
case 'authSourcesNew': case 'authSourcesNew':
$pluginRegistry = &PMPluginRegistry::getSingleton();
$arr = Array (); $arr = Array ();
$oDirectory = dir( PATH_RBAC . 'plugins' . PATH_SEP ); $oDirectory = dir( PATH_RBAC . 'plugins' . PATH_SEP );
$aAuthSourceTypes = array ();
while ($sObject = $oDirectory->read()) { while ($sObject = $oDirectory->read()) {
if (($sObject != '.') && ($sObject != '..') && ($sObject != '.svn') && ($sObject != 'ldap')) { if (($sObject != '.') && ($sObject != '..') && ($sObject != '.svn') && ($sObject != 'ldap')) {
if (is_file( PATH_RBAC . 'plugins' . PATH_SEP . $sObject )) { if (is_file( PATH_RBAC . 'plugins' . PATH_SEP . $sObject )) {
$sType = trim( str_replace( 'class.', '', str_replace( '.php', '', $sObject ) ) ); $sType = trim(str_replace(array("class.", ".php"), "", $sObject));
$aAuthSourceTypes['sType'] = $sType;
$aAuthSourceTypes['sLabel'] = $sType; $statusPlugin = $pluginRegistry->getStatusPlugin($sType);
$arr[] = $aAuthSourceTypes; $flagAdd = false;
if (preg_match("/^(?:enabled|disabled)$/", $statusPlugin)) {
if ($statusPlugin == "enabled") {
$flagAdd = true;
}
} else {
$flagAdd = true;
}
if ($flagAdd) {
$arr[] = array("sType" => $sType, "sLabel" => $sType);
}
} }
} }
} }