Changeset 1310

Timestamp:

02/27/11 14:15:53 (2 years ago)

Author:

Torben Brodt

Message:

migrate websnapr to m-software thumbshots

Location:

websnapr

Files:

• de-informal.xml (modified) (1 diff)
• de.xml (modified) (1 diff)
• en.xml (modified) (1 diff)
• eventlistener.xml (modified) (2 diffs)
• files/acp (added)
• files/acp/update_websnapr.php (added)
• files/js/Bubble.js (added)
• files/js/WebSnapr.js (deleted)
• files/lib/system/event/listener/AbstractPageThumsbotsListener.class.php (moved) (moved from websnapr/files/lib/system/event/listener/AbstractPageWebsnaprListener.class.php) (2 diffs)
• fr.xml (deleted)
• hr.xml (deleted)
• it.xml (deleted)
• options.xml (modified) (2 diffs)
• package.xml (modified) (1 diff)
• templates (deleted)

websnapr/de-informal.xml

@@ -3 +3 @@
 <language languagecode="de-informal">
         <category name="wcf.acp.option">
-                <item name="wcf.acp.option.websnapr_key"><![CDATA[WebSnapr Key]]></item>
-                <item name="wcf.acp.option.websnapr_key.description"><![CDATA[Holen Sie sich den SchlÃŒssel kostenlos auf <a href="http://www.websnapr.com" target="_blank">websnapr.com</a>.]]></item>
-                <item name="wcf.acp.option.websnapr_regex"><![CDATA[WebSnapr Regex]]></item>
-                <item name="wcf.acp.option.websnapr_regex.description"><![CDATA[Zum Ausschluss von URLs oder Dateiendungen.]]></item>
-                
-                <item name="wcf.acp.option.category.websnapr"><![CDATA[WebSnapr]]></item>
-                <item name="wcf.acp.option.category.websnapr.description"><![CDATA[]]></item>
+                <item name="wcf.acp.option.thumbshots_backlink"><![CDATA[Thumbshots Backlink]]></item>
+                <item name="wcf.acp.option.thumbshots_backlink.description"><![CDATA[Der Service von <a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url=http://www.m-software.de/thumbshots">M-Software</a> finanziert sich durch Links auf den eigenen Service. Diese werden standardmÀßig im Footer von gepinnten Themen gezeigt. Wenn sie keine gepinnten Themen haben, geben Sie hier bitte eine andere Seite an, wo der Link platziert werden soll. Zum Beispiel: "grafik-forum.html"]]></item>
+                <item name="wcf.acp.option.thumbshots_disallow"><![CDATA[Thumbshots Blacklist]]></item>
+                <item name="wcf.acp.option.thumbshots_disallow.description"><![CDATA[RegulÀrer Ausdruck zum Ausschluss von URLs oder Dateiendungen.]]></item>
         </category>
 </language>

websnapr/de.xml

@@ -3 +3 @@
 <language languagecode="de">
         <category name="wcf.acp.option">
-                <item name="wcf.acp.option.websnapr_key"><![CDATA[WebSnapr Key]]></item>
-                <item name="wcf.acp.option.websnapr_key.description"><![CDATA[Holen Sie sich den SchlÃŒssel kostenlos auf <a href="http://www.websnapr.com" target="_blank">websnapr.com</a>.]]></item>
-                <item name="wcf.acp.option.websnapr_regex"><![CDATA[WebSnapr Regex]]></item>
-                <item name="wcf.acp.option.websnapr_regex.description"><![CDATA[Zum Ausschluss von URLs oder Dateiendungen.]]></item>
-                
-                <item name="wcf.acp.option.category.websnapr"><![CDATA[WebSnapr]]></item>
-                <item name="wcf.acp.option.category.websnapr.description"><![CDATA[]]></item>
+                <item name="wcf.acp.option.thumbshots_backlink"><![CDATA[Thumbshots Backlink]]></item>
+                <item name="wcf.acp.option.thumbshots_backlink.description"><![CDATA[Der Service von <a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url=http://www.m-software.de/thumbshots">M-Software</a> finanziert sich durch Links auf den eigenen Service. Diese werden standardmÀßig im Footer von gepinnten Themen gezeigt. Wenn sie keine gepinnten Themen haben, geben Sie hier bitte eine andere Seite an, wo der Link platziert werden soll. Zum Beispiel: "grafik-forum.html"]]></item>
+                <item name="wcf.acp.option.thumbshots_disallow"><![CDATA[Thumbshots Blacklist]]></item>
+                <item name="wcf.acp.option.thumbshots_disallow.description"><![CDATA[RegulÀrer Ausdruck zum Ausschluss von URLs oder Dateiendungen.]]></item>
         </category>
 </language>

websnapr/en.xml

@@ -3 +3 @@
 <language languagecode="en">
         <category name="wcf.acp.option">
-                <item name="wcf.acp.option.websnapr_key"><![CDATA[WebSnapr Key]]></item>
-                <item name="wcf.acp.option.websnapr_key.description"><![CDATA[Insert your WebSnapr developer key here - get it free on <a href="http://www.websnapr.com" target="_blank">websnapr.com</a>.]]></item>
-                <item name="wcf.acp.option.websnapr_regex"><![CDATA[WebSnapr Regex]]></item>
-                <item name="wcf.acp.option.websnapr_regex.description"><![CDATA[To exclude URLs or filetypes.]]></item>
-                
-                <item name="wcf.acp.option.category.websnapr"><![CDATA[WebSnapr]]></item>
-                <item name="wcf.acp.option.category.websnapr.description"><![CDATA[]]></item>
+                <item name="wcf.acp.option.thumbshots_backlink"><![CDATA[Thumbshots Backlink]]></item>
+                <item name="wcf.acp.option.thumbshots_backlink.description"><![CDATA[The Service <a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url=http://www.m-software.de/thumbshots">M-Software</a> is free of charge but requires a link to its service. These will be places on pinned thread. If you don't have any, please enter a Location where the link should be places. E.g.: "graphics-forum.html"]]></item>
+                <item name="wcf.acp.option.thumbshots_disallow"><![CDATA[Thumbshots Blacklist]]></item>
+                <item name="wcf.acp.option.thumbshots_disallow.description"><![CDATA[Regular Expression to exclude URLs or filetypes.]]></item>
         </category>
 </language>

websnapr/eventlistener.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
 <!DOCTYPE data SYSTEM "http://www.woltlab.com/DTDs/eventListeners.dtd">
-<data>  
+<data>
         <import>
+                <eventlistener>
+                        <eventclassname>AbstractPage</eventclassname>
+                        <eventname>assignVariables</eventname>
+                        <inherit>1</inherit>
+                        <listenerclassfile>lib/system/event/listener/AbstractPageThumbshotsListener.class.php</listenerclassfile>
+                </eventlistener>
+        </import>
+        <delete>
                 <eventlistener>
                         <eventclassname>AbstractPage</eventclassname>
@@ -9 +17 @@
                         <listenerclassfile>lib/system/event/listener/AbstractPageWebsnaprListener.class.php</listenerclassfile>
                 </eventlistener>
-        </import>
+        </delete>
 </data>

websnapr/files/lib/system/event/listener/AbstractPageThumsbotsListener.class.php

@@ -4 +4 @@
 
 /**
- * Adds the bubble javascript from websnapr to the template
+ * Adds the bubble javascript from thumbshots
  *
  * @author      Torben Brodt
- * @package     de.easy-coding.wcf.websnapr
+ * @package     de.easy-coding.wcf.thumbshots
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-3.0.html>
  */
-class AbstractPageWebsnaprListener implements EventListener {
+class AbstractPageThumbshotsListener implements EventListener {
         private static $called = false;
 
@@ -17 +17 @@
          */
         public function execute($eventObj, $className, $eventName) {
-                if(defined('WEBSNAPR_KEY') && WEBSNAPR_KEY != "" && !self::$called) {
+                if(!self::$called) {
                         self::$called = true;
-                        WCF::getTPL()->append('additionalFooterContents', WCF::getTPL()->fetch('WebSnapr'));
+                        
+                        // place author backlink
+                        if($this->isBranding($eventObj, $className)) {
+                                WCF::getTPL()->append('additionalFooterOptions',
+                                        '<li><a class="externalURL" href="http://www.m-software.de/thumbshots"><span>Thumbshots</span></a></li>');
+                        }
+                        
+                        // place javascript widget
+                        WCF::getTPL()->append('additionalFooterContents', '<script type="text/javascript" src="'.RELATIVE_WCF_DIR.'js/Bubble.js"></script><script type="text/javascript">
+Bubble.disallow("href", '.THUMBSHOTS_DISALLOW.');
+Bubble.init("externalURL", function (D) {
+        return \'<img alt="" style="width:150px;height:100px" src="http://www.m-software.de/screenshot/Screenshot.png?url=\'+ escape(D.href) +\'&commingsoonimg=http://fadeout.de/images/thumbshot.png" />\';
+});
+</script>');
                 }
+        }
+        
+        /**
+         * @return boolean
+         */
+        protected function isBranding($eventObj, $className) {
+                $doBranding = false;
+                if($className == 'ThreadPage') {
+                        if($eventObj->thread->isSticky || $eventObj->thread->isAnnouncement) {
+                                return true;
+                        }
+                }
+                if(THUMBSHOTS_BACKLINK && isset($_SERVER['REQUEST_URI']) && @preg_match('/'.THUMBSHOTS_BACKLINK.'/', $_SERVER['REQUEST_URI'])) {
+                        return true;
+                }
+                return false;
         }
 }

websnapr/options.xml

@@ -3 +3 @@
 <data>
         <import>
-                <categories>
-                        <category name="websnapr">
-                                <parent>general.page</parent>
-                        </category>
-                </categories>
                 <options>
-                        <option name="websnapr_key">
-                                <categoryname>websnapr</categoryname>
+                        <option name="thumbshots_backlink">
+                                <categoryname>general.page</categoryname>
                                 <optiontype>text</optiontype>
                                 <defaultvalue><![CDATA[]]></defaultvalue>
                         </option>
-                        <option name="websnapr_regex">
+                        <option name="thumbshots_disallow">
                                 <categoryname>websnapr</categoryname>
                                 <optiontype>text</optiontype>
@@ -21 +16 @@
                 </options>
         </import>
+        <delete>
+                <category name="websnapr" />
+                <option name="websnapr_key"/>
+                <option name="websnapr_regex"/>
+        </delete>
 </data>

websnapr/package.xml

@@ -2 +2 @@
 <!DOCTYPE package SYSTEM "http://www.woltlab.com/DTDs/package.dtd">
 <package name="de.easy-coding.wcf.websnapr">
+<!-- will be renamed to de.easy-coding.wcf.thumsbots -->
         <packageinformation>
-                <packagename>WebSnapr</packagename>
-                <packagedescription>WebSnapr lets you capture screenshots of (almost) any web page. Let your visitors to instantly visualize any web page before clicking. Increase site traffic, click-through rate and site stickiness.</packagedescription>
+                <packagename>Thumsbots</packagename>
+                <packagedescription>Adds preview bubbles to all external links.</packagedescription>
                 <version>2.0.0</version>
                 <date>DATE</date>