From 2aaf38b5d3ddf27870cb6e448975e475e9a84101 Mon Sep 17 00:00:00 2001 From: j-ed Date: Sat, 2 Mar 2013 12:12:33 +0100 Subject: [PATCH 01/54] Update app.php suppress log message `include path for class \"OC\\Files\\Storage\\SMB\" starts with \"apps\/\"` --- apps/files_external/appinfo/app.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php index d976c01752..d786c6c7a2 100644 --- a/apps/files_external/appinfo/app.php +++ b/apps/files_external/appinfo/app.php @@ -6,16 +6,16 @@ * See the COPYING-README file. */ -OC::$CLASSPATH['OC\Files\Storage\StreamWrapper']='apps/files_external/lib/streamwrapper.php'; -OC::$CLASSPATH['OC\Files\Storage\FTP']='apps/files_external/lib/ftp.php'; -OC::$CLASSPATH['OC\Files\Storage\DAV']='apps/files_external/lib/webdav.php'; -OC::$CLASSPATH['OC\Files\Storage\Google']='apps/files_external/lib/google.php'; -OC::$CLASSPATH['OC\Files\Storage\SWIFT']='apps/files_external/lib/swift.php'; -OC::$CLASSPATH['OC\Files\Storage\SMB']='apps/files_external/lib/smb.php'; -OC::$CLASSPATH['OC\Files\Storage\AmazonS3']='apps/files_external/lib/amazons3.php'; -OC::$CLASSPATH['OC\Files\Storage\Dropbox']='apps/files_external/lib/dropbox.php'; -OC::$CLASSPATH['OC\Files\Storage\SFTP']='apps/files_external/lib/sftp.php'; -OC::$CLASSPATH['OC_Mount_Config']='apps/files_external/lib/config.php'; +OC::$CLASSPATH['OC\Files\Storage\StreamWrapper'] = 'files_external/lib/streamwrapper.php'; +OC::$CLASSPATH['OC\Files\Storage\FTP'] = 'files_external/lib/ftp.php'; +OC::$CLASSPATH['OC\Files\Storage\DAV'] = 'files_external/lib/webdav.php'; +OC::$CLASSPATH['OC\Files\Storage\Google'] = 'files_external/lib/google.php'; +OC::$CLASSPATH['OC\Files\Storage\SWIFT'] = 'files_external/lib/swift.php'; +OC::$CLASSPATH['OC\Files\Storage\SMB'] = 'files_external/lib/smb.php'; +OC::$CLASSPATH['OC\Files\Storage\AmazonS3'] = 'files_external/lib/amazons3.php'; +OC::$CLASSPATH['OC\Files\Storage\Dropbox'] = 'files_external/lib/dropbox.php'; +OC::$CLASSPATH['OC\Files\Storage\SFTP'] = 'files_external/lib/sftp.php'; +OC::$CLASSPATH['OC_Mount_Config'] = 'files_external/lib/config.php'; OCP\App::registerAdmin('files_external', 'settings'); if (OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes') == 'yes') { From d3e0a41dad5a5e3547edbc4b37545aa2991112e2 Mon Sep 17 00:00:00 2001 From: j-ed Date: Sat, 2 Mar 2013 12:14:52 +0100 Subject: [PATCH 02/54] Update app.php suppress log messages like `include path for class \"OC\\Files\\Storage\\Shared\" starts with \"apps\/\"` --- apps/files_sharing/appinfo/app.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index d3e05cc62d..5b5893abc9 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -1,11 +1,11 @@ Date: Sat, 2 Mar 2013 12:18:28 +0100 Subject: [PATCH 03/54] Update app.php suppress log messages like `include path for class \"OCA\\Encryption\\Crypt\" starts with \"apps\/\"`. --- apps/files_encryption/appinfo/app.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php index c7cd8ca32d..f7b2140b58 100644 --- a/apps/files_encryption/appinfo/app.php +++ b/apps/files_encryption/appinfo/app.php @@ -1,12 +1,12 @@ Date: Sat, 2 Mar 2013 12:24:12 +0100 Subject: [PATCH 04/54] Update app.php suppress log messages like `include path for class \"OCA\\Files_Trashbin\\Hooks\" starts with \"apps\/\"`. --- apps/files_trashbin/appinfo/app.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php index 7c04e583db..a6a99db034 100644 --- a/apps/files_trashbin/appinfo/app.php +++ b/apps/files_trashbin/appinfo/app.php @@ -1,7 +1,7 @@ Date: Sat, 2 Mar 2013 12:26:13 +0100 Subject: [PATCH 05/54] Update app.php suppress log messages like `include path for class \"OCA\\Files_Versions\\Storage\" starts with \"apps\/\"`. --- apps/files_versions/appinfo/app.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php index ae48b0cc10..44d01f5cd5 100644 --- a/apps/files_versions/appinfo/app.php +++ b/apps/files_versions/appinfo/app.php @@ -1,8 +1,8 @@ Date: Sat, 2 Mar 2013 12:33:38 +0100 Subject: [PATCH 06/54] Update app.php replaced fixed path to app folder to support multiple apps pathes. --- apps/user_webdavauth/appinfo/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/user_webdavauth/appinfo/app.php b/apps/user_webdavauth/appinfo/app.php index c4c131b7ef..3cd227bddb 100755 --- a/apps/user_webdavauth/appinfo/app.php +++ b/apps/user_webdavauth/appinfo/app.php @@ -21,7 +21,7 @@ * */ -require_once 'apps/user_webdavauth/user_webdavauth.php'; +require_once OC_App::getAppPath('user_webdavauth').'/user_webdavauth.php'; OC_APP::registerAdmin('user_webdavauth', 'settings'); From afe7ea8ca2c834fc54210e8724f3cf9464ec5893 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 4 Mar 2013 16:10:11 +0100 Subject: [PATCH 07/54] fix files table CSS specificity issue causing multiselect bar overlap, fix #2075 --- apps/files/css/files.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index fd06c61ce2..4d2b16e6f1 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -73,7 +73,7 @@ table th#headerSize, table td.filesize { min-width:3em; padding:0 1em; text-alig table th#headerDate, table td.date { min-width:11em; padding:0 .1em 0 1em; text-align:left; } /* Multiselect bar */ -table.multiselect { top:63px; } +#filestable.multiselect { top:63px; } table.multiselect thead { position:fixed; top:82px; z-index:1; -moz-box-sizing: border-box; box-sizing: border-box; left: 0; padding-left: 64px; width:100%; } table.multiselect thead th { background:rgba(230,230,230,.8); color:#000; font-weight:bold; border-bottom:0; } table.multiselect #headerName { width: 100%; } From e9f46a745224a8ac551a1303462769c052f6d7b5 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Mon, 4 Mar 2013 16:36:49 +0100 Subject: [PATCH 08/54] Remove inline js from OC.Dialogs.FilePicker. --- core/js/oc-dialogs.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 28dec97fd3..cfbca2833c 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -129,13 +129,13 @@ var OCdialogs = { var p; if ($(c_id).data('multiselect') == true) { p = []; - $(c_id+' .filepicker_element_selected #filename').each(function(i, elem) { + $(c_id+' .filepicker_element_selected .filename').each(function(i, elem) { p.push(($(c_id).data('path')?$(c_id).data('path'):'')+'/'+$(elem).text()); }); } else { var p = $(c_id).data('path'); if (p == undefined) p = ''; - p = p+'/'+$(c_id+' .filepicker_element_selected #filename').text() + p = p+'/'+$(c_id+' .filepicker_element_selected .filename').text() } callback(p); $(c_id).dialog('close'); @@ -216,13 +216,15 @@ var OCdialogs = { } }, fillFilePicker:function(r, dialog_content_id) { - var entry_template = '
*NAME*
*LASTMODDATE*
'; + var entry_template = '
*NAME*
*LASTMODDATE*
'; var names = ''; $.each(r.data, function(index, a) { names += entry_template.replace('*LASTMODDATE*', OC.mtime2date(a.mtime)).replace('*NAME*', a.name).replace('*MIMETYPEICON*', a.mimetype_icon).replace('*ENTRYNAME*', a.name).replace('*ENTRYTYPE*', a.type); }); - $(dialog_content_id + ' #filelist').html(names); + $(dialog_content_id + ' #filelist').html(names).on('click', '[data="file"]', function() { + OC.dialogs.handlePickerClick(this, $(this).data('entryname'), $(this).data('dcid')); + }); $(dialog_content_id + ' .filepicker_loader').css('visibility', 'hidden'); }, handleTreeListSelect:function(event) { From d9c11a93c6af2fb8b0a042d6cb72fd6e065a8784 Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Mon, 4 Mar 2013 21:34:50 +0530 Subject: [PATCH 09/54] Corrects Files Layout in Trashbin --- apps/files_trashbin/templates/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php index 4c865d8981..cb5edaa2c9 100644 --- a/apps/files_trashbin/templates/index.php +++ b/apps/files_trashbin/templates/index.php @@ -9,7 +9,7 @@
t('Nothing in here. Your trash bin is empty!'))?>
- +
From c08a04bc839651f14816f04d10a9250ac2515f35 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Mon, 4 Mar 2013 17:05:08 +0100 Subject: [PATCH 10/54] VCategories: Don't forget to save category relations if category exists. --- lib/vcategories.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/vcategories.php b/lib/vcategories.php index f94a0a55d3..2f990c5d2d 100644 --- a/lib/vcategories.php +++ b/lib/vcategories.php @@ -348,12 +348,11 @@ class OC_VCategories { self::$relations[] = array('objid' => $id, 'category' => $name); } } - if(count($newones) > 0) { - $this->categories = array_merge($this->categories, $newones); - if($sync === true) { - $this->save(); - } + $this->categories = array_merge($this->categories, $newones); + if($sync === true) { + $this->save(); } + return true; } From 70014d37dcf1cd693d8b8ce723afcfcc3d6d24aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Mon, 4 Mar 2013 17:20:14 +0100 Subject: [PATCH 11/54] fix expire function --- apps/files_versions/lib/versions.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index 178ef72273..c37133cf32 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -442,12 +442,12 @@ class Storage { } } - // 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 - $numOfVersions = count($all_versions); + // 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 ; $i = 0; - while ($availableSpace < 0) { - if ($i = $numOfVersions-2) break; // keep at least the last version + 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']; From ec2a9169b921179d8bd24c4338c65fd01ea0b535 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Mon, 4 Mar 2013 11:44:09 -0500 Subject: [PATCH 12/54] Change remove() $user parameter to optional --- apps/files_sharing/lib/permissions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_sharing/lib/permissions.php b/apps/files_sharing/lib/permissions.php index 72c1ec96c4..6747faa4d4 100644 --- a/apps/files_sharing/lib/permissions.php +++ b/apps/files_sharing/lib/permissions.php @@ -76,7 +76,7 @@ class Shared_Permissions extends Permissions { * @param int $fileId * @param string $user */ - public function remove($fileId, $user) { + public function remove($fileId, $user = null) { // Not a valid action for Shared Permissions } From 8b09402b771fcede0cc5183340729b9c4be654e9 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Mon, 4 Mar 2013 12:08:41 -0500 Subject: [PATCH 13/54] Fix #2074 by initializing as an array --- lib/group/backend.php | 10 +++++----- lib/group/database.php | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/group/backend.php b/lib/group/backend.php index e7b7b21d95..26a784efb2 100644 --- a/lib/group/backend.php +++ b/lib/group/backend.php @@ -142,14 +142,14 @@ abstract class OC_Group_Backend implements OC_Group_Interface { * @param int $offset * @return array with display names (value) and user ids (key) */ - public function DisplayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) { - $displayNames = ''; + public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) { + $displayNames = array(); $users = $this->usersInGroup($gid, $search, $limit, $offset); - foreach ( $users as $user ) { - $DisplayNames[$user] = $user; + foreach ($users as $user) { + $displayNames[$user] = $user; } - return $DisplayNames; + return $displayNames; } } diff --git a/lib/group/database.php b/lib/group/database.php index 40e9b0d414..d0974685ff 100644 --- a/lib/group/database.php +++ b/lib/group/database.php @@ -219,8 +219,8 @@ class OC_Group_Database extends OC_Group_Backend { * @param int $offset * @return array with display names (value) and user ids (key) */ - public function DisplayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) { - $displayNames = ''; + public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) { + $displayNames = array(); $stmt = OC_DB::prepare('SELECT `*PREFIX*users`.`uid`, `*PREFIX*users`.`displayname`' .' FROM `*PREFIX*users`' From a97006144e520d5789ed5e06ddebc00d6b16c664 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Mon, 4 Mar 2013 20:35:58 +0100 Subject: [PATCH 14/54] Only send the standard headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes https://github.com/owncloud/apps/issues/675 --- lib/template.php | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/template.php b/lib/template.php index b2d1f0c029..398f9de065 100644 --- a/lib/template.php +++ b/lib/template.php @@ -200,7 +200,6 @@ class OC_Template{ .'img-src *; ' .'font-src \'self\' data:'); header('Content-Security-Policy:'.$policy); // Standard - header('X-WebKit-CSP:'.$policy); // Older webkit browsers $this->findTemplate($name); } From 6019cdd5bdba8623673299e9ae7b765bef8235a9 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Mon, 4 Mar 2013 21:10:18 +0100 Subject: [PATCH 15/54] adding test case for getDefaultEmailAddress() + fixing #1844 again --- lib/mail.php | 8 ++++++++ lib/public/util.php | 4 ++-- tests/lib/util.php | 5 +++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/mail.php b/lib/mail.php index 22194045a7..61634632ef 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -119,4 +119,12 @@ class OC_Mail { return($txt); } + + /** + * @param string $emailAddress a given email address to be validated + * @return bool + */ + public static function ValidateAddress($emailAddress) { + return PHPMailer::ValidateAddress($emailAddress); + } } diff --git a/lib/public/util.php b/lib/public/util.php index 5d814114a2..db07cbcfff 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -219,11 +219,11 @@ class Util { $host_name = self::getServerHostName(); $defaultEmailAddress = $user_part.'@'.$host_name; - if (\PHPMailer::ValidateAddress($defaultEmailAddress)) { + if (\OC_Mail::ValidateAddress($defaultEmailAddress)) { return $defaultEmailAddress; } - // incase we cannot build a valid email address from the hostname let's fallback to 'localhost.localdomain' + // in case we cannot build a valid email address from the hostname let's fallback to 'localhost.localdomain' return $user_part.'@localhost.localdomain'; } diff --git a/tests/lib/util.php b/tests/lib/util.php index ebff3c7381..b904c35980 100644 --- a/tests/lib/util.php +++ b/tests/lib/util.php @@ -42,4 +42,9 @@ class Test_Util extends PHPUnit_Framework_TestCase { $result = strlen(OC_Util::generate_random_bytes(59)); $this->assertEquals(59, $result); } + + function testGetDefaultEmailAddress() { + $email = \OCP\Util::getDefaultEmailAddress("no-reply"); + $this->assertEquals('no-reply@localhost.localdomain', $email); + } } \ No newline at end of file From a118906f2676ee20d2d8c97567ab6aa143a61f11 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Mon, 4 Mar 2013 21:45:21 +0100 Subject: [PATCH 16/54] fixes #2089 --- apps/files_trashbin/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index 8e726836f8..779db9bc31 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -104,7 +104,7 @@ $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); $list->assign('disableSharing', true); -$list->assign('dirlisting', $dirlisting); +$tmpl->assign('dirlisting', $dirlisting); $list->assign('disableDownloadActions', true); $tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage()); $tmpl->assign('fileList', $list->fetchPage()); From 07dee24cb29bd6fd49e26094b28d6506eaf3e96c Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 4 Mar 2013 22:11:57 +0100 Subject: [PATCH 17/54] explicitly add empty placeholder to inputs which use infield labels, fix #2049 --- apps/files_sharing/templates/authenticate.php | 4 ++-- core/lostpassword/templates/lostpassword.php | 2 +- core/templates/installation.php | 14 +++++++------- core/templates/login.php | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php index b6ef82da6f..7a67b6e550 100644 --- a/apps/files_sharing/templates/authenticate.php +++ b/apps/files_sharing/templates/authenticate.php @@ -2,8 +2,8 @@

- +

- \ No newline at end of file + diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php index 55c070f3e0..dc9f0bc8ad 100644 --- a/core/lostpassword/templates/lostpassword.php +++ b/core/lostpassword/templates/lostpassword.php @@ -9,7 +9,7 @@

- +

diff --git a/core/templates/installation.php b/core/templates/installation.php index 33b01853fb..842686932c 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -36,13 +36,13 @@
t( 'Create an admin account' )); ?>

-

- @@ -127,17 +127,17 @@

-

-

-

@@ -147,14 +147,14 @@

-

-

diff --git a/core/templates/login.php b/core/templates/login.php index 463b951c80..2c9884f524 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -22,7 +22,7 @@

- autocomplete="on" required/> @@ -30,7 +30,7 @@

- /> From 56ae4bb6e9a08c5ada36b4c42ae4e22eaf288df7 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 4 Mar 2013 22:26:03 +0100 Subject: [PATCH 18/54] Cache: also check if the file id is already in the cache during upgrade Should solve upgrade issues if only some of the configured storages were migrated previously --- lib/files/cache/upgrade.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/files/cache/upgrade.php b/lib/files/cache/upgrade.php index 1fe4c58468..4d98abb2f8 100644 --- a/lib/files/cache/upgrade.php +++ b/lib/files/cache/upgrade.php @@ -64,7 +64,7 @@ class Upgrade { * @param array $data the data for the new cache */ function insert($data) { - if (!$this->inCache($data['storage'], $data['path_hash'])) { + if (!$this->inCache($data['storage'], $data['path_hash'], $data['id'])) { $insertQuery = \OC_DB::prepare('INSERT INTO `*PREFIX*filecache` ( `fileid`, `storage`, `path`, `path_hash`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted` ) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)'); @@ -78,12 +78,19 @@ class Upgrade { /** * @param string $storage * @param string $pathHash + * @param string $id * @return bool */ - function inCache($storage, $pathHash) { + function inCache($storage, $pathHash, $id) { $query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?'); $result = $query->execute(array($storage, $pathHash)); - return (bool)$result->fetchRow(); + if ($result->fetchRow()) { + return true; + } else { + $query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `fileid` = ?'); + $result = $query->execute(array($id)); + return (bool)$result->fetchRow(); + } } /** From 9d9acf24de482bdd5d0b700ba75631b246e5699b Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 4 Mar 2013 23:19:55 +0100 Subject: [PATCH 19/54] Cache: more efficient detection for existing entries during upgrade --- lib/files/cache/upgrade.php | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/files/cache/upgrade.php b/lib/files/cache/upgrade.php index 4d98abb2f8..811d82d743 100644 --- a/lib/files/cache/upgrade.php +++ b/lib/files/cache/upgrade.php @@ -82,15 +82,9 @@ class Upgrade { * @return bool */ function inCache($storage, $pathHash, $id) { - $query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?'); - $result = $query->execute(array($storage, $pathHash)); - if ($result->fetchRow()) { - return true; - } else { - $query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `fileid` = ?'); - $result = $query->execute(array($id)); - return (bool)$result->fetchRow(); - } + $query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE (`storage` = ? AND `path_hash` = ?) OR `fileid` = ?'); + $result = $query->execute(array($storage, $pathHash, $id)); + return (bool)$result->fetchRow(); } /** From 6c96b93fd49304afa438c79dbca77c25ec246a94 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Tue, 5 Mar 2013 00:19:07 +0100 Subject: [PATCH 20/54] [tx-robot] updated from transifex --- apps/files/l10n/cs_CZ.php | 1 + apps/files/l10n/da.php | 2 + apps/files/l10n/de.php | 1 + apps/files/l10n/de_DE.php | 1 + apps/files_versions/l10n/da.php | 1 + apps/user_ldap/l10n/cs_CZ.php | 8 +++- apps/user_ldap/l10n/it.php | 2 + l10n/cs_CZ/files.po | 8 ++-- l10n/cs_CZ/user_ldap.po | 20 ++++----- l10n/da/files.po | 11 ++--- l10n/da/files_versions.po | 13 +++--- l10n/da/lib.po | 9 ++-- l10n/da/settings.po | 67 +++++++++++++++-------------- l10n/de/files.po | 6 +-- l10n/de_DE/files.po | 6 +-- l10n/fa/settings.po | 25 +++++------ l10n/it/user_ldap.po | 8 ++-- l10n/nl/settings.po | 9 ++-- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_trashbin.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- lib/l10n/da.php | 1 + settings/l10n/da.php | 30 +++++++++++++ settings/l10n/fa.php | 9 ++++ settings/l10n/nl.php | 1 + 33 files changed, 161 insertions(+), 100 deletions(-) diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php index 4c7dc898cc..48b60bfb71 100644 --- a/apps/files/l10n/cs_CZ.php +++ b/apps/files/l10n/cs_CZ.php @@ -61,6 +61,7 @@ "From link" => "Z odkazu", "Deleted files" => "Odstraněné soubory", "Cancel upload" => "Zrušit odesílání", +"You don’t have write permissions here." => "Nemáte zde práva zápisu.", "Nothing in here. Upload something!" => "Žádný obsah. Nahrajte něco.", "Download" => "Stáhnout", "Unshare" => "Zrušit sdílení", diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php index c9042e30b4..c147c939f8 100644 --- a/apps/files/l10n/da.php +++ b/apps/files/l10n/da.php @@ -59,7 +59,9 @@ "Text file" => "Tekstfil", "Folder" => "Mappe", "From link" => "Fra link", +"Deleted files" => "Slettede filer", "Cancel upload" => "Fortryd upload", +"You don’t have write permissions here." => "Du har ikke skriverettigheder her.", "Nothing in here. Upload something!" => "Her er tomt. Upload noget!", "Download" => "Download", "Unshare" => "Fjern deling", diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php index b78ffe1c16..53427503f4 100644 --- a/apps/files/l10n/de.php +++ b/apps/files/l10n/de.php @@ -61,6 +61,7 @@ "From link" => "Von einem Link", "Deleted files" => "Gelöschte Dateien", "Cancel upload" => "Upload abbrechen", +"You don’t have write permissions here." => "Du besitzt hier keine Schreib-Berechtigung.", "Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!", "Download" => "Herunterladen", "Unshare" => "Nicht mehr freigeben", diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php index dd5dd28472..56aaabe9e8 100644 --- a/apps/files/l10n/de_DE.php +++ b/apps/files/l10n/de_DE.php @@ -61,6 +61,7 @@ "From link" => "Von einem Link", "Deleted files" => "Gelöschte Dateien", "Cancel upload" => "Upload abbrechen", +"You don’t have write permissions here." => "Sie haben keine Schreib-Berechtigungen hier.", "Nothing in here. Upload something!" => "Alles leer. Bitte laden Sie etwas hoch!", "Download" => "Herunterladen", "Unshare" => "Nicht mehr freigeben", diff --git a/apps/files_versions/l10n/da.php b/apps/files_versions/l10n/da.php index 76ababe665..447a3d2b85 100644 --- a/apps/files_versions/l10n/da.php +++ b/apps/files_versions/l10n/da.php @@ -6,5 +6,6 @@ "File %s could not be reverted to version %s" => "Filen %s blev genskabt til version: %s", "No old versions available" => "Ingen gamle version tilgængelige", "No path specified" => "Ingen sti specificeret", +"Versions" => "Versioner", "Revert a file to a previous version by clicking on its revert button" => "Genskab en fil til en tidligere version ved at klikke på denne genskab knap." ); diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php index 4c74f195cf..c5d77026b9 100644 --- a/apps/user_ldap/l10n/cs_CZ.php +++ b/apps/user_ldap/l10n/cs_CZ.php @@ -1,5 +1,5 @@ "Selhalo smazání konfigurace serveru", +"Failed to delete the server configuration" => "Selhalo smazání nastavení serveru", "The configuration is valid and the connection could be established!" => "Nastavení je v pořádku a spojení bylo navázáno.", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurace je v pořádku, ale spojení selhalo. Zkontrolujte, prosím, nastavení serveru a přihlašovací údaje.", "The configuration is invalid. Please look in the ownCloud log for further details." => "Nastavení je neplatné. Zkontrolujte, prosím, záznam ownCloud pro další podrobnosti.", @@ -48,6 +48,7 @@ "Turn off SSL certificate validation." => "Vypnout ověřování SSL certifikátu.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Pokud připojení pracuje pouze s touto možností, tak importujte SSL certifikát SSL serveru do Vašeho serveru ownCloud", "Not recommended, use for testing only." => "Není doporučeno, pouze pro testovací účely.", +"Cache Time-To-Live" => "TTL vyrovnávací paměti", "in seconds. A change empties the cache." => "ve vteřinách. Změna vyprázdní vyrovnávací paměť.", "Directory Settings" => "Nastavení adresáře", "User Display Name Field" => "Pole pro zobrazované jméno uživatele", @@ -63,7 +64,12 @@ "Group Search Attributes" => "Atributy vyhledávání skupin", "Group-Member association" => "Asociace člena skupiny", "Special Attributes" => "Speciální atributy", +"Quota Field" => "Pole pro kvótu", +"Quota Default" => "Výchozí kvóta", "in bytes" => "v bajtech", +"Email Field" => "Pole e-mailu", +"User Home Folder Naming Rule" => "Pravidlo pojmenování domovské složky uživatele", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte LDAP/AD parametr.", +"Test Configuration" => "Vyzkoušet nastavení", "Help" => "Nápověda" ); diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php index 86887970da..a2790fd1de 100644 --- a/apps/user_ldap/l10n/it.php +++ b/apps/user_ldap/l10n/it.php @@ -48,6 +48,7 @@ "Turn off SSL certificate validation." => "Disattiva il controllo del certificato SSL.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server ownCloud.", "Not recommended, use for testing only." => "Non consigliato, utilizzare solo per test.", +"Cache Time-To-Live" => "Tempo di vita della cache", "in seconds. A change empties the cache." => "in secondi. Il cambio svuota la cache.", "Directory Settings" => "Impostazioni delle cartelle", "User Display Name Field" => "Campo per la visualizzazione del nome utente", @@ -67,6 +68,7 @@ "Quota Default" => "Quota predefinita", "in bytes" => "in byte", "Email Field" => "Campo Email", +"User Home Folder Naming Rule" => "Regola di assegnazione del nome della cartella utente", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD.", "Test Configuration" => "Prova configurazione", "Help" => "Aiuto" diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po index ccb6c7fa43..5aaad21444 100644 --- a/l10n/cs_CZ/files.po +++ b/l10n/cs_CZ/files.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" -"PO-Revision-Date: 2013-03-03 23:06+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"PO-Revision-Date: 2013-03-04 07:30+0000\n" +"Last-Translator: Tomáš Chvátal \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -281,7 +281,7 @@ msgstr "Zrušit odesílání" #: templates/index.php:53 msgid "You don’t have write permissions here." -msgstr "" +msgstr "Nemáte zde práva zápisu." #: templates/index.php:60 msgid "Nothing in here. Upload something!" diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po index a1d1984547..cd9f8f3782 100644 --- a/l10n/cs_CZ/user_ldap.po +++ b/l10n/cs_CZ/user_ldap.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-02 00:03+0100\n" -"PO-Revision-Date: 2013-03-01 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"PO-Revision-Date: 2013-03-04 12:20+0000\n" +"Last-Translator: Tomáš Chvátal \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +21,7 @@ msgstr "" #: ajax/deleteConfiguration.php:34 msgid "Failed to delete the server configuration" -msgstr "Selhalo smazání konfigurace serveru" +msgstr "Selhalo smazání nastavení serveru" #: ajax/testConfiguration.php:36 msgid "The configuration is valid and the connection could be established!" @@ -238,7 +238,7 @@ msgstr "Není doporučeno, pouze pro testovací účely." #: templates/settings.php:65 msgid "Cache Time-To-Live" -msgstr "" +msgstr "TTL vyrovnávací paměti" #: templates/settings.php:65 msgid "in seconds. A change empties the cache." @@ -302,11 +302,11 @@ msgstr "Speciální atributy" #: templates/settings.php:79 msgid "Quota Field" -msgstr "" +msgstr "Pole pro kvótu" #: templates/settings.php:80 msgid "Quota Default" -msgstr "" +msgstr "Výchozí kvóta" #: templates/settings.php:80 msgid "in bytes" @@ -314,11 +314,11 @@ msgstr "v bajtech" #: templates/settings.php:81 msgid "Email Field" -msgstr "" +msgstr "Pole e-mailu" #: templates/settings.php:82 msgid "User Home Folder Naming Rule" -msgstr "" +msgstr "Pravidlo pojmenování domovské složky uživatele" #: templates/settings.php:82 msgid "" @@ -328,7 +328,7 @@ msgstr "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte L #: templates/settings.php:86 msgid "Test Configuration" -msgstr "" +msgstr "Vyzkoušet nastavení" #: templates/settings.php:86 msgid "Help" diff --git a/l10n/da/files.po b/l10n/da/files.po index 637f4779fb..7d64d326b9 100644 --- a/l10n/da/files.po +++ b/l10n/da/files.po @@ -10,15 +10,16 @@ # , 2012. # Pascal d'Hermilly , 2011. # , 2012. +# Thomas , 2013. # Thomas Tanghus <>, 2012. # Thomas Tanghus , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" -"PO-Revision-Date: 2013-03-03 23:06+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"PO-Revision-Date: 2013-03-04 18:10+0000\n" +"Last-Translator: cronner \n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -279,7 +280,7 @@ msgstr "Fra link" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Slettede filer" #: templates/index.php:46 msgid "Cancel upload" @@ -287,7 +288,7 @@ msgstr "Fortryd upload" #: templates/index.php:53 msgid "You don’t have write permissions here." -msgstr "" +msgstr "Du har ikke skriverettigheder her." #: templates/index.php:60 msgid "Nothing in here. Upload something!" diff --git a/l10n/da/files_versions.po b/l10n/da/files_versions.po index 00cf12aa11..6b6ab2ac91 100644 --- a/l10n/da/files_versions.po +++ b/l10n/da/files_versions.po @@ -6,13 +6,14 @@ # Frederik Lassen , 2013. # Morten Juhl-Johansen Zölde-Fejér , 2012. # , 2012. +# Thomas , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-28 00:04+0100\n" -"PO-Revision-Date: 2013-02-27 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"PO-Revision-Date: 2013-03-04 18:20+0000\n" +"Last-Translator: cronner \n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,17 +44,17 @@ msgstr "fejl" msgid "File %s could not be reverted to version %s" msgstr "Filen %s blev genskabt til version: %s" -#: history.php:68 +#: history.php:69 msgid "No old versions available" msgstr "Ingen gamle version tilgængelige" -#: history.php:73 +#: history.php:74 msgid "No path specified" msgstr "Ingen sti specificeret" #: js/versions.js:6 msgid "Versions" -msgstr "" +msgstr "Versioner" #: templates/history.php:20 msgid "Revert a file to a previous version by clicking on its revert button" diff --git a/l10n/da/lib.po b/l10n/da/lib.po index e541159bed..a8476f00b3 100644 --- a/l10n/da/lib.po +++ b/l10n/da/lib.po @@ -7,13 +7,14 @@ # Frederik Lassen , 2013. # Morten Juhl-Johansen Zölde-Fejér , 2012-2013. # , 2012. +# Thomas , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 14:35+0100\n" -"PO-Revision-Date: 2013-02-27 13:35+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"PO-Revision-Date: 2013-03-04 18:10+0000\n" +"Last-Translator: cronner \n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -178,7 +179,7 @@ msgstr "Fejlende kommando var: \"%s\", navn: %s, password: %s" #: setup.php:631 #, php-format msgid "MS SQL username and/or password not valid: %s" -msgstr "" +msgstr "MS SQL brugernavn og/eller adgangskode ikke er gyldigt: %s" #: setup.php:849 msgid "" diff --git a/l10n/da/settings.po b/l10n/da/settings.po index a70828aa5e..645026b75e 100644 --- a/l10n/da/settings.po +++ b/l10n/da/settings.po @@ -12,15 +12,16 @@ # Pascal d'Hermilly , 2011. # , 2012. # , 2012-2013. +# Thomas , 2013. # Thomas Tanghus <>, 2012. # Thomas Tanghus , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 14:35+0100\n" -"PO-Revision-Date: 2013-02-27 13:35+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"PO-Revision-Date: 2013-03-04 18:30+0000\n" +"Last-Translator: cronner \n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -141,7 +142,7 @@ msgstr "fortryd" #: js/users.js:62 msgid "Unable to remove user" -msgstr "" +msgstr "Kan ikke fjerne bruger" #: js/users.js:75 templates/users.php:26 templates/users.php:80 #: templates/users.php:105 @@ -158,19 +159,19 @@ msgstr "Slet" #: js/users.js:191 msgid "add group" -msgstr "" +msgstr "Tilføj gruppe" #: js/users.js:352 msgid "A valid username must be provided" -msgstr "" +msgstr "Et gyldigt brugernavn skal angives" #: js/users.js:353 js/users.js:359 js/users.js:374 msgid "Error creating user" -msgstr "" +msgstr "Fejl ved oprettelse af bruger" #: js/users.js:358 msgid "A valid password must be provided" -msgstr "" +msgstr "En gyldig adgangskode skal angives" #: personal.php:29 personal.php:30 msgid "__language_name__" @@ -191,7 +192,7 @@ msgstr "Din data mappe og dine filer er muligvis tilgængelige fra internettet. #: templates/admin.php:29 msgid "Setup Warning" -msgstr "" +msgstr "Opsætnings Advarsel" #: templates/admin.php:32 msgid "" @@ -206,17 +207,17 @@ msgstr "Dobbelttjek venligst installations vejledningerne." #: templates/admin.php:44 msgid "Module 'fileinfo' missing" -msgstr "" +msgstr "Module 'fileinfo' mangler" #: templates/admin.php:47 msgid "" "The PHP module 'fileinfo' is missing. We strongly recommend to enable this " "module to get best results with mime-type detection." -msgstr "" +msgstr "PHP modulet 'fileinfo' mangler. Vi anbefaler stærkt at aktivere dette modul til at få de bedste resultater med mime-type detektion." #: templates/admin.php:58 msgid "Locale not working" -msgstr "" +msgstr "Landestandard fungerer ikke" #: templates/admin.php:63 #, php-format @@ -224,11 +225,11 @@ msgid "" "This ownCloud server can't set system locale to %s. This means that there " "might be problems with certain characters in file names. We strongly suggest" " to install the required packages on your system to support %s." -msgstr "" +msgstr "Denne ownCloud server kan ikke indstille systemets landestandard for %s. Det betyder, at der kan være problemer med visse tegn i filnavne. Vi anbefaler kraftigt, at installere de nødvendige pakker på dit system til at understøtte %s." #: templates/admin.php:75 msgid "Internet connection not working" -msgstr "" +msgstr "Internetforbindelse fungerer ikke" #: templates/admin.php:78 msgid "" @@ -242,86 +243,86 @@ msgstr "" #: templates/admin.php:92 msgid "Cron" -msgstr "" +msgstr "Cron" #: templates/admin.php:101 msgid "Execute one task with each page loaded" -msgstr "" +msgstr "Udføre en opgave med hver side indlæst" #: templates/admin.php:111 msgid "" "cron.php is registered at a webcron service. Call the cron.php page in the " "owncloud root once a minute over http." -msgstr "" +msgstr "cron.php er registreret hos en webcron service. Kald cron.php side i owncloud rod en gang i minuttet over HTTP." #: templates/admin.php:121 msgid "" "Use systems cron service. Call the cron.php file in the owncloud folder via " "a system cronjob once a minute." -msgstr "" +msgstr "Brug system cron service. Kald cron.php filen i owncloud mappe via et system cronjob en gang i minuttet." #: templates/admin.php:128 msgid "Sharing" -msgstr "" +msgstr "Deling" #: templates/admin.php:134 msgid "Enable Share API" -msgstr "" +msgstr "Aktiver Share API" #: templates/admin.php:135 msgid "Allow apps to use the Share API" -msgstr "" +msgstr "Tillad apps til at bruge Share API" #: templates/admin.php:142 msgid "Allow links" -msgstr "" +msgstr "Tillad links" #: templates/admin.php:143 msgid "Allow users to share items to the public with links" -msgstr "" +msgstr "Tillad brugere at dele elementer til offentligheden med links" #: templates/admin.php:150 msgid "Allow resharing" -msgstr "" +msgstr "Tillad videredeling" #: templates/admin.php:151 msgid "Allow users to share items shared with them again" -msgstr "" +msgstr "Tillad brugere at dele elementer delt med dem igen" #: templates/admin.php:158 msgid "Allow users to share with anyone" -msgstr "" +msgstr "Tillad brugere at dele med alle" #: templates/admin.php:161 msgid "Allow users to only share with users in their groups" -msgstr "" +msgstr "Tillad brugere at kun dele med brugerne i deres grupper" #: templates/admin.php:168 msgid "Security" -msgstr "" +msgstr "Sikkerhed" #: templates/admin.php:181 msgid "Enforce HTTPS" -msgstr "" +msgstr "Gennemtving HTTPS" #: templates/admin.php:182 msgid "" "Enforces the clients to connect to ownCloud via an encrypted connection." -msgstr "" +msgstr "Håndhæver klienter at oprette forbindelse til ownCloud via en krypteret forbindelse." #: templates/admin.php:185 msgid "" "Please connect to this ownCloud instance via HTTPS to enable or disable the " "SSL enforcement." -msgstr "" +msgstr "Opret forbindelse til denne ownCloud enhed via HTTPS for at aktivere eller deaktivere SSL håndhævelse." #: templates/admin.php:195 msgid "Log" -msgstr "" +msgstr "Log" #: templates/admin.php:196 msgid "Log level" -msgstr "" +msgstr "Log niveau" #: templates/admin.php:223 msgid "More" diff --git a/l10n/de/files.po b/l10n/de/files.po index 423becbecd..12c0a5d450 100644 --- a/l10n/de/files.po +++ b/l10n/de/files.po @@ -28,8 +28,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" -"PO-Revision-Date: 2013-03-03 23:06+0000\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"PO-Revision-Date: 2013-03-04 13:20+0000\n" "Last-Translator: I Robot \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -299,7 +299,7 @@ msgstr "Upload abbrechen" #: templates/index.php:53 msgid "You don’t have write permissions here." -msgstr "" +msgstr "Du besitzt hier keine Schreib-Berechtigung." #: templates/index.php:60 msgid "Nothing in here. Upload something!" diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po index f6bec1d9e4..533533fac7 100644 --- a/l10n/de_DE/files.po +++ b/l10n/de_DE/files.po @@ -33,8 +33,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" -"PO-Revision-Date: 2013-03-03 23:06+0000\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"PO-Revision-Date: 2013-03-04 13:20+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" @@ -304,7 +304,7 @@ msgstr "Upload abbrechen" #: templates/index.php:53 msgid "You don’t have write permissions here." -msgstr "" +msgstr "Sie haben keine Schreib-Berechtigungen hier." #: templates/index.php:60 msgid "Nothing in here. Upload something!" diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po index 2f64799441..269b362350 100644 --- a/l10n/fa/settings.po +++ b/l10n/fa/settings.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Amir Reza Asadi , 2013. # , 2012. # Hossein nag , 2012. # mahdi Kereshteh , 2013. @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 14:35+0100\n" -"PO-Revision-Date: 2013-02-27 13:35+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"PO-Revision-Date: 2013-03-04 16:30+0000\n" +"Last-Translator: Amir Reza Asadi \n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -152,7 +153,7 @@ msgstr "پاک کردن" #: js/users.js:191 msgid "add group" -msgstr "" +msgstr "افزودن گروه" #: js/users.js:352 msgid "A valid username must be provided" @@ -160,7 +161,7 @@ msgstr "" #: js/users.js:353 js/users.js:359 js/users.js:374 msgid "Error creating user" -msgstr "" +msgstr "خطا در ایجاد کاربر" #: js/users.js:358 msgid "A valid password must be provided" @@ -185,7 +186,7 @@ msgstr "" #: templates/admin.php:29 msgid "Setup Warning" -msgstr "" +msgstr "هشدار راه اندازی" #: templates/admin.php:32 msgid "" @@ -222,7 +223,7 @@ msgstr "" #: templates/admin.php:75 msgid "Internet connection not working" -msgstr "" +msgstr "اتصال اینترنت کار نمی کند" #: templates/admin.php:78 msgid "" @@ -256,7 +257,7 @@ msgstr "" #: templates/admin.php:128 msgid "Sharing" -msgstr "" +msgstr "اشتراک گذاری" #: templates/admin.php:134 msgid "Enable Share API" @@ -272,7 +273,7 @@ msgstr "" #: templates/admin.php:143 msgid "Allow users to share items to the public with links" -msgstr "" +msgstr "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها" #: templates/admin.php:150 msgid "Allow resharing" @@ -292,7 +293,7 @@ msgstr "" #: templates/admin.php:168 msgid "Security" -msgstr "" +msgstr "امنیت" #: templates/admin.php:181 msgid "Enforce HTTPS" @@ -369,7 +370,7 @@ msgstr "مستندات مدیر" #: templates/help.php:9 msgid "Online Documentation" -msgstr "" +msgstr "مستندات آنلاین" #: templates/help.php:11 msgid "Forum" @@ -377,7 +378,7 @@ msgstr "انجمن" #: templates/help.php:14 msgid "Bugtracker" -msgstr "" +msgstr "ردیاب باگ " #: templates/help.php:17 msgid "Commercial Support" diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po index 22e3dcf32c..a03705a5cf 100644 --- a/l10n/it/user_ldap.po +++ b/l10n/it/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-03 00:05+0100\n" -"PO-Revision-Date: 2013-03-02 00:40+0000\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"PO-Revision-Date: 2013-03-04 14:30+0000\n" "Last-Translator: Vincenzo Reale \n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" @@ -238,7 +238,7 @@ msgstr "Non consigliato, utilizzare solo per test." #: templates/settings.php:65 msgid "Cache Time-To-Live" -msgstr "" +msgstr "Tempo di vita della cache" #: templates/settings.php:65 msgid "in seconds. A change empties the cache." @@ -318,7 +318,7 @@ msgstr "Campo Email" #: templates/settings.php:82 msgid "User Home Folder Naming Rule" -msgstr "" +msgstr "Regola di assegnazione del nome della cartella utente" #: templates/settings.php:82 msgid "" diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po index 075d5a41e1..595fce94d9 100644 --- a/l10n/nl/settings.po +++ b/l10n/nl/settings.po @@ -14,13 +14,14 @@ # , 2012. # , 2012. # Richard Bos , 2012. +# Wilfred Dijksman , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 14:35+0100\n" -"PO-Revision-Date: 2013-02-27 13:35+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" +"PO-Revision-Date: 2013-03-04 22:30+0000\n" +"Last-Translator: Wilfred Dijksman \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -224,7 +225,7 @@ msgid "" "This ownCloud server can't set system locale to %s. This means that there " "might be problems with certain characters in file names. We strongly suggest" " to install the required packages on your system to support %s." -msgstr "" +msgstr "Deze ownCloud server kan de systeemtaal niet instellen op %s. Hierdoor kunnen er mogelijk problemen optreden met bepaalde karakters in bestandsnamen. Het wordt sterk aangeraden om de vereiste pakketen op uw systeem te installeren zodat %s ondersteund wordt." #: templates/admin.php:75 msgid "Internet connection not working" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 219bf35914..a7051235b0 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 72f58c0683..af772e8ce1 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index b57b08dcda..4e1bf94f6d 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 74f193704f..70e3969859 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 5c2416d85b..579bcded72 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index bfccd22964..3ad1f56c80 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 5c289ea665..59437ff1c8 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 6d35680ccd..d84be95ab9 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 588e6c0b61..c8f5ea514a 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 1163dc5984..1dbd4468b9 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index 1973963fc4..11dc1e3768 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" +"POT-Creation-Date: 2013-03-05 00:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/lib/l10n/da.php b/lib/l10n/da.php index e61fba30ff..38ccbbe8e2 100644 --- a/lib/l10n/da.php +++ b/lib/l10n/da.php @@ -34,6 +34,7 @@ "MySQL user '%s'@'%%' already exists" => "MySQL brugeren '%s'@'%%' eksisterer allerede.", "Drop this user from MySQL." => "Slet denne bruger fra MySQL", "Offending command was: \"%s\", name: %s, password: %s" => "Fejlende kommando var: \"%s\", navn: %s, password: %s", +"MS SQL username and/or password not valid: %s" => "MS SQL brugernavn og/eller adgangskode ikke er gyldigt: %s", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt.", "Please double check the installation guides." => "Dobbelttjek venligst installations vejledningerne.", "seconds ago" => "sekunder siden", diff --git a/settings/l10n/da.php b/settings/l10n/da.php index 5a330d371a..a2b9063053 100644 --- a/settings/l10n/da.php +++ b/settings/l10n/da.php @@ -26,14 +26,44 @@ "Saving..." => "Gemmer...", "deleted" => "Slettet", "undo" => "fortryd", +"Unable to remove user" => "Kan ikke fjerne bruger", "Groups" => "Grupper", "Group Admin" => "Gruppe Administrator", "Delete" => "Slet", +"add group" => "Tilføj gruppe", +"A valid username must be provided" => "Et gyldigt brugernavn skal angives", +"Error creating user" => "Fejl ved oprettelse af bruger", +"A valid password must be provided" => "En gyldig adgangskode skal angives", "__language_name__" => "Dansk", "Security Warning" => "Sikkerhedsadvarsel", "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Din data mappe og dine filer er muligvis tilgængelige fra internettet. .htaccess filen som ownCloud leverer virker ikke. Vi anbefaler på det kraftigste at du konfigurerer din webserver på en måske så data mappen ikke længere er tilgængelig eller at du flytter data mappen uden for webserverens dokument rod. ", +"Setup Warning" => "Opsætnings Advarsel", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt.", "Please double check the installation guides." => "Dobbelttjek venligst installations vejledningerne.", +"Module 'fileinfo' missing" => "Module 'fileinfo' mangler", +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modulet 'fileinfo' mangler. Vi anbefaler stærkt at aktivere dette modul til at få de bedste resultater med mime-type detektion.", +"Locale not working" => "Landestandard fungerer ikke", +"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Denne ownCloud server kan ikke indstille systemets landestandard for %s. Det betyder, at der kan være problemer med visse tegn i filnavne. Vi anbefaler kraftigt, at installere de nødvendige pakker på dit system til at understøtte %s.", +"Internet connection not working" => "Internetforbindelse fungerer ikke", +"Cron" => "Cron", +"Execute one task with each page loaded" => "Udføre en opgave med hver side indlæst", +"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php er registreret hos en webcron service. Kald cron.php side i owncloud rod en gang i minuttet over HTTP.", +"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Brug system cron service. Kald cron.php filen i owncloud mappe via et system cronjob en gang i minuttet.", +"Sharing" => "Deling", +"Enable Share API" => "Aktiver Share API", +"Allow apps to use the Share API" => "Tillad apps til at bruge Share API", +"Allow links" => "Tillad links", +"Allow users to share items to the public with links" => "Tillad brugere at dele elementer til offentligheden med links", +"Allow resharing" => "Tillad videredeling", +"Allow users to share items shared with them again" => "Tillad brugere at dele elementer delt med dem igen", +"Allow users to share with anyone" => "Tillad brugere at dele med alle", +"Allow users to only share with users in their groups" => "Tillad brugere at kun dele med brugerne i deres grupper", +"Security" => "Sikkerhed", +"Enforce HTTPS" => "Gennemtving HTTPS", +"Enforces the clients to connect to ownCloud via an encrypted connection." => "Håndhæver klienter at oprette forbindelse til ownCloud via en krypteret forbindelse.", +"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Opret forbindelse til denne ownCloud enhed via HTTPS for at aktivere eller deaktivere SSL håndhævelse.", +"Log" => "Log", +"Log level" => "Log niveau", "More" => "Mere", "Version" => "Version", "Developed by the ownCloud community, the source code is licensed under the AGPL." => "Udviklet af ownClouds community, og kildekoden er underlagt licensen AGPL.", diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php index d75efa85eb..688374e8e3 100644 --- a/settings/l10n/fa.php +++ b/settings/l10n/fa.php @@ -22,8 +22,15 @@ "undo" => "بازگشت", "Groups" => "گروه ها", "Delete" => "پاک کردن", +"add group" => "افزودن گروه", +"Error creating user" => "خطا در ایجاد کاربر", "__language_name__" => "__language_name__", "Security Warning" => "اخطار امنیتی", +"Setup Warning" => "هشدار راه اندازی", +"Internet connection not working" => "اتصال اینترنت کار نمی کند", +"Sharing" => "اشتراک گذاری", +"Allow users to share items to the public with links" => "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها", +"Security" => "امنیت", "More" => "بیش‌تر", "Version" => "نسخه", "Add your App" => "برنامه خود را بیافزایید", @@ -33,7 +40,9 @@ "Update" => "به روز رسانی", "User Documentation" => "مستندات کاربر", "Administrator Documentation" => "مستندات مدیر", +"Online Documentation" => "مستندات آنلاین", "Forum" => "انجمن", +"Bugtracker" => "ردیاب باگ ", "Commercial Support" => "پشتیبانی تجاری", "Show First Run Wizard again" => "راهبری کمکی اجرای اول را دوباره نمایش بده", "Password" => "گذرواژه", diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php index 249bf63cd3..1ce0ef8829 100644 --- a/settings/l10n/nl.php +++ b/settings/l10n/nl.php @@ -43,6 +43,7 @@ "Module 'fileinfo' missing" => "Module 'fileinfo' ontbreekt", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie.", "Locale not working" => "Taalbestand werkt niet", +"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Deze ownCloud server kan de systeemtaal niet instellen op %s. Hierdoor kunnen er mogelijk problemen optreden met bepaalde karakters in bestandsnamen. Het wordt sterk aangeraden om de vereiste pakketen op uw systeem te installeren zodat %s ondersteund wordt.", "Internet connection not working" => "Internet verbinding werkt niet", "This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Deze ownCloud server heeft geen actieve internet verbinding. dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internet verbinding voor deze server in te schakelen als u alle functies van ownCloud wilt gebruiken.", "Cron" => "Cron", From 2b7ff7273d0c791a3b7eabe90146915f063a8339 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Sat, 2 Mar 2013 04:06:27 +0100 Subject: [PATCH 21/54] ownCloud 5 RC2 --- lib/util.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/util.php b/lib/util.php index de1f870fd7..c7916b9e77 100755 --- a/lib/util.php +++ b/lib/util.php @@ -75,7 +75,7 @@ class OC_Util { public static function getVersion() { // hint: We only can count up. Reset minor/patchlevel when // updating major/minor version number. - return array(4, 95, 10); + return array(4, 96, 10); } /** @@ -83,7 +83,7 @@ class OC_Util { * @return string */ public static function getVersionString() { - return '5.0 RC 1'; + return '5.0 RC 2'; } /** From b08894ba7727f9bce8d0e41d76ad5d2ae4a3b7e3 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 5 Mar 2013 13:47:03 +0100 Subject: [PATCH 22/54] LDAP: error codes can be negative, too --- apps/user_ldap/lib/access.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 05249b8f16..d409591283 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -650,7 +650,7 @@ abstract class Access { $linkResources = array_pad(array(), count($base), $link_resource); $sr = ldap_search($linkResources, $base, $filter, $attr); $error = ldap_errno($link_resource); - if(!is_array($sr) || $error > 0) { + if(!is_array($sr) || $error != 0) { \OCP\Util::writeLog('user_ldap', 'Error when searching: '.ldap_error($link_resource).' code '.ldap_errno($link_resource), \OCP\Util::ERROR); From 055fadd10dcbe0b7cd87eb85d77cfd515e2c71cf Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 5 Mar 2013 14:33:20 +0100 Subject: [PATCH 23/54] LDAP: escape some more chars for proper search filter, fixes #1673 --- apps/user_ldap/lib/access.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index d409591283..a8cfd45bf4 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -144,6 +144,9 @@ abstract class Access { '\;' => '\5c3B', '\"' => '\5c22', '\#' => '\5c23', + '(' => '\28', + ')' => '\29', + '*' => '\2A', ); $dn = str_replace(array_keys($replacements), array_values($replacements), $dn); From 5da9223d1c61257cbccbc762e6a7c28bc06f110b Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 5 Mar 2013 21:22:34 +0100 Subject: [PATCH 24/54] make getDisplayNames optional feature for Group Backends, fall back to internal names --- lib/group.php | 8 +++++++- lib/group/backend.php | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/group.php b/lib/group.php index 88f0a2a032..d1a830730b 100644 --- a/lib/group.php +++ b/lib/group.php @@ -294,7 +294,13 @@ class OC_Group { public static function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) { $displayNames=array(); foreach(self::$_usedBackends as $backend) { - $displayNames = array_merge($backend->displayNamesInGroup($gid, $search, $limit, $offset), $displayNames); + if($backend->implementsActions(OC_GROUP_BACKEND_GET_DISPLAYNAME)) { + $displayNames = array_merge($backend->displayNamesInGroup($gid, $search, $limit, $offset), $displayNames); + } else { + $users = $backend->usersInGroup($gid, $search, $limit, $offset); + $names = array_combine($users, $users); + $displayNames = array_merge($names, $displayNames); + } } return $displayNames; } diff --git a/lib/group/backend.php b/lib/group/backend.php index 26a784efb2..2e17b5d0b7 100644 --- a/lib/group/backend.php +++ b/lib/group/backend.php @@ -33,6 +33,7 @@ define('OC_GROUP_BACKEND_CREATE_GROUP', 0x00000001); define('OC_GROUP_BACKEND_DELETE_GROUP', 0x00000010); define('OC_GROUP_BACKEND_ADD_TO_GROUP', 0x00000100); define('OC_GROUP_BACKEND_REMOVE_FROM_GOUP', 0x00001000); +define('OC_GROUP_BACKEND_GET_DISPLAYNAME', 0x00010000); /** * Abstract base class for user management @@ -43,6 +44,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface { OC_GROUP_BACKEND_DELETE_GROUP => 'deleteGroup', OC_GROUP_BACKEND_ADD_TO_GROUP => 'addToGroup', OC_GROUP_BACKEND_REMOVE_FROM_GOUP => 'removeFromGroup', + OC_GROUP_BACKEND_GET_DISPLAYNAME => 'displayNamesInGroup', ); /** From 72c293e834a41f7c0368ead099513deb8388cbc9 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 5 Mar 2013 21:23:58 +0100 Subject: [PATCH 25/54] LDAP: implementation of displayNamesInGroup --- apps/user_ldap/group_ldap.php | 17 ++++++++++++++--- apps/user_ldap/group_proxy.php | 16 ++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php index 4fd4c63691..efa5f8b4fe 100644 --- a/apps/user_ldap/group_ldap.php +++ b/apps/user_ldap/group_ldap.php @@ -209,6 +209,19 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface { return $groupUsers; } + /** + * @brief get a list of all display names in a group + * @returns array with display names (value) and user ids(key) + */ + public function displayNamesInGroup($gid, $search, $limit, $offset) { + $users = $this->usersInGroup($gid, $search, $limit, $offset); + $displayNames = array(); + foreach($users as $user) { + $displayNames[$user] = \OC_User::getDisplayName($user); + } + return $displayNames; + } + /** * @brief get a list of all groups * @returns array with group names @@ -287,8 +300,6 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface { * compared with OC_USER_BACKEND_CREATE_USER etc. */ public function implementsActions($actions) { - //always returns false, because possible actions are modifying - // actions. We do not write to LDAP, at least for now. - return false; + return (bool)(OC_GROUP_BACKEND_GET_DISPLAYNAME & $actions); } } diff --git a/apps/user_ldap/group_proxy.php b/apps/user_ldap/group_proxy.php index 5aa1aef0e0..8f2e34e9b7 100644 --- a/apps/user_ldap/group_proxy.php +++ b/apps/user_ldap/group_proxy.php @@ -135,6 +135,22 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface { return $users; } + /** + * @brief get a list of all display names in a group + * @returns array with display names (value) and user ids(key) + */ + public function displayNamesInGroup($gid, $search, $limit, $offset) { + $displayNames = array(); + + foreach($this->backends as $backend) { + $backendUsers = $backend->displayNamesInGroup($gid, $search, $limit, $offset); + if (is_array($backendUsers)) { + $displayNames = array_merge($displayNames, $backendUsers); + } + } + return $displayNames; + } + /** * @brief get a list of all groups * @returns array with group names From b5dc8b9ca364adc301bf8be62061a160d94c22ca Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 5 Mar 2013 21:25:59 +0100 Subject: [PATCH 26/54] whitespace --- apps/user_ldap/group_proxy.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/user_ldap/group_proxy.php b/apps/user_ldap/group_proxy.php index 8f2e34e9b7..68d2efe387 100644 --- a/apps/user_ldap/group_proxy.php +++ b/apps/user_ldap/group_proxy.php @@ -143,7 +143,7 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface { $displayNames = array(); foreach($this->backends as $backend) { - $backendUsers = $backend->displayNamesInGroup($gid, $search, $limit, $offset); + $backendUsers = $backend->displayNamesInGroup($gid, $search, $limit, $offset); if (is_array($backendUsers)) { $displayNames = array_merge($displayNames, $backendUsers); } From 1e5f8b0e205d01bee32b5db5b9cd20c69c8f467a Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 5 Mar 2013 23:43:22 +0100 Subject: [PATCH 27/54] LDAP: fix settings output thus make settings work again --- apps/user_ldap/templates/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php index cd004cec4b..f44127594c 100644 --- a/apps/user_ldap/templates/settings.php +++ b/apps/user_ldap/templates/settings.php @@ -14,7 +14,7 @@