nextcloud /
server
@@ -30,33 +30,33 @@ |
||
| 30 | 30 | $helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig()); |
| 31 | 31 | $configPrefixes = $helper->getServerConfigurationPrefixes(true); |
| 32 | 32 | if(count($configPrefixes) > 0) { |
| 33 | - $ldapWrapper = new OCA\User_LDAP\LDAP(); |
|
| 34 | - $ocConfig = \OC::$server->getConfig(); |
|
| 35 | - $notificationManager = \OC::$server->getNotificationManager(); |
|
| 36 | - $notificationManager->registerNotifier(function() { |
|
| 37 | - return new \OCA\User_LDAP\Notification\Notifier( |
|
| 38 | - \OC::$server->getL10NFactory() |
|
| 39 | - ); |
|
| 40 | - }, function() { |
|
| 41 | - $l = \OC::$server->getL10N('user_ldap'); |
|
| 42 | - return [ |
|
| 43 | - 'id' => 'user_ldap', |
|
| 44 | - 'name' => $l->t('LDAP user and group backend'), |
|
| 45 | - ]; |
|
| 46 | - }); |
|
| 33 | + $ldapWrapper = new OCA\User_LDAP\LDAP(); |
|
| 34 | + $ocConfig = \OC::$server->getConfig(); |
|
| 35 | + $notificationManager = \OC::$server->getNotificationManager(); |
|
| 36 | + $notificationManager->registerNotifier(function() { |
|
| 37 | + return new \OCA\User_LDAP\Notification\Notifier( |
|
| 38 | + \OC::$server->getL10NFactory() |
|
| 39 | + ); |
|
| 40 | + }, function() { |
|
| 41 | + $l = \OC::$server->getL10N('user_ldap'); |
|
| 42 | + return [ |
|
| 43 | + 'id' => 'user_ldap', |
|
| 44 | + 'name' => $l->t('LDAP user and group backend'), |
|
| 45 | + ]; |
|
| 46 | + }); |
|
| 47 | 47 | |
| 48 | - $userBackend = new OCA\User_LDAP\User_Proxy( |
|
| 49 | - $configPrefixes, $ldapWrapper, $ocConfig, $notificationManager |
|
| 50 | - ); |
|
| 51 | - $groupBackend = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper); |
|
| 52 | - // register user backend |
|
| 53 | - OC_User::useBackend($userBackend); |
|
| 54 | - \OC::$server->getGroupManager()->addBackend($groupBackend); |
|
| 48 | + $userBackend = new OCA\User_LDAP\User_Proxy( |
|
| 49 | + $configPrefixes, $ldapWrapper, $ocConfig, $notificationManager |
|
| 50 | + ); |
|
| 51 | + $groupBackend = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper); |
|
| 52 | + // register user backend |
|
| 53 | + OC_User::useBackend($userBackend); |
|
| 54 | + \OC::$server->getGroupManager()->addBackend($groupBackend); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | \OCP\Util::connectHook( |
| 58 | - '\OCA\Files_Sharing\API\Server2Server', |
|
| 59 | - 'preLoginNameUsedAsUserName', |
|
| 60 | - '\OCA\User_LDAP\Helper', |
|
| 61 | - 'loginName2UserName' |
|
| 58 | + '\OCA\Files_Sharing\API\Server2Server', |
|
| 59 | + 'preLoginNameUsedAsUserName', |
|
| 60 | + '\OCA\User_LDAP\Helper', |
|
| 61 | + 'loginName2UserName' |
|
| 62 | 62 | ); |
@@ -5,46 +5,46 @@ discard block |
||
| 5 | 5 | vendor_style('user_ldap', 'ui-multiselect/jquery.multiselect'); |
| 6 | 6 | |
| 7 | 7 | script('user_ldap', [ |
| 8 | - 'wizard/controller', |
|
| 9 | - 'wizard/configModel', |
|
| 10 | - 'wizard/view', |
|
| 11 | - 'wizard/wizardObject', |
|
| 12 | - 'wizard/wizardTabGeneric', |
|
| 13 | - 'wizard/wizardTabElementary', |
|
| 14 | - 'wizard/wizardTabAbstractFilter', |
|
| 15 | - 'wizard/wizardTabUserFilter', |
|
| 16 | - 'wizard/wizardTabLoginFilter', |
|
| 17 | - 'wizard/wizardTabGroupFilter', |
|
| 18 | - 'wizard/wizardTabAdvanced', |
|
| 19 | - 'wizard/wizardTabExpert', |
|
| 20 | - 'wizard/wizardDetectorQueue', |
|
| 21 | - 'wizard/wizardDetectorGeneric', |
|
| 22 | - 'wizard/wizardDetectorPort', |
|
| 23 | - 'wizard/wizardDetectorBaseDN', |
|
| 24 | - 'wizard/wizardDetectorFeatureAbstract', |
|
| 25 | - 'wizard/wizardDetectorUserObjectClasses', |
|
| 26 | - 'wizard/wizardDetectorGroupObjectClasses', |
|
| 27 | - 'wizard/wizardDetectorGroupsForUsers', |
|
| 28 | - 'wizard/wizardDetectorGroupsForGroups', |
|
| 29 | - 'wizard/wizardDetectorSimpleRequestAbstract', |
|
| 30 | - 'wizard/wizardDetectorFilterUser', |
|
| 31 | - 'wizard/wizardDetectorFilterLogin', |
|
| 32 | - 'wizard/wizardDetectorFilterGroup', |
|
| 33 | - 'wizard/wizardDetectorUserCount', |
|
| 34 | - 'wizard/wizardDetectorGroupCount', |
|
| 35 | - 'wizard/wizardDetectorEmailAttribute', |
|
| 36 | - 'wizard/wizardDetectorUserDisplayNameAttribute', |
|
| 37 | - 'wizard/wizardDetectorUserGroupAssociation', |
|
| 38 | - 'wizard/wizardDetectorAvailableAttributes', |
|
| 39 | - 'wizard/wizardDetectorTestAbstract', |
|
| 40 | - 'wizard/wizardDetectorTestLoginName', |
|
| 41 | - 'wizard/wizardDetectorTestBaseDN', |
|
| 42 | - 'wizard/wizardDetectorTestConfiguration', |
|
| 43 | - 'wizard/wizardDetectorClearUserMappings', |
|
| 44 | - 'wizard/wizardDetectorClearGroupMappings', |
|
| 45 | - 'wizard/wizardFilterOnType', |
|
| 46 | - 'wizard/wizardFilterOnTypeFactory', |
|
| 47 | - 'wizard/wizard' |
|
| 8 | + 'wizard/controller', |
|
| 9 | + 'wizard/configModel', |
|
| 10 | + 'wizard/view', |
|
| 11 | + 'wizard/wizardObject', |
|
| 12 | + 'wizard/wizardTabGeneric', |
|
| 13 | + 'wizard/wizardTabElementary', |
|
| 14 | + 'wizard/wizardTabAbstractFilter', |
|
| 15 | + 'wizard/wizardTabUserFilter', |
|
| 16 | + 'wizard/wizardTabLoginFilter', |
|
| 17 | + 'wizard/wizardTabGroupFilter', |
|
| 18 | + 'wizard/wizardTabAdvanced', |
|
| 19 | + 'wizard/wizardTabExpert', |
|
| 20 | + 'wizard/wizardDetectorQueue', |
|
| 21 | + 'wizard/wizardDetectorGeneric', |
|
| 22 | + 'wizard/wizardDetectorPort', |
|
| 23 | + 'wizard/wizardDetectorBaseDN', |
|
| 24 | + 'wizard/wizardDetectorFeatureAbstract', |
|
| 25 | + 'wizard/wizardDetectorUserObjectClasses', |
|
| 26 | + 'wizard/wizardDetectorGroupObjectClasses', |
|
| 27 | + 'wizard/wizardDetectorGroupsForUsers', |
|
| 28 | + 'wizard/wizardDetectorGroupsForGroups', |
|
| 29 | + 'wizard/wizardDetectorSimpleRequestAbstract', |
|
| 30 | + 'wizard/wizardDetectorFilterUser', |
|
| 31 | + 'wizard/wizardDetectorFilterLogin', |
|
| 32 | + 'wizard/wizardDetectorFilterGroup', |
|
| 33 | + 'wizard/wizardDetectorUserCount', |
|
| 34 | + 'wizard/wizardDetectorGroupCount', |
|
| 35 | + 'wizard/wizardDetectorEmailAttribute', |
|
| 36 | + 'wizard/wizardDetectorUserDisplayNameAttribute', |
|
| 37 | + 'wizard/wizardDetectorUserGroupAssociation', |
|
| 38 | + 'wizard/wizardDetectorAvailableAttributes', |
|
| 39 | + 'wizard/wizardDetectorTestAbstract', |
|
| 40 | + 'wizard/wizardDetectorTestLoginName', |
|
| 41 | + 'wizard/wizardDetectorTestBaseDN', |
|
| 42 | + 'wizard/wizardDetectorTestConfiguration', |
|
| 43 | + 'wizard/wizardDetectorClearUserMappings', |
|
| 44 | + 'wizard/wizardDetectorClearGroupMappings', |
|
| 45 | + 'wizard/wizardFilterOnType', |
|
| 46 | + 'wizard/wizardFilterOnTypeFactory', |
|
| 47 | + 'wizard/wizard' |
|
| 48 | 48 | ]); |
| 49 | 49 | |
| 50 | 50 | style('user_ldap', 'settings'); |
@@ -67,10 +67,10 @@ discard block |
||
| 67 | 67 | <li class="ldapSettingsTabs"><a href="#ldapSettings-1"><?php p($l->t('Advanced'));?></a></li> |
| 68 | 68 | </ul> |
| 69 | 69 | <?php |
| 70 | - if(!function_exists('ldap_connect')) { |
|
| 71 | - print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>'); |
|
| 72 | - } |
|
| 73 | - ?> |
|
| 70 | + if(!function_exists('ldap_connect')) { |
|
| 71 | + print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>'); |
|
| 72 | + } |
|
| 73 | + ?> |
|
| 74 | 74 | <?php require_once(__DIR__ . '/part.wizard-server.php'); ?> |
| 75 | 75 | <?php require_once(__DIR__ . '/part.wizard-userfilter.php'); ?> |
| 76 | 76 | <?php require_once(__DIR__ . '/part.wizard-loginfilter.php'); ?> |
