Merge branch 'master' into rename-lostpassword-controller

Conflicts:
	core/lostpassword/controller.php

12 files changed, 116 insertions, 51 deletions

diff --git a/core/css/apps.css b/core/css/apps.css
index 445a3b9b59f..5de146feb1f 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -129,6 +129,7 @@
 /* counter and actions */
 #app-navigation .utils {
 	position: absolute;
+	padding: 7px 7px 0 0;
 	right: 0;
 	top: 0;
 	bottom: 0;
diff --git a/core/css/fixes.css b/core/css/fixes.css
index 3df60ad5b5c..a33bd94bb10 100644
--- a/core/css/fixes.css
+++ b/core/css/fixes.css
@@ -44,3 +44,7 @@
 	height: auto !important;
 }
 
+/* oc-dialog only uses box shadow which is not supported by ie8 */
+.ie8 .oc-dialog {
+	border: 1px solid #888888;
+}
diff --git a/core/css/styles.css b/core/css/styles.css
index 85f65a2f427..bf78af15af5 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -150,14 +150,20 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 
 /* CONTENT ------------------------------------------------------------------ */
 #controls {
-	position:fixed;
-	height:2.8em; width:100%;
-	padding:0 70px 0 0.5em; margin:0;
-	-moz-box-sizing:border-box; box-sizing:border-box;
-	-moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000;
-	background:#eee; border-bottom:1px solid #e7e7e7; z-index:50;
+	position: fixed;
+	height: 36px;
+	width: 100%;
+	padding: 0 75px 0 6px;
+	margin: 0;
+	background: #eee;
+	border-bottom: 1px solid #e7e7e7;
+	z-index: 50;
+	-moz-box-sizing: border-box; box-sizing: border-box;
+	-moz-box-shadow: 0 -3px 7px #000; -webkit-box-shadow: 0 -3px 7px #000; box-shadow: 0 -3px 7px #000;
+}
+#controls .button {
+	display: inline-block;
 }
-#controls .button { display:inline-block; }
 
 #content { position:relative; height:100%; width:100%; }
 #content .hascontrols { position: relative; top: 2.9em; }
@@ -177,7 +183,14 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 #leftcontent a { height:100%; display:block; margin:0; padding:0 1em 0 0; float:left; }
 #rightcontent, .rightcontent { position:fixed; top:6.4em; left:24.5em; overflow:auto }
 
-
+#emptycontent {
+	font-size:1.5em; font-weight:bold;
+	color:#888; text-shadow:#fff 0 1px 0;
+	position: absolute;
+	text-align: center;
+	top: 50%;
+	width: 100%;
+}
 
 
 /* LOG IN & INSTALLATION ------------------------------------------------------------ */
@@ -677,8 +690,21 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
 	background-color:white;
 	width:100%;
 }
-#oc-dialog-filepicker-content .filelist img { margin: 2px 1em 0 4px; }
-#oc-dialog-filepicker-content .filelist .date { float:right;margin-right:1em; }
+#oc-dialog-filepicker-content .filelist li {
+	position: relative;
+}
+#oc-dialog-filepicker-content .filelist .filename {
+	position: absolute;
+	top: 8px;
+}
+#oc-dialog-filepicker-content .filelist img {
+	margin: 2px 1em 0 4px;
+}
+#oc-dialog-filepicker-content .filelist .date {
+	float: right;
+	margin-right: 1em;
+	margin-top: 8px;
+}
 #oc-dialog-filepicker-content .filepicker_element_selected { background-color:lightblue;}
 .ui-dialog {position:fixed !important;}
 span.ui-icon {float: left; margin: 3px 7px 30px 0;}
