Changeset 1285

Timestamp:

02/12/11 17:47:46 (2 years ago)

Author:

Torben Brodt

Message:

move twitter base package

Files:

• bbcode.jsfiddle/bbcodes.xml (modified) (1 diff)
• bbcode.jsfiddle/files/lib/data/message/bbcode/JsfiddleBBCode.class.php (modified) (1 diff)
• buddyloo/cronjobs.xml (added)
• buddyloo/files/lib/system/cronjob (added)
• buddyloo/files/lib/system/cronjob/BuddylooSocialCleanupCronjob.class.php (added)
• buddyloo/package.xml (modified) (8 diffs)
• de.easy-coding.wcf.twitter (moved) (moved from twitter/requirements/de.easy-coding.wcf.twitter)
• de.easy-coding.wcf.twitter/files/lib/util/TwitterUtil.class.php (modified) (13 diffs)
• solr/templates/solr.tpl (modified) (2 diffs)
• taggingreloaded/install.sql (modified) (1 diff)
• twitter/package.xml (modified) (1 diff)

bbcode.jsfiddle/bbcodes.xml

@@ -6 +6 @@
                         <classname>JsfiddleBBCode</classname>
                         <allowedchildren>none</allowedchildren>
+                        <attributes>
+                                <attribute name="0">
+                                        <required>0</required>
+                                </attribute>
+                        </attributes>
                         <sourcecode>0</sourcecode>
                 </bbcode>

bbcode.jsfiddle/files/lib/data/message/bbcode/JsfiddleBBCode.class.php

