Changeset 217

Timestamp:

02/21/08 23:47:08 (5 years ago)

Author:

d0nut

Message:

released 0.9.1 of buddyloo. see changelog

Location:

buddyloo

Files:

• de-informal.xml (modified) (2 diffs)
• de.xml (modified) (2 diffs)
• en.xml (modified) (2 diffs)
• files/lib/system/event/listener/BuddylooAbstractPageListener.class.php (modified) (1 diff)
• files/lib/system/event/listener/BuddylooWhiteListEditFormListener.class.php (modified) (1 diff)
• package.xml (modified) (3 diffs)
• useroptions.xml (added)

buddyloo/de-informal.xml

@@ -11 +11 @@
                 <item name="wcf.buddyloo.out.abolish"><![CDATA[ZurÃŒcknehmen]]></item>
                 <item name="wcf.buddyloo.out.abolish.success"><![CDATA[Du hast deine Freundschaftseinladung zurÃŒck genommen.]]></item>
-                <item name="wcf.buddyloo.awaitingconfirmations"><![CDATA[Es warten {count} Freundschaftseinladungen auf ihre BestÀtigung.]]></item>
+                <item name="wcf.buddyloo.awaitingconfirmation"><![CDATA[Es wartet eine Freundschaftseinladung auf deine BestÀtigung.]]></item>
+                <item name="wcf.buddyloo.awaitingconfirmations"><![CDATA[Es warten {$count} Freundschaftseinladungen auf deine BestÀtigung.]]></item>
                 <item name="wcf.buddyloo.subject"><![CDATA[Freundschaftseinladung von {$author}]]></item>
                 <item name="wcf.buddyloo.body"><![CDATA[Hallo {$recipient}!
@@ -23 +24 @@
 Dein {PAGE_TITLE} Team]]></item>
         </category>
+        <category name="wcf.user.whitelist">
+                <item name="wcf.user.whitelist.add.success"><![CDATA[{if $users|count == 1}Der Benutzer &raquo;{$users|array_shift}&laquo; wurde{else}Die Benutzer {implode from=$users item=user}&raquo;{$user}&laquo;{/implode} wurden{/if} ÃŒber ihre Freundschaftseinladung informiert.]]></item>
+        </category>
 </language>

buddyloo/de.xml

@@ -11 +11 @@
                 <item name="wcf.buddyloo.out.abolish"><![CDATA[ZurÃŒcknehmen]]></item>
                 <item name="wcf.buddyloo.out.abolish.success"><![CDATA[Sie haben ihre Freundschaftseinladung zurÃŒck genommen.]]></item>
-                <item name="wcf.buddyloo.awaitingconfirmations"><![CDATA[Es warten {$count} Freundschaftseinladungen auf deine BestÀtigung.]]></item>
+                <item name="wcf.buddyloo.awaitingconfirmation"><![CDATA[Es wartet eine Freundschaftseinladung auf Ihre BestÀtigung.]]></item>
+                <item name="wcf.buddyloo.awaitingconfirmations"><![CDATA[Es warten {$count} Freundschaftseinladungen auf Ihre BestÀtigung.]]></item>
                 <item name="wcf.buddyloo.subject"><![CDATA[Freundschaftseinladung von {$author}]]></item>
                 <item name="wcf.buddyloo.body"><![CDATA[Hallo {$recipient}!
@@ -23 +24 @@
 Ihr {PAGE_TITLE} Team]]></item>
         </category>
+        <category name="wcf.user.whitelist">
+                <item name="wcf.user.whitelist.add.success"><![CDATA[{if $users|count == 1}Der Benutzer &raquo;{$users|array_shift}&laquo; wurde{else}Die Benutzer {implode from=$users item=user}&raquo;{$user}&laquo;{/implode} wurden{/if} ÃŒber ihre Freundschaftseinladung informiert.]]></item>
+        </category>
 </language>

buddyloo/en.xml

@@ -11 +11 @@
                 <item name="wcf.buddyloo.out.abolish"><![CDATA[Abolish]]></item>
                 <item name="wcf.buddyloo.out.abolish.success"><![CDATA[You cancelled your invitation.]]></item>
