Ticket #208: category.patch

themes/Default/video.php

@@ -40 +40 @@
     if( $Filter_Category == -1)
         echo "selected";
     echo ">All</option>\n";
-    for($i=0;$i<=$Total_Categories;$i++) {
-        echo "<option value=$i ";
-        if( $i == $Filter_Category )
-            echo "selected";
-        echo ">"; 
-        echo "$Category_String[$i]</option>\n";
+    $i=0;      // Represents the category's intid
+    $count=0;  // Number of categories printed so far
+    while ($count <= $Total_Categories) {
+        // Check if a category exists with this intid.
+        if (isset($Category_String[$i]))  {
+          echo "<option value=$i ";
+          if ($i == $Filter_Category)
+              echo "selected";
+          echo ">";
+          echo "$Category_String[$i]</option>\n";
+          $count++;
+        }
+        $i++;
     }
 ?>
     </select>
@@ -116 +123 @@
        
         echo 'MythVideo:';
         echo "&nbsp; &nbsp;";
-        echo "<a href=\"video.php?reverse=$new_reverse";
+        echo "<a href=\"?reverse=$new_reverse";
         if($new_sortby)
             echo "&sortby=$new_sortby";
         if($new_cat)
@@ -124 +131 @@
         echo "\">";
         echo t('Reverse Order');
         echo "</a>";
+        echo "&nbsp; | &nbsp;";
+        echo "<a href=\"video.php\">Videos</a>";
+        echo "&nbsp; | &nbsp;";
+        echo "<a href=\"video_category.php\">Categories</a>";
     }
 }
 

includes/sorting.php

@@ -185 +185 @@
         return ($a->transcoder > $b->transcoder) ? 1 : -1;
     }
 
+    function by_intid(&$a, &$b) {
+        if ($a->intid == $b->profile) return 0;
+        return ($a->intid > $b->intid) ? 1 : -1;
+    }
 ?>

video_edit.php

@@ -96 +96 @@
        $result = mysql_query('SELECT * FROM videocategory')
             or trigger_error('SQL Error: '.mysql_error(), FATAL);
            while( $cat_data = mysql_fetch_assoc($result) )  {
-           $num_cat++;
+           $num_cat = $cat_data["intid"];
            $cat_str = $cat_data["category"]; ?>
        <option <?if ($category == $num_cat) print "selected"; ?> value="<?print $num_cat; ?>"><?print $cat_str; ?></option>
        <?}