Changeset 1160

Timestamp:

02/21/10 01:08:46 (3 years ago)

Author:

GneX

Message:

SkypeButton? wird durch neuen SkypeButton? ersetzt

Location:

org.gnex.skypeStatusSidebar

Files:

• de-informal.xml (modified) (1 diff)
• de.xml (modified) (1 diff)
• files/lib/system/event/listener/MessageSidebarSkypeStatusListener.class.php (modified) (2 diffs)
• package.xml (modified) (2 diffs)

org.gnex.skypeStatusSidebar/de-informal.xml

@@ -3 +3 @@
 <language languagecode="de-informal">
         <category name="org.gnex.skypeStatusSidebar">
-                <item name="org.gnex.skypeStatusSidebar.status"><![CDATA[SkypeStatus von &raquo;{$username}&laquo; - SkypeName: {$skypeName}]]></item>
+                <item name="org.gnex.skypeStatusSidebar.status"><![CDATA[&raquo;{$username}&laquo; ({$skypeName}) ÃŒber Skype kontaktieren]]></item>
         </category>
 </language>

org.gnex.skypeStatusSidebar/de.xml

@@ -3 +3 @@
 <language languagecode="de">
         <category name="org.gnex.skypeStatusSidebar">
-                <item name="org.gnex.skypeStatusSidebar.status"><![CDATA[SkypeStatus von &raquo;{$username}&laquo; - SkypeName: {$skypeName}]]></item>
+                <item name="org.gnex.skypeStatusSidebar.status"><![CDATA[&raquo;{$username}&laquo; ({$skypeName}) ÃŒber Skype kontaktieren]]></item>
         </category>
 </language>

org.gnex.skypeStatusSidebar/files/lib/system/event/listener/MessageSidebarSkypeStatusListener.class.php

@@ -1 +1 @@
 <?php
 require_once(WCF_DIR.'lib/system/event/EventListener.class.php');
+require_once(WCF_DIR.'lib/data/user/option/UserOptions.class.php');
 
 class MessageSidebarSkypeStatusListener implements EventListener {
@@ -9 +10 @@
         public function execute($eventObj, $className, $eventName) {
                 foreach ($eventObj->messageSidebars as $id => $sidebar) {
-                  $skypeValue = $sidebar->getUser()->getUserOption('Skype');
-                  
-            if(isset($skypeValue) && !empty($skypeValue)) {
-              if($skypeStatus) $sidebar->addUserContact($this->getButton($sidebar->getUser()->username, $skypeValue));
-            }
+                        $userOptions = new UserOptions('short', explode(',', MESSAGE_SIDEBAR_SHOW_USER_OPTIONS));
+                        $categories = $userOptions->getOptionTree('profile', $sidebar->getUser());
+                        foreach ($categories as $category) {
+                          if($category['categoryName'] == 'profile.messenger') {
+                            foreach ($category['options'] as $userOption) {
+                                    if($userOption['optionName'] == 'skype') {
+                                      $skypeName = $userOption['outputData']['value'];
+                                      $optionValue = $userOption['optionValue'];
+            }
+                            }
+        }
+      }
+      
+      $userContacts = $sidebar->getUserContacts();
+                        foreach ($userContacts as $userContact => $value) {
+                          if($value['value'] == $optionValue) {
+                            $arrayKey = $userContact;
+        }
+                        }
+                        
+                        $userContacts[$arrayKey] = array('value' => $this->getLink($sidebar->getUser()->userID, $this->getImage($sidebar->getUser()->username, $skypeName)));
+                        $sidebar->userContacts = $userContacts;
                 }
         }
         
-        public function getButton($username, $skypeName) {
-          return '<a href="skype:'.$skypeName.'?call"><img src="http://mystatus.skype.com/smallicon/'.$skypeName.'" style="border: none" width="16" height="16" alt="'.WCF::getLanguage()->get('org.gnex.skypeStatusSidebar.status', array('$username' => $username, '$skypeName' => $skypeName)).'" title="'.WCF::getLanguage()->get('org.gnex.skypeStatusSidebar.status', array('$username' => $username, '$skypeName' => $skypeName)).'" /></a>';
+        public function getImage($username, $skypeName) {
+                $title = WCF::getLanguage()->get('org.gnex.skypeStatusSidebar.status', array('$username' => $username, '$skypeName' => $skypeName));
+                return '<img src="http://mystatus.skype.com/smallicon/'.$skypeName.'" alt="" title="'.$title.'" />';
+        }
+        
+        public function getLink($userID, $title) {
+                return '<a href="index.php?page=Messenger&amp;userID='.$userID.'&amp;action=skype'.SID_ARG_2ND.'" onclick="return !window.open(this.href, \'skype\', \'width=350,height=400,scrollbars=yes,resizable=yes\')">'.$title.'</a>';
         }
 }

org.gnex.skypeStatusSidebar/package.xml

@@ -6 +6 @@
                 <packagedescription><![CDATA[Zeigt in der MessageSidebar an, welchen Status der Benutzer bei Skype hat.]]></packagedescription>
                 <isunique>1</isunique>
-                <version>1.1.0</version>
+                <version>1.2.0</version>
                 <date>2010-02-20</date>
                 <plugin>com.woltlab.wcf</plugin>
@@ -39 +39 @@
                 <languages languagecode="de-informal">de-informal.xml</languages>
         </instructions>
+        <instructions type="update" fromversion="1.1.0">
+                <files>files.tar</files>
+        </instructions>
 </package>