added methods for CardDAV-implementation

Controller/SabreDavController.php

@@ -17,6 +17,8 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\Routing\RouterInterface;
 
 /**
  * Class SabreDavController
@@ -33,15 +35,30 @@ class SabreDavController
      */
     private $dispatcher;
 
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    /**
+     * @var RouterInterface 
+     */
+    private $router;
+
     /**
      * Constructor
      *
      * @param Server $dav
      * @param EventDispatcherInterface $dispatcher
+     * @param ContainerInterface $container
+     * @param Router $router
      */
-    public function __construct(Server $dav, EventDispatcherInterface $dispatcher)
+    public function __construct(Server $dav, EventDispatcherInterface $dispatcher,  ContainerInterface $container, RouterInterface $router)
     {
         $this->dav = $dav;
+        $this->dav->setBaseUri($router->generate('secotrust_sabre_dav'));
+
+        $this->container = $container;
         $this->dispatcher = $dispatcher; // TODO needed?
     }
 

DependencyInjection/Configuration.php

@@ -27,26 +27,42 @@ public function getConfigTreeBuilder()
         $treeBuilder = new TreeBuilder();
         $rootNode = $treeBuilder->root('secotrust_sabre_dav');
 
-        // TODO needs "little" improvement ;-)
-
+        $default_base_uri = '/app_dev.php/remote';
+	
         $rootNode
             ->children()
-                ->scalarNode('root_dir')->example('%kernel.root_dir%/../web/dav')->defaultNull()->end()
-                ->scalarNode('base_uri')->example('/app_dev.php/dav/')->isRequired()->end()
+                ->scalarNode('root_dir')
+                    ->example('%kernel.root_dir%/../web/dav/')
+                ->end()
+                ->scalarNode('base_uri')
+                    ->example($default_base_uri)
+                ->end()
                 ->arrayNode('plugins')
                     ->addDefaultsIfNotSet()
                     ->children()
                         ->booleanNode('acl')->defaultFalse()->end()
                         ->booleanNode('auth')->defaultFalse()->end()
                         ->booleanNode('browser')->defaultFalse()->end()
-                        ->booleanNode('caldav')->defaultFalse()->end()
                         ->booleanNode('lock')->defaultTrue()->end()
                         ->booleanNode('temp')->defaultTrue()->end()
                         ->booleanNode('mount')->defaultFalse()->end()
                         ->booleanNode('patch')->defaultFalse()->end()
                         ->booleanNode('content_type')->defaultFalse()->end()
+                        ->booleanNode('webdav')->defaultFalse()->end()
+                        ->booleanNode('principal')->defaultFalse()->end()
+                        ->booleanNode('carddav')->defaultFalse()->end()
+                        ->booleanNode('caldav')->defaultFalse()->end()
                     ->end()
                 ->end()
+                ->arrayNode('settings')
+                    ->addDefaultsIfNotSet()
+                        ->children()
+                            ->scalarNode('cards_class')->defaultValue('')->end()		
+                            ->scalarNode('addressbooks_class')->defaultValue('')->end()		
+                            ->scalarNode('principals_class')->defaultValue('')->end()		
+                        ->end()
+                    ->end()
+                ->end()                
             ->end();
 
         return $treeBuilder;

DependencyInjection/SecotrustSabreDavExtension.php

@@ -31,21 +31,26 @@ public function load(array $configs, ContainerBuilder $container)
 
         $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services/services.xml');
-
-        if ($config['base_uri']) {
+	
+        if (isset($config['base_uri'])) {
             $container->getDefinition('secotrust.sabredav.server')->addMethodCall('setBaseUri', array($config['base_uri']));
         }
-
-        if ($config['root_dir']) {
-            $container->getDefinition('secotrust.sabredav_root')->replaceArgument(0, $config['root_dir']);
-        } else {
-            $container->getDefinition('secotrust.sabredav_root')->clearTag('secotrust.sabredav.collection');
-        }
-
+
+        // load all plugins
         foreach ($config['plugins'] as $plugin => $enabled) {
             if ($enabled) {
                 $loader->load(sprintf('services/plugins/%s.xml', $plugin));
             }
         }
+
+        // no root dir is set, but webdav plugin is active: throw exception
+        if (array_key_exists('root_dir', $config) && $config['root_dir'] !== '' && $config['plugins']['webdav'] === true ) { 
+            //replace argument
+            $container->getDefinition('secotrust.sabredav_root')->replaceArgument(0, $config['root_dir']);
+        }
+
+        $container->setParameter('secotrust.cards_class', $config['settings']['cards_class']);
+        $container->setParameter('secotrust.addressbooks_class', $config['settings']['addressbooks_class']);
+        $container->setParameter('secotrust.principals_class', $config['settings']['principals_class']);
     }
 }

