Ticket #7: mythweb_user_jobs3.2.diff

mythweb/schedule_manually.php

@@ -60 +60 @@
             $schedule->recgroup     = $_POST['recgroup'];
             $schedule->autoexpire   = $_POST['autoexpire']   ? 1 : 0;
             $schedule->autocommflag = $_POST['autocommflag'] ? 1 : 0;
+            $schedule->autouserjob1 = $_POST['autouserjob1'] ? 1 : 0;
+            $schedule->autouserjob2 = $_POST['autouserjob2'] ? 1 : 0;
+            $schedule->autouserjob3 = $_POST['autouserjob3'] ? 1 : 0;
+            $schedule->autouserjob4 = $_POST['autouserjob4'] ? 1 : 0;
             $schedule->maxnewest    = $_POST['maxnewest']    ? 1 : 0;
             $schedule->dupin        = _or($_POST['dupin'],    15);
             $schedule->dupmethod    = _or($_POST['dupmethod'], 6);
@@ -117 +121 @@
     // auto-commercial-flag
         if (!isset($schedule->autocommflag))
             $schedule->autocommflag = get_backend_setting('AutoCommercialFlag');
+    // auto-user-jobs
+        if (!isset($schedule->autouserjob1))
+            $schedule->autouserjob1 = get_backend_setting('AutoRunUserJob1');
+        if (!isset($schedule->autouserjob2))
+            $schedule->autouserjob2 = get_backend_setting('AutoRunUserJob2');
+        if (!isset($schedule->autouserjob3))
+            $schedule->autouserjob3 = get_backend_setting('AutoRunUserJob3');
+        if (!isset($schedule->autouserjob4))
+            $schedule->autouserjob4 = get_backend_setting('AutoRunUserJob4');
     // auto-transcode
         if (!isset($schedule->autotranscode))
             $schedule->autotranscode = get_backend_setting('AutoTranscode');

mythweb/themes/Default/schedule_manually.php

@@ -155 +155 @@
                 <dd><input type="checkbox" class="radio" name="autocommflag"<?php if ($schedule->autocommflag) echo ' CHECKED' ?> value="1" /></dd>
                 <dt><? echo t('Auto-transcode') ?>:</dt>
                 <dd><input type="checkbox" class="radio" name="autotranscode"<?php if ($schedule->autotranscode) echo ' CHECKED' ?> value="1" /></dd>
+                <dt><? echo get_backend_setting('UserJobDesc1') ?>:</dt>
+                <dd><input type="checkbox" class="radio" name="autouserjob1"<?php if ($schedule->autouserjob1) echo ' CHECKED' ?> value="1" /></dd>
+                <dt><? echo get_backend_setting('UserJobDesc2') ?>:</dt>
+                <dd><input type="checkbox" class="radio" name="autouserjob2"<?php if ($schedule->autouserjob2) echo ' CHECKED' ?> value="1" /></dd>
+                <dt><? echo get_backend_setting('UserJobDesc3') ?>:</dt>
+                <dd><input type="checkbox" class="radio" name="autouserjob3"<?php if ($schedule->autouserjob3) echo ' CHECKED' ?> value="1" /></dd>
+                <dt><? echo get_backend_setting('UserJobDesc4') ?>:</dt>
+                <dd><input type="checkbox" class="radio" name="autouserjob4"<?php if ($schedule->autouserjob4) echo ' CHECKED' ?> value="1" /></dd>
                 <dt><? echo t('Auto-expire recordings') ?>:</dt>
                 <dd><input type="checkbox" class="radio" name="autoexpire"<?php if ($schedule->autoexpire) echo ' CHECKED' ?> value="1" /></dd>
                 <dt><? echo t('Record new and expire old') ?>:</dt>

mythweb/themes/Default/program_detail.php

@@ -363 +363 @@
                 <dd><input type="checkbox" class="radio" name="autocommflag"<?php if ($schedule->autocommflag) echo ' CHECKED' ?> value="1" /></dd>
                 <dt><? echo t('Auto-transcode') ?>:</dt>
                 <dd><input type="checkbox" class="radio" name="autotranscode"<?php if ($schedule->autotranscode) echo ' CHECKED' ?> value="1" /></dd>
