https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114726
Revision: 114726
Author: laner
Date: 2012-04-05 00:12:01 +0000 (Thu, 05 Apr 2012)
Log Message:
-----------
* Fixing global role search
* Adding in a missing message
Modified Paths:
--------------
trunk/extensions/OpenStackManager/OpenStackManager.i18n.php
trunk/extensions/OpenStackManager/OpenStackNovaUser.php
Modified: trunk/extensions/OpenStackManager/OpenStackManager.i18n.php
===================================================================
--- trunk/extensions/OpenStackManager/OpenStackManager.i18n.php 2012-04-05
00:06:26 UTC (rev 114725)
+++ trunk/extensions/OpenStackManager/OpenStackManager.i18n.php 2012-04-05
00:12:01 UTC (rev 114726)
@@ -194,6 +194,7 @@
'openstackmanager-projects' => 'Projects',
'openstackmanager-setprojects' => 'Successfully set the project
filter.',
'openstackmanager-setprojectfilter' => 'Please select projects to
display using the project filter.',
+ 'openstackmanager-toggleproject' => 'Toggle',
'openstackmanager-roles' => 'Roles',
'openstackmanager-rolename' => 'Role name',
Modified: trunk/extensions/OpenStackManager/OpenStackNovaUser.php
===================================================================
--- trunk/extensions/OpenStackManager/OpenStackNovaUser.php 2012-04-05
00:06:26 UTC (rev 114725)
+++ trunk/extensions/OpenStackManager/OpenStackNovaUser.php 2012-04-05
00:12:01 UTC (rev 114726)
@@ -250,11 +250,11 @@
if ( $wgOpenStackManagerLDAPGlobalRoles["$role"] ) {
# Check global role
$roledn = $wgOpenStackManagerLDAPGlobalRoles["$role"];
- $filter = "(member=$this->userDN)";
- $result = LdapAuthenticationPlugin::ldap_search(
$wgAuth->ldapconn, $roledn, $filter );
+ $filter = "(objectclass=*)";
+ $result = LdapAuthenticationPlugin::ldap_read(
$wgAuth->ldapconn, $roledn, $filter );
if ( $result ) {
$entries =
LdapAuthenticationPlugin::ldap_get_entries( $wgAuth->ldapconn, $result );
- return ( (int)$entries['count'] > 0 );
+ return ( in_array( $this->userDN,
$entries[0]['member'] ) );
}
}
return false;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
