diff options
Diffstat (limited to 'apps/user_ldap')
| -rw-r--r-- | apps/user_ldap/js/wizard/wizardTabGeneric.js | 2 | ||||
| -rw-r--r-- | apps/user_ldap/l10n/sl.js | 5 | ||||
| -rw-r--r-- | apps/user_ldap/l10n/sl.json | 5 | ||||
| -rw-r--r-- | apps/user_ldap/l10n/th_TH.js | 3 | ||||
| -rw-r--r-- | apps/user_ldap/l10n/th_TH.json | 3 | ||||
| -rw-r--r-- | apps/user_ldap/lib/access.php | 4 | ||||
| -rw-r--r-- | apps/user_ldap/lib/connection.php | 10 |
7 files changed, 18 insertions, 14 deletions
diff --git a/apps/user_ldap/js/wizard/wizardTabGeneric.js b/apps/user_ldap/js/wizard/wizardTabGeneric.js index 21085e3a584..4415172a18c 100644 --- a/apps/user_ldap/js/wizard/wizardTabGeneric.js +++ b/apps/user_ldap/js/wizard/wizardTabGeneric.js @@ -391,7 +391,7 @@ OCA = OCA || {}; */ _setCheckBox: function($element, value) { if(parseInt(value, 10) === 1) { - $element.attr('checked', 'checked'); + $element.prop('checked', 'checked'); } else { $element.removeAttr('checked'); } diff --git a/apps/user_ldap/l10n/sl.js b/apps/user_ldap/l10n/sl.js index 57b80dc1345..6a8e8e5f273 100644 --- a/apps/user_ldap/l10n/sl.js +++ b/apps/user_ldap/l10n/sl.js @@ -20,11 +20,14 @@ OC.L10N.register( "Select object classes" : "Izbor razredov predmeta", "Please check the credentials, they seem to be wrong." : "Preverite poverila! Najverjetneje so napačna.", "Base DN could not be auto-detected, please revise credentials, host and port." : "Osnovnega enoznačnega imena (DN) ni mogoče samodejno zaznati. Preverite poverila ter nastavitve gostitelja in vrat.", + "Could not detect Base DN, please enter it manually." : "Ni mogoče zaznati osnovnega enoznačnega imena (DN). Vnesti ga bo treba ročno.", "{nthServer}. Server" : "{nthServer}. strežnik", "No object found in the given Base DN. Please revise." : "Ni najdenega predmeta v osnovnem enoznačnem imenu (DN). Preverite nastavitve.", "More than 1,000 directory entries available." : "Na voljo je več kot 1000 vnosov imenika", "Do you really want to delete the current Server Configuration?" : "Ali res želite izbrisati trenutne nastavitve strežnika?", "Confirm Deletion" : "Potrdi brisanje", + "Mappings cleared successfully!" : "Preslikave so uspešno počiščene!", + "Error while clearing the mappings." : "Napaka pri čiščenju preslikav.", "Mode switch" : "Preklop načina", "Select attributes" : "Izbor atributov", "User found and settings verified." : "Uporabnik je najden in nastavitve so overjene.", @@ -48,6 +51,7 @@ OC.L10N.register( "Edit LDAP Query" : "Uredi poizvedbo LDAP", "LDAP Filter:" : "Filter LDAP:", "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter določa, katere skupine LDAP bodo imele dostop do %s.", + "Verify settings and count groups" : "Preveri nastavitve in preštej skupine", "LDAP / AD Username:" : "Uporabniško ime LDAP / AD:", "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Omogoča prijavo prek LDAP / AD, ki je ali UID ali ime računa, ki bo zaznano.", "LDAP / AD Email Address:" : "Elektronski naslov LDAP / AD:", @@ -57,6 +61,7 @@ OC.L10N.register( "Verify settings" : "Preveri nastavitve", "1. Server" : "1. strežnik", "%s. Server:" : "%s. strežnik:", + "Add a new and blank configuration" : "In nova, privzeta nastavitev", "Host" : "Gostitelj", "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://", "Port" : "Vrata", diff --git a/apps/user_ldap/l10n/sl.json b/apps/user_ldap/l10n/sl.json index 39a8fae8cdb..f4622c44fa7 100644 --- a/apps/user_ldap/l10n/sl.json +++ b/apps/user_ldap/l10n/sl.json @@ -18,11 +18,14 @@ "Select object classes" : "Izbor razredov predmeta", "Please check the credentials, they seem to be wrong." : "Preverite poverila! Najverjetneje so napačna.", "Base DN could not be auto-detected, please revise credentials, host and port." : "Osnovnega enoznačnega imena (DN) ni mogoče samodejno zaznati. Preverite poverila ter nastavitve gostitelja in vrat.", + "Could not detect Base DN, please enter it manually." : "Ni mogoče zaznati osnovnega enoznačnega imena (DN). Vnesti ga bo treba ročno.", "{nthServer}. Server" : "{nthServer}. strežnik", "No object found in the given Base DN. Please revise." : "Ni najdenega predmeta v osnovnem enoznačnem imenu (DN). Preverite nastavitve.", "More than 1,000 directory entries available." : "Na voljo je več kot 1000 vnosov imenika", "Do you really want to delete the current Server Configuration?" : "Ali res želite izbrisati trenutne nastavitve strežnika?", "Confirm Deletion" : "Potrdi brisanje", + "Mappings cleared successfully!" : "Preslikave so uspešno počiščene!", + "Error while clearing the mappings." : "Napaka pri čiščenju preslikav.", "Mode switch" : "Preklop načina", "Select attributes" : "Izbor atributov", "User found and settings verified." : "Uporabnik je najden in nastavitve so overjene.", @@ -46,6 +49,7 @@ "Edit LDAP Query" : "Uredi poizvedbo LDAP", "LDAP Filter:" : "Filter LDAP:", "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter določa, katere skupine LDAP bodo imele dostop do %s.", + "Verify settings and count groups" : "Preveri nastavitve in preštej skupine", "LDAP / AD Username:" : "Uporabniško ime LDAP / AD:", "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Omogoča prijavo prek LDAP / AD, ki je ali UID ali ime računa, ki bo zaznano.", "LDAP / AD Email Address:" : "Elektronski naslov LDAP / AD:", @@ -55,6 +59,7 @@ "Verify settings" : "Preveri nastavitve", "1. Server" : "1. strežnik", "%s. Server:" : "%s. strežnik:", + "Add a new and blank configuration" : "In nova, privzeta nastavitev", "Host" : "Gostitelj", "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://", "Port" : "Vrata", diff --git a/apps/user_ldap/l10n/th_TH.js b/apps/user_ldap/l10n/th_TH.js index 8b155dcfe23..be13cad195e 100644 --- a/apps/user_ldap/l10n/th_TH.js +++ b/apps/user_ldap/l10n/th_TH.js @@ -120,8 +120,9 @@ OC.L10N.register( "Cache Time-To-Live" : "แคช TTL", "in seconds. A change empties the cache." : "ในอีกไม่กี่วินาที ระบบจะล้างข้อมูลในแคชให้ว่างเปล่า", "Directory Settings" : "ตั้งค่าไดเร็กทอรี่", - "User Display Name Field" : "ช่องแสดงชื่อผู้ใช้งานที่ต้องการ", + "User Display Name Field" : "ช่องแสดงชื่อผู้ใช้งาน", "The LDAP attribute to use to generate the user's display name." : "คุณลักษณะ LDAP เพื่อใช้ในการสร้างชื่อที่ปรากฏของผู้ใช้", + "2nd User Display Name Field" : "ช่องแสดงชื่อผู้ใช้งานคนที่ 2", "Base User Tree" : "รายการผู้ใช้งานหลักแบบ Tree", "One User Base DN per line" : "หนึ่งผู้ใช้ Base DN ต่อหนึ่งบรรทัด", "User Search Attributes" : "คุณลักษณะการค้นหาชื่อผู้ใช้", diff --git a/apps/user_ldap/l10n/th_TH.json b/apps/user_ldap/l10n/th_TH.json index 9787ba10037..09e69a655b0 100644 --- a/apps/user_ldap/l10n/th_TH.json +++ b/apps/user_ldap/l10n/th_TH.json @@ -118,8 +118,9 @@ "Cache Time-To-Live" : "แคช TTL", "in seconds. A change empties the cache." : "ในอีกไม่กี่วินาที ระบบจะล้างข้อมูลในแคชให้ว่างเปล่า", "Directory Settings" : "ตั้งค่าไดเร็กทอรี่", - "User Display Name Field" : "ช่องแสดงชื่อผู้ใช้งานที่ต้องการ", + "User Display Name Field" : "ช่องแสดงชื่อผู้ใช้งาน", "The LDAP attribute to use to generate the user's display name." : "คุณลักษณะ LDAP เพื่อใช้ในการสร้างชื่อที่ปรากฏของผู้ใช้", + "2nd User Display Name Field" : "ช่องแสดงชื่อผู้ใช้งานคนที่ 2", "Base User Tree" : "รายการผู้ใช้งานหลักแบบ Tree", "One User Base DN per line" : "หนึ่งผู้ใช้ Base DN ต่อหนึ่งบรรทัด", "User Search Attributes" : "คุณลักษณะการค้นหาชื่อผู้ใช้", diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 569d2dbcbe9..f92ded64797 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -1296,9 +1296,7 @@ class Access extends LDAPUtility implements user\IUserTools { if(!$testConnection->setConfiguration($credentials)) { return false; } - $result=$testConnection->bind(); - $this->ldap->unbind($this->connection->getConnectionResource()); - return $result; + return $testConnection->bind(); } /** diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index 974cad6dc02..93e7e4bf974 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -49,9 +49,6 @@ class Connection extends LDAPUtility { private $configPrefix; private $configID; private $configured = false; - - //whether connection should be kept on __destruct - private $dontDestruct = false; private $hasPagedResultSupport = true; /** @@ -94,8 +91,7 @@ class Connection extends LDAPUtility { } public function __destruct() { - if(!$this->dontDestruct && - $this->ldap->isResource($this->ldapConnectionRes)) { + if($this->ldap->isResource($this->ldapConnectionRes)) { @$this->ldap->unbind($this->ldapConnectionRes); }; } @@ -104,11 +100,9 @@ class Connection extends LDAPUtility { * defines behaviour when the instance is cloned */ public function __clone() { - //a cloned instance inherits the connection resource. It may use it, - //but it may not disconnect it - $this->dontDestruct = true; $this->configuration = new Configuration($this->configPrefix, !is_null($this->configID)); + $this->ldapConnectionRes = null; } /** |