fixed some issues with refresh on the localplay page and hopefully improved the french translation a little more

7 files changed, 24 insertions, 22 deletions

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 380623e7..68c6289e 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,7 @@
 
 --------------------------------------------------------------------------
   v.3.3.3 
+	- Fixed some refresh issues on the localplay page
 	- Fixed a redirect to a blank page if you hit play selected when
 		nothing was selected (Thx Chenb)
 	- Added detection of old config files, message displayed to admins
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 54a94a71..c0b1bd09 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.mo
+++ b/locale/fr_FR/LC_MESSAGES/messages.mo
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 360de5fd..bd70888d 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -773,9 +773,8 @@ msgid "No Disabled songs found"
 msgstr "Voir les morceaux désactivés"
 
 #: ../../admin/catalog.php:249
-#, fuzzy
 msgid "Delete Catalog"
-msgstr "Mise á jour des catalogues"
+msgstr "Supprimer le catalogue"
 
 #: ../../admin/catalog.php:249
 msgid "Do you really want to delete this catalog?"
@@ -786,9 +785,8 @@ msgid "Album Art Search Finished"
 msgstr "Recherche de jaquettes d'albums terminée"
 
 #: ../../admin/flag.php:97
-#, fuzzy
 msgid "Song Updated"
-msgstr "Score mis á jour"
+msgstr "Morceaux mis á jour"
 
 #: ../../admin/flag.php:97
 #, fuzzy
@@ -802,14 +800,12 @@ msgid "Album Updated"
 msgstr "l'Album mis á jour"
 
 #: ../../admin/flag.php:181
-#, fuzzy
 msgid "Artist Updated"
-msgstr "Liste de lecture mise á jour"
+msgstr "Artist mise á jour"
 
 #: ../../admin/flag.php:246
-#, fuzzy
 msgid "Songs Updated"
-msgstr "Score mis á jour"
+msgstr "Morceaux mis á jour"
 
 #: ../../admin/flag.php:254
 msgid "Flag Removed"
@@ -968,14 +964,12 @@ msgid "Are you sure you want to remove this module?"
 msgstr "Voulez-vous vraiment supprimer cette mode ?"
 
 #: ../../admin/modules.php:56
-#, fuzzy
 msgid "Module Deactivated"
-msgstr "Utilisateur activé"
+msgstr "Mode activé"
 
 #: ../../admin/modules.php:72
-#, fuzzy
 msgid "Plugin Activated"
-msgstr "Utilisateur activé"
+msgstr "Plugin activé"
 
 #: ../../admin/modules.php:79
 msgid "Are you sure you want to remove this plugin?"
@@ -1687,7 +1681,6 @@ msgstr "Morceaux marquées"
 
 #: ../../templates/show_mail_users.inc.php:77
 #: ../../templates/show_admin_info.inc.php:36
-#, fuzzy
 msgid "Disabled Songs"
 msgstr "Voir les morceaux désactivés"
 
@@ -1728,7 +1721,6 @@ msgid "out of"
 msgstr "hors de"
 
 #: ../../templates/show_tv_adminctl.inc.php:22
-#, fuzzy
 msgid "Admin Controls"
 msgstr "Sections administrateur"
 
@@ -1740,7 +1732,7 @@ msgstr "liste de lecture accueil"
 #: ../../templates/show_tv_adminctl.inc.php:36
 #: ../../templates/show_localplay.inc.php:32
 msgid "Clear Playlist"
-msgstr "créée liste de lecture"
+msgstr "Effacer liste de lecture"
 
 #: ../../templates/show_confirmation.inc.php:26
 msgid "Continue"
@@ -1759,9 +1751,8 @@ msgid "Select"
 msgstr "Selectionner"
 
 #: ../../templates/show_flagged.inc.php:28
-#, fuzzy
 msgid "Object"
