Merge branch 'manager'

vikman90 · Sep 16, 2015 · 982434e · 982434e
2 parents 21b9910 + 0ffcf5f
commit 982434e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 1 deletion.
diff --git a/manager/control.php b/manager/control.php
@@ -158,6 +158,9 @@ function new_playlist() {
     if (!isset($_POST['name']))
         html_error('args');
 
+    if (strlen($_POST['name']) == 0)
+        html_error('name_blank');
+
     $id = db_insert_playlist($_POST['name']);
     html_redirect("playlist.php?idplaylist=$id");
 }
@@ -168,6 +171,9 @@ function rename_playlist() {
     if (!(isset($_POST['name']) and isset($_POST['idplaylist'])))
         html_error('args');
 
+    if (strlen($_POST['name']) == 0)
+        html_error('name_blank');
+
     if (!db_get_playlist($_POST['idplaylist']))
         html_error('args');
 
@@ -233,6 +239,9 @@ function rename_score() {
     if (!(isset($_POST['name']) and isset($_POST['idscore'])))
         html_error('args');
 
+    if (strlen($_POST['name']) == 0)
+        html_error('name_blank');
+
     if (!db_get_score($_POST['idscore']))
         html_error('args');
 

diff --git a/manager/playlist.php b/manager/playlist.php
@@ -20,7 +20,7 @@
     $playlist = db_get_playlist($_GET['idplaylist']);
 
 if ($playlist === null)
-    html_error('args');
+    html_error('list_not_found');
 
 set_page("playlist.php?idplaylist={$_GET['idplaylist']}");
 

diff --git a/manager/translations/english.xml b/manager/translations/english.xml
@@ -57,4 +57,7 @@
     <string name="engineer">Engineering Mode</string>
     <string name="wait">Please wait</string>
     <string name="uploading">Uploading files...</string>
+    <string name="error_list_not_found">Playlist not found.</string>
+    <string name="error_score_not_found">Score not found.</string>
+    <string name="error_name_blank">Name field empty.</string>
 </translation>
diff --git a/manager/translations/italian.xml b/manager/translations/italian.xml
@@ -57,4 +57,7 @@
     <string name="engineer">Modo Ingegneria</string>
     <string name="wait">Attendere prego</string>
     <string name="uploading">Caricamento dei file...</string>
+    <string name="error_list_not_found">Playlist non trovato.</string>
+    <string name="error_score_not_found">Brano non trovato.</string>
+    <string name="error_name_blank">Nome vuoto.</string>
 </translation>
diff --git a/manager/translations/spanish.xml b/manager/translations/spanish.xml
@@ -57,4 +57,7 @@
     <string name="engineer">Modo Ingeniería</string>
     <string name="wait">Espere</string>
     <string name="uploading">Subiendo archivos...</string>
+    <string name="error_list_not_found">Lista de reproducción no encontrada.</string>
+    <string name="error_score_not_found">Pieza no encontrada.</string>
+    <string name="error_name_blank">No se ha especificado el nombre.</string>
 </translation>