From ba0ea210744479e7cbf092fe0115c4d27fff1c48 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Thu, 26 Jul 2012 08:04:12 +0200
Subject: [tx-robot] updated from transifex

---
 apps/media/l10n/vi.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 apps/media/l10n/vi.php

(limited to 'apps/media')

diff --git a/apps/media/l10n/vi.php b/apps/media/l10n/vi.php
new file mode 100644
index 00000000000..01942ba173f
--- /dev/null
+++ b/apps/media/l10n/vi.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Âm nhạc",
+"Add album to playlist" => "Thêm album vào playlist",
+"Play" => "Play",
+"Pause" => "Tạm dừng",
+"Previous" => "Trang trước",
+"Next" => "Tiếp theo",
+"Mute" => "Tắt",
+"Unmute" => "Bật",
+"Rescan Collection" => "Quét lại bộ sưu tập",
+"Artist" => "Nghệ sỹ",
+"Album" => "Album",
+"Title" => "Tiêu đề"
+);
-- 
cgit v1.2.3


From 6a4c46e2c29eac2c6c0344c46ab18375608b5c5f Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 27 Jul 2012 18:05:18 -0400
Subject: Set the user id when authenticating user for Ampache, fixes bug
 oc-219

---
 apps/media/lib_ampache.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'apps/media')

diff --git a/apps/media/lib_ampache.php b/apps/media/lib_ampache.php
index d5a093338cc..a041e9a884c 100644
--- a/apps/media/lib_ampache.php
+++ b/apps/media/lib_ampache.php
@@ -71,6 +71,7 @@ class OC_MEDIA_AMPACHE{
 				$pass=$users[0]['user_password_sha256'];
 				$key=hash('sha256',$time.$pass);
 				if($key==$auth){
+					
 					$token=hash('sha256','oc_media_'.$key);
 					OC_MEDIA_COLLECTION::$uid=$users[0]['user_id'];
 					$date=date('c');//todo proper update/add/clean dates
@@ -150,6 +151,7 @@ class OC_MEDIA_AMPACHE{
 		$users=$query->execute(array($auth))->fetchAll();
 		if(count($users)>0){
 			OC_MEDIA_COLLECTION::$uid=$users[0]['user_id'];
+			OC_User::setUserId($users[0]['user_id']);
 			return $users[0]['user_id'];
 		}else{
 			return false;
-- 
cgit v1.2.3


From dd4765ad1654f1fb52585a093ab3438b0810c88b Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 27 Jul 2012 18:10:40 -0400
Subject: Set filter to empty if not set by Ampache client

---
 apps/media/lib_ampache.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'apps/media')

diff --git a/apps/media/lib_ampache.php b/apps/media/lib_ampache.php
index a041e9a884c..4951399fa18 100644
--- a/apps/media/lib_ampache.php
+++ b/apps/media/lib_ampache.php
@@ -71,7 +71,6 @@ class OC_MEDIA_AMPACHE{
 				$pass=$users[0]['user_password_sha256'];
 				$key=hash('sha256',$time.$pass);
 				if($key==$auth){
-					
 					$token=hash('sha256','oc_media_'.$key);
 					OC_MEDIA_COLLECTION::$uid=$users[0]['user_id'];
 					$date=date('c');//todo proper update/add/clean dates
@@ -273,7 +272,7 @@ class OC_MEDIA_AMPACHE{
 </root>");
 			return;
 		}
-		$filter=$params['filter'];
+		$filter = isset($params['filter']) ? $params['filter'] : '';
 		$albums=OC_MEDIA_COLLECTION::getAlbums($filter);
 		$artist=OC_MEDIA_COLLECTION::getArtistName($filter);
 		echo('<?xml version="1.0" encoding="UTF-8"?>');
@@ -402,7 +401,7 @@ class OC_MEDIA_AMPACHE{
 </root>");
 			return;
 		}
-		$filter=$params['filter'];
+		$filter = isset($params['filter']) ? $params['filter'] : '';
 		$artists=OC_MEDIA_COLLECTION::getArtists($filter);
 		$albums=OC_MEDIA_COLLECTION::getAlbums(0,$filter);
 		$songs=OC_MEDIA_COLLECTION::getSongs(0,0,$filter);
-- 
cgit v1.2.3