Fixes #6783, this adds in the ability to override canned searches via the new configuration directory, and adds in a default one for the aussies out there

git-svn-id: http://svn.mythtv.org/svn/trunk@21090 7dbf422c-18fa-0310-86e9-fd20926502f2

Author: kormoc

configuration/canned_searches.conf.php.Australia

@@ -0,0 +1,25 @@
+<?php
+/**
+ * This file is used to create canned searches for your local setup.  They are
+ * defined in this separate file so that are not overwritten when you next
+ * upgrade mythweb. Just use the php square bracket syntax to append to the
+ * Canned_Searches array.  See the examples included in this file. The
+ * canned search names (array keys) are not subject to translate as it's
+ * intented for local use and not global distribution.
+ * Remove the .default extension to activate
+ *
+ * @url         $URL: http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythplugins/mythweb/modules/tv/canned_searches.conf.php $
+ * @date        $Date: 2007-12-31 21:38:38 +0100 (Mo, 31. Dez 2007) $
+ * @version     $Revision: 15274 $
+ * @author      $Author: xris $
+ * @license     GPL
+ *
+ * @package     MythWeb
+ *
+/**/
+
+$Canned_Searches['Movies on Aussie TV (non HD)'] = '( program.category_type like "%movie%" OR program.title like "%movie%" ) AND timediff(program.endtime, program.starttime) > "01:10:00" and callsign not like "%HD%"';
+
+$Canned_Searches['Movies on Aussie TV (HD)'] = '( program.category_type like "%movie%" OR program.title like "%movie%" ) AND timediff(program.endtime, program.starttime) > "01:10:00" and callsign like "%HD%';
+
+?>

modules/tv/search.php

@@ -265,6 +265,9 @@
             $search_name = $search_name[1];
         // Load the canned searches
             require_once 'modules/tv/canned_searches.conf.php';
+        // Load the local canned searches (if it exists)
+            if (file_exists('configuration/canned_searches.conf.php'))
+                include 'configuration/canned_searches.conf.php';
         // Find the query
             if (empty($Canned_Searches[$search_name]))
                 add_warning("Unknown canned query: $search_name");

modules/tv/searches.php

@@ -15,10 +15,12 @@
 
 // Load the canned searches
     require_once 'modules/tv/canned_searches.conf.php';
+// Load the local canned searches (if it exists)
+    if (file_exists('configuration/canned_searches.conf.php'))
+        include 'configuration/canned_searches.conf.php';
 
 // Load the class for this page
     require_once tmpl_dir.'searches.php';
 
 // Exit
     exit;
-