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