diff options
| author | blizzz <blizzz@owncloud.com> | 2015-11-02 13:32:24 +0100 |
|---|---|---|
| committer | blizzz <blizzz@owncloud.com> | 2015-11-02 13:32:24 +0100 |
| commit | 83d3c94590aa877fe23a5d49c991e617d76a6060 (patch) | |
| tree | 88813a6c5e13381bf8a23723862a6b7d7ea56a92 /apps/user_ldap | |
| parent | 16aa33947581959eeb9a89530ad0152cb2c33c25 (diff) | |
| parent | a8641fdc9559d67696fb612597c4b27d1832220a (diff) | |
| download | nextcloud-server-83d3c94590aa877fe23a5d49c991e617d76a6060.tar.gz nextcloud-server-83d3c94590aa877fe23a5d49c991e617d76a6060.zip | |
Merge branch 'master' into fix-20151
Diffstat (limited to 'apps/user_ldap')
| -rw-r--r-- | apps/user_ldap/js/wizard/view.js | 1 | ||||
| -rw-r--r-- | apps/user_ldap/l10n/pt_PT.js | 1 | ||||
| -rw-r--r-- | apps/user_ldap/l10n/pt_PT.json | 1 | ||||
| -rw-r--r-- | apps/user_ldap/lib/access.php | 5 | ||||
| -rw-r--r-- | apps/user_ldap/lib/user/offlineuser.php | 7 |
5 files changed, 15 insertions, 0 deletions
diff --git a/apps/user_ldap/js/wizard/view.js b/apps/user_ldap/js/wizard/view.js index 7dedfab75f0..3d994af652d 100644 --- a/apps/user_ldap/js/wizard/view.js +++ b/apps/user_ldap/js/wizard/view.js @@ -352,6 +352,7 @@ OCA = OCA || {}; $('.ldap_submit').button(); $('.ldap_action_test_connection').button(); $('#ldapSettings').tabs({ beforeActivate: this.onTabChange }); + $('#ldapSettings :input').tooltip({placement: "right", container: "body", trigger: "hover"}); this.initControls(); this.disableTabs(); diff --git a/apps/user_ldap/l10n/pt_PT.js b/apps/user_ldap/l10n/pt_PT.js index 109c2efa85e..7288c683303 100644 --- a/apps/user_ldap/l10n/pt_PT.js +++ b/apps/user_ldap/l10n/pt_PT.js @@ -66,6 +66,7 @@ OC.L10N.register( "Verify settings" : "Verificar definições", "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servvidor", + "Add a new and blank configuration" : "Adicione uma nova configuração em branco", "Delete the current configuration" : "Apagar a configuração actual", "Host" : "Anfitrião", "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://", diff --git a/apps/user_ldap/l10n/pt_PT.json b/apps/user_ldap/l10n/pt_PT.json index 30c8078964a..5de030281b3 100644 --- a/apps/user_ldap/l10n/pt_PT.json +++ b/apps/user_ldap/l10n/pt_PT.json @@ -64,6 +64,7 @@ "Verify settings" : "Verificar definições", "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servvidor", + "Add a new and blank configuration" : "Adicione uma nova configuração em branco", "Delete the current configuration" : "Apagar a configuração actual", "Host" : "Anfitrião", "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://", diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 8a6e3c6726f..d4f4eaddcb3 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -35,6 +35,7 @@ namespace OCA\user_ldap\lib; +use OCA\user_ldap\lib\user\OfflineUser; use OCA\User_LDAP\Mapping\AbstractMapping; /** @@ -710,6 +711,10 @@ class Access extends LDAPUtility implements user\IUserTools { $ocName = $this->dn2ocname($userRecord['dn'][0], $userRecord[$displayNameAttribute]); $this->cacheUserExists($ocName); $user = $this->userManager->get($ocName); + if($user instanceof OfflineUser) { + $user->unmark(); + $user = $this->userManager->get($ocName); + } $user->processAttributes($userRecord); } } diff --git a/apps/user_ldap/lib/user/offlineuser.php b/apps/user_ldap/lib/user/offlineuser.php index 72c02427928..3456a27b412 100644 --- a/apps/user_ldap/lib/user/offlineuser.php +++ b/apps/user_ldap/lib/user/offlineuser.php @@ -86,6 +86,13 @@ class OfflineUser { } /** + * remove the Delete-flag from the user. + */ + public function unmark() { + $this->config->setUserValue($this->ocName, 'user_ldap', 'isDeleted', '0'); + } + + /** * exports the user details in an assoc array * @return array */ |