Changeset 342

Timestamp:

03/21/08 17:12:13 (5 years ago)

Author:

d0nut

Message:

• real name can be accessed in posts/pms
• closed possible xss error

Location:

buddyloo

Files:

• files/lib/data (added)
• files/lib/data/user (added)
• files/lib/data/user/option (added)
• files/lib/data/user/option/UserOptionOutputRealname.class.php (added)
• files/lib/system/cache/CacheBuilderBuddylooFriendships.class.php (added)
• files/lib/system/event/listener/BuddylooUserPageListener.class.php (modified) (1 diff)
• files/lib/system/event/listener/BuddylooWhiteListEditFormListener.class.php (modified) (2 diffs)
• package.xml (modified) (5 diffs)
• useroptions.xml (modified) (1 diff)

buddyloo/files/lib/system/event/listener/BuddylooUserPageListener.class.php

@@ -54 +54 @@
 
                 // show real name
-                if($this->isFriend || $this->eventObj->userID == WCF::getUser()->userID || $this->eventObj->user->getUserOption('shareRealname') == 0) {
-                        $realname = $this->eventObj->user->realname;
-                        if(!empty($realname)) {
-                                if(!isset($this->eventObj->categories['profile.personal'])) {
-                                        $this->eventObj->categories['profile.personal'] = array (
-                                                'categoryName' => 'profile.personal',
-                                                'categoryIconM' => RELATIVE_WCF_DIR.'icon/userProfilePersonalM.png',
-                                                'parentCategoryName' => 'profile',
-                                                'options' => array ()
-                                        );
+                if(!$this->isFriend && !$this->eventObj->userID == WCF::getUser()->userID && !$this->eventObj->user->getUserOption('shareRealname') == 0) {
+                        $i=0;
+                        $j=0;
+                        $keys = array_keys($this->eventObj->categories);
+                        for($i=0; $i<count($keys); $i++) {
+                                for($j=0; $j<count($this->eventObj->categories[$keys[$i]]['options']); $j++) {
+                                        if($this->eventObj->categories[$keys[$i]]['options'][$j]['optionName'] == 'realname') {
+                                                unset($this->eventObj->categories[$keys[$i]]['options'][$j]);
+                                                break 2;
+                                        }
                                 }
-                                array_unshift($this->eventObj->categories['profile.personal']['options'], array(
-                                        'categoryName' => 'profile.personal',
-                                        'optionName' => 'realname',
-                                        'optionValue' => $realname
-                                ));
+                        }
+                        if(count($this->eventObj->categories[$keys[$i]]['options']) == 0) {
+                                unset($this->eventObj->categories[$keys[$i]]);
                         }
                 }

buddyloo/files/lib/system/event/listener/BuddylooWhiteListEditFormListener.class.php

@@ -92 +92 @@
                                                 AND ".$this->eventObj->listType."UserID = ".WCF::getUser()->userID;
                         WCF::getDB()->sendQuery($sql);
+                        $this->updateCache();
                         
                         // reset session
@@ -286 +287 @@
         protected function updateCache() {
                 WCF::getCache()->clear(WCF_DIR.'cache', 'cache.buddyloo.whitelist.php', true);
+                WCF::getCache()->clear(WCF_DIR.'cache', 'cache.buddyloo.friendships.php', true);
         }
 }

buddyloo/package.xml

@@ -7 +7 @@
                 <packagedescription language="de"><![CDATA[Buddy System fÃŒr das WCF. Freundschaften funktionieren nur in beide Richtungen. Das GegenÃŒber hat die Wahl zum ablehnen/akzeptieren der Freunschafts-Einladung.]]></packagedescription>
                 <packagedescription language="fr"><![CDATA[SystÚme d’amitié pour le WCF. Les demandes d’amitié peuvent être acceptées ou refusées.]]></packagedescription>
-                <version>0.9.4 pl 2</version>
+                <version>0.9.5</version>
                 <date>DATE</date>
                 <plugin>com.woltlab.wcf</plugin>
@@ -42 +42 @@
         </instructions>
         
+        <instructions type="update" fromversion="0.9.4 pl 2">
+                <files>files.tar</files>
+                <useroptions>useroptions.xml</useroptions>
+        </instructions>
+        
         <instructions type="update" fromversion="0.9.4 pl 1">
                 <files>files.tar</files>
+                <useroptions>useroptions.xml</useroptions>
         </instructions>
         
         <instructions type="update" fromversion="0.9.4 pl1">
                 <files>files.tar</files>
+                <useroptions>useroptions.xml</useroptions>
         </instructions>
         
         <instructions type="update" fromversion="0.9.4">
                 <files>files.tar</files>
+                <useroptions>useroptions.xml</useroptions>
         </instructions>
         
@@ -59 +67 @@
                 <eventlistener>eventlistener.xml</eventlistener>
                 <options>options.xml</options>
+                <useroptions>useroptions.xml</useroptions>
                 <groupoptions>groupoptions.xml</groupoptions>
                 <usercpmenu>usercpmenu.xml</usercpmenu>
@@ -72 +81 @@
                 <eventlistener>eventlistener.xml</eventlistener>
                 <options>options.xml</options>
+                <useroptions>useroptions.xml</useroptions>
                 <groupoptions>groupoptions.xml</groupoptions>
                 <usercpmenu>usercpmenu.xml</usercpmenu>
@@ -86 +96 @@
                 <eventlistener>eventlistener.xml</eventlistener>
                 <options>options.xml</options>
+                <useroptions>useroptions.xml</useroptions>
                 <groupoptions>groupoptions.xml</groupoptions>
                 <usercpmenu>usercpmenu.xml</usercpmenu>

buddyloo/useroptions.xml

@@ -7 +7 @@
                                 <categoryname>profile.personal</categoryname>
                                 <optiontype>text</optiontype>
-                                <visible>4</visible>
+                                <outputclass>UserOptionOutputRealname</outputclass>
                         </option>
                 </options>