add sfa upcalls to AddPersontToSite and DeletPersonFromSite

[plcapi.git] / PLC / Methods / DeletePersonFromSite.py

diff --git a/PLC/Methods/DeletePersonFromSite.py b/PLC/Methods/DeletePersonFromSite.py
index f7bd630..7400dc3 100644 (file)
--- a/PLC/Methods/DeletePersonFromSite.py
+++ b/PLC/Methods/DeletePersonFromSite.py
@@ -1,9 +1,12 @@
+# $Id$
+# $URL$
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Persons import Person, Persons
 from PLC.Sites import Site, Sites
 from PLC.Auth import Auth
+from PLC.SFA import SFA
 
 class DeletePersonFromSite(Method):
     """
@@ -25,28 +28,36 @@ class DeletePersonFromSite(Method):
         ]
 
     returns = Parameter(int, '1 if successful')
-    
-    event_type = 'DeleteFrom'
-    object_type = 'Site'
 
     def call(self, auth, person_id_or_email, site_id_or_login_base):
         # Get account information
         persons = Persons(self.api, [person_id_or_email])
         if not persons:
             raise PLCInvalidArgument, "No such account"
-
         person = persons[0]
 
+        if person['peer_id'] is not None:
+            raise PLCInvalidArgument, "Not a local account"
+
         # Get site information
         sites = Sites(self.api, [site_id_or_login_base])
         if not sites:
             raise PLCInvalidArgument, "No such site"
-
         site = sites[0]
 
+        if site['peer_id'] is not None:
+            raise PLCInvalidArgument, "Not a local site"
+
         if site['site_id'] in person['site_ids']:
             site.remove_person(person)
 
-       self.object_ids = [site['site_id']]
-       
+        # Logging variables
+        self.event_objects = {'Site': [site['site_id']],
+                              'Person': [person['person_id']]} 
+        self.message = 'Person %d deleted from site %d ' % \
+                        (person['person_id'], site['site_id'])
+
+        sfa = SFA(self.api)
+        sfa.delete_record(person, 'user')
+
         return 1