-                <item name="wcf.buddyloo.awaitingconfirmations"><![CDATA[There are {count} friendship-invitations, which are waiting for you confirmation.]]></item>
+                <item name="wcf.buddyloo.awaitingconfirmation"><![CDATA[There is one friendship-invitation which is waiting for your approvement.]]></item>
+                <item name="wcf.buddyloo.awaitingconfirmations"><![CDATA[There are {$count} friendship-invitations which are waiting for your approvement.]]></item>
                 <item name="wcf.buddyloo.subject"><![CDATA[{$author} wants to be your friend]]></item>
                 <item name="wcf.buddyloo.body"><![CDATA[Hello {$recipient}!
@@ -23 +24 @@
 Your {PAGE_TITLE} Team]]></item>
         </category>
+        <category name="wcf.user.whitelist">
+                <item name="wcf.user.whitelist.add.success"><![CDATA[{if $users|count == 1}&quot;{$users|array_shift}&quot; has{else}{implode from=$users item=user}&quot;{$user}&quot;{/implode} have{/if} were informed about your friendship-invitation.]]></item>
+        </category>
 </language>

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

@@ -9 +9 @@
  */
 class BuddylooAbstractPageListener implements EventListener {   
+        protected static $check = false;
+
         /**
          * @see EventListener::execute()
          */
         public function execute($eventObj, $className, $eventName) {
-                $count = 0; //TODO: sql/cache check
-                if($count > 0) {
-                        WCF::getTPL()->assign(array(
-                                'buddyloo_awaitingconfirmations' => $count
-                        ));
-                        WCF::getTPL()->append('userMessages', '<p class="info">'.WCF::getLanguage()->get('wcf.buddyloo.awaitingconfirmations', $count).'</p>');
+                if(self::$check || (WCF::getUser()->userID == 0 || (isset($_GET['form']) && $_GET['form'] == 'WhiteListEdit')))
+                        return;
+
+                self::$check = true;
+
+                $sql = "SELECT  COUNT(*) as c
+                        FROM    wcf".WCF_N."_buddyloo
+                        WHERE   whiteUserID = ".WCF::getUser()->userID;
+                $row = WCF::getDB()->getFirstRow($sql);
+
+                if($row['c'] > 0) {
+                        $text = $row['c'] > 1 ? 
+                                WCF::getLanguage()->get('wcf.buddyloo.awaitingconfirmations', array('$count'=>$row['c'])) : 
+                                WCF::getLanguage()->get('wcf.buddyloo.awaitingconfirmation');
+
+                        WCF::getTPL()->append('userMessages', '<p class="info"><a href="index.php?form=WhiteListEdit">'.$text.'</a></p>');
                 }
         }

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

@@ -140 +140 @@
                 foreach ($this->eventObj->users as $user) {
                         if (!empty($inserts)) $inserts .= ',';
-                        if (!empty($ids)) $inserts .= ',';
+                        if (!empty($ids)) $ids .= ',';
                         $inserts .= "(".WCF::getUser()->userID.", ".$user->userID.")";
                         $ids .= $user->userID;

buddyloo/package.xml

@@ -6 +6 @@
                 <packagedescription>Friendship system for wcf. Friendships can be accepted/declined.</packagedescription>
                 <packagedescription languagecode="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>
-                <version>0.9.0</version>
+                <version>0.9.1</version>
                 <date>DATE</date>
                 <plugin>com.woltlab.wcf</plugin>
@@ -25 +25 @@
                 <templates>templates.tar</templates>
                 <eventlistener>eventlistener.xml</eventlistener>
+                <useroptions>useroptions.xml</useroptions>
                 <sql>install.sql</sql>
                 <languages languagecode="de">de.xml</languages>
@@ -30 +31 @@
                 <languages languagecode="en">en.xml</languages>
         </instructions>
+        
+        <instructions type="update" fromversion="0.9.0">
+                <files>files.tar</files>
+                <languages languagecode="de">de.xml</languages>
+                <languages languagecode="de-informal">de-informal.xml</languages>
+                <languages languagecode="en">en.xml</languages>
+                <useroptions>useroptions.xml</useroptions>
+        </instructions>
 </package>