nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-01-28 00:43:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change defaults for some less desirable config options.

Browse Source
This commit is contained in:
Andrew McMillan 2009-09-25 13:38:04 +12:00
parent a6d40bbd07
commit 1db30e30f1
3 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/example-config.php
View File

@ -32,16 +32,16 @@ $c->pg_connect[] = "dbname=davical user=davical_app";
// $c->system_name = "DAViCal CalDAV Server";
/**
* default is false
* default: true
* If true, then TODO requested from someone other than the admmin or owner
* of a calendar will not get any answer. Often these todo are only relevant
* to the owner, but in some shared calendar situations they might not be in
* which case you should let this default to false.
* which case you should set this to false.
*/
$c->hide_TODO = true;
// $c->hide_TODO = false;
/**
* The default is false for backward compatibility
* default: true
* If true, then calendars accessed via WebDAV will only be readonly. Any
* changes to them must be applied via CalDAV.
*
@ -50,7 +50,7 @@ $c->hide_TODO = true;
* their data. After this it is recommended to turn it off so that clients
* which have been misconfigured are readily identifiable.
*/
$c->readonly_webdav_collections = true;
// $c->readonly_webdav_collections = false;
/***************************************************************************
* *

19
inc/always.php
View File

@ -32,6 +32,16 @@ $c->base_directory = preg_replace("#/[^/]*$#", "", $_SERVER['DOCUMENT_ROOT']);
$c->stylesheets = array( $c->base_url."/davical.css" );
$c->images = $c->base_url . "/images";
// Add a default for newly created users
$c->template_usr = array( 'active' => true,
'locale' => 'en_EN',
'date_format_type' => 'E',
'email_ok' => date('Y-m-d')
);
$c->hide_TODO = true; // VTODO only visible to collection owner
$c->readonly_webdav_collections = true; // WebDAV access is readonly
// Ensure that ../inc is in our included paths as early as possible
set_include_path( '../inc'. PATH_SEPARATOR. get_include_path());
@ -72,9 +82,6 @@ init_gettext( 'davical', '../locale' );
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("/etc/davical/config.php") ) {
include_once("/etc/davical/config.php");
}
@ -109,15 +116,15 @@ awl_set_locale($c->default_locale);
*
*/
$c->code_version = 0;
$c->version_string = '0.9.7.2'; // The actual version # is replaced into that during the build /release process
$c->version_string = '0.9.7.3'; // The actual version # is replaced into that during the build /release process
if ( isset($c->version_string) && preg_match( '/(\d+)\.(\d+)\.(\d+)(.*)/', $c->version_string, $matches) ) {
$c->code_major = $matches[1];
$c->code_minor = $matches[2];
$c->code_patch = $matches[3];
$c->code_version = (($c->code_major * 1000) + $c->code_minor).".".$c->code_patch;
dbg_error_log("caldav", "Version (%d.%d.%d) == %s", $c->code_major, $c->code_minor, $c->code_patch, $c->code_version);
header( sprintf("Server: %d.%d", $c->code_major, $c->code_minor) );
}
dbg_error_log("caldav", "Version (%d.%d.%d) == %s", $c->code_major, $c->code_minor, $c->code_patch, $c->code_version);
header( sprintf("Server: %d.%d", $c->code_major, $c->code_minor) );
/**
* Force the domain name to what was in the configuration file

19
inc/always.php.in
View File

@ -32,6 +32,16 @@ $c->base_directory = preg_replace("#/[^/]*$#", "", $_SERVER['DOCUMENT_ROOT']);
$c->stylesheets = array( $c->base_url."/davical.css" );
$c->images = $c->base_url . "/images";
// Add a default for newly created users
$c->template_usr = array( 'active' => true,
'locale' => 'en_EN',
'date_format_type' => 'E',
'email_ok' => date('Y-m-d')
);
$c->hide_TODO = true; // VTODO only visible to collection owner
$c->readonly_webdav_collections = true; // WebDAV access is readonly
// Ensure that ../inc is in our included paths as early as possible
set_include_path( '../inc'. PATH_SEPARATOR. get_include_path());
@ -72,9 +82,6 @@ init_gettext( 'davical', '../locale' );
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("/etc/davical/config.php") ) {
include_once("/etc/davical/config.php");
}
@ -109,15 +116,15 @@ awl_set_locale($c->default_locale);
*
*/
$c->code_version = 0;
$c->version_string = '0.7.0~rc3'; // The actual version # is replaced into that during the build /release process
$c->version_string = '0.9.7.2'; // The actual version # is replaced into that during the build /release process
if ( isset($c->version_string) && preg_match( '/(\d+)\.(\d+)\.(\d+)(.*)/', $c->version_string, $matches) ) {
$c->code_major = $matches[1];
$c->code_minor = $matches[2];
$c->code_patch = $matches[3];
$c->code_version = (($c->code_major * 1000) + $c->code_minor).".".$c->code_patch;
dbg_error_log("caldav", "Version (%d.%d.%d) == %s", $c->code_major, $c->code_minor, $c->code_patch, $c->code_version);
header( sprintf("Server: %d.%d", $c->code_major, $c->code_minor) );
}
dbg_error_log("caldav", "Version (%d.%d.%d) == %s", $c->code_major, $c->code_minor, $c->code_patch, $c->code_version);
header( sprintf("Server: %d.%d", $c->code_major, $c->code_minor) );
/**
* Force the domain name to what was in the configuration file