-
-
-
-
-
+
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index a32b7414ac..6f1c364737 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -101,12 +101,15 @@ $breadcrumbNav->assign('home', OCP\Util::linkTo('files', 'index.php'));
$list = new OCP\Template('files_trashbin', 'part.list', '');
$list->assign('files', $files);
-$list->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php'). '?dir='.$dir);
-$list->assign('downloadURL', OCP\Util::linkTo('files_trashbin', 'download.php') . '?file='.$dir);
+
+$encodedDir = \OCP\Util::encodePath($dir);
+$list->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php'). '?dir='.$encodedDir);
+$list->assign('downloadURL', OCP\Util::linkTo('files_trashbin', 'download.php') . '?file='.$encodedDir);
$list->assign('disableSharing', true);
$list->assign('dirlisting', $dirlisting);
-$tmpl->assign('dirlisting', $dirlisting);
$list->assign('disableDownloadActions', true);
+
+$tmpl->assign('dirlisting', $dirlisting);
$tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage());
$tmpl->assign('fileList', $list->fetchPage());
$tmpl->assign('files', $files);
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index 691642811b..87dfea491e 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -2,9 +2,9 @@
$(document).ready(function() {
if (typeof FileActions !== 'undefined') {
- FileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/undelete.png'), function(filename) {
+ FileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/history'), function(filename) {
var tr=$('tr').filterAttr('data-file', filename);
- var spinner = '
- ; ?>)
-
-
-
-
-
+
+
+
-
-
+ -
-
-
- t('No preview available for').' '.$_['fileTarget']); ?>
-" - />t('Download'))?> -
-
+
+
+
+
+
+
+
+ -
+
-
+ t('No preview available for').' '.$_['fileTarget']); ?>
+
+
 +' "'+t('files_trashbin', 'perform restore operation')+'")
