Changeset 343

Timestamp:

03/21/08 18:56:19 (5 years ago)

Author:

d0nut

Message:

bugfixes for group apply mail listener

Location:

groupapplymail/files/lib/system

Files:

• cache/CacheBuilderGroupApplyMail.class.php (modified) (2 diffs)
• event/listener/AbstractPageGroupActivityListener.class.php (modified) (1 diff)
• event/listener/UserGroupApplicationDeleteMailListener.class.php (modified) (2 diffs)
• event/listener/UserGroupApplyMailListener.class.php (modified) (2 diffs)

groupapplymail/files/lib/system/cache/CacheBuilderGroupApplyMail.class.php

@@ -17 +17 @@
                 $data = array();
 
-                $sql = "SELECT          *
+                $sql = "SELECT          notification.*
                         FROM            wcf".WCF_N."_group_user_option opt
                         NATURAL JOIN    wcf".WCF_N."_group_user_notification notification
@@ -25 +25 @@
                         $id = $row['userID'];
                         unset($row['userID']);
-                        $data[$id] = $row;
+                        if(!isset($data[$id])) {
+                                $data[$id] = array();
+                        }
+                        $data[$id][] = $row;
                 }
 

groupapplymail/files/lib/system/event/listener/AbstractPageGroupActivityListener.class.php

@@ -28 +28 @@
                 if(isset($cache[WCF::getUser()->userID])) {
                         WCF::getTPL()->assign(array(
-                                'groupactions' => $cache[WCF::getUser()->userID]
+                                'activities' => $cache[WCF::getUser()->userID]
                         ));
 

groupapplymail/files/lib/system/event/listener/UserGroupApplicationDeleteMailListener.class.php

@@ -21 +21 @@
                 WCF::getDB()->sendQuery($sql);
                 
-                // update cache
-                WCF::getCache()->clear(WBB_DIR.'cache', 'cache.groupapplymail.php');
-                WCF::getCache()->addResource('groupapplymail', 
-                        WCF_DIR.'cache/cache.groupapplymail.php',
-                        WCF_DIR.'lib/system/cache/CacheBuilderGroupApplyMail.class.php');
-
                 $sql = "INSERT INTO     wcf".WCF_N."_group_user_notification 
                                         (userID, groupID, foreignID, messageType, slot1, slot2)
@@ -46 +40 @@
                         )";
                 WCF::getDB()->sendQuery($sql);
+                
+                // update cache
+                WCF::getCache()->clear(WCF_DIR.'cache', 'cache.groupapplymail.php', true);
         }
 }

groupapplymail/files/lib/system/event/listener/UserGroupApplyMailListener.class.php

@@ -43 +43 @@
                 }
                 
-                if($i > 0) {
-                        // update cache
-                        WCF::getCache()->clear(WBB_DIR.'cache', 'cache.groupapplymail.php');
-                        WCF::getCache()->addResource('groupapplymail', 
-                                WCF_DIR.'cache/cache.groupapplymail.php',
-                                WCF_DIR.'lib/system/cache/CacheBuilderGroupApplyMail.class.php');
-                }
+                // update cache
+                WCF::getCache()->clear(WCF_DIR.'cache', 'cache.groupapplymail.php', true);
                 
                 // enable user language
@@ -62 +57 @@
                 $applicationID = $this->eventObj->group->groupID == 6 ? $this->eventObj->applicationID : "0";
         
-                $sql = "INSERT INTO     wcf".WCF_N."_group_user_notification
+                $sql = "REPLACE INTO    wcf".WCF_N."_group_user_notification
                                         (userID, groupID, foreignID, messageType, slot1)
                         VALUES          (