Merge branch 'master' into versions_cleanup

11 files changed, 33 insertions, 12 deletions

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 3cd809038b9..cd339ad26a5 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -124,22 +124,16 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
 .selectedActions a img { position:relative; top:.3em; }
 
 #fileList a.action {
-	display:none;
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
 	filter: alpha(opacity=0);
-	opacity: 0; 
 }
 #fileList tr:hover a.action {
-	display:inline;
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=.5)";
 	filter: alpha(opacity=.5);
-	opacity: .5; 
 }
 #fileList tr:hover a.action:hover {
-	display:inline;
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=1)";
 	filter: alpha(opacity=1);
-	opacity: 1; 
 }
 
 #scanning-message{ top:40%; left:40%; position:absolute; display:none; }
diff --git a/apps/files/l10n/ka.php b/apps/files/l10n/ka.php
new file mode 100644
index 00000000000..148e688547a
--- /dev/null
+++ b/apps/files/l10n/ka.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Files" => "ფაილები",
+"Download" => "გადმოწერა"
+);
diff --git a/apps/files/l10n/my_MM.php b/apps/files/l10n/my_MM.php
index 1835b434905..b791a134ccc 100644
--- a/apps/files/l10n/my_MM.php
+++ b/apps/files/l10n/my_MM.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Files" => "ဖိုင်များ"
+"Files" => "ဖိုင်များ",
+"Download" => "ဒေါင်းလုတ်"
 );
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index ca4dfcf553b..12fef78dbd0 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -60,6 +60,7 @@
 "Text file" => "Textfil",
 "Folder" => "Mapp",
 "From link" => "Från länk",
+"Deleted files" => "Raderade filer",
 "Cancel upload" => "Avbryt uppladdning",
 "Nothing in here. Upload something!" => "Ingenting här. Ladda upp något!",
 "Download" => "Ladda ner",
diff --git a/apps/files_external/l10n/ka.php b/apps/files_external/l10n/ka.php
new file mode 100644
index 00000000000..14c0625e1f2
--- /dev/null
+++ b/apps/files_external/l10n/ka.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Users" => "მომხმარებლები"
+);
diff --git a/apps/files_sharing/l10n/ka.php b/apps/files_sharing/l10n/ka.php
new file mode 100644
index 00000000000..0270d5d6f8c
--- /dev/null
+++ b/apps/files_sharing/l10n/ka.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Password" => "პაროლი",
+"Download" => "გადმოწერა"
+);
diff --git a/apps/files_sharing/l10n/my_MM.php b/apps/files_sharing/l10n/my_MM.php
index aa574b58b02..dc7ec17e9c5 100644
--- a/apps/files_sharing/l10n/my_MM.php
+++ b/apps/files_sharing/l10n/my_MM.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Password" => "စကားဝှက်",
+"Submit" => "ထည့်သွင်းမည်",
+"Download" => "ဒေါင်းလုတ်",
 "web services under your control" => "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services"
 );
diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php
index 8a8fa43080c..f9174c45a65 100644
--- a/apps/files_versions/ajax/getVersions.php
+++ b/apps/files_versions/ajax/getVersions.php
@@ -3,7 +3,6 @@ OCP\JSON::checkAppEnabled('files_versions');
 
 $source = $_GET['source'];
 list ($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($source);
-
 $count = 5; //show the newest revisions
 if( ($versions = OCA\Files_Versions\Storage::getVersions($uid, $filename, $count)) ) {
 
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 778fefd8a72..12f8fdaa0dc 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -107,7 +107,7 @@ class Storage {
 			// store a new version of a file
 			$users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename));
 			$versionsSize = self::getVersionsSize($uid);
-			if (  $versionsSize === false || $versionSize < 0 ) {
+			if (  $versionsSize === false || $versionsSize < 0 ) {
 				$versionsSize = self::calculateSize($uid);
 			}
 
@@ -208,10 +208,10 @@ class Storage {
 		if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
 			$versions_fileview = new \OC\Files\View('/' . $uid . '/files_versions');
 
-			$versionsName = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath($filename);
+			$versionsName = \OC_Filesystem::normalizePath(\OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath($filename));
 			$versions = array();
 			// fetch for old versions
-			$matches = glob( $versionsName.'.v*' );
+			$matches = glob(preg_quote($versionsName).'.v*' );
 
 			if ( !$matches ) {
 				return $versions;
diff --git a/apps/user_ldap/l10n/ka.php b/apps/user_ldap/l10n/ka.php
new file mode 100644
index 00000000000..169926283e9
--- /dev/null
+++ b/apps/user_ldap/l10n/ka.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Password" => "პაროლი",
+"Help" => "შველა"
+);
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 901299e7c21..05249b8f163 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -624,7 +624,8 @@ abstract class Access {
 	 * @brief executes an LDAP search
 	 * @param $filter the LDAP filter for the search
 	 * @param $base an array containing the LDAP subtree(s) that shall be searched
-	 * @param $attr optional, when a certain attribute shall be filtered out
+	 * @param $attr optional, array, one or more attributes that shall be
+	 * retrieved. Results will according to the order in the array.
 	 * @returns array with the search result
 	 *
 	 * Executes an LDAP search
@@ -656,6 +657,14 @@ abstract class Access {
 			\OCP\Util::writeLog('user_ldap', 'Attempt for Paging?  '.print_r($pagedSearchOK, true), \OCP\Util::ERROR);
 			return array();
 		}
+
+		// Do the server-side sorting
+		foreach(array_reverse($attr) as $sortAttr){
+			foreach($sr as $searchResource) {
+				ldap_sort($link_resource, $searchResource, $sortAttr);
+			}
+		}
+
 		$findings = array();
 		foreach($sr as $key => $res) {
 		    $findings = array_merge($findings, ldap_get_entries($link_resource, $res ));