Take a stab in the dark at AgenDAV v2.1.0 support.

[mailshears.git] / lib / rm / plugins / agendav.rb

diff --git a/lib/rm/plugins/agendav.rb b/lib/rm/plugins/agendav.rb
index 46bd4073bfd459b4b2569ed1fd1d2f3a4657974f..4bf6bc4aca11a2427c10e40151310bbeca452ea6 100644 (file)
--- a/lib/rm/plugins/agendav.rb
+++ b/lib/rm/plugins/agendav.rb
@@ -22,7 +22,21 @@ class AgendavRm
     raise NonexistentUserError.new(user.to_s()) if not user_exists(user)
 
     sql_queries = ['DELETE FROM prefs WHERE username = $1;']
-    sql_queries << 'DELETE FROM shared WHERE user_from = $1;'
+
+    # The "shares" table contains principal URLs, and the "@" symbol
+    # is usually encoded to "%40". These queries do a regex match on
+    # the username after replacing the "%40" with a "@".
+    #
+    # As a precaution, I haven chosen not to delete based on the
+    # "calendar" field here. Nobody should have a calendar named
+    # "user%40example.com", but it's not impossible -- and we don't
+    # want to delete that calendar when the not-necessarily-related
+    # "user@example.com" account is removed. And the usual appearance
+    # of the user's email address in the "calendar" field happens when
+    # he is also the owner, so the calendar does get deleted in the
+    # normal situation.
+    sql_queries << "DELETE FROM shares WHERE REPLACE(owner, '%40', '@') ~ $1;"
+    sql_queries << "DELETE FROM shares WHERE REPLACE(with, '%40', '@')  ~ $1;"
 
     connection = PG::Connection.new(@db_hash)
     begin