-msgstr "Sujet"
+msgstr "Objet"
 
 #: ../../templates/show_flagged.inc.php:29
 #: ../../templates/show_preference_admin.inc.php:38
@@ -2233,7 +2224,7 @@ msgstr "Mode debogage d'Ampache"
 
 #: ../../tv.php:62
 msgid "Playlist Cleared"
-msgstr "Liste de lecture créée"
+msgstr "Liste de lecture effacée"
 
 #: ../../artists.php:91 ../../albums.php:191
 msgid "Starting Update from Tags"
diff --git a/server/ajax.server.php b/server/ajax.server.php
index 3e913bea..534405ce 100644
--- a/server/ajax.server.php
+++ b/server/ajax.server.php
@@ -47,6 +47,8 @@ switch ($action) {
 		$localplay->connect();
 		$function 	= scrub_in($_GET['cmd']);
 		$value		= scrub_in($_GET['value']);
+		$return		= scrub_in($_GET['return']);
+		$localplay->$function($value); 
 		/* Return information based on function */
 		switch($function) { 
 			case 'skip':
@@ -60,11 +62,18 @@ switch ($action) {
 				$status = $localplay->status();
 				$results['lp_volume']	= $status['volume'];
 			break;
+			case 'next':
+			case 'stop':
+			case 'prev':
+			case 'pause':
+			case 'play':
+				if ($return) { 
+					$results['lp_playing'] = $localplay->get_user_playing(); 
+				} 	
 			default:
 				$results['3514'] = '0x1';	
 			break;
 		} // end switch on cmd
-		$localplay->$function($value); 
 		$xml_doc = xml_from_array($results);
 		echo $xml_doc;
 	break;
diff --git a/templates/show_localplay.inc.php b/templates/show_localplay.inc.php
index 206389d2..2cac12bd 100644
--- a/templates/show_localplay.inc.php
+++ b/templates/show_localplay.inc.php
@@ -29,9 +29,10 @@ $localplay = init_localplay();
 	<td valign="top">
 		<strong><?php echo _('Actions'); ?>:</strong><br />
 		<?php if ($localplay->has_function('delete_all')) { ?>
-			&nbsp;&nbsp;&nbsp;<a href="<?php echo $web_path; ?>/localplay.php?action=delete_all"><?php echo _('Clear Playlist'); ?></a>
+			<div class="text-action"><a href="<?php echo $web_path; ?>/localplay.php?action=delete_all"><?php echo _('Clear Playlist'); ?></a></div>
 		<?php } ?>
 	</td><td>
+		<?php $add_info = "&amp;return=1"; ?>
 		<?php require_once(conf('prefix') . '/templates/show_localplay_status.inc.php'); ?>
 	</td>
 </tr>
diff --git a/templates/show_localplay_control.inc.php b/templates/show_localplay_control.inc.php
index e3384431..8d5f7fec 100644
--- a/templates/show_localplay_control.inc.php
+++ b/templates/show_localplay_control.inc.php
@@ -23,7 +23,7 @@
 $web_path = conf('web_path'); 
 $localplay = init_localplay();
 
-$required_info 	= conf('ajax_info');
+$required_info 	= conf('ajax_info') . $add_info;
 $ajax_url	= conf('ajax_url');
 
 /* If we actually got something back */
diff --git a/templates/show_localplay_status.inc.php b/templates/show_localplay_status.inc.php
index c92d97dd..7073db82 100644
--- a/templates/show_localplay_status.inc.php
+++ b/templates/show_localplay_status.inc.php
@@ -23,7 +23,7 @@
 $web_path = conf('web_path'); 
 $localplay = init_localplay();
 
-$required_info 	= "&amp;user_id=" . $GLOBALS['user']->id . "&amp;sessid=" . session_id(); 
+$required_info 	= "&amp;user_id=" . $GLOBALS['user']->id . "&amp;sessid=" . session_id();
 $ajax_url	= $web_path . '/server/ajax.server.php';
 $status		= $localplay->status();