Updated the copyright declaration in several modules, removing any language which...
[citadel.git] / citadel / serv_extensions.c
index c46e4a4b325cc665cb63c9608438bc4d6709b7ba..861ecb8497adee990ab428fb624c116f78b1c599 100644 (file)
@@ -5,18 +5,12 @@
  * Copyright (c) 1987-2011 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License, version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include "sysdep.h"
@@ -87,6 +81,7 @@ extern FixedOutputHook *FixedOutputTable;
 typedef struct SessionFunctionHook SessionFunctionHook;
 struct SessionFunctionHook {
        SessionFunctionHook *next;
+       int Priority;
        void (*h_function_pointer) (void);
        int eventtype;
 };
@@ -493,20 +488,29 @@ void CtdlRegisterCleanupHook(void (*fcn_ptr) (void))
 
 void CtdlUnregisterCleanupHook(void (*fcn_ptr) (void))
 {
-       CleanupFunctionHook *cur, *p;
-
-       for (cur = CleanupHookTable; cur != NULL; cur = cur->next) {
-               /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               fcn_ptr == cur->h_function_pointer) {
+       CleanupFunctionHook *cur, *p, *last;
+       last = NULL;
+       cur = CleanupHookTable;
+       while (cur != NULL)
+       {
+               if (fcn_ptr == cur->h_function_pointer)
+               {
                        MODM_syslog(LOG_DEBUG, "Unregistered cleanup function\n");
                        p = cur->next;
-                       if (cur == CleanupHookTable) {
-                               CleanupHookTable = p;
-                       }
+
                        free(cur);
+                       cur = NULL;
+
+                       if (last != NULL)
+                               last->next = p;
+                       else 
+                               CleanupHookTable = p;
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 
@@ -543,20 +547,29 @@ void CtdlRegisterEVCleanupHook(void (*fcn_ptr) (void))
 
 void CtdlUnregisterEVCleanupHook(void (*fcn_ptr) (void))
 {
-       CleanupFunctionHook *cur, *p;
-
-       for (cur = EVCleanupHookTable; cur != NULL; cur = cur->next) {
-               /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               fcn_ptr == cur->h_function_pointer) {
+       CleanupFunctionHook *cur, *p, *last;
+       last = NULL;
+       cur = EVCleanupHookTable;
+       while (cur != NULL)
+       {
+               if (fcn_ptr == cur->h_function_pointer)
+               {
                        MODM_syslog(LOG_DEBUG, "Unregistered cleanup function\n");
                        p = cur->next;
-                       if (cur == EVCleanupHookTable) {
-                               EVCleanupHookTable = p;
-                       }
+
                        free(cur);
+                       cur = NULL;
+
+                       if (last != NULL)
+                               last->next = p;
+                       else 
+                               EVCleanupHookTable = p;
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 
@@ -577,41 +590,57 @@ void CtdlDestroyEVCleanupHooks(void)
 }
 
 
-void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType)
+void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType, int Priority)
 {
-
        SessionFunctionHook *newfcn;
 
        newfcn = (SessionFunctionHook *)
            malloc(sizeof(SessionFunctionHook));
-       newfcn->next = SessionHookTable;
+       newfcn->Priority = Priority;
        newfcn->h_function_pointer = fcn_ptr;
        newfcn->eventtype = EventType;
-       SessionHookTable = newfcn;
 
-       MOD_syslog(LOG_DEBUG, "Registered a new session function (type %d)\n",
-                  EventType);
+       SessionFunctionHook **pfcn;
+       pfcn = &SessionHookTable;
+       while ((*pfcn != NULL) && 
+              ((*pfcn)->Priority < newfcn->Priority) &&
+              ((*pfcn)->next != NULL))
+               pfcn = &(*pfcn)->next;
+               
+       newfcn->next = *pfcn;
+       *pfcn = newfcn;
+       
+       MOD_syslog(LOG_DEBUG, "Registered a new session function (type %d Priority %d)\n",
+                  EventType, Priority);
 }
 
 
 void CtdlUnregisterSessionHook(void (*fcn_ptr) (void), int EventType)
 {
-       SessionFunctionHook *cur, *p;
-
-       for (cur = SessionHookTable; cur != NULL; cur = cur->next) {
-               /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               fcn_ptr == cur->h_function_pointer &&
-                               EventType == cur->eventtype) {
+       SessionFunctionHook *cur, *p, *last;
+       last = NULL;
+       cur = SessionHookTable;
+       while  (cur != NULL) {
+               if ((fcn_ptr == cur->h_function_pointer) &&
+                   (EventType == cur->eventtype))
+               {
                        MOD_syslog(LOG_DEBUG, "Unregistered session function (type %d)\n",
                                   EventType);
                        p = cur->next;
-                       if (cur == SessionHookTable) {
-                               SessionHookTable = p;
-                       }
+
                        free(cur);
+                       cur = NULL;
+
+                       if (last != NULL)
+                               last->next = p;
+                       else 
+                               SessionHookTable = p;
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 
@@ -650,22 +679,30 @@ void CtdlRegisterUserHook(void (*fcn_ptr) (ctdluser *), int EventType)
 
 void CtdlUnregisterUserHook(void (*fcn_ptr) (struct ctdluser *), int EventType)
 {
-       UserFunctionHook *cur, *p;
-
-       for (cur = UserHookTable; cur != NULL; cur = cur->next) {
-               /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               fcn_ptr == cur->h_function_pointer &&
-                               EventType == cur->eventtype) {
+       UserFunctionHook *cur, *p, *last;
+       last = NULL;
+       cur = UserHookTable;
+       while (cur != NULL) {
+               if ((fcn_ptr == cur->h_function_pointer) &&
+                   (EventType == cur->eventtype))
+               {
                        MOD_syslog(LOG_DEBUG, "Unregistered user function (type %d)\n",
                                   EventType);
                        p = cur->next;
-                       if (cur == UserHookTable) {
-                               UserHookTable = p;
-                       }
+
                        free(cur);
+                       cur = NULL;
+
+                       if (last != NULL)
+                               last->next = p;
+                       else 
+                               UserHookTable = p;
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 
@@ -706,22 +743,29 @@ void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *),
 void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *),
                int EventType)
 {
-       MessageFunctionHook *cur, *p;
-
-       for (cur = MessageHookTable; cur != NULL; cur = cur->next) {
-               /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               handler == cur->h_function_pointer &&
-                               EventType == cur->eventtype) {
+       MessageFunctionHook *cur, *p, *last;
+       last = NULL;
+       cur = MessageHookTable;
+       while (cur != NULL) {
+               if ((handler == cur->h_function_pointer) &&
+                   (EventType == cur->eventtype))
+               {
                        MOD_syslog(LOG_DEBUG, "Unregistered message function (type %d)\n",
                                   EventType);
                        p = cur->next;
-                       if (cur == MessageHookTable) {
-                               MessageHookTable = p;
-                       }
                        free(cur);
+                       cur = NULL;
+
+                       if (last != NULL)
+                               last->next = p;
+                       else 
+                               MessageHookTable = p;
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 
@@ -779,7 +823,6 @@ void CtdlUnregisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
                        last = cur;
                        cur = cur->next;
                }
-
        }
 }