@@ -17 +17 @@
         public function getParsedTag($openingTag, $content, $closingTag, BBCodeParser $parser) {
                 $code = $content;
-                $code = preg_replace('/[^0-9A-Z]+/', '', $code);
+                $code = preg_replace('/[^0-9A-Za-z\/]+/', '', $code);
                 $code = StringUtil::encodeHTML($code);
 
+                $format = isset($openingTag['attributes'][0]) ? $openingTag['attributes'][0].'/' : 'result,js,html,css/';
+
                 if ($parser->getOutputType() == 'text/html') {
-                        return '<iframe style="width: 100%; height: 300px" src="http://jsfiddle.net/'.$code.'/embedded/"></iframe>';
+                        return '<iframe style="width: 100%; height: 300px" src="http://jsfiddle.net/'.$code.'/embedded/'.$format.'"></iframe>';
                 }
                 else if ($parser->getOutputType() == 'text/plain') {

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>1.0.0</version>
+                <version>1.0.1</version>
                 <date>DATE</date>
                 <plugin>com.woltlab.wcf</plugin>
@@ -31 +31 @@
                 <!--<packageinstallationplugins>pip.tar</packageinstallationplugins>//-->
                 <files>files.tar</files>
+                <cronjobs>cronjobs.xml</cronjobs>
                 <templates>templates.tar</templates>
                 <eventlistener>eventlistener.xml</eventlistener>
@@ -45 +46 @@
         </instructions>
         
+        <instructions type="update" fromversion="1.0.0">
+                <files>files.tar</files>
+                <cronjobs>cronjobs.xml</cronjobs>
+        </instructions>
+        
         <instructions type="update" fromversion="0.9.8">
                 <files>files.tar</files>
+                <cronjobs>cronjobs.xml</cronjobs>
                 <templates>templates.tar</templates>
         </instructions>
@@ -52 +59 @@
         <instructions type="update" fromversion="0.9.7 pl 3">
                 <files>files.tar</files>
+                <cronjobs>cronjobs.xml</cronjobs>
                 <templates>templates.tar</templates>
         </instructions>
@@ -57 +65 @@
         <instructions type="update" fromversion="0.9.7 pl 2">
                 <files>files.tar</files>
+                <cronjobs>cronjobs.xml</cronjobs>
                 <templates>templates.tar</templates>
         </instructions>
@@ -62 +71 @@
         <instructions type="update" fromversion="0.9.7 pl 1">
                 <files>files.tar</files>
+                <cronjobs>cronjobs.xml</cronjobs>
                 <templates>templates.tar</templates>
         </instructions>
@@ -67 +77 @@
         <instructions type="update" fromversion="0.9.7">
                 <files>files.tar</files>
+                <cronjobs>cronjobs.xml</cronjobs>
                 <templates>templates.tar</templates>
         </instructions>
@@ -72 +83 @@
         <instructions type="update" fromversion="0.9.5 pl 2">
                 <files>files.tar</files>
+                <cronjobs>cronjobs.xml</cronjobs>
                 <templates>templates.tar</templates>
                 <eventlistener>eventlistener.xml</eventlistener>

de.easy-coding.wcf.twitter/files/lib/util/TwitterUtil.class.php

@@ -96 +96 @@
         
         function getRateLimit($format, $since_id = 0) {
-                $api_call = sprintf("http://twitter.com/account/rate_limit_status.%s", $format);
+                $api_call = sprintf("account/rate_limit_status.%s", $format);
+                return $this->APICall($api_call);
+        }
+        
+        function getRateLimit($format, $since_id = 0) {
+                $api_call = sprintf("account/rate_limit_status.%s", $format);
+                return $this->APICall($api_call);
+        }
+        
+        function getMentions($format, $since_id = 0) {
+                $api_call = sprintf("statuses/mentions.%s", $format);
                 return $this->APICall($api_call);
         }
         
         function getPublicTimeline($format, $since_id = 0) {
-                $api_call = sprintf("http://twitter.com/statuses/public_timeline.%s", $format);
+                $api_call = sprintf("statuses/public_timeline.%s", $format);
                 if ($since_id > 0) {
                         $api_call .= sprintf("?since_id=%d", $since_id);
@@ -110 +120 @@
         function getFriendsTimeline($format, $id = NULL, $since = NULL) {
                 if ($id != NULL) {
-                        $api_call = sprintf("http://twitter.com/statuses/friends_timeline/%s.%s", $id, $format);
+                        $api_call = sprintf("statuses/friends_timeline/%s.%s", $id, $format);
                 }
                 else {
-                        $api_call = sprintf("http://twitter.com/statuses/friends_timeline.%s", $format);
+                        $api_call = sprintf("statuses/friends_timeline.%s", $format);
                 }
                 if ($since != NULL) {
@@ -123 +133 @@
         function getUserTimeline($format, $id = NULL, $count = 20, $since = NULL) {
                 if ($id != NULL) {
-                        $api_call = sprintf("http://twitter.com/statuses/user_timeline/%s.%s", $id, $format);
+                        $api_call = sprintf("statuses/user_timeline/%s.%s", $id, $format);
                 }
                 else {
-                        $api_call = sprintf("http://twitter.com/statuses/user_timeline.%s", $format);
+                        $api_call = sprintf("statuses/user_timeline.%s", $format);
                 }
                 if ($count != 20) {
@@ -138 +148 @@
         
         function showStatus($format, $id) {
-                $api_call = sprintf("http://twitter.com/statuses/show/%d.%s", $id, $format);
+                $api_call = sprintf("statuses/show/%d.%s", $id, $format);
                 return $this->APICall($api_call);
         }
@@ -144 +154 @@
         function updateStatus($format, $status) {
                 $status = urlencode(stripslashes(urldecode($status)));
-                $api_call = sprintf("http://twitter.com/statuses/update.%s?status=%s", $format, $status);
+                $api_call = sprintf("statuses/update.%s?status=%s", $format, $status);
                 return $this->APICall($api_call, true, true);
         }
         
         function getReplies($format, $page = 0) {
-                $api_call = sprintf("http://twitter.com/statuses/replies.%s", $format);
+                $api_call = sprintf("statuses/replies.%s", $format);
                 if ($page) {
                         $api_call .= sprintf("?page=%d", $page);
@@ -157 +167 @@
         
         function destroyStatus($format, $id) {
-                $api_call = sprintf("http://twitter.com/statuses/destroy/%d.%s", $id, $format);
+                $api_call = sprintf("statuses/destroy/%d.%s", $id, $format);
                 return $this->APICall($api_call, true);
         }
@@ -163 +173 @@
         function getFriends($format, $page = 1) {
                 // take care of the id parameter
-                $api_call = sprintf("http://twitter.com/statuses/friends.%s%s", $format, "?page=$page");
+                $api_call = sprintf("statuses/friends.%s%s", $format, "?page=$page");
                 return $this->APICall($api_call, true);
         }
         
         function getFollowers($format, $page = 1) {
-                $api_call = sprintf("http://twitter.com/statuses/followers.%s%s", $format, "?page=$page");
+                $api_call = sprintf("statuses/followers.%s%s", $format, "?page=$page");
                 return $this->APICall($api_call, true);
         }
         
         function getFeatured($format) {
-                $api_call = sprintf("http://twitter.com/statuses/featured.%s", $format);
+                $api_call = sprintf("statuses/featured.%s", $format);
                 return $this->APICall($api_call);
         }
@@ -179 +189 @@
         function showUser($format, $id, $email = NULL) {
                 if ($email == NULL) {
-                        $api_call = sprintf("http://twitter.com/users/show/%s.%s", $id, $format);
+                        $api_call = sprintf("users/show/%s.%s", $id, $format);
                 }
                 else {
-                        $api_call = sprintf("http://twitter.com/users/show.xml?email=%s", $email);
+                        $api_call = sprintf("users/show.xml?email=%s", $email);
                 }
                 return $this->APICall($api_call, true);
@@ -188 +198 @@
         
         function getMessages($format, $since = NULL, $since_id = 0, $page = 1) {
-                $api_call = sprintf("http://twitter.com/direct_messages.%s", $format);
+                $api_call = sprintf("direct_messages.%s", $format);
                 if ($since != NULL) {
                         $api_call .= sprintf("?since=%s", urlencode($since));
@@ -202 +212 @@
         
         function getSentMessages($format, $since = NULL, $since_id = 0, $page = 1) {
-                $api_call = sprintf("http://twitter.com/direct_messages/sent.%s", $format);
+                $api_call = sprintf("direct_messages/sent.%s", $format);
                 if ($since != NULL) {
                         $api_call .= sprintf("?since=%s", urlencode($since));
@@ -217 +227 @@
         function newMessage($format, $user, $text) {
                 $text = urlencode(stripslashes(urldecode($text)));
-                $api_call = sprintf("http://twitter.com/direct_messages/new.%s?user=%s&text=%s", $format, $user, $text);
+                $api_call = sprintf("direct_messages/new.%s?user=%s&text=%s", $format, $user, $text);
                 return $this->APICall($api_call, true, true);
         }
         
         function destroyMessage($format, $id) {
-                $api_call = sprintf("http://twitter.com/direct_messages/destroy/%s.%s", $id, $format);
+                $api_call = sprintf("direct_messages/destroy/%s.%s", $id, $format);
                 return $this->APICall($api_call, true);
         }
         
         function createFriendship($format, $id) {
-                $api_call = sprintf("http://twitter.com/friendships/create/%d.%s", $id, $format);
+                $api_call = sprintf("friendships/create/%d.%s", $id, $format);
                 return $this->APICall($api_call, true, true);
         }
         
         function destroyFriendship($format, $id) {
-                $api_call = sprintf("http://twitter.com/friendships/destroy/%s.%s", $id, $format);
+                $api_call = sprintf("friendships/destroy/%s.%s", $id, $format);
                 return $this->APICall($api_call, true, true);
         }
         
         function verifyCredentials($format = NULL) {
-                $api_call = sprintf("http://twitter.com/account/verify_credentials%s", ($format != NULL) ? sprintf(".%s", $format) : NULL);
+                $api_call = sprintf("account/verify_credentials%s", ($format != NULL) ? sprintf(".%s", $format) : NULL);
                 return $this->APICall($api_call, true);
         }
         
         function endSession() {
-                $api_call = "http://twitter.com/account/end_session";
+                $api_call = "account/end_session";
                 return $this->APICall($api_call, true);
         }
         
         function getArchive($format, $page = 1) {
-                $api_call = sprintf("http://twitter.com/account/archive.%s", $format);
+                $api_call = sprintf("account/archive.%s", $format);
                 if ($page > 1) {
                         $api_call .= sprintf("?page=%d", $page);
@@ -256 +266 @@
         function getFavorites($format, $id = NULL, $page = 1) {
                 if ($id == NULL) {
-                        $api_call = sprintf("http://twitter.com/favourings.%s", $format);
+                        $api_call = sprintf("favourings.%s", $format);
                 }
                 else {
-                        $api_call = sprintf("http://twitter.com/favourings/%s.%s", $id, $format);
+                        $api_call = sprintf("favourings/%s.%s", $id, $format);
                 }
                 if ($page > 1) {
@@ -268 +278 @@
         
         function createFavorite($format, $id) {
-                $api_call = sprintf("http://twitter.com/favourings/create/%d.%s", $id, $format);
+                $api_call = sprintf("favourings/create/%d.%s", $id, $format);
                 return $this->APICall($api_call, true);
         }
         
         function destroyFavorite($format, $id) {
-                $api_call = sprintf("http://twitter.com/favourings/destroy/%d.%s", $id, $format);
+                $api_call = sprintf("favourings/destroy/%d.%s", $id, $format);
                 return $this->APICall($api_call, true);
         }
         
         private function APICall($api_url, $require_credentials = false, $http_post = false) {
+                $api_url = 'http://api.twitter.com/1/';
+        
                 $curl_handle = curl_init();
                 curl_setopt($curl_handle, CURLOPT_URL, $api_url);

solr/templates/solr.tpl

@@ -92 +92 @@
                                 <div class="container-1{if $singleColumn == false} column first{/if}">
                                         <div class="columnInner">
-                                                <div class="contentBox">
+                                                <div class="contentBox" id="searchResults">
         
                                                 {foreach from=$messages item=item}
@@ -134 +134 @@
                 </div>
         </div>
+        <script type="text/javascript">
+        onloadEvents.push(function() {
+                if(_gaq) {
+                        var links = $$('#searchResults a');
+                        for(var i=0; i<links.length; i++) {
+                                links[i].onclick = function(href) {
+                                        return function () {
+                                                _gaq.push(['_trackEvent', 'search', 'solr', href]);
+                                        };
+                                }(links[i].href);
+                        }
+                }
+        });
+        </script>
         
         <div class="contentFooter">

taggingreloaded/install.sql

@@ -7 +7 @@
   `userID` int(10) UNSIGNED NOT NULL DEFAULT '0',
   `weight` tinyint(1) UNSIGNED NOT NULL DEFAULT '0',
-  PRIMARY KEY (`taggableID`,`languageID`,`objectID`,`userID`,`tagID`),
+  PRIMARY KEY (`taggableID`,`languageID`,`objectID`,`tagID`,`userID`),
   KEY `taggableID` (`taggableID`,`languageID`,`tagID`),
   KEY `tagID` (`tagID`,`taggableID`),

twitter/package.xml

@@ -18 +18 @@
         
         <requiredpackages>
-                <requiredpackage file="requirements/de.easy-coding.wcf.twitter.tar.gz" minversion="1.0.0">de.easy-coding.wcf.twitter</requiredpackage>
+                <requiredpackage>de.easy-coding.wcf.twitter</requiredpackage>
                 <requiredpackage minversion="1.0.0">com.woltlab.wcf</requiredpackage>
                 <requiredpackage minversion="2.0.0">com.woltlab.wbb</requiredpackage>