SOURCES: mythweb-config.patch (NEW) - mythweb config is in /etc

[glen]

Author: glen                         Date: Tue Oct 25 21:22:13 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- mythweb config is in /etc

---- Files affected:
SOURCES:
   mythweb-config.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/mythweb-config.patch
diff -u /dev/null SOURCES/mythweb-config.patch:1.1
--- /dev/null	Tue Oct 25 23:22:13 2005
+++ SOURCES/mythweb-config.patch	Tue Oct 25 23:22:08 2005
@@ -0,0 +1,76 @@
+diff -ur ./mythweb/canned_searches.php /tmp/mythweb/canned_searches.php
+--- ./mythweb/canned_searches.php	2005-03-01 09:10:23.000000000 +0200
++++ /tmp/mythweb/canned_searches.php	2005-10-26 00:17:02.000000000 +0300
+@@ -13,7 +13,7 @@
+     require_once "includes/init.php";
+ 
+ // Load the canned searches
+-    require_once "config/canned_searches.php";
++    require_once "/etc/mythweb/canned_searches.php";
+ 
+ // Load the class for this page
+     require_once theme_dir.'canned_searches.php';
+diff -ur ./mythweb/includes/init.php /tmp/mythweb/includes/init.php
+--- ./mythweb/includes/init.php	2005-02-28 00:52:48.000000000 +0200
++++ /tmp/mythweb/includes/init.php	2005-10-26 00:11:25.000000000 +0300
+@@ -14,7 +14,7 @@
+     require_once 'includes/errordisplay.php';
+ 
+ // Load the user-defined configuration settings
+-    require_once 'config/conf.php';
++    require_once '/etc/mythweb/conf.php';
+ 
+ // Clean up some variables
+     if (!ereg('/$', $_SERVER['DOCUMENT_ROOT']))
+@@ -127,15 +127,15 @@
+     define('theme_dir', 'themes/'.Theme.'/');
+ 
+ // Load the theme config
+-    require_once 'config/theme_'.Theme.'.php';
++    require_once '/etc/mythweb/theme_'.Theme.'.php';
+ 
+ // Load the overall page theme class
+     require_once theme_dir."theme.php";
+ 
+ // Make sure the image cache path exists
+     $path = '';
+-    foreach (split('/+', image_cache) as $dir) {
+-        $path .= $path ? '/' . $dir : $dir;
++    foreach (split("/+", image_cache) as $dir) {
++        $path .= $path ? ('/' . $dir) : ($dir ? $dir : "/$dir");
+         if(!is_dir($path) && !mkdir($path, 0755))
+             trigger_error('Error creating path for '.$path.': Please check permissions.', FATAL);
+     }
+diff -ur ./mythweb/search.php /tmp/mythweb/search.php
+--- ./mythweb/search.php	2005-03-01 09:10:23.000000000 +0200
++++ /tmp/mythweb/search.php	2005-10-26 00:17:12.000000000 +0300
+@@ -64,7 +64,7 @@
+     if (preg_match('/^\s*canned:\s*(.+)\s*$/', $_SESSION['search']['searchstr'], $search_name)) {
+         $search_name = $search_name[1];
+     // Load the canned searches
+-        require_once 'config/canned_searches.php';
++        require_once '/etc/mythweb/canned_searches.php';
+     // Find the query
+         if ($Canned_Searches[$search_name]) {
+             $query = array($Canned_Searches[$search_name]);
+diff -ur ./mythweb/weather.php /tmp/mythweb/weather.php
+--- ./mythweb/weather.php	2005-03-09 08:41:54.000000000 +0200
++++ /tmp/mythweb/weather.php	2005-10-26 00:17:22.000000000 +0300
+@@ -253,7 +253,7 @@
+ }
+ 
+ function getImageAndDescFromId($myid) {
+-    $data = file("config/weathertypes.dat");
++    $data = file("/etc/mythweb/weathertypes.dat");
+     foreach($data as $line) {
+     list($id, $name, $img) = explode(",", $line);
+     if($id != $myid) continue;
+@@ -263,7 +263,7 @@
+ }
+ 
+ function getImageFromName($myname) {
+-    $data = file("config/weathertypes.dat");
++    $data = file("/etc/mythweb/weathertypes.dat");
+     foreach($data as $line) {
+     list($id, $name, $img) = explode(",", $line);
+     if($name != $myname) continue;
================================================================