Entity/AddressbookInterface.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace Secotrust\Bundle\SabreDavBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Description of AddressbookInterface
+ *
+ * @author lduer
+ */
+interface AddressbookInterface {
+
+    /**
+     * Get id
+     *
+     * @return integer 
+     */
+    public function getId();
+
+    /**
+     * Get label
+     *
+     * @return string 
+     */
+    public function getLabel();
+
+    /**
+     * Set label
+     *
+     * @param string $label
+     * @return $this
+     */
+    public function setLabel($label);
+
+    /**
+     * Get description
+     *
+     * @return string 
+     */
+    public function getDescription();
+
+    /**
+     * Set description
+     *
+     * @param string $label
+     * @return $this
+     */
+    public function setDescription($description);
+
+    /**
+     * Get the value of the current CTag
+     * 
+     * @return string
+     */
+    public function getCtag();
+
+    /**
+     * updates the cTag of the current Group 
+     * 
+     * @return $this
+     */
+    public function updateCTag();
+
+    /**
+     * get the Uri
+     * 
+     * @return type
+     */    
+    public function getUri();
+
+
+    /**
+     * Get all Contacts for current Addressbook
+     * 
+     * @return array
+     */
+    public function getContactList();
+
+}

Entity/CardInterface.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace Secotrust\Bundle\SabreDavBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Description of CardInterface
+ * 
+ * Interface for single Contact-Entity in CardDAV
+ * 
+ * use prePersist()-Action (Doctrine-Call) to call "updateCTag()" and "updateLastmodified()" actions automatically
+ *
+ * @author lduer
+ */
+interface CardInterface {
+
+    /**
+     * Get id
+     *
+     * @return integer 
+     */    
+    public function getId();
+
+    /**
+     * Get vCardUid
+     *
+     * @return string 
+     */
+    public function getVCardUid();
+
+    /**
+     * Set vCardUid
+     *
+     * @param string $vCardUid
+     * @return Contact
+     */    
+    public function setVCardUid($vCardUid);
+
+    /**
+     * get the vCard
+     * 
+     * @return string
+     */
+    public function getVCard();
+
+    /**
+     * updates the current vCard
+     * 
+     * @return $this
+     */    
+    public function setVCard($vCard);
+
+    /**
+     * get lastmodified-date of the current card
+     * 
+     * @return \DateTime()
+     */
+    public function getLastmodified();
+
+    /**
+     * updates the lastmodified-date of the current Card 
+     * 
+     * @return $this
+     */
+    public function updateLastmodified();
+
+    /**
+     * Get the value of the current CTag
+     * 
+     * @return string
+     */
+    public function getCTag();
+
+    /**
+     * updates the cTag of the current Card 
+     * 
+     * @return $this
+     */
+    public function updateCTag();
+
+    /**
+     * get ETag of current Card
+     * 
+     * possible method: return md5-checksum of vCard-String
+     *      return md5($this->getVCard());
+     */
+    public function getETag();
+
+}

Entity/PrincipalInterface.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Secotrust\Bundle\SabreDavBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Description of PrincipalInterface
+ *
+ * @author lduer
+ */
+interface PrincipalInterface {
+
+    /**
+     * Get id
+     *
+     * @return integer 
+     */    
+    public function getId();
+
+    /**
+     * get username
+     * 
+     * @return string
+     */    
+    public function getUsername();
+
+    /**
+     * get Email
+     * 
+     * @return string
+     */    
+    public function getEmail();
+
+    /**
+     * requried to define me-card as a property on the users' addressbook'
+     * 
+     * @return string
+     */
+    public function getVCardUrl();
+}

Entity/Repository/AddressbookRepositoryInterface.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Secotrust\Bundle\SabreDavBundle\Entity\Repository;
+
+/**
+ * Description of AddressbookRepositoryInterface
+ *
+ * @author lduer
+ */
+interface AddressbookRepositoryInterface {
+
+    /**
+     * get all Addressbooks for submitted principal
+     * 
+     * @param type $principalUri
+     * @return array
+     */
+    public function findAllPrincipalAddressbooks($principalUri);
+
+}

Entity/Repository/CardRepositoryInterface.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Secotrust\Bundle\SabreDavBundle\Entity\Repository;
+
+/**
+ * Description of CardRepositoryInterface
+ *
+ * @author lduer
+ */
+interface CardRepositoryInterface {
+
+    /**
+     * Find one Card By vCard UID
+     * 
+     * @param type $uid
+     */
+    public function findSingleCardByUid($uid=null);
+
+    /**
+     * delete Card by cardUri
+     * 
+     * @param type $cardUri
+     */    
+    public function deleteCard($cardUri);
+}