Ticket #5459: mythweb-music-rating.patch

modules/music/mp3act_js.js.php

@@ -303 +303 @@
                       setMsgText("You must choose at least one random item");
                       return false;
                     }
-          items = items.substring(1);
+                    items = items.substring(1);
                 }
-                x_randAdd(type,num,items,randadd_cb);
+                if(data.rating.value == 'all'){
+                    x_randAdd(type,num,items,randadd_cb);
+                }
+                else{
+                    var filter = data.rating.value + ' ' + data.rating_value.value;
+                    x_randAdd(type,num,items,filter,randadd_cb);
+                }
+
                 return false;
 
             }

modules/music/mp3act_functions.php

@@ -512 +512 @@
         <option>40</option>
         <option>50</option>
         <option>100</option>
-        </select><br>
-        <strong>'.t('Random Type').'</strong><br>
+        </select><br />
+        
+        <strong>'.t('Rating').'</strong><br />
+        <select name="rating">
+        <option value="all">All</option>
+        <option value=">">></option>
+        <option value="=">=</option>
+        <option value="<"><</option>
+        </select>
+         
+        <select name="rating_value">
+        <option value="9">9</option>
+        <option value="8">8</option>
+        <option value="7">7</option>
+        <option value="6">6</option>
+        <option value="5">5</option>
+        <option value="4">4</option>
+        <option value="3">3</option>
+        <option value="2">2</option>
+        <option value="1">1</option>
+        </select><br />
+        
+        <strong>'.t('Random Type').'</strong><br />
+
         <select name="random_type" onchange="getRandItems(this.options[selectedIndex].value); return false;">
         <option value="">'.t('Choose Type').'...</option>
         <option value="artists">'.t('Artists').'</option>
@@ -1366 +1388 @@
   return $output;
 }
 
-function randAdd($type,$num=0,$items='')
+function randAdd($type,$num=0,$items='',$rating='')
 {
   $output = array(0 => 1);
   // Check to see if $items matches our REGEXP.
@@ -1390 +1412 @@
       $query .= 'WHERE album_id IN ('.$sql_items.') ';
       break;
   }
-  $query .= 'ORDER BY RAND()+0 '.
+  if($rating != '') {
+    if($type == 'all')
+      $query .= 'WHERE rating '.$rating.' ';
+    else
+      $query .= 'AND rating '.$rating.' ';
+  }
+  
+  $query .= 'GROUP BY name ORDER BY RAND()+0 '.
     'LIMIT '.mysql_real_escape_string(intval($num));
   $result = mysql_query($query);