| Index: trunk/extensions/LdapAuthentication/LdapAuthentication.php |
| — | — | @@ -1545,10 +1545,10 @@ |
| 1546 | 1546 | } |
| 1547 | 1547 | } else { |
| 1548 | 1548 | $this->printDebug( "Searching for the groups", NONSENSITIVE ); |
| 1549 | | - $this->userLDAPGroups = LdapAuthenticationPlugin::searchGroups( $usertopass ); |
| | 1549 | + $this->userLDAPGroups = $this->searchGroups( $usertopass ); |
| 1550 | 1550 | |
| 1551 | 1551 | if ( $this->getConf( 'GroupSearchNestedGroups' ) ) { |
| 1552 | | - $this->userLDAPGroups = LdapAuthenticationPlugin::searchNestedGroups( $this->userLDAPGroups ); |
| | 1552 | + $this->userLDAPGroups = $this->searchNestedGroups( $this->userLDAPGroups ); |
| 1553 | 1553 | $this->printDebug( "Got the following nested groups:", SENSITIVE, $this->userLDAPGroups["dn"] ); |
| 1554 | 1554 | } |
| 1555 | 1555 | } |
| — | — | @@ -1556,7 +1556,7 @@ |
| 1557 | 1557 | // Only find all groups if the user has any groups; otherwise, we are |
| 1558 | 1558 | // just wasting a search. |
| 1559 | 1559 | if ( $this->getConf( 'GroupsPrevail' ) && count( $this->userLDAPGroups ) != 0 ) { |
| 1560 | | - $this->allLDAPGroups = LdapAuthenticationPlugin::searchGroups( '*' ); |
| | 1560 | + $this->allLDAPGroups = $this->searchGroups( '*' ); |
| 1561 | 1561 | } |
| 1562 | 1562 | } |
| 1563 | 1563 | } |
| — | — | @@ -1584,7 +1584,7 @@ |
| 1585 | 1585 | |
| 1586 | 1586 | $groupstosearch = array( "short" => array(), "dn" => array() ); |
| 1587 | 1587 | foreach ( $groups["dn"] as $group ) { |
| 1588 | | - $returnedgroups = LdapAuthenticationPlugin::searchGroups( $group ); |
| | 1588 | + $returnedgroups = $this->searchGroups( $group ); |
| 1589 | 1589 | $this->printDebug( "Group $group is in the following groups:", SENSITIVE, $returnedgroups["dn"] ); |
| 1590 | 1590 | foreach ( $returnedgroups["dn"] as $searchme ) { |
| 1591 | 1591 | if ( in_array( $searchme, $searchedgroups["dn"] ) ) { |
| — | — | @@ -1610,7 +1610,7 @@ |
| 1611 | 1611 | |
| 1612 | 1612 | $searchedgroups = array_merge_recursive( $groups, $searchedgroups ); |
| 1613 | 1613 | |
| 1614 | | - return LdapAuthenticationPlugin::searchNestedGroups( $groupstosearch, $searchedgroups ); |
| | 1614 | + return $this->searchNestedGroups( $groupstosearch, $searchedgroups ); |
| 1615 | 1615 | } |
| 1616 | 1616 | |
| 1617 | 1617 | /** |