Author: hobbes1069 Update of /cvs/free/rpms/mythweb/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14209 Modified Files: ChangeLog mythweb-0.26-fixes.patch mythweb.conf mythweb.spec Added Files: mythweb-notrans.patch Log Message: * Mon Aug 13 2013 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.26.0-5 - Update to latest fixes. - Patch for NoTrans issue with php in Fedora 19 and up. (Fixes #2856) mythweb-notrans.patch: init.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- NEW FILE mythweb-notrans.patch --- diff --git a/includes/init.php b/includes/init.php index 830223d..a0a9816 100644 --- a/includes/init.php +++ b/includes/init.php @@ -36,6 +36,9 @@ require_once 'includes/errors.php'; require_once 'includes/errordisplay.php'; +// Define some common stuff + require_once 'includes/defines.php'; + // Setup the database require_once 'includes/database.php'; @@ -45,9 +48,6 @@ // Load the session handler routines require_once 'includes/session.php'; -// Define some common stuff - require_once 'includes/defines.php'; - // Load the translation routines so the modules can translate their descriptions require_once 'includes/translate.php'; Index: ChangeLog =================================================================== RCS file: /cvs/free/rpms/mythweb/F-18/ChangeLog,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ChangeLog 24 Dec 2012 19:23:08 -0000 1.3 +++ ChangeLog 13 Aug 2013 16:13:38 -0000 1.4 @@ -1,3 +1,57 @@ +commit 8aa49039796ca347503553b048b5bd7a750df7c1 +Author: Paul Gardiner <mythtv(a)glidos.net&gt; +Date: Tue Jun 18 19:41:27 2013 -0400 + + Use Default recording rule template in MythWeb + + when creating new recording rules. This patch only uses values from the + Default recording rule template, but it's still better/more capable than + the old approach that pulled values for a few parameters from settings. + + Patch by Paul Gardiner (thanks!) with minor changes by me. + Fixes #11512. + + Signed-off-by: Michael T. Dean <mdean(a)mythtv.org&gt; + + Backporting to 0.26 since users who upgraded from previous versions of + MythTV (and, therefore, had set the no-longer-existing settings) were + relying on their effect. This provides a functional replacement that + uses the proper approach for current MythTV. + (cherry picked from commit f97529656ca2e7e4aa7806eb493873d72b2b7cef) + +commit 570f1375b0cefc5808653a57f861723dcc77db84 +Author: Michael T. Dean <mdean(a)mythtv.org&gt; +Date: Tue Jun 18 19:33:33 2013 -0400 + + Remove use of deprecated default rec rule settings + + from MythWeb. These values should all be set from the recording rule + templates. Fixes #11138. Refs #11512. + + Backporting to 0.26 since there is no way to set the values being used + by MythWeb in 0.26. + (cherry picked from commit 71ee4dd6692a6ae9d99f9626459868f9863e30dc) + +commit e39afca283ecf06c5a0493854c500eba4c3a7da0 +Author: Karl Dietz <dekarl(a)mythtv.org&gt; +Date: Sat Jun 8 13:47:53 2013 +0200 + + fix search at TheMovieDB on detail page + + Patch by OP, thank you + + Fixes #11566 + + (cherry picked from commit 373cbde7552d65b10f33f27072a82136d5f9f812) + +commit e6747e6480294b0fc067d6d72d00a71937d3f7f8 +Author: bas-t <bas-t(a)gmail.com&gt; +Date: Mon Mar 25 13:33:32 2013 -0700 + + Fixes an issue when the subtitle has a newline. + + Signed-off-by: Rob Smith <kormoc(a)mythtv.org&gt; + commit f82ca9521775edbbc53caf0f40f7bc183732dcc2 Author: Karl Dietz <dekarl(a)users.sourceforge.net&gt; Date: Fri Aug 3 23:26:30 2012 +0200 mythweb-0.26-fixes.patch: classes/Video.php | 14 ++++--- modules/stream/stream_raw.pl | 4 ++ modules/tv/classes/Schedule.php | 41 ++++++++++++++++++++ modules/tv/detail.php | 37 +----------------- modules/tv/schedules_custom.php | 39 +------------------ modules/tv/schedules_manual.php | 35 +---------------- modules/tv/tmpl/default/detail.php | 2 - modules/tv/tmpl/default/recorded.php | 2 - modules/tv/tmpl/lite/detail.php | 2 - modules/video/handler.php | 26 +++++++++---- modules/video/stream.php | 69 +++++++++++++++++++++++++++++++++++ modules/video/tmpl/default/video.php | 2 - mythweb.php | 2 - 13 files changed, 152 insertions(+), 123 deletions(-) Index: mythweb-0.26-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythweb/F-18/mythweb-0.26-fixes.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mythweb-0.26-fixes.patch 24 Dec 2012 19:23:08 -0000 1.1 +++ mythweb-0.26-fixes.patch 13 Aug 2013 16:13:38 -0000 1.2 @@ -1,10 +1,17 @@ classes/Video.php | 14 ++++---- modules/stream/stream_raw.pl | 4 +++ + modules/tv/classes/Schedule.php | 41 +++++++++++++++++++++ + modules/tv/detail.php | 37 ++----------------- + modules/tv/schedules_custom.php | 39 ++------------------ + modules/tv/schedules_manual.php | 35 ++---------------- + modules/tv/tmpl/default/detail.php | 2 +- + modules/tv/tmpl/default/recorded.php | 2 +- + modules/tv/tmpl/lite/detail.php | 2 +- modules/video/handler.php | 26 +++++++++----- modules/video/stream.php | 69 ++++++++++++++++++++++++++++++++++++ modules/video/tmpl/default/video.php | 2 +- mythweb.php | 2 +- - 6 files changed, 101 insertions(+), 16 deletions(-) + 13 files changed, 152 insertions(+), 123 deletions(-) diff --git a/classes/Video.php b/classes/Video.php index 7995aa4..5c6f7e4 100644 @@ -46,6 +53,253 @@ else { print header(), "Unknown video type requested: $basename\n"; +diff --git a/modules/tv/classes/Schedule.php b/modules/tv/classes/Schedule.php +index 3d9400f..0ad566d 100644 +--- a/modules/tv/classes/Schedule.php ++++ b/modules/tv/classes/Schedule.php +@@ -240,6 +240,47 @@ class Schedule extends MythBase { + } + + /** ++ * Alternative constructor for returning recording templates ++ **/ ++ static function recording_template($name) { ++ global $db; ++ $sched = new Schedule(NULL); ++ $data = $db->query_assoc(' ++ SELECT * ++ FROM record ++ WHERE type = ? ++ AND title = ?', ++ rectype_template, ++ $name.' (Template)' ++ ); ++ ++ $template_params = array( ++ 'recpriority', 'prefinput', 'startoffset', 'endoffset', ++ 'dupmethod', 'dupin', 'filter', 'inactive', ++ 'profile', 'recgroup', 'storagegroup', 'playgroup', 'autoexpire', ++ 'maxepisodes', 'maxnewest', ++ 'autocommflag', 'autotranscode', 'transcoder', ++ 'autouserjob1', 'autouserjob2', 'autouserjob3', 'autouserjob4', ++ 'autometadata'); ++ foreach ($template_params as $param) ++ if (isset($data[$param])) ++ $sched->$param = $data[$param]; ++ ++ return $sched; ++ } ++ ++/** ++ * Merge values from another schedule ++ **/ ++ public function merge($prog) { ++ foreach (get_object_vars($prog) as $name => $value) { ++ if ($value && !$this->$name) { ++ $this->$name = $value; ++ } ++ } ++ } ++ ++/** + * Save this schedule + /**/ + public function save($new_type) { +diff --git a/modules/tv/detail.php b/modules/tv/detail.php +index 27637c2..48bdb53 100644 +--- a/modules/tv/detail.php ++++ b/modules/tv/detail.php +@@ -269,42 +269,9 @@ + // Redirect back to the page again, but without the query string, so reloads are cleaner + redirect_browser(root_url.'tv/detail/'.$program->chanid.'/'.$program->starttime); + } +-// Load default settings for recpriority, autoexpire etc + else { +- // auto-metadata-lookup +- if (!isset($schedule->autometadata)) +- $schedule->autometadata = setting('AutoMetadataLookup'); +- // auto-commercial-flag +- if (!isset($schedule->autocommflag)) +- $schedule->autocommflag = setting('AutoCommercialFlag'); +- // auto-user-jobs +- if (!isset($schedule->autouserjob1)) +- $schedule->autouserjob1 = setting('AutoRunUserJob1'); +- if (!isset($schedule->autouserjob2)) +- $schedule->autouserjob2 = setting('AutoRunUserJob2'); +- if (!isset($schedule->autouserjob3)) +- $schedule->autouserjob3 = setting('AutoRunUserJob3'); +- if (!isset($schedule->autouserjob4)) +- $schedule->autouserjob4 = setting('AutoRunUserJob4'); +- // auto-transcode +- if (!isset($schedule->autotranscode)) +- $schedule->autotranscode = setting('AutoTranscode'); +- // transcoder +- if (!isset($schedule->transcoder)) +- $schedule->transcoder = setting('DefaultTranscoder'); +- // recpriority +- if (!isset($schedule->recpriority)) { +- $schedule->recpriority = $db->query_col('SELECT recpriority from channel where chanid=?', +- $program->chanid); +- } +- // autoexpire +- if (!isset($schedule->autoexpire)) +- $schedule->autoexpire = setting('AutoExpireDefault'); +- // start early / end late +- if (!isset($schedule->startoffset)) +- $schedule->startoffset = setting('DefaultStartOffset'); +- if (!isset($schedule->endoffset)) +- $schedule->endoffset = setting('DefaultEndOffset'); ++ // Load default values from Default recording rule template ++ $schedule->merge(Schedule::recording_template('Default')); + } + + // Load the channel +diff --git a/modules/tv/schedules_custom.php b/modules/tv/schedules_custom.php +index 623db4b..035c46b 100644 +--- a/modules/tv/schedules_custom.php ++++ b/modules/tv/schedules_custom.php +@@ -147,46 +147,11 @@ + } + } + } +-// Load default settings for recpriority, autoexpire etc ++// Set some defaults + else { + // Make sure we have a default rectype + if (!$schedule->type) + $schedule->type = rectype_always; +- // auto-metadata-lookup +- if (!isset($schedule->autometadata)) +- $schedule->autometadata = setting('AutoMetadataLookup'); +- // auto-commercial-flag +- if (!isset($schedule->autocommflag)) +- $schedule->autocommflag = setting('AutoCommercialFlag'); +- // auto-user-jobs +- if (!isset($schedule->autouserjob1)) +- $schedule->autouserjob1 = setting('AutoRunUserJob1'); +- if (!isset($schedule->autouserjob2)) +- $schedule->autouserjob2 = setting('AutoRunUserJob2'); +- if (!isset($schedule->autouserjob3)) +- $schedule->autouserjob3 = setting('AutoRunUserJob3'); +- if (!isset($schedule->autouserjob4)) +- $schedule->autouserjob4 = setting('AutoRunUserJob4'); +- // auto-transcode +- if (!isset($schedule->autotranscode)) +- $schedule->autotranscode = setting('AutoTranscode'); +- // transcoder +- if (!isset($schedule->transcoder)) +- $schedule->transcoder = setting('DefaultTranscoder'); +- // recpriority +- if (!isset($schedule->recpriority)) { +- $result = mysql_query('SELECT recpriority from channel where chanid='.escape($program->chanid)); +- list($schedule->recpriority) = mysql_fetch_row($result); +- mysql_free_result($result); +- } +- // autoexpire +- if (!isset($schedule->autoexpire)) +- $schedule->autoexpire = setting('AutoExpireDefault'); +- // start early / end late +- if (!isset($schedule->startoffset)) +- $schedule->startoffset = setting('DefaultStartOffset'); +- if (!isset($schedule->endoffset)) +- $schedule->endoffset = setting('DefaultEndOffset'); + // Get the searchtype string + switch ($schedule->search) { + case searchtype_power: $schedule->search_type = t('Power'); break; +@@ -195,6 +160,8 @@ + case searchtype_title: + default: $schedule->search_type = t('Title'); break; + } ++ // Load default values from Default recording rule template ++ $schedule->merge(Schedule::recording_template('Default')); + } + + // Create an edit-friendly title +diff --git a/modules/tv/schedules_manual.php b/modules/tv/schedules_manual.php +index 626ec39..6a2937a 100644 +--- a/modules/tv/schedules_manual.php ++++ b/modules/tv/schedules_manual.php +@@ -120,39 +120,8 @@ + // Date/time/etc + if (!$schedule->starttime) + $schedule->starttime = time(); +- // auto-metadata-lookup +- if (!isset($schedule->autometadata)) +- $schedule->autometadata = setting('AutoMetadataLookup'); +- // auto-commercial-flag +- if (!isset($schedule->autocommflag)) +- $schedule->autocommflag = setting('AutoCommercialFlag'); +- // auto-user-jobs +- if (!isset($schedule->autouserjob1)) +- $schedule->autouserjob1 = setting('AutoRunUserJob1'); +- if (!isset($schedule->autouserjob2)) +- $schedule->autouserjob2 = setting('AutoRunUserJob2'); +- if (!isset($schedule->autouserjob3)) +- $schedule->autouserjob3 = setting('AutoRunUserJob3'); +- if (!isset($schedule->autouserjob4)) +- $schedule->autouserjob4 = setting('AutoRunUserJob4'); +- // auto-transcode +- if (!isset($schedule->autotranscode)) +- $schedule->autotranscode = setting('AutoTranscode'); +- // transcoder +- if (!isset($schedule->transcoder)) +- $schedule->transcoder = setting('DefaultTranscoder'); +- // recpriority +- if (!isset($schedule->recpriority)) { +- $result = mysql_query('SELECT recpriority from channel where chanid='.escape($program->chanid)); +- list($schedule->recpriority) = mysql_fetch_row($result); +- mysql_free_result($result); +- } +- // autoexpire +- if (!isset($schedule->autoexpire)) { +- $result = mysql_query("SELECT data from settings where value='AutoExpireDefault'"); +- list($schedule->autoexpire) = mysql_fetch_row($result); +- mysql_free_result($result); +- } ++ // Load default values from Default recording rule template ++ $schedule->merge(Schedule::recording_template('Default')); + } + + // Calculate the length +diff --git a/modules/tv/tmpl/default/detail.php b/modules/tv/tmpl/default/detail.php +index cdd8093..8e9bfc5 100644 +--- a/modules/tv/tmpl/default/detail.php ++++ b/modules/tv/tmpl/default/detail.php +@@ -488,7 +488,7 @@ + <th><?php echo t('More') ?>:</th> + <td> + <?php if ($schedule->title) { ?> +- <a href="http://www.themoviedb.org/search?search=<?php echo urlencode($schedule->title) ?>"><?php echo t('Search $1', 'themoviedb') ?></a> ++ <a href="http://www.themoviedb.org/search?query=<?php echo urlencode($schedule->title) ?>"><?php echo t('Search $1', 'themoviedb') ?></a> + <a href="http://www.imdb.com/search/title?title=<?php echo urlencode($schedule->title) ?>"><?php echo t('Search $1', 'IMDB') ?></a> + <a href="http://www.thetvdb.com/?string=<?php echo urlencode($schedule->title) ?>&searchseriesid=&tab=listseries&function=Search"><?php echo t('Search $1', 'TheTVDB') ?></a> + <a href="http://www.tv.com/search.php?type=11&stype=all&qs=<... echo urlencode($schedule->title) ?>"><?php echo t('Search $1', 'TV.com') ?></a> +diff --git a/modules/tv/tmpl/default/recorded.php b/modules/tv/tmpl/default/recorded.php +index 203d4da..d1febd9 100644 +--- a/modules/tv/tmpl/default/recorded.php ++++ b/modules/tv/tmpl/default/recorded.php +@@ -297,7 +297,7 @@ EOM; + ?> + file = new Object(); + file.title = '<?php echo addslashes($show->title) ?>'; +- file.subtitle = '<?php echo addslashes($show->subtitle) ?>'; ++ file.subtitle = '<?php echo str_replace("\n", '', nl2br(addslashes($show->subtitle))) ?>'; + file.chanid = '<?php echo addslashes($show->chanid) ?>'; + file.starttime = '<?php echo addslashes($show->recstartts) ?>'; + file.recgroup = '<?php echo addslashes(str_replace('%2F', '/', rawurlencode($show->recgroup))) ?>'; +diff --git a/modules/tv/tmpl/lite/detail.php b/modules/tv/tmpl/lite/detail.php +index dc124e4..2eba29d 100644 +--- a/modules/tv/tmpl/lite/detail.php ++++ b/modules/tv/tmpl/lite/detail.php +@@ -65,7 +65,7 @@ + </div> + <div id="external_searches"> + (<?php echo t('Search') ?>: &nbsp; +- <a href="http://www.themoviedb.org/search?search=<?php echo urlencode($schedule->title) ?>"><?php echo t('themoviedb') ?></a> ++ <a href="http://www.themoviedb.org/search?query=<?php echo urlencode($schedule->title) ?>"><?php echo t('themoviedb') ?></a> + &nbsp;-&nbsp; + <a href="http://www.imdb.com/search/title?title=<?php echo urlencode($schedule->title) ?>"><?php echo t('IMDB') ?></a> + &nbsp;-&nbsp; diff --git a/modules/video/handler.php b/modules/video/handler.php index fd769ce..721f186 100644 --- a/modules/video/handler.php Index: mythweb.conf =================================================================== RCS file: /cvs/free/rpms/mythweb/F-18/mythweb.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mythweb.conf 11 Jan 2013 18:22:43 -0000 1.2 +++ mythweb.conf 13 Aug 2013 16:13:38 -0000 1.3 @@ -95,12 +95,12 @@ # doesn't support php_value, or things like memory_limit aren't working # as expected, then use these settings as examples for your own php.ini # files. - php_value safe_mode 0 +# php_value safe_mode 0 php_value memory_limit 32M - php_value register_globals 0 - php_value magic_quotes_gpc 0 +# php_value register_globals 0 +# php_value magic_quotes_gpc 0 php_value file_uploads 0 php_value allow_url_fopen On Index: mythweb.spec =================================================================== RCS file: /cvs/free/rpms/mythweb/F-18/mythweb.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mythweb.spec 11 Jan 2013 18:22:43 -0000 1.6 +++ mythweb.spec 13 Aug 2013 16:13:38 -0000 1.7 @@ -2,6 +2,7 @@ # git hash for archive %global githash1 g4dcd253 %global githash2 4e9fd7a +%global gitrev v0.26.0-220-g92dbb43 Name: mythweb Summary: The web interface to MythTV @@ -9,7 +10,7 @@ Group: Applications/Multimedia Version: 0.26.0 -Release: 3%{?dist} +Release: 5%{?dist} License: GPLv2 and LGPLv2 and MIT @@ -18,11 +19,10 @@ Source1: mythweb.conf Source2: ChangeLog -Patch0: mythweb-0.26-fixes.patch - # Patch generated from mythweb fixes branch. From mythweb git directory: # git diff -p --stat %{version} > mythweb-fixes.patch -#Patch0: mythweb-fixes.patch +Patch0: mythweb-0.26-fixes.patch +Patch1: mythweb-notrans.patch # The following are required only in mythweb is running on the same computer # as the backend. They will be pulled in by the mythtv meta package anyway. @@ -46,6 +46,7 @@ %prep %setup -q -n MythTV-mythweb-%{githash2} %patch0 -p1 +%patch1 -p1 # Fix directory permissions #find ./ -type d -exec chmod 0755 {} \; @@ -79,6 +80,10 @@ %changelog +* Mon Aug 13 2013 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.26.0-5 +- Update to latest fixes. +- Patch for NoTrans issue with php in Fedora 19 and up. (Fixes #2856) + * Fri Jan 11 2013 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.26.0-3 - Update mythweb config to work with apache 2.4.