Merge branch 'master' into no-standard-sqlite-db

Author: evert

.gitignore

@@ -10,3 +10,9 @@ Specific/virtualhosts/baikal.apache2
 # Composer stuff
 composer.lock
 vendor
+
+# Build
+/build
+
+# Vim
+.*.swp

CHANGELOG.md

@@ -0,0 +1,73 @@
+ChangeLog
+=========
+
+0.3.0 (????-??-??)
+------------------
+
+* Now requires PHP 5.5.
+* Upgraded to sabre/dav 3.1
+  * Support for WebDAV-Sync.
+  * Support for Calendar subscriptions.
+  * Support for iCalender and vCard export plugins.
+* Created a central `dav.php` that does both carddav and caldav. `cal.php`
+  and `card.php` are still there, but will be removed in a future version.
+* Added ability for users to change the calendar color.
+* Moved server logic to a new class: `Baikal\Core\Server`.
+* List of timezones is not generated from `DateTimeZone` class.
+* Simplified packaging scripts into a Makefile.
+* Fixed: bug when using a MySQL schema name that contains a whitespace.
+* Twig is now a composer dependency.
+* Moved documentation to sabre.io.
+
+
+0.2.7 (2014-02-02)
+------------------
+
+* @jeromeschneider: New error detection: composer has not been installed.
+* @Busch: added rewrite rules for apache2 hosts.
+* @jeromeschneider: Corrected the http/https protocol detection.
+* @josteink, @janpieper, @jaltek, @Jentsch, @GeeF and @fhemberger: Improved
+  INSTALL.md.
+* @janpieper: Added CalDAV and CardDAV instructions for BlackBerry OS 10.
+* James Lay: Add Quick & Dirty install guide for Ubuntu 12.04 in INSTALL.md.
+* @torzak: Auth more compatible with Synology software.
+* @skyhook19: Added Thunderbird CardDAV setup instructions.
+* @cimm: Update OS X and iOS installation instructions.
+* @Jentsch: Removing eXecutable flag from non executables like text files or
+  php scripts.
+* @Jentsch: Adding eXecutable flag to a bash script.
+* @altima: Improved CardDAV and CalDAV auth compatibility with Windows Phones.
+* @fhemberger: Make calendar description optional.
+* @fhemberger: Make HTML5 shiv a local resource.
+* @fhemberger: Improve application security.
+* @janpieper and @evert: Fixing #139: Prevent PHP from parsing your MySQL
+  credentials.
+* Ships with sabre/dav 1.8.6
+
+
+0.2.6 (2013-07-07)
+------------------
+
+* No changes
+* Ships with sabre/dav 1.8.6
+
+
+0.2.5 (2013-07-07)
+------------------
+
+* Baïkal releases are now based on composer thanks to @evert.
+* Formal and Flake are not longer submodules
+* Moved a few classes around.
+* Ships with sabre/dav 1.8.6
+
+
+0.2.4 (2012-11-18)
+------------------
+
+* Ships with sabre/dav 1.8.0
+
+
+0.2.3 (2012-11-08)
+-----------------
+
+* Ships with sabre/dav 1.5.7

ChangeLog.md

@@ -31,7 +31,7 @@
 /**
  * The Baikal Server
  *
- * This class sets up the underlying Sabre\DAV\Server object. 
+ * This class sets up the underlying Sabre\DAV\Server object.
  *
  * @copyright Copyright (C) Jérôme Schneider <[email protected]>
  * @author Evert Pot (http://evertpot.com/)
@@ -41,63 +41,63 @@ class Server {
 
     /**
      * Is CalDAV enabled?
-     * 
+     *
      * @var bool
      */
     protected $enableCalDAV;
 
     /**
      * is CardDAV enabled?
-     * 
-     * @var bool 
+     *
+     * @var bool
      */
     protected $enableCardDAV;
 
     /**
-     * "Basic" or "Digest" 
-     * 
-     * @var string 
+     * "Basic" or "Digest"
+     *
+     * @var string
      */
     protected $authType;
 
     /**
-     * HTTP authentication realm 
-     * 
-     * @var string 
+     * HTTP authentication realm
+     *
+     * @var string
      */
     protected $authRealm;
 
     /**
-     * Reference to Database object 
-     * 
-     * @var PDO 
+     * Reference to Database object
+     *
+     * @var PDO
      */
     protected $pdo;
 
     /**
-     * baseUri for the sabre/dav server 
-     * 
+     * baseUri for the sabre/dav server
+     *
      * @var string
      */
     protected $baseUri;
 
     /**
-     * The sabre/dav Server object 
-     * 
-     * @var \Sabre\DAV\Server 
+     * The sabre/dav Server object
+     *
+     * @var \Sabre\DAV\Server
      */
     protected $server;
 
 
     /**
-     * Creates the server object. 
-     * 
-     * @param bool $enableCalDAV 
-     * @param bool $enableCardDAV 
-     * @param string $authType 
-     * @param string $authRealm 
-     * @param PDO $pdo 
-     * @param string $baseUri 
+     * Creates the server object.
+     *
+     * @param bool $enableCalDAV
+     * @param bool $enableCardDAV
+     * @param string $authType
+     * @param string $authRealm
+     * @param PDO $pdo
+     * @param string $baseUri
      */
     function __construct($enableCalDAV, $enableCardDAV, $authType, $authRealm, PDO $pdo, $baseUri) {
 
@@ -114,7 +114,7 @@ function __construct($enableCalDAV, $enableCardDAV, $authType, $authRealm, PDO $
 
     /**
      * Starts processing
-     * 
+     *
      * @return void
      */
     function start() {
@@ -145,7 +145,7 @@ protected function initServer() {
             $nodes[] = new \Sabre\CalDAV\CalendarRoot($principalBackend, $calendarBackend);
         }
         if ($this->enableCardDAV) {
-            $carddavBackend = new \Sabre\CardDAV\Backend\PDO($GLOBALS["DB"]->getPDO()); 
+            $carddavBackend = new \Sabre\CardDAV\Backend\PDO($GLOBALS["DB"]->getPDO());
             $nodes[] = new \Sabre\CardDAV\AddressBookRoot($principalBackend, $carddavBackend);
         }
 

Core/Frameworks/Baikal/Core/Server.php

@@ -117,11 +117,6 @@ CREATE TABLE groupmembers (
     UNIQUE(principal_id, member_id)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
-INSERT INTO principals (uri,email,displayname) VALUES
-('principals/admin', '[email protected]','Administrator'),
-('principals/admin/calendar-proxy-read', null, null),
-('principals/admin/calendar-proxy-write', null, null);
-
 CREATE TABLE propertystorage (
     id INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
     path VARBINARY(1024) NOT NULL,
@@ -137,6 +132,3 @@ CREATE TABLE users (
     digesta1 VARBINARY(32),
     UNIQUE(username)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-INSERT INTO users (username,digesta1) VALUES
-('admin',  '87fd274b7b6c01e48d7c2f965da8ddf7');