From 01eb5172282e6812a158bd534116bdc14b3ba468 Mon Sep 17 00:00:00 2001 From: Evert Pot Date: Thu, 18 Feb 2016 22:33:12 -0500 Subject: [PATCH] Removed unused setting --- CHANGELOG.md | 1 + .../Frameworks/Baikal/Model/Config/System.php | 21 ------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1963cf9..bfbf53b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ ChangeLog * #457: The realm was not correctly set from configuration for Digest auth. * Reduced memory usage in upgrade script. Should help with upgrading large databases. +* Removed `BAIKAL_PATH_SABREDAV` setting. It was no longer used. 0.3.2 (2016-02-16) diff --git a/Core/Frameworks/Baikal/Model/Config/System.php b/Core/Frameworks/Baikal/Model/Config/System.php index 94ad874..07c72ec 100644 --- a/Core/Frameworks/Baikal/Model/Config/System.php +++ b/Core/Frameworks/Baikal/Model/Config/System.php @@ -29,10 +29,6 @@ namespace Baikal\Model\Config; class System extends \Baikal\Model\Config { protected $aConstants = array( - "BAIKAL_PATH_SABREDAV" => array( - "type" => "litteral", - "comment" => "PATH to SabreDAV", - ), "BAIKAL_AUTH_REALM" => array( "type" => "string", "comment" => "If you change this value, you'll have to re-generate passwords for all your users", @@ -85,7 +81,6 @@ class System extends \Baikal\Model\Config { # Default values protected $aData = array( - "BAIKAL_PATH_SABREDAV" => 'PROJECT_PATH_FRAMEWORKS . "SabreDAV/lib/Sabre/"', "BAIKAL_AUTH_REALM" => "BaikalDAV", "BAIKAL_CARD_BASEURI" => 'PROJECT_BASEURI . "card.php/"', "BAIKAL_CAL_BASEURI" => 'PROJECT_BASEURI . "cal.php/"', @@ -146,19 +141,6 @@ class System extends \Baikal\Model\Config { ) ))); - $oMorpho->add(new \Formal\Element\Text(array( - "prop" => "BAIKAL_PATH_SABREDAV", - "label" => "Path to SabreDAV", - "validation" => "required", - "inputclass" => "input-xxlarge", - "help" => "The absolute server path to SabreDAV API", - "popover" => array( - "title" => "Path to SabreDAV", - "content" => "If Baïkal is hosted in a subfolder, this path should reflect it.
Whatever happens, it should begin and end with a slash.", - "position" => "top" - ) - ))); - $oMorpho->add(new \Formal\Element\Text(array( "prop" => "PROJECT_SQLITE_FILE", "label" => "SQLite file path", @@ -216,9 +198,6 @@ class System extends \Baikal\Model\Config { # 1. All URIs *must* be suffixed by "/" if pointing to a folder # -# PATH to SabreDAV -define("BAIKAL_PATH_SABREDAV", PROJECT_PATH_FRAMEWORKS . "SabreDAV/lib/Sabre/"); - # If you change this value, you'll have to re-generate passwords for all your users define("BAIKAL_AUTH_REALM", "BaikalDAV");