+                <dt><? echo get_backend_setting('UserJobDesc1') ?>:</dt>
+                <dd><input type="checkbox" class="radio" name="autouserjob1"<?php if ($schedule->autouserjob1) echo ' CHECKED' ?> value="1" /></dd>
+                <dt><? echo get_backend_setting('UserJobDesc2') ?>:</dt>
+                <dd><input type="checkbox" class="radio" name="autouserjob2"<?php if ($schedule->autouserjob2) echo ' CHECKED' ?> value="1" /></dd>
+                <dt><? echo get_backend_setting('UserJobDesc3') ?>:</dt>
+                <dd><input type="checkbox" class="radio" name="autouserjob3"<?php if ($schedule->autouserjob3) echo ' CHECKED' ?> value="1" /></dd>
+                <dt><? echo get_backend_setting('UserJobDesc4') ?>:</dt>
+                <dd><input type="checkbox" class="radio" name="autouserjob4"<?php if ($schedule->autouserjob4) echo ' CHECKED' ?> value="1" /></dd>
                 <dt><? echo t('Auto-expire recordings') ?>:</dt>
                 <dd><input type="checkbox" class="radio" name="autoexpire"<?php if ($schedule->autoexpire) echo ' CHECKED' ?> value="1" /></dd>
                 <dt><? echo t('Record new and expire old') ?>:</dt>

mythweb/includes/mythbackend.php

@@ -223 +223 @@
     function generate_preview_pixmap($show) {
         $fileurl  = $show->filename;
         $pngpath  = image_cache . '/' . basename($fileurl) . '.png';
+        if (is_file($pngpath))
+                return;
         $hostname = chop(`hostname`);
         $host     = $GLOBALS['Master_Host'];
         $port     = $GLOBALS['Master_Port'];

mythweb/includes/recording_schedules.php

@@ -222 +222 @@
     // Update the type, in case it changed
         $this->type = $new_type;
     // Update the record
-        $result = mysql_query('REPLACE INTO record (recordid,type,chanid,starttime,startdate,endtime,enddate,search,title,subtitle,description,profile,recpriority,category,maxnewest,inactive,maxepisodes,autoexpire,startoffset,endoffset,recgroup,dupmethod,dupin,station,seriesid,programid,autocommflag,findday,findtime,findid,autotranscode,transcoder,tsdefault) values ('
+        $result = mysql_query('REPLACE INTO record (recordid,type,chanid,starttime,startdate,endtime,enddate,search,title,subtitle,description,profile,recpriority,category,maxnewest,inactive,maxepisodes,autoexpire,startoffset,endoffset,recgroup,dupmethod,dupin,station,seriesid,programid,autocommflag,findday,findtime,findid,autotranscode,transcoder,tsdefault,autouserjob1,autouserjob2,autouserjob3,autouserjob4) values ('
                                 .escape($this->recordid, true)             .','
                                 .escape($this->type)                       .','
                                 .escape($this->chanid)                     .','
@@ -255 +255 @@
                                 .escape($this->findid)                     .','
                                 .escape($this->autotranscode)              .','
                                 .escape($this->transcoder)                 .','
-                                .escape($this->tsdefault)                  .')')
+                                .escape($this->tsdefault)                  .','
+                                .escape($this->autouserjob1)               .','
+                                .escape($this->autouserjob2)               .','
+                                .escape($this->autouserjob3)               .','
+                                .escape($this->autouserjob4)               .')')
             or trigger_error('SQL Error: '.mysql_error(), FATAL);
     // Get the id that was returned
         $recordid = mysql_insert_id();

mythweb/program_detail.php

@@ -98 +98 @@
             $schedule->recgroup     = $_POST['recgroup'];
             $schedule->autoexpire   = $_POST['autoexpire']   ? 1 : 0;
             $schedule->autocommflag = $_POST['autocommflag'] ? 1 : 0;
+            $schedule->autouserjob1 = $_POST['autouserjob1'] ? 1 : 0;
+            $schedule->autouserjob2 = $_POST['autouserjob2'] ? 1 : 0;
+            $schedule->autouserjob3 = $_POST['autouserjob3'] ? 1 : 0;
+            $schedule->autouserjob4 = $_POST['autouserjob4'] ? 1 : 0;
             $schedule->maxnewest    = $_POST['maxnewest']    ? 1 : 0;
             $schedule->inactive     = $_POST['inactive']     ? 1 : 0;
             $schedule->dupin        = _or($_POST['dupin'],    15);
@@ -118 +122 @@
     // auto-commercial-flag
         if (!isset($schedule->autocommflag))
             $schedule->autocommflag = get_backend_setting('AutoCommercialFlag');
+    // auto-user-jobs
+        if (!isset($schedule->autouserjob1))
+            $schedule->autouserjob1 = get_backend_setting('AutoRunUserJob1');
+        if (!isset($schedule->autouserjob2))
+            $schedule->autouserjob2 = get_backend_setting('AutoRunUserJob2');
+        if (!isset($schedule->autouserjob3))
+            $schedule->autouserjob3 = get_backend_setting('AutoRunUserJob3');
+        if (!isset($schedule->autouserjob4))
+            $schedule->autouserjob4 = get_backend_setting('AutoRunUserJob4');
     // auto-transcode
         if (!isset($schedule->autotranscode))
             $schedule->autotranscode = get_backend_setting('AutoTranscode');