Merge branch 'master' of git://anongit.kde.org/owncloud

16 files changed, 91 insertions, 56 deletions

diff --git a/apps/bookmarks/ajax/delBookmark.php b/apps/bookmarks/ajax/delBookmark.php
index a47bd2b9ea4..99a618a7d14 100644
--- a/apps/bookmarks/ajax/delBookmark.php
+++ b/apps/bookmarks/ajax/delBookmark.php
@@ -35,18 +35,33 @@ if( !OC_User::isLoggedIn()){
 	exit();
 }
 
+$params=array(
+	urldecode($_GET["url"]),
+	OC_User::getUser()
+	);
+
 $query = OC_DB::prepare("
-	DELETE FROM *PREFIX*bookmarks
+	SELECT id FROM *PREFIX*bookmarks 
 	WHERE url LIKE ?
 		AND user_id = ?
 	");
+
+$id = $query->execute($params)->fetchOne();
+
+$query = OC_DB::prepare("
+	DELETE FROM *PREFIX*bookmarks
+	WHERE id = $id
+	");
 	
-$params=array(
-	urldecode($_GET["url"]),
-	OC_User::getUser()
-	);
-$result = $query->execute($params);
+$result = $query->execute();
 
+
+$query = OC_DB::prepare("
+	DELETE FROM *PREFIX*bookmarks_tags
+	WHERE bookmark_id = $id
+	");
+	
+$result = $query->execute();
 // var_dump($params);
 
 echo json_encode( array( "status" => "success", "data" => array()));
diff --git a/apps/contacts/templates/part.details.php b/apps/contacts/templates/part.details.php
index 5048349abc5..81b32f2ff56 100644
--- a/apps/contacts/templates/part.details.php
+++ b/apps/contacts/templates/part.details.php
@@ -30,6 +30,6 @@
 <?php endif; ?>
 
 <div id="contacts_cardoptions">
-	<a id="contacts_deletecard"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></a>
-	<a id="contacts_addproperty"><img class="svg action" src="<?php echo image_path('', 'actions/download.svg'); ?>" /></a>
+	<a id="contacts_deletecard"><img class="svg action" alt="<?php echo $l->t('Delete');?>" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></a>
+	<a id="contacts_addproperty"><img class="svg action" alt="<?php echo $l->t('Download');?>" src="<?php echo image_path('', 'actions/download.svg'); ?>" /></a>
 </div>
diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php
index e50a319ace4..a1b6c316cd5 100644
--- a/apps/files_sharing/get.php
+++ b/apps/files_sharing/get.php
@@ -67,7 +67,7 @@ if ($source !== false) {
 		header("Expires: 0");
 		header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
 		header("Pragma: public");
-		header("Content-Disposition: filename='".basename($source)."'");
+		header("Content-Disposition: filename=".basename($source));
 		header("Content-Type: " . $mimetype);
 		header("Content-Length: " . OC_Filesystem::filesize($source));
 		//download the file
@@ -80,4 +80,4 @@ if ($source !== false) {
 	$tmpl->printPage();
 	die();
 }
-?>
\ No newline at end of file
+?>
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 1fae8cbdc95..1bd1ac1075b 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -117,7 +117,7 @@ $(document).ready(function() {
 			cache: false,
 			data: data,
 			success: function() {
-				var option = "<option value='"+uid_shared_with+"'>"+uid_shared_with+"</option>";
+				var option = '<option value="'+uid_shared_with+'">'+uid_shared_with+'</option>';
 				$(user).remove();
 				$(option).appendTo('#share_with');
 				$('#share_with').trigger('liszt:updated');
@@ -128,7 +128,7 @@ $(document).ready(function() {
 	$('#makelink').live('change', function() {
 		if (this.checked) {
 			var source = $('#dropdown').data('file');
-			var uid_shared_with = "public";
+			var uid_shared_with = 'public';
 			var permissions = 0;
 			var data = 'sources='+encodeURIComponent(source)+'&uid_shared_with='+encodeURIComponent(uid_shared_with)+'&permissions='+encodeURIComponent(permissions);
 			$.ajax({
@@ -144,7 +144,7 @@ $(document).ready(function() {
 			});
 		} else {
 			var source = $('#dropdown').data('file');
-			var uid_shared_with = "public";
+			var uid_shared_with = 'public';
 			var data = 'source='+encodeURIComponent(source)+'&uid_shared_with='+encodeURIComponent(uid_shared_with);
 			$.ajax({
 				type: 'GET',
@@ -165,19 +165,19 @@ $(document).ready(function() {
 });
 
 function createDropdown(filename, files) {
-	var html = "<div id='dropdown' class='drop' data-file='"+files+"'>";
-	html += "<div id='private'>";
-	html += "<select data-placeholder='User or Group' style='width:220px;' id='share_with' class='chzen-select'>";
-	html += "<option value=''></option>";
-	html += "</select>";
-	html += "<ul id='shared_list'></ul>";
-	html += "</div>";
-	html += "<div id='public'>";
-	html += "<input type='checkbox' name='makelink' id='makelink' value='1' /><label for='makelink'>make public</label>";
-	//html += "<input type='checkbox' name='public_link_write' id='public_link_write' value='1' /><label for='public_link_write'>allow upload</label>";
-	html += "<br />";
-	html += "<input id='link' style='display:none; width:90%;' />";
-	html += "</div>";
+	var html = '<div id="dropdown" class="drop" data-file="'+files+'">';
+	html += '<div id="private">';
+	html += '<select data-placeholder="User or Group" style="width:220px;" id="share_with" class="chzen-select">';
+	html += '<option value=""></option>';
+	html += '</select>';
+	html += '<ul id="shared_list"></ul>';
+	html += '</div>';
+	html += '<div id="public">';
+	html += '<input type="checkbox" name="makelink" id="makelink" value="1" /><label for="makelink">make public</label>';
+	//html += '<input type="checkbox" name="public_link_write" id="public_link_write" value="1" /><label for="public_link_write">allow upload</label>';
+	html += '<br />';
+	html += '<input id="link" style="display:none; width:90%;" />';
+	html += '</div>';
 	if (filename) {
 		$('tr[data-file="'+filename+'"]').addClass('mouseOver');
 		$(html).appendTo($('tr[data-file="'+filename+'"] td.filename'));
@@ -211,13 +211,13 @@ function createDropdown(filename, files) {
 
 function addUser(uid_shared_with, permissions, parentFolder) {
 	if (parentFolder) {
-		var user = "<li>Parent folder "+parentFolder+" shared with "+uid_shared_with+"</li>";
+		var user = '<li>Parent folder '+parentFolder+' shared with '+uid_shared_with+'</li>';
 	} else {
-		var checked = ((permissions > 0) ? "checked='checked'" : "style='display:none;'");
-		var style = ((permissions == 0) ? "style='display:none;'" : "");
-		var user = "<li data-uid_shared_with='"+uid_shared_with+"'>"+uid_shared_with;
-		user += "<input type='checkbox' name='permissions' id='"+uid_shared_with+"' class='permissions' "+checked+"/><label for='"+uid_shared_with+"' "+style+">can edit</label>";
-		user += "<a href='' title='Unshare' class='unshare' style='display:none;'><img class='svg' src='"+OC.imagePath('core','actions/delete')+"'/></a></li>";
+		var checked = ((permissions > 0) ? 'checked="checked"' : 'style="display:none;"');
+		var style = ((permissions == 0) ? 'style="display:none;"' : '');
+		var user = '<li data-uid_shared_with="'+uid_shared_with+'">'+uid_shared_with;
+		user += '<input type="checkbox" name="permissions" id="'+uid_shared_with+'" class="permissions" "+checked+" /><label for="'+uid_shared_with+'" '+style+'>can edit</label>';
+		user += '<a href="" class="unshare" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core','actions/delete')+'"/></a></li>';
 	}
 	$('#share_with option[value="'+uid_shared_with+'"]').remove();
 	$('#share_with').trigger('liszt:updated');
@@ -227,6 +227,6 @@ function addUser(uid_shared_with, permissions, parentFolder) {
 function showPublicLink(token) {
 	$('#makelink').attr('checked', true);
 	$('#link').data('token', token);
-	$('#link').val(parent.location.protocol+"//"+location.host+OC.linkTo('files_sharing','get.php')+'?token='+token);
+	$('#link').val(parent.location.protocol+'//'+location.host+OC.linkTo('files_sharing','get.php')+'?token='+token);
 	$('#link').show('blind');
 }
diff --git a/apps/media/l10n/ca.php b/apps/media/l10n/ca.php
index 810eecd8a49..0ef70e58f1a 100644
--- a/apps/media/l10n/ca.php
+++ b/apps/media/l10n/ca.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Música",
+"Pause" => "Pausa",
 "Songs scanned" => "Cançons escanejades",
 "Rescan Collection" => "Escaneja de nou la col·lecció",
-"Pause" => "Pausa",
 "Artist" => "Artista",
 "Album" => "Àlbum",
 "Title" => "Títol"
diff --git a/apps/media/l10n/da.php b/apps/media/l10n/da.php
index 671f0cf44ca..64cdc59ded5 100644
--- a/apps/media/l10n/da.php
+++ b/apps/media/l10n/da.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Musik",
+"Pause" => "Pause",
 "Songs scanned" => "Sange skannet",
 "Rescan Collection" => "Genskan Samling",
-"Pause" => "Pause",
 "Artist" => "Kunstner",
 "Album" => "Album",
 "Title" => "Titel"
diff --git a/apps/media/l10n/de.php b/apps/media/l10n/de.php
index 9f664b78d80..7a87f6dcb35 100644
--- a/apps/media/l10n/de.php
+++ b/apps/media/l10n/de.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Musik",
+"Pause" => "Pause",
 "Songs scanned" => "Lieder gescannt",
 "Rescan Collection" => "Sammlung scannen",
-"Pause" => "Pause",
 "Artist" => "Künstler",
 "Album" => "Album",
 "Title" => "Titel"
diff --git a/apps/media/l10n/el.php b/apps/media/l10n/el.php
index 0543dae8b3c..47918ec2f9a 100644
--- a/apps/media/l10n/el.php
+++ b/apps/media/l10n/el.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Μουσική",
+"Pause" => "Παύση",
 "Songs scanned" => "Σαρωμένα τραγούγια",
 "Rescan Collection" => "Επανασάρωση συλλογής",
-"Pause" => "Παύση",
 "Artist" => "Καλλιτέχνης",
 "Album" => "Άλμπουμ",
 "Title" => "Τίτλος"
diff --git a/apps/media/l10n/es.php b/apps/media/l10n/es.php
index 2b4044706f0..6740fea7790 100644
--- a/apps/media/l10n/es.php
+++ b/apps/media/l10n/es.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Música",
+"Pause" => "Pausa",
 "Songs scanned" => "Canciones encontradas",
 "Rescan Collection" => "Buscar música nueva",
-"Pause" => "Pausa",
 "Artist" => "Artista",
 "Album" => "Álbum",
 "Title" => "Título"
diff --git a/apps/media/l10n/fr.php b/apps/media/l10n/fr.php
index 619ee9bc835..3e4e0f19283 100644
--- a/apps/media/l10n/fr.php
+++ b/apps/media/l10n/fr.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Musique",
+"Pause" => "Pause",
 "Songs scanned" => "Pistes scannées",
 "Rescan Collection" => "Réanalyser la Collection",
-"Pause" => "Pause",
 "Artist" => "Artiste",
 "Album" => "Album",
 "Title" => "Titre"
diff --git a/apps/media/l10n/id.php b/apps/media/l10n/id.php
new file mode 100644
index 00000000000..7127f85fbf0
--- /dev/null
+++ b/apps/media/l10n/id.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Musik",
+"Pause" => "Jeda",
+"Songs scanned" => "Lagu-lagu yang telah dipindai",
+"Rescan Collection" => "Pindai ulang Koleksi",
+"Artist" => "Artis",
+"Album" => "Album",
+"Title" => "Judul"
+);
diff --git a/apps/media/l10n/nl.php b/apps/media/l10n/nl.php
index 5d4e41ba0da..7ae0a761af0 100644
--- a/apps/media/l10n/nl.php
+++ b/apps/media/l10n/nl.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Muziek",
+"Pause" => "Pauze",
 "Songs scanned" => "nummers gescanned",
 "Rescan Collection" => "Collectie opnieuw scannen",
-"Pause" => "Pauze",
 "Artist" => "Artiest",
 "Album" => "Album",
 "Title" => "Titel"
diff --git a/apps/media/l10n/pl.php b/apps/media/l10n/pl.php
new file mode 100644
index 00000000000..bb74d6d578a
--- /dev/null
+++ b/apps/media/l10n/pl.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Muzyka",
+"Pause" => "Zatrzymaj",
+"Songs scanned" => "Przeskanowane utwory",
+"Rescan Collection" => "Przeskanuj kolekcję",
+"Artist" => "Artysta",
+"Album" => "Album",
+"Title" => "Tytuł"
+);
diff --git a/apps/media/l10n/pt_BR.php b/apps/media/l10n/pt_BR.php
index 750b86359a9..ca290d3ee9d 100644
--- a/apps/media/l10n/pt_BR.php
+++ b/apps/media/l10n/pt_BR.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Música",
+"Pause" => "Pausa",
 "Songs scanned" => "Músicas encontradas",
 "Rescan Collection" => "Atualizar a Coleção",
-"Pause" => "Pausa",
 "Artist" => "Artista",
 "Album" => "Álbum",
 "Title" => "Título"
diff --git a/apps/media/l10n/sv.php b/apps/media/l10n/sv.php
index 8e2e7039c50..b3a7f18f7b2 100644
--- a/apps/media/l10n/sv.php
+++ b/apps/media/l10n/sv.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Musik",
+"Pause" => "Paus",
 "Songs scanned" => "Skannade låtar",
 "Rescan Collection" => "Sök igenom samlingen",
-"Pause" => "Paus",
 "Artist" => "Artist",
 "Album" => "Album",
 "Title" => "Titel"
diff --git a/apps/media/templates/music.php b/apps/media/templates/music.php
index 3cbb1c50a95..cbfab0dff4a 100644
--- a/apps/media/templates/music.php
+++ b/apps/media/templates/music.php
@@ -1,11 +1,11 @@
 <div id="controls">
 	<ul class="jp-controls">
-		<li><a href="#" class="jp-play action"><img class="svg" src="<?php echo image_path('core', 'actions/play-big.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-pause action"><img class="svg" src="<?php echo image_path('core', 'actions/pause-big.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-previous action"><img class="svg" src="<?php echo image_path('core', 'actions/play-previous.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-next action"><img class="svg" src="<?php echo image_path('core', 'actions/play-next.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-mute action"><img class="svg" src="<?php echo image_path('core', 'actions/sound.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-unmute action"><img class="svg" src="<?php echo image_path('core', 'actions/sound-off.svg'); ?>" /></a></li>
+		<li><a href="#" class="jp-play action"><img class="svg" alt="<?php echo $l->t('Play');?>" src="<?php echo image_path('core', 'actions/play-big.svg'); ?>" /></a></li>
+		<li><a href="#" class="jp-pause action"><img class="svg" alt="<?php echo $l->t('Pause');?>" src="<?php echo image_path('core', 'actions/pause-big.svg'); ?>" /></a></li>
+		<li><a href="#" class="jp-previous action"><img class="svg" alt="<?php echo $l->t('Previous');?>" src="<?php echo image_path('core', 'actions/play-previous.svg'); ?>" /></a></li>
+		<li><a href="#" class="jp-next action"><img class="svg" alt="<?php echo $l->t('Next');?>" src="<?php echo image_path('core', 'actions/play-next.svg'); ?>" /></a></li>
+		<li><a href="#" class="jp-mute action"><img class="svg" alt="<?php echo $l->t('Mute');?>" src="<?php echo image_path('core', 'actions/sound.svg'); ?>" /></a></li>
+		<li><a href="#" class="jp-unmute action"><img class="svg" alt="<?php echo $l->t('Unmute');?>" src="<?php echo image_path('core', 'actions/sound-off.svg'); ?>" /></a></li>
 	</ul>
 	<div class="jp-progress">
 		<div class="jp-seek-bar">
@@ -26,22 +26,24 @@
 <div id="rightcontent">
 <div id="scan">
 	<p id="scancount" style="display:none"><span class="songCount">0</span> <?php echo $l->t('Songs scanned')?>
-	<input type="button" class="start" value="<?php echo $l->t('Rescan Collection')?>"></input>
-	<input type="button" class="stop" style="display:none" value="<?php echo $l->t('Pause')?>"></input></p>
+	<input type="button" class="start" value="<?php echo $l->t('Rescan Collection')?>" />
+	<input type="button" class="stop" style="display:none" value="<?php echo $l->t('Pause')?>" /></p>
 	<div id="scanprogressbar"></div>
 	
 </div>
 <table id="collection">
 	<thead>
-		<th><?php echo $l->t('Artist')?></th>
-		<th><?php echo $l->t('Album')?></th>
-		<th><?php echo $l->t('Title')?></th>
+		<tr>
+			<th><?php echo $l->t('Artist')?></th>
+			<th><?php echo $l->t('Album')?></th>
+			<th><?php echo $l->t('Title')?></th>
+		</tr>
 	</thead>
 	<tbody>
 		<tr class="template">
-			<td class="artist"><a/></td>
-			<td class="album"><a/></td>
-			<td class="title"><a/></td>
+			<td class="artist"><a></a></td>
+			<td class="album"><a></a></td>
+			<td class="title"><a></a></td>
 		</tr>
 	</tbody>
 </table>