1 #--- ./mythweb/includes/init.php 2005-02-28 00:52:48.000000000 +0200
2 #+++ /tmp/mythweb/includes/init.php 2005-10-26 00:11:25.000000000 +0300
4 # require_once 'includes/errordisplay.php';
6 # // Load the user-defined configuration settings
7 #- require_once 'config/conf.php';
8 #+ require_once '/etc/webapps/mythweb/conf.php';
10 # // Clean up some variables
11 # if (!ereg('/$', $_SERVER['DOCUMENT_ROOT']))
12 #--- ./mythweb/config/conf.php~ 2005-11-04 02:25:34.000000000 +0200
13 #+++ ./mythweb/config/conf.php 2005-11-04 02:26:32.000000000 +0200
15 # // defined as mythtv.mydomain.com in server_domain above, mail will go to
16 # // mythweb_errors@mydomain.com.
18 #- define('error_email', 'mythweb_errors@'.preg_replace('/.*?\b([\w\-]+\.[\w\-]+)$/', '$1', server_domain));
19 #+ define('error_email', 'root@'.preg_replace('/.*?\b([\w\-]+\.[\w\-]+)$/', '$1', server_domain));
21 # // For the "movies" search -- set this to the word your listings provider uses to
22 # // describe movies/films/peliculas/etc.
23 --- /mythweb/includes/mythbackend.php~ 2005-10-22 13:31:12.000000000 +0300
24 +++ /mythweb/includes/mythbackend.php 2005-11-04 23:31:31.707600269 +0200
26 // Make sure the local path exists
28 foreach (split('/+', dirname($pngpath)) as $dir) {
29 - $path .= $path ? '/' . $dir : $dir;
30 + $path .= $path ? ('/' . $dir) : ($dir ? $dir : "/$dir");
31 if(!is_dir($path) && !mkdir($path, 0755))
32 trigger_error('Error creating path for '.$path.': Please check permissions.', FATAL);
34 #--- ./mythweb/includes/init.php 2006-01-07 02:10:47.000000000 +0200
35 #+++ /tmp/init.php 2006-01-08 01:02:40.000000000 +0200
36 #@@ -232,12 +232,12 @@
37 # define('theme_url', root.theme_dir);
39 # // Make sure the data directory exists and is writable
40 #- if (!is_dir('data') && !mkdir('data', 0755)) {
41 #+ if (!is_dir('/var/cache/mythweb') && !mkdir('/var/cache/mythweb', 0755)) {
42 # $Error = 'Error creating the data directory. Please check permissions.';
43 # require_once 'templates/_error.php';
46 #- if (!is_writable('data')) {
47 #+ if (!is_writable('/var/cache/mythweb')) {
48 # $process_user = posix_getpwuid(posix_geteuid());
49 # $Error = 'data directory is not writable by '.$process_user['name'].'. Please check permissions.';
50 # require_once 'templates/_error.php';
54 # // New hard-coded cache directory
55 #- define('cache_dir', 'data/cache');
56 #+ define('cache_dir', '/var/cache/mythweb');
58 # // Make sure the image cache path exists and is writable
59 # if (!is_dir(cache_dir) && !mkdir(cache_dir, 0755)) {
60 #--- ./mythweb/modules/tv/handler.php 2006-02-01 21:18:41.000000000 +0200
61 #+++ ./modules/tv/handler.php 2006-02-01 21:18:43.170715902 +0200
65 # // Make sure the image cache path exists and is writable
66 #- if (!is_dir('data/tv_icons') && !mkdir('data/tv_icons', 0755)) {
67 #- $Error = 'Error creating data/tv_icons: Please check permissions on the data directory.';
68 #+ if (!is_dir('/var/cache/mythweb/tv_icons') && !mkdir('/var/cache/mythweb/tv_icons', 0755)) {
69 #+ $Error = 'Error creating /var/cache/mythweb/tv_icons: Please check permissions on the data directory.';
70 # require_once 'templates/_error.php';
73 #- if (!is_writable('data/tv_icons')) {
74 #+ if (!is_writable('/var/cache/mythweb/tv_icons')) {
75 # $process_user = posix_getpwuid(posix_geteuid());
76 #- $Error = 'data/tv_icons directory is not writable by '.$process_user['name'].'. Please check permissions.';
77 #+ $Error = '/var/cache/mythweb/tv_icons directory is not writable by '.$process_user['name'].'. Please check permissions.';
78 # require_once 'templates/_error.php';