Remove the link between the principals table and the sabre principals connector.

diff --git a/lib/base.php b/lib/base.php
index 4e24f9f44ac96c5ee44ece8b0436a7cef3e82d1c..9995544f14e7854aa3924a9c0dfb7c15ddd4ee7e 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -316,10 +316,6 @@ class OC{
                        OC_App::loadApps();
                }
 
-               // Last part: connect some hooks
-               OC_HOOK::connect('OC_User', 'post_createUser', 'OC_Connector_Sabre_Principal', 'addPrincipal');
-               OC_HOOK::connect('OC_User', 'post_deleteUser', 'OC_Connector_Sabre_Principal', 'deletePrincipal');
-               
                //make sure temporary files are cleaned up
                register_shutdown_function(array('OC_Helper','cleanTmp'));
        }

diff --git a/lib/connector/sabre/principal.php b/lib/connector/sabre/principal.php
index 72e180c65c0d6ab0e7306884b015a34670aee436..28a36438e8767d5c4d1fb4dd9fdcb5ec441a6b4c 100644 (file)
--- a/lib/connector/sabre/principal.php
+++ b/lib/connector/sabre/principal.php
@@ -8,50 +8,6 @@
  */
 
 class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend {
-       /**
-        * TODO: write doc
-        */
-       public static function addPrincipal($params){
-               // Add the user
-               $uri = 'principals/'.$params['uid'];
-               $displayname = $params['uid'];
-               $query = OC_DB::prepare('INSERT INTO *PREFIX*principals (uri,displayname) VALUES(?,?)');
-               $query->execute(array($uri,$displayname));
-               
-               // Add calendar and addressbook read and write support (sharing calendars)
-               $uri = 'principals/'.$params['uid'].'/calendar-proxy-read';
-               $displayname = null;
-               $query->execute(array($uri,$displayname));
-               $uri = 'principals/'.$params['uid'].'/calendar-proxy-write';
-               $query->execute(array($uri,$displayname));
-               $uri = 'principals/'.$params['uid'].'/addressbook-proxy-read';
-               $query->execute(array($uri,$displayname));
-               $uri = 'principals/'.$params['uid'].'/addressbook-proxy-write';
-               $query->execute(array($uri,$displayname));
-
-               return true;
-       }
-       
-       /**
-        * TODO: write doc
-        */
-       public static function deletePrincipal($params){
-               $query = OC_DB::prepare('SELECT * FROM *PREFIX*principals');
-               $result = $query->execute();
-
-               $deleteprincipal = OC_DB::prepare('DELETE FROM *PREFIX*principals WHERE id = ?');
-               $deletegroup = OC_DB::prepare('DELETE FROM *PREFIX*principalgroups WHERE principal_id = ? OR member_id = ?');
-               // We have to delete the principals and relations! Principals include 
-               while($row = $result->fetchRow()){
-                       // Checking if the principal is in the prefix
-                       $array = explode('/',$row['uri']);
-                       if ($array[1] != $params['uid']) continue;
-                       $deleteprincipal->execute(array($row['id']));
-                       $deletegroup->execute(array($row['id'],$row['id']));
-               }
-               return true;
-       }
-
        /**
         * Returns a list of principals based on a prefix.
         *