';
+ var spinner = ' +' "'+t('files_trashbin', 'perform restore operation')+'")
';
var undeleteAction = $('tr').filterAttr('data-file',filename).children("td.date");
var files = tr.attr('data-file');
undeleteAction[0].innerHTML = undeleteAction[0].innerHTML+spinner;
@@ -94,7 +94,7 @@ $(document).ready(function() {
$('.undelete').click('click',function(event) {
event.preventDefault();
- var spinner = '';
+ var spinner = '';
var files=getSelectedFiles('file');
var fileslist = JSON.stringify(files);
var dirlisting=getSelectedFiles('dirlisting')[0];
diff --git a/apps/files_trashbin/l10n/es.php b/apps/files_trashbin/l10n/es.php
index c267db7358..b2d5a2aed2 100644
--- a/apps/files_trashbin/l10n/es.php
+++ b/apps/files_trashbin/l10n/es.php
@@ -1,9 +1,9 @@
"No se puede eliminar %s permanentemente",
"Couldn't restore %s" => "No se puede restaurar %s",
-"perform restore operation" => "Restaurar",
+"perform restore operation" => "restaurar",
"Error" => "Error",
-"delete file permanently" => "Eliminar archivo permanentemente",
+"delete file permanently" => "eliminar archivo permanentemente",
"Delete permanently" => "Eliminar permanentemente",
"Name" => "Nombre",
"Deleted" => "Eliminado",
diff --git a/apps/files_trashbin/l10n/zh_CN.GB2312.php b/apps/files_trashbin/l10n/zh_CN.GB2312.php
index 4dda1e0433..1ab193517f 100644
--- a/apps/files_trashbin/l10n/zh_CN.GB2312.php
+++ b/apps/files_trashbin/l10n/zh_CN.GB2312.php
@@ -1,5 +1,6 @@
"出错",
+"Delete permanently" => "永久删除",
"Name" => "名称",
"1 folder" => "1 个文件夹",
"{count} folders" => "{count} 个文件夹",
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index cb5edaa2c9..66ec36df86 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -18,7 +18,7 @@
svg"
data-dir=''>
diff --git a/apps/files_trashbin/templates/part.list.php b/apps/files_trashbin/templates/part.list.php
index 92a38bd263..94a8eec951 100644
--- a/apps/files_trashbin/templates/part.list.php
+++ b/apps/files_trashbin/templates/part.list.php
@@ -4,10 +4,8 @@
// the older the file, the brighter the shade of grey; days*14
$relative_date_color = round((time()-$file['date'])/60/60/24*14);
if($relative_date_color>200) $relative_date_color = 200;
- $name = str_replace('+', '%20', urlencode($file['name']));
- $name = str_replace('%2F', '/', $name);
- $directory = str_replace('+', '%20', urlencode($file['directory']));
- $directory = str_replace('%2F', '/', $directory); ?>
+ $name = \OCP\Util::encodePath($file['name']);
+ $directory = \OCP\Util::encodePath($file['directory']); ?>
"بازگردانی امکان ناپذیر است: %s",
"success" => "موفقیت",
+"File %s was reverted to version %s" => "فایل %s به نسخه %s بازگردانده شده است.",
"failure" => "شکست",
+"File %s could not be reverted to version %s" => "فایل %s نمی تواند به نسخه %s بازگردانده شود.",
"No old versions available" => "هیچ نسخه قدیمی در دسترس نیست",
"No path specified" => "هیچ مسیری مشخص نشده است",
+"Versions" => "نسخه ها",
"Revert a file to a previous version by clicking on its revert button" => "بازگردانی یک پرورنده به نسخه قدیمی اش از طریق دکمه بازگردانی امکان پذیر است"
);
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 2f8262475b..c083a000c3 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -113,6 +113,18 @@ class Storage {
mkdir($versionsFolderName.'/'.$info['dirname'], 0750, true);
}
+ $versionsSize = self::getVersionsSize($uid);
+ if ( $versionsSize === false || $versionsSize < 0 ) {
+ $versionsSize = self::calculateSize($uid);
+ }
+
+ // assumption: we need filesize($filename) for the new version +
+ // some more free space for the modified file which might be
+ // 1.5 times as large as the current version -> 2.5
+ $neededSpace = $files_view->filesize($filename) * 2.5;
+
+ $versionsSize = self::expire($filename, $versionsSize, $neededSpace);
+
// disable proxy to prevent multiple fopen calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
@@ -123,19 +135,9 @@ class Storage {
// reset proxy state
\OC_FileProxy::$enabled = $proxyStatus;
- $versionsSize = self::getVersionsSize($uid);
- if ( $versionsSize === false || $versionsSize < 0 ) {
- $versionsSize = self::calculateSize($uid);
- }
-
$versionsSize += $users_view->filesize('files'.$filename);
- // expire old revisions if necessary
- $newSize = self::expire($filename, $versionsSize);
-
- if ( $newSize != $versionsSize ) {
- self::setVersionsSize($uid, $newSize);
- }
+ self::setVersionsSize($uid, $versionsSize);
}
}
@@ -175,12 +177,14 @@ class Storage {
if ($files_view->file_exists($newpath)) {
return self::store($new_path);
}
-
+
+ self::expire($newpath);
+
$abs_newpath = $versions_view->getLocalFile($newpath);
if ( $files_view->is_dir($oldpath) && $versions_view->is_dir($oldpath) ) {
$versions_view->rename($oldpath, $newpath);
- } else if ( ($versions = Storage::getVersions($uid, $oldpath)) ) {
+ } else if ( ($versions = Storage::getVersions($uid, $oldpath)) ) {
$info=pathinfo($abs_newpath);
if(!file_exists($info['dirname'])) mkdir($info['dirname'], 0750, true);
foreach ($versions as $v) {
@@ -391,10 +395,10 @@ class Storage {
/**
* @brief Erase a file's versions which exceed the set quota
*/
- private static function expire($filename, $versionsSize = null) {
+ private static function expire($filename, $versionsSize = null, $offset = 0) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
list($uid, $filename) = self::getUidAndFilename($filename);
- $versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions');
+ $versionsFileview = new \OC\Files\View('/'.$uid.'/files_versions');
// get available disk space for user
$softQuota = true;
@@ -424,87 +428,52 @@ class Storage {
$rootInfo = $files_view->getFileInfo('/');
$free = $quota-$rootInfo['size']; // remaining free space for user
if ( $free > 0 ) {
- $availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $versionsSize; // how much space can be used for versions
+ $availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - ($versionsSize + $offset); // how much space can be used for versions
} else {
- $availableSpace = $free-$versionsSize;
+ $availableSpace = $free - $versionsSize - $offset;
}
} else {
- $availableSpace = $quota;
+ $availableSpace = $quota - $offset;
}
- // after every 1000s run reduce the number of all versions not only for the current file
+ // with the probability of 0.1% we reduce the number of all versions not only for the current file
$random = rand(0, 1000);
if ($random == 0) {
- $result = Storage::getAllVersions($uid);
- $versions_by_file = $result['by_file'];
- $all_versions = $result['all'];
+ $allFiles = true;
} else {
- $all_versions = Storage::getVersions($uid, $filename);
- $versions_by_file[$filename] = $all_versions;
+ $allFiles = false;
}
- $time = time();
+ $allVersions = Storage::getVersions($uid, $filename);
+ $versionsByFile[$filename] = $allVersions;
- // it is possible to expire versions from more than one file
- // iterate through all given files
- foreach ($versions_by_file as $filename => $versions) {
- $versions = array_reverse($versions); // newest version first
+ $sizeOfDeletedVersions = self::delOldVersions($versionsByFile, $allVersions, $versionsFileview);
+ $availableSpace = $availableSpace + $sizeOfDeletedVersions;
+ $versionsSize = $versionsSize - $sizeOfDeletedVersions;
- $interval = 1;
- $step = Storage::$max_versions_per_interval[$interval]['step'];
- if (Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'] == -1) {
- $nextInterval = -1;
- } else {
- $nextInterval = $time - Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'];
- }
+ // if still not enough free space we rearrange the versions from all files
+ if ($availableSpace <= 0 || $allFiles) {
+ $result = Storage::getAllVersions($uid);
+ $versionsByFile = $result['by_file'];
+ $allVersions = $result['all'];
- $firstVersion = reset($versions);
- $firstKey = key($versions);
- $prevTimestamp = $firstVersion['version'];
- $nextVersion = $firstVersion['version'] - $step;
- $remaining_versions[$firstKey] = $firstVersion;
- unset($versions[$firstKey]);
-
- foreach ($versions as $key => $version) {
- $newInterval = true;
- while ( $newInterval ) {
- if ( $nextInterval == -1 || $version['version'] >= $nextInterval ) {
- if ( $version['version'] > $nextVersion ) {
- //distance between two version too small, delete version
- $versions_fileview->unlink($version['path'].'.v'.$version['version']);
- $availableSpace += $version['size'];
- $versionsSize -= $version['size'];
- unset($all_versions[$key]); // update array with all versions
- } else {
- $nextVersion = $version['version'] - $step;
- }
- $newInterval = false; // version checked so we can move to the next one
- } else { // time to move on to the next interval
- $interval++;
- $step = Storage::$max_versions_per_interval[$interval]['step'];
- $nextVersion = $prevTimestamp - $step;
- if ( Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'] == -1 ) {
- $nextInterval = -1;
- } else {
- $nextInterval = $time - Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'];
- }
- $newInterval = true; // we changed the interval -> check same version with new interval
- }
- }
- $prevTimestamp = $version['version'];
- }
+ $sizeOfDeletedVersions = self::delOldVersions($versionsByFile, $allVersions, $versionsFileview);
+ $availableSpace = $availableSpace + $sizeOfDeletedVersions;
+ $versionsSize = $versionsSize - $sizeOfDeletedVersions;
}
// Check if enough space is available after versions are rearranged.
// If not we delete the oldest versions until we meet the size limit for versions,
// but always keep the two latest versions
- $numOfVersions = count($all_versions) -2 ;
+ $numOfVersions = count($allVersions) -2 ;
$i = 0;
while ($availableSpace < 0 && $i < $numOfVersions) {
- $versions_fileview->unlink($all_versions[$i]['path'].'.v'.$all_versions[$i]['version']);
- $versionsSize -= $all_versions[$i]['size'];
- $availableSpace += $all_versions[$i]['size'];
+ $version = current($allVersions);
+ $versionsFileview->unlink($version['path'].'.v'.$version['version']);
+ $versionsSize -= $version['size'];
+ $availableSpace += $version['size'];
+ next($allVersions);
$i++;
}
@@ -513,4 +482,67 @@ class Storage {
return false;
}
+
+ /**
+ * @brief delete old version from a given list of versions
+ *
+ * @param array $versionsByFile list of versions ordered by files
+ * @param array $allVversions all versions accross multiple files
+ * @param $versionsFileview OC\Files\View on data/user/files_versions
+ * @return size of releted versions
+ */
+ private static function delOldVersions($versionsByFile, &$allVersions, $versionsFileview) {
+
+ $time = time();
+ $size = 0;
+
+ // delete old versions for every given file
+ foreach ($versionsByFile as $versions) {
+ $versions = array_reverse($versions); // newest version first
+
+ $interval = 1;
+ $step = Storage::$max_versions_per_interval[$interval]['step'];
+ if (Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'] == -1) {
+ $nextInterval = -1;
+ } else {
+ $nextInterval = $time - Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'];
+ }
+
+ $firstVersion = reset($versions);
+ $firstKey = key($versions);
+ $prevTimestamp = $firstVersion['version'];
+ $nextVersion = $firstVersion['version'] - $step;
+ unset($versions[$firstKey]);
+
+ foreach ($versions as $key => $version) {
+ $newInterval = true;
+ while ($newInterval) {
+ if ($nextInterval == -1 || $version['version'] >= $nextInterval) {
+ if ($version['version'] > $nextVersion) {
+ //distance between two version too small, delete version
+ $versionsFileview->unlink($version['path'] . '.v' . $version['version']);
+ $size += $version['size'];
+ unset($allVersions[$key]); // update array with all versions
+ } else {
+ $nextVersion = $version['version'] - $step;
+ }
+ $newInterval = false; // version checked so we can move to the next one
+ } else { // time to move on to the next interval
+ $interval++;
+ $step = Storage::$max_versions_per_interval[$interval]['step'];
+ $nextVersion = $prevTimestamp - $step;
+ if (Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'] == -1) {
+ $nextInterval = -1;
+ } else {
+ $nextInterval = $time - Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'];
+ }
+ $newInterval = true; // we changed the interval -> check same version with new interval
+ }
+ }
+ $prevTimestamp = $version['version'];
+ }
+ }
+ return $size;
+ }
+
}
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index f001081842..bf25806d38 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -1,4 +1,5 @@
"Löschen der Zuordnung fehlgeschlagen.",
"Failed to delete the server configuration" => "Löschen der Serverkonfiguration fehlgeschlagen",
"The configuration is valid and the connection could be established!" => "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfe die Servereinstellungen und Anmeldeinformationen.",
@@ -7,6 +8,7 @@
"Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?",
"Keep settings?" => "Einstellungen beibehalten?",
"Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
+"mappings cleared" => "Zuordnungen gelöscht",
"Success" => "Erfolgreich",
"Error" => "Fehler",
"Connection test succeeded" => "Verbindungstest erfolgreich",
@@ -72,6 +74,16 @@
"Email Field" => "E-Mail Feld",
"User Home Folder Naming Rule" => "Benennungsregel für das Home-Verzeichnis des Benutzers",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein.",
+"Internal Username" => "Interner Benutzername",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Standardmäßig wird der interne Benutzername aus der UUID erstellt. Dies stellt sicher, daß der Name einmalig ist und keine Zeichen umgewandelt werden müssen. Für den internen Benutzernamen sind nur die folgenden Zeichen zulässig: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden durch ihr ASCII-Äquivalent ersetzt oder ausgelassen. Bei Kollisionen wird eine Nummer hinzugefügt/erhöht. Der interne Benutzername wird verwendet, um einen Benutzer intern zu identifizieren. Er ist auch der Standardname für das Benutzerverzeichnis in ownCloud und Teil von Remote-URLs, unter anderem für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten geändert werden. Um ein ähnliches Verhalten wie in ownCloud 5 zu erreichen, geben Sie das Benutzer-Anzeige-Namen-Attribut in das folgende Feld ein. Änderungen betreffen nur neu angelegte LDAP-Benutzer.",
+"Internal Username Attribute:" => "Attribut für interne Benutzernamen:",
+"Override UUID detection" => "UUID-Erkennung überschreiben",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Standardmäßig erkennt ownCloud das UUID-Attribut automatisch. Das UUID-Attribut wird benutzt, um LDAP-Benutzer und Gruppen eindeutig zu identifizieren. Außerdem wird der interne Benutzername basierend auf der UUID erstellt, wenn nicht anders angegeben. Sie können dieses Verhalten ändern und ein Attribut Ihrer Wahl angeben. Sie müssen sichergehen, dass das Attribut Ihrer Wahl auf Benutzer und Gruppen anwendbar und einzigartig ist. Für das Standardverhalten lassen Sie das Feld leer. Änderungen betreffen nur neu angelegte LDAP-Benutzer und Gruppen.",
+"UUID Attribute:" => "UUID-Attribut:",
+"Username-LDAP User Mapping" => "LDAP-Benutzernamenzuordnung",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "OwnCloud nutzt die Benutzernamen, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung vom OwnCloud-Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch OwnCloud gefunden. Der interne OwnCloud-Name, wird in der gesamten OwnCloud verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste in der OwnCloud. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Lösche niemals die Zuordnungen in einer produktiven Umgebung. Lösche die Zuordnungen nur in einer Test- oder Experimentierumgebung.",
+"Clear Username-LDAP User Mapping" => "Lösche LDAP-Benutzernamenzuordnung",
+"Clear Groupname-LDAP Group Mapping" => "Lösche LDAP-Gruppennamenzuordnung",
"Test Configuration" => "Testkonfiguration",
"Help" => "Hilfe"
);
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index 8aa64477e4..a876119f36 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -1,4 +1,5 @@
"Löschen der Zuordnung fehlgeschlagen.",
"Failed to delete the server configuration" => "Löschen der Serverkonfiguration fehlgeschlagen",
"The configuration is valid and the connection could be established!" => "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen.",
@@ -7,6 +8,7 @@
"Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?",
"Keep settings?" => "Einstellungen beibehalten?",
"Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
+"mappings cleared" => "Zuordnungen gelöscht",
"Success" => "Erfolg",
"Error" => "Fehler",
"Connection test succeeded" => "Verbindungstest erfolgreich",
@@ -74,8 +76,14 @@
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein.",
"Internal Username" => "Interner Benutzername",
"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Standardmäßig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichenwerden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Übereinstimmungen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmäßig vorausgewählte Namen des Heimatverzeichnisses in ownCloud. Es dient weiterhin als Port für Remote-URLs - zum Beispiel für alle *DAV-Dienste Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich einzig und allein nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken.",
+"Internal Username Attribute:" => "Interne Eigenschaften des Benutzers:",
"Override UUID detection" => "UUID-Erkennung überschreiben",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Standardmäßig erkennt OwnCloud die UUID-Eigenschaften des Benutzers selbstständig. Die UUID-Eigenschaften werden genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Außerdem wird ein interner Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie können diese Eigenschaften überschreiben und selbst Eigenschaften nach Wahl vorgeben. Sie müssen allerdings sicherstellen, dass die Eigenschaften zur Identifikation für Benutzer und Gruppen eindeutig sind. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu zugeordnete (neu erstellte) LDAP-Benutzer und -Gruppen aus.",
"UUID Attribute:" => "UUID-Attribut:",
+"Username-LDAP User Mapping" => "LDAP-Benutzernamenzuordnung",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "OwnCloud nutzt die Benutzernamen, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung vom OwnCloud-Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch OwnCloud gefunden. Der interne OwnCloud-Name, wird in der gesamten OwnCloud verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste in der OwnCloud. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Löschen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung.",
+"Clear Username-LDAP User Mapping" => "Lösche LDAP-Benutzernamenzuordnung",
+"Clear Groupname-LDAP Group Mapping" => "Lösche LDAP-Gruppennamenzuordnung",
"Test Configuration" => "Testkonfiguration",
"Help" => "Hilfe"
);
diff --git a/apps/user_ldap/l10n/fa.php b/apps/user_ldap/l10n/fa.php
index bef13457ad..889555079d 100644
--- a/apps/user_ldap/l10n/fa.php
+++ b/apps/user_ldap/l10n/fa.php
@@ -1,8 +1,13 @@
"عدم موفقیت در پاک کردن نگاشت.",
"Failed to delete the server configuration" => "عملیات حذف پیکربندی سرور ناموفق ماند",
"The configuration is valid and the connection could be established!" => "پیکربندی معتبر است و ارتباط می تواند برقرار شود",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "پیکربندی معتبراست، اما اتصال شکست خورد. لطفا تنظیمات و اعتبارهای سرور را بررسی کنید.",
"Deletion failed" => "حذف کردن انجام نشد",
"Keep settings?" => "آیا تنظیمات ذخیره شود ؟",
+"Cannot add server configuration" => "نمی توان پیکربندی سرور را اضافه نمود",
+"mappings cleared" => "نگاشت پاک شده است",
+"Success" => "موفقیت",
"Error" => "خطا",
"Connection test succeeded" => "تست اتصال با موفقیت انجام گردید",
"Connection test failed" => "تست اتصال ناموفق بود",
@@ -11,9 +16,56 @@
"Server configuration" => "پیکربندی سرور",
"Add Server Configuration" => "افزودن پیکربندی سرور",
"Host" => "میزبانی",
+"Base DN" => "پایه DN",
+"One Base DN per line" => "یک پایه DN در هر خط",
+"You can specify Base DN for users and groups in the Advanced tab" => "شما می توانید پایه DN را برای کاربران و گروه ها در زبانه Advanced مشخص کنید.",
+"User DN" => "کاربر DN",
"Password" => "گذرواژه",
+"For anonymous access, leave DN and Password empty." => "برای دسترسی ناشناس، DN را رها نموده و رمزعبور را خالی بگذارید.",
+"User Login Filter" => "فیلتر ورودی کاربر",
"Group Filter" => "فیلتر گروه",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "بدون هیچ گونه حفره یا سوراخ، به عنوان مثال، \"objectClass = posixGroup\".",
+"Connection Settings" => "تنظیمات اتصال",
+"Configuration Active" => "پیکربندی فعال",
+"When unchecked, this configuration will be skipped." => "زمانیکه انتخاب نشود، این پیکربندی نادیده گرفته خواهد شد.",
"Port" => "درگاه",
+"Backup (Replica) Host" => "پشتیبان گیری (بدل) میزبان",
+"Backup (Replica) Port" => "پشتیبان گیری (بدل) پورت",
+"Disable Main Server" => "غیر فعال کردن سرور اصلی",
+"When switched on, ownCloud will only connect to the replica server." => "وقتی روشن می شود، ownCloud تنها با سرور ماکت ارتباط برقرار می کند.",
+"Use TLS" => "استفاده ازTLS",
+"Do not use it additionally for LDAPS connections, it will fail." => "علاوه بر این برای اتصالات LDAPS از آن استفاده نکنید، با شکست مواجه خواهد شد.",
+"Case insensitve LDAP server (Windows)" => "غیر حساس به بزرگی و کوچکی حروف LDAP سرور (ویندوز)",
+"Turn off SSL certificate validation." => "غیرفعال کردن اعتبار گواهی نامه SSL .",
+"Not recommended, use for testing only." => "توصیه نمی شود، تنها برای آزمایش استفاده کنید.",
+"Directory Settings" => "تنظیمات پوشه",
+"User Display Name Field" => "فیلد نام کاربر",
+"Base User Tree" => "کاربر درخت پایه",
+"One User Base DN per line" => "یک کاربر پایه DN در هر خط",
+"User Search Attributes" => "ویژگی های جستجوی کاربر",
+"Optional; one attribute per line" => "اختیاری؛ یک ویژگی در هر خط",
+"Group Display Name Field" => "فیلد نام گروه",
+"Base Group Tree" => "گروه درخت پایه ",
+"One Group Base DN per line" => "یک گروه پایه DN در هر خط",
+"Group Search Attributes" => "گروه صفات جستجو",
+"Group-Member association" => "انجمن گروه کاربران",
+"Special Attributes" => "ویژگی های مخصوص",
+"Quota Field" => "سهمیه بندی انجام نشد.",
+"Quota Default" => "سهمیه بندی پیش فرض",
"in bytes" => "در بایت",
+"Email Field" => "ایمیل ارسال نشد.",
+"User Home Folder Naming Rule" => "قانون نامگذاری پوشه خانه کاربر",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "خالی گذاشتن برای نام کاربری (پیش فرض). در غیر این صورت، تعیین یک ویژگی LDAP/AD.",
+"Internal Username" => "نام کاربری داخلی",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "به طور پیش فرض نام کاربری داخلی از ویژگی UUID ایجاد خواهد شد. این اطمینان حاصل می کند که نام کاربری منحصر به فرد است و کاراکترها نیاز به تبدیل ندارند. نام کاربری داخلی دارای محدودیت است که فقط این کاراکتر ها مجاز می باشند: [ a-zA-Z0-9_.@- ]. بقیه کاراکترها با مکاتبات ASCII آنها جایگزین میشود یا به سادگی حذف شوند. در برخورد یک عدد اضافه خواهد شد / افزایش یافته است. نام کاربری داخلی برای شناسایی یک کاربر داخلی استفاده می شود.همچنین این نام به طور پیش فرض برای پوشه خانه کاربر در ownCloud. همچنین یک پورت برای آدرس های دور از راه است، به عنوان مثال برای تمام خدمات *DAV. با این تنظیمات، رفتار پیش فرض می تواند لغو گردد. برای رسیدن به یک رفتار مشابه به عنوان قبل، ownCloud 5 وارد نمایش ویژگی نام کاربر در زمینه های زیر است. آن را برای رفتار پیش فرض خالی بگذارید. تغییرات اثربخش خواهد بود فقط در نگاشت جدید(اضافه شده) کاربران LDAP .",
+"Internal Username Attribute:" => "ویژگی نام کاربری داخلی:",
+"Override UUID detection" => "نادیده گرفتن تشخیص UUID ",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "به طور پیش فرض، ownCloud ویژگی UUID را به صورت اتوماتیک تشخیص می دهد. ویژگی UUID برای شناسایی کاربران و گروه های LDAP استفاده می شود. همچنین، نام کاربری داخلی بر پایه UUID ایجاد خواهد شد، در غیر اینصورت در بالا مشخص نشده باشد. شما می توانید تنظیمات را لغو کنید و یک ویژگی از انتخابتان را تصویب کنید. شما باید مطمئن شوید که ویژگی انتخاب شده شما می تواند آورده شود برای کاربران و گروه ها و آن منحصر به فرد است. آن را برای رفتار پیش فرض ترک کن. تغییرات فقط بر روی نگاشت جدید (اضافه شده) کاربران و گروه های LDAP .",
+"UUID Attribute:" => "صفت UUID:",
+"Username-LDAP User Mapping" => "نام کاربری - نگاشت کاربر LDAP ",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud از نام های کاربری برای ذخیره و تعیین داده (متا) استفاده می کند. به منظور دقت شناسایی و به رسمیت شناختن کاربران، هر کاربرLDAP باید یک نام کاربری داخلی داشته باشد. این نیازمند یک نگاشت از نام کاربری ownCloud به کاربرLDAP است. نام کاربری ساخته شده به UUID از کاربرLDAP نگاشته شده است. علاوه بر این DN پنهانی نیز بخوبی برای کاهش تعامل LDAP است، اما برای شناسایی مورد استفاده قرار نمی گیرد. اگر DN تغییر کند، تغییرات توسط ownCloud یافت خواهند شد. نام داخلی ownCloud در تمام ownCloud استفاده می شود. پاک سازی نگاشت ها در همه جا باقی مانده باشد. پیکربندی پاک سازی نگاشت ها حساس نیست، آن تحت تاثیر تمام پیکربندی های LDAP است! آیا هرگز نگاشت را در یک محیط تولید پاک کرده اید. نگاشت ها را فقط در وضعیت آزمایشی یا تجربی پاک کن.",
+"Clear Username-LDAP User Mapping" => "پاک کردن نام کاربری- LDAP نگاشت کاربر ",
+"Clear Groupname-LDAP Group Mapping" => "پاک کردن نام گروه -LDAP گروه نقشه برداری",
+"Test Configuration" => "امتحان پیکربندی",
"Help" => "راهنما"
);
diff --git a/apps/user_ldap/l10n/hi.php b/apps/user_ldap/l10n/hi.php
index 45166eb0e3..8e8e4e8ff6 100644
--- a/apps/user_ldap/l10n/hi.php
+++ b/apps/user_ldap/l10n/hi.php
@@ -1,4 +1,5 @@
"त्रुटि",
"Password" => "पासवर्ड",
"Help" => "सहयोग"
);
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index 308fd34760..aca8c8e770 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -75,10 +75,13 @@
"User Home Folder Naming Rule" => "Regra da pasta inicial do utilizador",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD.",
"Internal Username" => "Nome de utilizador interno",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Por padrão o nome de utilizador interno vai ser criado através do atributo UUID. Desta forma é assegurado que o nome é único e os caracteres nao necessitam de serem convertidos. O nome interno tem a restrição de que apenas estes caracteres são permitidos: [ a-zA-Z0-9_.@- ]. Outros caracteres são substituidos pela sua correspondência ASCII ou simplesmente omitidos. Mesmo assim, quando for detetado uma colisão irá ser acrescentado um número. O nome interno é usado para identificar o utilizador internamente. É também o nome utilizado para a pasta inicial no ownCloud. É também parte de URLs remotos, como por exemplo os serviços *DAV. Com esta definição, o comportamento padrão é pode ser sobreposto. Para obter o mesmo comportamento antes do ownCloud 5 introduza o atributo do nome no campo seguinte. Deixe vazio para obter o comportamento padrão. As alterações apenas serão feitas para novos utilizadores LDAP.",
"Internal Username Attribute:" => "Atributo do nome de utilizador interno",
"Override UUID detection" => "Passar a detecção do UUID",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por defeito, o ownCloud deteta automaticamente o atributo UUID. Este atributo é usado para identificar inequivocamente grupos e utilizadores LDAP. Igualmente, o nome de utilizador interno é criado com base no UUID, se o contrário não for especificado. Pode sobrepor esta definição colocando um atributo à sua escolha. Tenha em atenção que esse atributo deve ser válido tanto para grupos como para utilizadores, e que é único. Deixe em branco para optar pelo comportamento por defeito. Estas alteração apenas terão efeito em novos utilizadores e grupos mapeados (adicionados).",
"UUID Attribute:" => "Atributo UUID:",
"Username-LDAP User Mapping" => "Mapeamento do utilizador LDAP",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "O ownCloud usa nomes de utilizadores para guardar e atribuir (meta) dados. Para identificar com precisão os utilizadores, cada utilizador de LDAP tem um nome de utilizador interno. Isto requer um mapeamento entre o utilizador LDAP e o utilizador ownCloud. Adicionalmente, o DN é colocado em cache para reduzir a interação com LDAP, porém não é usado para identificação. Se o DN muda, essas alterações serão vistas pelo ownCloud. O nome interno do ownCloud é usado em todo o lado, no ownCloud. Limpar os mapeamentos deixará vestígios em todo o lado. A limpeza dos mapeamentos não é sensível à configuração, pois afeta todas as configurações de LDAP! Nunca limpe os mapeamentos num ambiente de produção, apenas o faça numa fase de testes ou experimental.",
"Clear Username-LDAP User Mapping" => "Limpar mapeamento do utilizador-LDAP",
"Clear Groupname-LDAP Group Mapping" => "Limpar o mapeamento do nome de grupo LDAP",
"Test Configuration" => "Testar a configuração",
diff --git a/apps/user_ldap/l10n/zh_TW.php b/apps/user_ldap/l10n/zh_TW.php
index d01e75356c..cde743f003 100644
--- a/apps/user_ldap/l10n/zh_TW.php
+++ b/apps/user_ldap/l10n/zh_TW.php
@@ -1,11 +1,76 @@
"清除映射失敗",
+"Failed to delete the server configuration" => "刪除伺服器設定時失敗",
+"The configuration is valid and the connection could be established!" => "設定有效且連線可建立",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "設定有效但連線無法建立。請檢查伺服器的設定與認證資料。",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "設定無效。更多細節請參閱ownCloud的記錄檔。",
"Deletion failed" => "移除失敗",
+"Take over settings from recent server configuration?" => "要使用最近一次的伺服器設定嗎?",
+"Keep settings?" => "維持設定嗎?",
+"Cannot add server configuration" => "無法新增伺服器設定",
+"mappings cleared" => "映射已清除",
"Success" => "成功",
"Error" => "錯誤",
+"Connection test succeeded" => "連線測試成功",
+"Connection test failed" => "連線測試失敗",
+"Do you really want to delete the current Server Configuration?" => "您真的確定要刪除現在的伺服器設定嗎?",
+"Confirm Deletion" => "確認已刪除",
+"Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "警告: 應用程式user_ldap和user_webdavauth互不相容。可能會造成無法預期的結果。請要求您的系統管理員將兩者其中之一停用。",
+"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "警告:沒有安裝 PHP LDAP 模組，後端系統將無法運作。請要求您的系統管理員安裝模組。",
+"Server configuration" => "伺服器設定",
+"Add Server Configuration" => "新增伺服器設定",
"Host" => "主機",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "若您不需要SSL加密傳輸則可忽略通訊協定。若非如此請從ldaps://開始",
+"One Base DN per line" => "一行一個Base DN",
+"You can specify Base DN for users and groups in the Advanced tab" => "您可以在進階標籤頁裡面指定使用者及群組的Base DN",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "客戶端使用者的DN與特定字詞的連結需要完善，例如:uid=agent,dc=example,dc=com。若是匿名連接，則將DN與密碼欄位留白。",
"Password" => "密碼",
+"For anonymous access, leave DN and Password empty." => "匿名連接時請將DN與密碼欄位留白",
+"User Login Filter" => "使用者登入過濾器",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "試圖登入時會定義要套用的篩選器。登入過程中%%uid會取代使用者名稱。",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "請使用 %%uid placeholder，例如:\"uid=%%uid\"",
+"User List Filter" => "使用者名單篩選器",
+"Defines the filter to apply, when retrieving users." => "檢索使用者時定義要套用的篩選器",
+"without any placeholder, e.g. \"objectClass=person\"." => "請勿使用任何placeholder，例如:\"objectClass=person\"。",
+"Group Filter" => "群組篩選器",
+"Defines the filter to apply, when retrieving groups." => "檢索群組時，定義要套用的篩選器",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "請勿使用任何placeholder，例如:\"objectClass=posixGroup\"。",
+"Connection Settings" => "連線設定",
+"Configuration Active" => "設定為主動模式",
+"When unchecked, this configuration will be skipped." => "沒有被勾選時，此設定會被略過。",
"Port" => "連接阜",
+"Backup (Replica) Host" => "備用主機",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "請給定一個可選的備用主機。必須是LDAP/AD中央伺服器的複本。",
+"Backup (Replica) Port" => "備用(複本)連接阜",
+"Disable Main Server" => "停用主伺服器",
+"When switched on, ownCloud will only connect to the replica server." => "當開關打開時，ownCloud將只會連接複本伺服器。",
"Use TLS" => "使用TLS",
+"Case insensitve LDAP server (Windows)" => "不區分大小寫的LDAP伺服器(Windows)",
"Turn off SSL certificate validation." => "關閉 SSL 憑證驗證",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "若連線只有在此選項開啟時運作，請匯入LDAP伺服器的SSL認證到您的ownCloud伺服器。",
+"Not recommended, use for testing only." => "不推薦使用，僅供測試用途。",
+"Cache Time-To-Live" => "快取的存活時間",
+"in seconds. A change empties the cache." => "以秒為單位。更變後會清空快取。",
+"Directory Settings" => "目錄選項",
+"User Display Name Field" => "使用者名稱欄位",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "用於產生ownCloud名稱",
+"Base User Tree" => "Base使用者數",
+"One User Base DN per line" => "一行一個使用者Base DN",
+"User Search Attributes" => "使用者搜索屬性",
+"Optional; one attribute per line" => "可選的; 一行一項屬性",
+"Group Display Name Field" => "群組顯示名稱欄位",
+"Base Group Tree" => "Base群組樹",
+"One Group Base DN per line" => "一行一個群組Base DN",
+"Group Search Attributes" => "群組搜索屬性",
+"Group-Member association" => "群組成員的關係",
+"Special Attributes" => "特殊屬性",
+"Quota Field" => "配額欄位",
+"Quota Default" => "預設配額",
+"in bytes" => "以位元組為單位",
+"Email Field" => "電郵欄位",
+"User Home Folder Naming Rule" => "使用者家目錄的命名規則",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "使用者名稱請留白(預設)。若不留白請指定一個LDAP/AD屬性。",
+"Internal Username" => "內部使用者名稱",
+"Test Configuration" => "測試此設定",
"Help" => "說明"
);
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 31150a5bec..36c8e648b1 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -209,6 +209,22 @@ class Connection {
$value);
}
+ /**
+ * Special handling for reading Base Configuration
+ *
+ * @param $base the internal name of the config key
+ * @param $value the value stored for the base
+ */
+ private function readBase($base, $value) {
+ if(empty($value)) {
+ $value = '';
+ } else {
+ $value = preg_split('/\r\n|\r|\n/', $value);
+ }
+
+ $this->config[$base] = $value;
+ }
+
/**
* Caches the general LDAP configuration.
*/
@@ -224,14 +240,9 @@ class Connection {
$this->config['ldapAgentName'] = $this->$v('ldap_dn');
$this->config['ldapAgentPassword']
= base64_decode($this->$v('ldap_agent_password'));
- $rawLdapBase = $this->$v('ldap_base');
- $this->config['ldapBase']
- = preg_split('/\r\n|\r|\n/', $rawLdapBase);
- $this->config['ldapBaseUsers']
- = preg_split('/\r\n|\r|\n/', ($this->$v('ldap_base_users')));
- $this->config['ldapBaseGroups']
- = preg_split('/\r\n|\r|\n/', $this->$v('ldap_base_groups'));
- unset($rawLdapBase);
+ $this->readBase('ldapBase', $this->$v('ldap_base'));
+ $this->readBase('ldapBaseUsers', $this->$v('ldap_base_users'));
+ $this->readBase('ldapBaseGroups', $this->$v('ldap_base_groups'));
$this->config['ldapTLS'] = $this->$v('ldap_tls');
$this->config['ldapNoCase'] = $this->$v('ldap_nocase');
$this->config['turnOffCertCheck']
diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php
index 60ecc0da33..d626afed6c 100644
--- a/apps/user_ldap/lib/jobs.php
+++ b/apps/user_ldap/lib/jobs.php
@@ -134,21 +134,19 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
\OCP\Util::DEBUG);
}
- static private function getConnector() {
- if(!is_null(self::$connector)) {
- return self::$connector;
- }
- self::$connector = new \OCA\user_ldap\lib\Connection('user_ldap');
- return self::$connector;
- }
-
static private function getGroupBE() {
if(!is_null(self::$groupBE)) {
return self::$groupBE;
}
- self::getConnector();
- self::$groupBE = new \OCA\user_ldap\GROUP_LDAP();
- self::$groupBE->setConnector(self::$connector);
+ $configPrefixes = Helper::getServerConfigurationPrefixes(true);
+ if(count($configPrefixes) == 1) {
+ //avoid the proxy when there is only one LDAP server configured
+ $connector = new Connection($configPrefixes[0]);
+ self::$groupBE = new \OCA\user_ldap\GROUP_LDAP();
+ self::$groupBE->setConnector($connector);
+ } else {
+ self::$groupBE = new \OCA\user_ldap\Group_Proxy($configPrefixes);
+ }
return self::$groupBE;
}
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 972970aa3e..95aa592594 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -6,7 +6,7 @@
Expert
'.$l->t('Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them.').'');
+ print_unescaped(' ./tests/autoconfig-sqlite.php < false,
'dbtype' => 'sqlite',
'dbtableprefix' => 'oc_',
- 'adminlogin' => 'admin',
+ 'adminlogin' => '$ADMINLOGIN',
'adminpass' => 'admin',
'directory' => '$BASEDIR/$DATADIR',
);
@@ -28,13 +34,13 @@ cat > ./tests/autoconfig-mysql.php < false,
'dbtype' => 'mysql',
'dbtableprefix' => 'oc_',
- 'adminlogin' => 'admin',
+ 'adminlogin' => '$ADMINLOGIN',
'adminpass' => 'admin',
'directory' => '$BASEDIR/$DATADIR',
- 'dbuser' => 'oc_autotest',
- 'dbname' => 'oc_autotest',
+ 'dbuser' => '$DATABASEUSER',
+ 'dbname' => '$DATABASENAME',
'dbhost' => 'localhost',
- 'dbpass' => 'owncloud',
+ 'dbpass' => 'owncloud',
);
DELIM
@@ -44,13 +50,13 @@ cat > ./tests/autoconfig-pgsql.php < false,
'dbtype' => 'pgsql',
'dbtableprefix' => 'oc_',
- 'adminlogin' => 'admin',
+ 'adminlogin' => '$ADMINLOGIN',
'adminpass' => 'admin',
'directory' => '$BASEDIR/$DATADIR',
- 'dbuser' => 'oc_autotest',
- 'dbname' => 'oc_autotest',
+ 'dbuser' => '$DATABASEUSER',
+ 'dbname' => '$DATABASENAME',
'dbhost' => 'localhost',
- 'dbpass' => 'owncloud',
+ 'dbpass' => 'owncloud',
);
DELIM
@@ -60,10 +66,10 @@ cat > ./tests/autoconfig-oci.php < false,
'dbtype' => 'oci',
'dbtableprefix' => 'oc_',
- 'adminlogin' => 'admin',
+ 'adminlogin' => '$ADMINLOGIN',
'adminpass' => 'admin',
'directory' => '$BASEDIR/$DATADIR',
- 'dbuser' => 'oc_autotest',
+ 'dbuser' => '$DATABASENAME',
'dbname' => 'XE',
'dbhost' => 'localhost',
'dbpass' => 'owncloud',
@@ -88,21 +94,21 @@ function execute_tests {
# drop database
if [ "$1" == "mysql" ] ; then
- mysql -u oc_autotest -powncloud -e "DROP DATABASE oc_autotest"
+ mysql -u $DATABASEUSER -powncloud -e "DROP DATABASE $DATABASENAME"
fi
if [ "$1" == "pgsql" ] ; then
- dropdb -U oc_autotest oc_autotest
+ dropdb -U $DATABASEUSER $DATABASENAME
fi
if [ "$1" == "oci" ] ; then
echo "drop the database"
sqlplus -s -l / as sysdba <
'.$l->t('Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them.').'
'); } if(!function_exists('ldap_connect')) { print_unescaped(''.$l->t('Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.').'
'); @@ -72,18 +72,18 @@ - +>
-
t('Not recommended, use for testing only.'));?>
t('Not recommended, use for testing only.'));?>
t('Directory Settings'));?>
-
+
-
+
@@ -99,16 +99,16 @@
- ); ?>)
t('Help'));?>
+ t('Help'));?>
diff --git a/apps/user_webdavauth/l10n/de.php b/apps/user_webdavauth/l10n/de.php
index e2db395b1c..a6d61a497f 100644
--- a/apps/user_webdavauth/l10n/de.php
+++ b/apps/user_webdavauth/l10n/de.php
@@ -1,4 +1,5 @@
"WebDAV Authentifikation",
+"URL: " => "URL:",
"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prüft die Antwort und wird die Statuscodes 401 und 403 als ungültige Daten und alle anderen Antworten als gültige Daten interpretieren."
);
diff --git a/apps/user_webdavauth/l10n/et_EE.php b/apps/user_webdavauth/l10n/et_EE.php
index 470cb2b0f1..f95b521413 100644
--- a/apps/user_webdavauth/l10n/et_EE.php
+++ b/apps/user_webdavauth/l10n/et_EE.php
@@ -1,4 +1,5 @@
"WebDAV autentimine",
+"URL: " => "URL: ",
"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud saadab kasutajatunnused sellel aadressil. See vidin kontrollib vastust ning tuvastab HTTP vastuskoodid 401 ja 403 kui vigased, ning kõik teised vastused kui korrektsed kasutajatunnused."
);
diff --git a/apps/user_webdavauth/l10n/ru.php b/apps/user_webdavauth/l10n/ru.php
index d5f554c802..20acc6e59a 100644
--- a/apps/user_webdavauth/l10n/ru.php
+++ b/apps/user_webdavauth/l10n/ru.php
@@ -1,4 +1,5 @@
"Идентификация WebDAV",
+"URL: " => "URL:",
"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud отправит учётные данные пользователя на этот адрес. Затем плагин проверит ответ, в случае HTTP ответа 401 или 403 данные будут считаться неверными, при любых других ответах - верными."
);
diff --git a/apps/user_webdavauth/l10n/zh_TW.php b/apps/user_webdavauth/l10n/zh_TW.php
index 32166b0475..827a7ef292 100644
--- a/apps/user_webdavauth/l10n/zh_TW.php
+++ b/apps/user_webdavauth/l10n/zh_TW.php
@@ -1,4 +1,5 @@
"WebDAV 認證",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud 會將把用戶的登入資訊發送到這個網址以嘗試登入，並檢查回應， HTTP 狀態碼401和403視為登入失敗，所有其他回應視為登入成功。"
+"URL: " => "URL: ",
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud 將會把用戶的帳密傳送至這個網址以嘗試登入，並檢查回應，HTTP 狀態碼401和403視為登入失敗，所有其他回應視為登入成功。"
);
diff --git a/apps/user_webdavauth/templates/settings.php b/apps/user_webdavauth/templates/settings.php
index e199c32675..70c10057c2 100755
--- a/apps/user_webdavauth/templates/settings.php
+++ b/apps/user_webdavauth/templates/settings.php
@@ -1,9 +1,9 @@
diff --git a/autotest.sh b/autotest.sh
index 59f0240d99..abe0b92586 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -3,12 +3,18 @@
# ownCloud
#
# @author Thomas Müller
-# @copyright 2012 Thomas Müller thomas.mueller@tmit.eu
+# @copyright 2012, 2013 Thomas Müller thomas.mueller@tmit.eu
#
+#$EXECUTOR_NUMBER is set by Jenkins and allows us to run autotest in parallel
+DATABASENAME=oc_autotest$EXECUTOR_NUMBER
+DATABASEUSER=oc_autotest$EXECUTOR_NUMBER
+ADMINLOGIN=admin$EXECUTOR_NUMBER
DATADIR=data-autotest
BASEDIR=$PWD
+echo "Using database $DATABASENAME"
+
# create autoconfig for sqlite, mysql and postgresql
cat > ./tests/autoconfig-sqlite.php < t('Help'));?>
+ t('Help'));?>