]>
Commit | Line | Data |
---|---|---|
90bace38 | 1 | --- davical-0.9.9.2/inc/always.php.in.orig 2010-09-22 15:19:34.000000000 +0200 |
2 | +++ davical-0.9.9.2/inc/always.php.in 2010-09-22 15:19:48.000000000 +0200 | |
3 | @@ -117,23 +104,11 @@ | |
4 | * too early. | |
5 | */ | |
6 | ob_start( ); | |
7 | -if ( @file_exists('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) { | |
8 | - include('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php'); | |
9 | +if ( @file_exists('/etc/webapps/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) { | |
10 | + include('/etc/webapps/davical/'.$_SERVER['SERVER_NAME'].'-conf.php'); | |
11 | } | |
12 | -else if ( @file_exists('/etc/davical/config.php') ) { | |
13 | - include('/etc/davical/config.php'); | |
14 | -} | |
15 | -else if ( @file_exists('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) { | |
16 | - include('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php'); | |
17 | -} | |
18 | -else if ( @file_exists('/usr/local/etc/davical/config.php') ) { | |
19 | - include('/usr/local/etc/davical/config.php'); | |
20 | -} | |
21 | -else if ( @file_exists('../config/config.php') ) { | |
22 | - include('../config/config.php'); | |
23 | -} | |
24 | -else if ( @file_exists('config/config.php') ) { | |
25 | - include('config/config.php'); | |
26 | +else if ( @file_exists('/etc/webapps/davical/config.php') ) { | |
27 | + include('/etc/webapps/davical/config.php'); | |
28 | } | |
29 | else { | |
30 | include('davical_configuration_missing.php'); |