Index: mythweb/schedule_manually.php
===================================================================
--- mythweb/schedule_manually.php (revision 7004)
+++ mythweb/schedule_manually.php (working copy)
@@ -60,6 +60,10 @@
$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,6 +121,15 @@
// 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');
Index: mythweb/themes/Default/schedule_manually.php
===================================================================
--- mythweb/themes/Default/schedule_manually.php (revision 7004)
+++ mythweb/themes/Default/schedule_manually.php (working copy)
@@ -155,6 +155,14 @@
autocommflag) echo ' CHECKED' ?> value="1" />
echo t('Auto-transcode') ?>:
autotranscode) echo ' CHECKED' ?> value="1" />
+ echo get_backend_setting('UserJobDesc1') ?>:
+ autouserjob1) echo ' CHECKED' ?> value="1" />
+ echo get_backend_setting('UserJobDesc2') ?>:
+ autouserjob2) echo ' CHECKED' ?> value="1" />
+ echo get_backend_setting('UserJobDesc3') ?>:
+ autouserjob3) echo ' CHECKED' ?> value="1" />
+ echo get_backend_setting('UserJobDesc4') ?>:
+ autouserjob4) echo ' CHECKED' ?> value="1" />
echo t('Auto-expire recordings') ?>:
autoexpire) echo ' CHECKED' ?> value="1" />
echo t('Record new and expire old') ?>:
Index: mythweb/themes/Default/program_detail.php
===================================================================
--- mythweb/themes/Default/program_detail.php (revision 7004)
+++ mythweb/themes/Default/program_detail.php (working copy)
@@ -363,6 +363,14 @@
autocommflag) echo ' CHECKED' ?> value="1" />
echo t('Auto-transcode') ?>:
autotranscode) echo ' CHECKED' ?> value="1" />
+ echo get_backend_setting('UserJobDesc1') ?>:
+ autouserjob1) echo ' CHECKED' ?> value="1" />
+ echo get_backend_setting('UserJobDesc2') ?>:
+ autouserjob2) echo ' CHECKED' ?> value="1" />
+ echo get_backend_setting('UserJobDesc3') ?>:
+ autouserjob3) echo ' CHECKED' ?> value="1" />
+ echo get_backend_setting('UserJobDesc4') ?>:
+ autouserjob4) echo ' CHECKED' ?> value="1" />
echo t('Auto-expire recordings') ?>:
autoexpire) echo ' CHECKED' ?> value="1" />
echo t('Record new and expire old') ?>:
Index: mythweb/includes/mythbackend.php
===================================================================
--- mythweb/includes/mythbackend.php (revision 7004)
+++ mythweb/includes/mythbackend.php (working copy)
@@ -223,6 +223,8 @@
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'];
Index: mythweb/includes/recording_schedules.php
===================================================================
--- mythweb/includes/recording_schedules.php (revision 7004)
+++ mythweb/includes/recording_schedules.php (working copy)
@@ -222,7 +222,7 @@
// 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,7 +255,11 @@
.escape($this->findid) .','
.escape($this->autotranscode) .','
.escape($this->transcoder) .','
- .escape($this->tsdefault) .')')
+ .escape($this->tsdefault) .','
+ .escape($this->autouser1) .','
+ .escape($this->autouser2) .','
+ .escape($this->autouser3) .','
+ .escape($this->autouser4) .')')
or trigger_error('SQL Error: '.mysql_error(), FATAL);
// Get the id that was returned
$recordid = mysql_insert_id();
Index: mythweb/program_detail.php
===================================================================
--- mythweb/program_detail.php (revision 7004)
+++ mythweb/program_detail.php (working copy)
@@ -98,6 +98,10 @@
$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,6 +122,15 @@
// 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');