diff --git a/core/js/js.js b/core/js/js.js
index af4a6d6b336..1999ff73d23 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -431,9 +431,16 @@ OC.Notification={
 
 OC.Breadcrumb={
 	container:null,
-	crumbs:[],
 	show:function(dir, leafname, leaflink){
-		OC.Breadcrumb.clear();
+		if(!this.container){//default
+			this.container=$('#controls');
+		}
+		this._show(this.container, dir, leafname, leaflink);
+	},
+	_show:function(container, dir, leafname, leaflink){
+		var self = this;
+		
+		this._clear(container);
 		
 		// show home + path in subdirectories
 		if (dir && dir !== '/') {
@@ -450,8 +457,7 @@ OC.Breadcrumb={
 			crumbImg.attr('src',OC.imagePath('core','places/home'));
 			crumbLink.append(crumbImg);
 			crumb.append(crumbLink);
-			OC.Breadcrumb.container.prepend(crumb);
-			OC.Breadcrumb.crumbs.push(crumb);
+			container.prepend(crumb);
 
 			//add path parts
 			var segments = dir.split('/');
@@ -460,20 +466,23 @@ OC.Breadcrumb={
 				if (name !== '') {
 					pathurl = pathurl+'/'+name;
 					var link = OC.linkTo('files','index.php')+'?dir='+encodeURIComponent(pathurl);
-					OC.Breadcrumb.push(name, link);
+					self._push(container, name, link);
 				}
 			});
 		}
 		
 		//add leafname
 		if (leafname && leaflink) {
-				OC.Breadcrumb.push(leafname, leaflink);
+			this._push(container, leafname, leaflink);
 		}
 	},
 	push:function(name, link){
-		if(!OC.Breadcrumb.container){//default
-			OC.Breadcrumb.container=$('#controls');
+		if(!this.container){//default
+			this.container=$('#controls');
 		}
+		return this._push(OC.Breadcrumb.container, name, link);
+	},
+	_push:function(container, name, link){
 		var crumb=$('<div/>');
 		crumb.addClass('crumb').addClass('last');
 
@@ -482,30 +491,30 @@ OC.Breadcrumb={
 		crumbLink.text(name);
 		crumb.append(crumbLink);
 
-		var existing=OC.Breadcrumb.container.find('div.crumb');
+		var existing=container.find('div.crumb');
 		if(existing.length){
 			existing.removeClass('last');
 			existing.last().after(crumb);
 		}else{
-			OC.Breadcrumb.container.prepend(crumb);
+			container.prepend(crumb);
 		}
-		OC.Breadcrumb.crumbs.push(crumb);
 		return crumb;
 	},
 	pop:function(){
-		if(!OC.Breadcrumb.container){//default
-			OC.Breadcrumb.container=$('#controls');
+		if(!this.container){//default
+			this.container=$('#controls');
 		}
-		OC.Breadcrumb.container.find('div.crumb').last().remove();
-		OC.Breadcrumb.container.find('div.crumb').last().addClass('last');
-		OC.Breadcrumb.crumbs.pop();
+		this.container.find('div.crumb').last().remove();
+		this.container.find('div.crumb').last().addClass('last');
 	},
 	clear:function(){
-		if(!OC.Breadcrumb.container){//default
-			OC.Breadcrumb.container=$('#controls');
+		if(!this.container){//default
+			this.container=$('#controls');
 		}
-		OC.Breadcrumb.container.find('div.crumb').remove();
-		OC.Breadcrumb.crumbs=[];
+		this._clear(this.container);
+	},
+	_clear:function(container) {
+		container.find('div.crumb').remove();
 	}
 };
 
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 4092b8d0746..f184a1022bc 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -77,7 +77,7 @@ var OCdialogs = {
 			self.$filePicker = $tmpl.octemplate({
 				dialog_name: dialog_name,
 				title: title
-			}).data('path', '');
+			}).data('path', '').data('multiselect', multiselect).data('mimetype', mimetype_filter);
 
 			if (modal === undefined) {
 				modal = false;
@@ -100,7 +100,7 @@ var OCdialogs = {
 					self._handlePickerClick(event, $(this));
 				});
 				self._fillFilePicker('');
-			}).data('multiselect', multiselect).data('mimetype',mimetype_filter);
+			});
 
 			// build buttons
 			var functionToCall = function() {
@@ -285,7 +285,11 @@ var OCdialogs = {
 					filename: entry.name,
 					date: OC.mtime2date(entry.mtime)
 				});
-				$li.find('img').attr('src', entry.mimetype_icon);
+				if (entry.mimetype === "httpd/unix-directory") {
+					$li.find('img').attr('src', OC.imagePath('core', 'filetypes/folder.png'));
+				} else {
+					$li.find('img').attr('src', OC.Router.generate('core_ajax_preview', {x:32, y:32, file:escapeHTML(dir+'/'+entry.name)}) );
+				}
 				self.$filelist.append($li);
 			});
 
