From fda1ba73e4983510b38f4dc5648c9b236492dee3 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <debian@mcmillan.net.nz>
Date: Sat, 8 Sep 2007 14:15:42 +1200
Subject: [PATCH] Change the default names, and also look in /etc/davical for
 the configuration.

---
 inc/always.php.in | 9 ++++++---
 rscds.webprj      | 3 ---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/inc/always.php.in b/inc/always.php.in
index 666670b7..f226bfe3 100644
--- a/inc/always.php.in
+++ b/inc/always.php.in
@@ -10,9 +10,9 @@
 unset($c);
 
 // Default some of the configurable values
-$c->sysabbr     = 'rscds';
+$c->sysabbr     = 'davical';
 $c->admin_email = 'andrew@catalyst.net.nz';
-$c->system_name = "Really Simple CalDAV Store";
+$c->system_name = "DAViCal CalDAV Server";
 $c->domain_name = $_SERVER['SERVER_NAME'];
 $c->save_time_zone_defs = true;
 $c->collections_always_exist = true;
@@ -54,7 +54,10 @@ $c->protocol_server_port_script = sprintf( "%s://%s%s%s", (isset($_SERVER['HTTPS
 
 init_gettext( 'rscds', '../locale' );
 
-if ( file_exists("/etc/rscds/".$_SERVER['SERVER_NAME']."-conf.php") ) {
+if ( file_exists("/etc/davical/".$_SERVER['SERVER_NAME']."-conf.php") ) {
+  include_once("/etc/davical/".$_SERVER['SERVER_NAME']."-conf.php");
+}
+else if ( file_exists("/etc/rscds/".$_SERVER['SERVER_NAME']."-conf.php") ) {
   include_once("/etc/rscds/".$_SERVER['SERVER_NAME']."-conf.php");
 }
 else if ( file_exists("../config/config.php") ) {
diff --git a/rscds.webprj b/rscds.webprj
index aff216b4..cbeef2af 100644
--- a/rscds.webprj
+++ b/rscds.webprj
@@ -13,7 +13,6 @@
     <item url="inc/caldav-OPTIONS.php" uploadstatus="1" />
     <item url="inc/" uploadstatus="1" />
     <item url="inc/always.php" uploadstatus="1" />
-    <item url="config/config.php" uploadstatus="1" />
     <item url="config/" uploadstatus="1" />
     <item url="inc/caldav-PUT.php" uploadstatus="1" />
     <item url="dba/" uploadstatus="1" />
@@ -22,7 +21,6 @@
     <item url="inc/caldav-GET.php" uploadstatus="1" />
     <item url="inc/caldav-DELETE.php" uploadstatus="1" />
     <item url="htdocs/caldav.php" uploadstatus="1" />
-    <item url="inc/BasicAuthSession.php" uploadstatus="1" />
     <item url="debian/" uploadstatus="1" />
     <item url="debian/rules" uploadstatus="1" />
     <item url="dba/rscds.sql" uploadstatus="1" />
@@ -232,7 +230,6 @@
     <item url="inc/drivers_ldap.php" uploadstatus="1" />
     <item url="dba/patches/1.1.8.sql" uploadstatus="1" />
     <item url="inc/caldav-client.php" uploadstatus="1" />
-    <item url="htdocs/calendar.php" uploadstatus="1" />
     <item url="dba/patches/1.1.9.sql" uploadstatus="1" />
     <item url="inc/always.php.in" uploadstatus="1" />
     <item url="htdocs/usr.php" uploadstatus="1" />