Changeset 1714

Timestamp:

08/30/08 13:09:10 (3 months ago)

Author:

vollmerk

Message:

sync to trunk

Location:

trunk

Files:

• docs/CHANGELOG (modified) (1 diff)
• play/index.php (modified) (3 diffs)
• server/ajax.server.php (modified) (2 diffs)
• templates/rightbar.inc.php (modified) (1 diff)

trunk/docs/CHANGELOG

@@ -5 +5 @@
 --------------------------------------------------------------------------
   v.3.5-Alpha1
+        - Fixed Dynamic Random/Related URLs with players that always send
+                a byte offset (MPD)
+        - Added Checkbox to use existing Database
         - Updated language code and Fixed catalan language code
         - Added Emulate gettext() from upgradephp-15

trunk/play/index.php

@@ -138 +138 @@
  */
 if ($random) { 
-        if (!isset($start)) { 
+        if ($start < 1) { 
                 $song_id = Random::get_single_song($_REQUEST['type']); 
                 // Save this one incase we do a seek
@@ -159 +159 @@
 }
 
-/* If we don't have a file, or the file is not readable */
-if (!$song->file OR ( !is_readable($song->file) AND $catalog->catalog_type != 'remote' ) ) { 
-
-        // We need to make sure this isn't democratic play, if it is then remove the song
-        // from the vote list
-        if (is_object($tmp_playlist)) { 
-                $tmp_playlist->delete_track($song_id); 
-        }
-
-        debug_event('file_not_found',"Error song $song->file ($song->title) does not have a valid filename specified",'2');
-        echo "Error: Invalid Song Specified, file not found or file unreadable"; 
-        exit; 
-}
+
 
         
@@ -212 +200 @@
         exit;
 } // end if remote catalog
+
+/* If we don't have a file, or the file is not readable */
+if (!$song->file OR !is_readable($song->file)) { 
+
+        // We need to make sure this isn't democratic play, if it is then remove the song
+        // from the vote list
+        if (is_object($tmp_playlist)) { 
+                $tmp_playlist->delete_track($song_id); 
+        }
+
+        debug_event('file_not_found',"Error song $song->file ($song->title) does not have a valid filename specified",'2');
+        echo "Error: Invalid Song Specified, file not found or file unreadable"; 
+        exit; 
+}
 
 // make fread binary safe

trunk/server/ajax.server.php

@@ -234 +234 @@
                         case 'album': 
                         case 'artist': 
-                        case 'genre': 
+                        case 'tag': 
                                 $object = new $_REQUEST['type']($_REQUEST['id']); 
                                 $songs = $object->get_songs(); 
@@ -250 +250 @@
                         case 'album_random': 
                         case 'artist_random': 
-                        case 'genre_random':
+                        case 'tag_random':
                                 $data = explode('_',$_REQUEST['type']); 
                                 $type = $data['0'];

trunk/templates/rightbar.inc.php

@@ -66 +66 @@
            </li>
            <li>
-            <?php echo Ajax::text('?action=basket&type=dynamic&random_type=genre',_('Related Genre'),'rb_add_related_genre'); ?>
+            <?php echo Ajax::text('?action=basket&type=dynamic&random_type=tag',_('Related Tag'),'rb_add_related_tag'); ?>
            </li>
           </ul>