diff --git a/core/js/oc-requesttoken.js b/core/js/oc-requesttoken.js
index 6cc6b5a855b..0d7f40c592a 100644
--- a/core/js/oc-requesttoken.js
+++ b/core/js/oc-requesttoken.js
@@ -1,3 +1,4 @@
-$(document).bind('ajaxSend', function(elm, xhr, s) {
+$(document).on('ajaxSend',function(elm, xhr, s) {
 	xhr.setRequestHeader('requesttoken', oc_requesttoken);
 });
+
diff --git a/core/js/placeholder.js b/core/js/placeholder.js
index 16543541cb4..d63730547d7 100644
--- a/core/js/placeholder.js
+++ b/core/js/placeholder.js
@@ -34,23 +34,20 @@
  *
  * Which will result in:
  *
- * <div id="albumart" style="background-color: rgb(123, 123, 123); ... ">T</div>
+ * <div id="albumart" style="background-color: hsl(123, 90%, 65%); ... ">T</div>
  *
  */
 
 (function ($) {
 	$.fn.placeholder = function(seed) {
 		var hash = md5(seed),
-			maxRange = parseInt('ffffffffff', 16),
-			red = parseInt(hash.substr(0,10), 16) / maxRange * 256,
-			green = parseInt(hash.substr(10,10), 16) / maxRange * 256,
-			blue = parseInt(hash.substr(20,10), 16) / maxRange * 256,
-			rgb = [Math.floor(red), Math.floor(green), Math.floor(blue)],
+			maxRange = parseInt('ffffffffffffffffffffffffffffffff', 16),
+			hue = parseInt(hash, 16) / maxRange * 256,
 			height = this.height();
-		this.css('background-color', 'rgb(' + rgb.join(',') + ')');
+		this.css('background-color', 'hsl(' + hue + ', 90%, 65%)');
 
 		// CSS rules
-		this.css('color', 'rgb(255, 255, 255)');
+		this.css('color', '#fff');
 		this.css('font-weight', 'bold');
 		this.css('text-align', 'center');
 
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 81fad258337..0f338a09340 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -2,6 +2,12 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s partagé »%s« avec vous",
 "group" => "groupe",
+"Turned on maintenance mode" => "Basculé en mode maintenance",
+"Turned off maintenance mode" => "Basculé en mode production (non maintenance)",
+"Updated database" => "Base de données mise à jour",
+"Updating filecache, this may take really long..." => "En cours de mise à jour de cache de fichiers. Cette opération peut être très longue...",
+"Updated filecache" => "Cache de fichier mis à jour",
+"... %d%% done ..." => "... %d%% effectué ...",
 "Category type not provided." => "Type de catégorie non spécifié.",
 "No category to add?" => "Pas de catégorie à ajouter ?",
 "This category already exists: %s" => "Cette catégorie existe déjà : %s",
@@ -31,13 +37,13 @@ $TRANSLATIONS = array(
 "December" => "décembre",
 "Settings" => "Paramètres",
 "seconds ago" => "il y a quelques secondes",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("il y a %n minute","il y a %n minutes"),
+"_%n hour ago_::_%n hours ago_" => array("Il y a %n heure","Il y a %n heures"),
 "today" => "aujourd'hui",
 "yesterday" => "hier",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("il y a %n jour","il y a %n jours"),
 "last month" => "le mois dernier",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("Il y a %n mois","Il y a %n mois"),
 "months ago" => "il y a plusieurs mois",
 "last year" => "l'année dernière",
 "years ago" => "il y a plusieurs années",
@@ -84,6 +90,7 @@ $TRANSLATIONS = array(
 "Email sent" => "Email envoyé",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La mise à jour a échoué. Veuillez signaler ce problème à la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">communauté ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud.",
+"%s password reset" => "Réinitialisation de votre mot de passe %s",
 "Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Le lien permettant de réinitialiser votre mot de passe vous a été transmis.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifier votre boîte de pourriels.<br>Au besoin, contactez votre administrateur local.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Requête en échec!<br>Avez-vous vérifié vos courriel/nom d'utilisateur?",
@@ -108,9 +115,11 @@ $TRANSLATIONS = array(
 "Add" => "Ajouter",
 "Security Warning" => "Avertissement de sécurité",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Votre version de PHP est vulnérable à l'attaque par caractère NULL (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Veuillez mettre à jour votre installation PHP pour utiliser %s de façon sécurisée.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Aucun générateur de nombre aléatoire sécurisé n'est disponible, veuillez activer l'extension PHP OpenSSL",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sans générateur de nombre aléatoire sécurisé, un attaquant peut être en mesure de prédire les jetons de réinitialisation du mot de passe, et ainsi prendre le contrôle de votre compte utilisateur.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Votre répertoire data est certainement accessible depuis l'internet car le fichier .htaccess ne semble pas fonctionner",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"%s\" target=\"_blank\">documentation</a>.",
 "Create an <strong>admin account</strong>" => "Créer un <strong>compte administrateur</strong>",
 "Advanced" => "Avancé",
 "Data folder" => "Répertoire des données",
diff --git a/core/l10n/hi.php b/core/l10n/hi.php
index 00cb5926d70..29e67f68abf 100644
--- a/core/l10n/hi.php
+++ b/core/l10n/hi.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Category type not provided." => "कैटेगरी प्रकार उपलब्ध नहीं है",
+"This category already exists: %s" => "यह कैटेगरी पहले से ही मौजूद है: %s",
+"Object type not provided." => "ऑब्जेक्ट प्रकार नहीं दिया हुआ",
+"Sunday" => "रविवार",
+"Monday" => "सोमवार",
+"Tuesday" => "मंगलवार",
+"Wednesday" => "बुधवार",
+"Thursday" => "बृहस्पतिवार",
+"Friday" => "शुक्रवार",
+"Saturday" => "शनिवार",
 "January" => "जनवरी",
 "February" => "फरवरी",
 "March" => "मार्च",
@@ -21,6 +31,9 @@ $TRANSLATIONS = array(
 "Share" => "साझा करें",
 "Share with" => "के साथ साझा",
 "Password" => "पासवर्ड",
+"Send" => "भेजें",
+"Sending ..." => "भेजा जा रहा है",
+"Email sent" => "ईमेल भेज दिया गया है ",
 "Use the following link to reset your password: {link}" => "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}",
 "You will receive a link to reset your password via Email." => "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|",
 "Username" => "प्रयोक्ता का नाम",
@@ -31,6 +44,7 @@ $TRANSLATIONS = array(
 "Apps" => "Apps",
 "Help" => "सहयोग",
 "Cloud not found" => "क्लौड नहीं मिला ",
+"Add" => "डाले",
 "Create an <strong>admin account</strong>" => "व्यवस्थापक खाता बनाएँ",
 "Advanced" => "उन्नत",
 "Data folder" => "डाटा फोल्डर",
diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php
index 66e4de5f54c..3c8099591a1 100644
--- a/core/lostpassword/controller.php
+++ b/core/lostpassword/controller.php
@@ -43,7 +43,7 @@ class Controller {
 		}
 
 		if (\OC_User::userExists($_POST['user']) && $continue) {
-			$token = hash('sha256', \OC_Util::generate_random_bytes(30).\OC_Config::getValue('passwordsalt', ''));
+			$token = hash('sha256', \OC_Util::generateRandomBytes(30).\OC_Config::getValue('passwordsalt', ''));
 			\OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword',
 				hash('sha256', $token)); // Hash the token again to prevent timing attacks
 			$email = \OC_Preferences::getValue($_POST['user'], 'settings', 'email', '');
diff --git a/core/minimizer.php b/core/minimizer.php
index 4da9037c413..eeeddf86a81 100644
--- a/core/minimizer.php
+++ b/core/minimizer.php
@@ -5,11 +5,11 @@ OC_App::loadApps();
 
 if ($service == 'core.css') {
 	$minimizer = new OC_Minimizer_CSS();
-	$files = OC_TemplateLayout::findStylesheetFiles(OC_Util::$core_styles);
+	$files = OC_TemplateLayout::findStylesheetFiles(OC_Util::$coreStyles);
 	$minimizer->output($files, $service);
 }
 else if ($service == 'core.js') {
 	$minimizer = new OC_Minimizer_JS();
-	$files = OC_TemplateLayout::findJavascriptFiles(OC_Util::$core_scripts);
+	$files = OC_TemplateLayout::findJavascriptFiles(OC_Util::$coreScripts);
 	$minimizer->output($files, $service);
 }
diff --git a/core/setup.php b/core/setup.php
index 40e30db533a..4758c23b045 100644
--- a/core/setup.php
+++ b/core/setup.php
@@ -33,8 +33,8 @@ $opts = array(
 	'hasOracle' => $hasOracle,
 	'hasMSSQL' => $hasMSSQL,
 	'directory' => $datadir,
-	'secureRNG' => OC_Util::secureRNG_available(),
-	'htaccessWorking' => OC_Util::ishtaccessworking(),
+	'secureRNG' => OC_Util::secureRNGAvailable(),
+	'htaccessWorking' => OC_Util::isHtAccessWorking(),
 	'vulnerableToNullByte' => $vulnerableToNullByte,
 	'errors' => array(),
 );