Ticket #622: mythweb_deletion.diff

themes/Default/recorded_programs.php

@@ -47 +47 @@
     foreach ($All_Shows as $show) {
 ?>
     file = new Object();
+    file.chanid   = '<?php echo addslashes($show->chanid) ?>';
+    file.starttime = '<?php echo addslashes($show->starttime) ?>';
     file.title    = '<?php echo addslashes($show->title) ?>';
     file.subtitle = '<?php echo addslashes($show->subtitle) ?>';
     file.group    = '<?php echo addslashes(urlencode($show->group)) ?>';
@@ -64 +66 @@
         if (confirm("<?php echo t('Are you sure you want to delete the following show?') ?>\n\n     "+file.title+": "+file.subtitle)) {
         // Do the actual deletion
             if (programs_shown == 1)
-                location.href = 'recorded_programs.php?delete=yes&file='+file.filename;
+                location.href = 'recorded_programs.php?delete=yes&chanid='+file.chanid+'&starttime='+file.starttime;
             else
-                submit_url('recorded_programs.php?ajax&delete=yes&file='+file.filename, http_success, http_failure, id, file);
+                submit_url('recorded_programs.php?ajax&delete=yes&chanid='+file.chanid+'&starttime='+file.starttime, http_success, http_failure, id, file);
         // Debug statements - uncomment to verify that the right file is being deleted
             //alert('row number ' + id + ' belonged to section ' + section + ' which now has ' + rowcount[section] + ' elements');
             //alert('just deleted an episode of "' + title + '" which now has ' + episode_count + ' episodes left');
@@ -279 +281 @@
 <?php   } else { ?>
     <td width="5%" rowspan="<?php echo $_SESSION['recorded_descunder'] ? 2 : 1 ?>" class="command command_border_l command_border_t command_border_b command_border_r" align="center">
         <a id="delete_<?php echo $row ?>"
-            href="recorded_programs.php?delete=yes&file=<?php echo urlencode($show->filename) ?>"
+            href="recorded_programs.php?delete=yes&chanid=<?php echo urlencode($show->chanid) ?>&starttime=<?php echo urlencode($show->starttime) ?>"
             js_href="javascript:confirm_delete(<?php echo $row ?>, false)";
             title="<?php echo htmlentities(t('Delete $1', preg_replace('/: $/', '', $show->title.': '.$show->subtitle))) ?>"
             ><?php echo t('Delete') ?></a>
@@ -304 +306 @@
         </td>
     <td width="5%" class="command command_border_l command_border_t command_border_b command_border_r" align="center">
         <a id="delete_rerecord_<?php echo $row ?>"
-            href="recorded_programs.php?delete=yes&file=<?php echo urlencode($show->filename) ?>&forget_old"
+            href="recorded_programs.php?delete=yes&chanid=<?php echo urlencode($show->chanid) ?>&starttime=<?php echo urlencode($show->starttime) ?>&forget_old"
             js_href="javascript:confirm_delete(<?php echo $row ?>, true)";
             title="<?php echo htmlentities(t('Delete and rerecord $1', preg_replace('/: $/', '', $show->title.': '.$show->subtitle))) ?>"
             ><?php echo t('Delete + Rerecord') ?></a></td>

recorded_programs.php

@@ -21 +21 @@
 // Delete a program?
     isset($_GET['forget_old']) or $_GET['forget_old'] = $_POST['forget_old'];
     isset($_GET['delete'])     or $_GET['delete']     = $_POST['delete'];
-    isset($_GET['file'])       or $_GET['file']       = $_POST['file'];
-    if ($_GET['delete'] && preg_match('/\\d+_\\d+/', $_GET['file'])) {
+    isset($_GET['chanid'])     or $_GET['chanid']     = $_POST['chanid'];
+    isset($_GET['starttime'])  or $_GET['starttime']  = $_POST['starttime'];
+    if ($_GET['delete']) {
     // Keep a previous-row counter to return to after deleting
         $prev_row = -2;
     // We need to scan through the available recordings to get at the additional information required by the DELETE_RECORDING query
@@ -31 +32 @@
             if (($_SESSION['recorded_title'] == $row[0]) || ($_SESSION['recorded_title'] == ''))
                 $prev_row++;
         // This row isn't the one we're looking for
-            if ($row[8] != $_GET['file'])
+            if (($row[4] != $_GET['chanid']) or ($row[11] != $_GET['starttime']))
                 continue;
         // Forget all knowledge of old recordings
             if (isset($_GET['forget_old'])) {
-                preg_match('/\/(\d+)_(\d+)_\d+\.nuv$/', $_GET['file'], $matches);
+                // What does this following line do? Commented it out as it wouldn't work anyway (matches nuv files only)
+                // preg_match('/\/(\d+)_(\d+)_\d+\.nuv$/', $_GET['file'], $matches);
                 $show = new Program($row);
                 $show->rec_forget_old();
             }