Changeset 1296

Timestamp:

02/17/11 09:46:06 (2 years ago)

Author:

Torben Brodt

Message:

finish websnapr 2.0 implementation for woltlab

Location:

websnapr

Files:

• de-informal.xml (modified) (1 diff)
• de.xml (modified) (1 diff)
• en.xml (modified) (1 diff)
• files/images (deleted)
• files/js/WebSnapr.js (modified) (4 diffs)
• files/lib/system/event/listener/AbstractPageWebsnaprListener.class.php (modified) (1 diff)
• fr.xml (modified) (1 diff)
• hr.xml (modified) (1 diff)
• it.xml (modified) (1 diff)
• options.xml (modified) (1 diff)
• package.xml (modified) (3 diffs)
• requirements (deleted)
• templates/WebSnapr.tpl (modified) (1 diff)

websnapr/de-informal.xml

@@ -7 +7 @@
                 <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>
         </category>
 </language>

websnapr/de.xml

@@ -7 +7 @@
                 <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>
         </category>
 </language>

websnapr/en.xml

@@ -7 +7 @@
                 <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>
         </category>
 </language>

websnapr/files/js/WebSnapr.js

@@ -113 +113 @@
         B = (B == "" ? WS.ClassName : B);
         var A = Math.random(100);
-        return ("http://" + WS.Domain + ".websnapr.com/?url=" + encodeURIComponent(WS.Url) + "&key=" + encodeURIComponent(WS.Key) + "&nocache=" + A + "&size=s&src=bubble")
+        var size = 's';
+        return "http://" + WS.Domain + ".websnapr.com/?size=" + (size.toLowerCase() == 't' || '' ? 't' : 's') + "&key=" + encodeURIComponent(WS.Key) + "&hash=" + encodeURIComponent(websnapr_hash) + "&url=" + encodeURIComponent(WS.Url)
     },
     getDimensions: function (B) {
@@ -215 +216 @@
         }
         for (var k = 0; k < parentObj.length; k++) {
-            tagObj = parentObj[k].getElementsByTagName("a");
-            for (i = 0; i < tagObj.length; i++) {
-                var ob = tagObj[i];
+            // tagObj = parentObj[k].getElementsByTagName("a");
+            // for (i = 0; i < tagObj.length; i++) {
+                var ob = parentObj[k];
+                
+                // placed by easy-coding.de
+                if(websnapr_regex && websnapr_regex.exec(ob.href)) {
+                    continue;
+                }
+                
                 if (ob.href.search(eval("/^(http:|https:)/g")) == -1) {
                     continue
@@ -232 +239 @@
                 }
                 targetUrlObj = WS.mergeArray(targetUrlObj, ob)
-            }
+            // }
         }
         return targetUrlObj
@@ -308 +315 @@
 WS.Domain = "images";
 WS.ParentID = "externalURL";
-WS.addEvent(window, ["load"], WS.init);
+if(typeof websnapr_hash !== 'undefined') {
+        WS.addEvent(window, ["load"], WS.init);
+}

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

@@ -19 +19 @@
                 if(defined('WEBSNAPR_KEY') && WEBSNAPR_KEY != "" && !self::$called) {
                         self::$called = true;
-                        WCF::getTPL()->append('specialStyles', WCF::getTPL()->fetch('WebSnapr'));
+                        WCF::getTPL()->append('additionalFooterContents', WCF::getTPL()->fetch('WebSnapr'));
                 }
         }

websnapr/fr.xml

@@ -7 +7 @@
                 <item name="wcf.acp.option.websnapr_regex"><![CDATA[Regex WebSnapr]]></item>
                 <item name="wcf.acp.option.websnapr_regex.description"><![CDATA[Pour exclure certains types de fichiers ou URLs.]]></item>
+                
+                <item name="wcf.acp.option.category.websnapr"><![CDATA[WebSnapr]]></item>
+                <item name="wcf.acp.option.category.websnapr.description"><![CDATA[]]></item>
         </category>
 </language>

websnapr/hr.xml

@@ -7 +7 @@
                 <item name="wcf.acp.option.websnapr_regex"><![CDATA[WebSnapr Regex]]></item>
                 <item name="wcf.acp.option.websnapr_regex.description"><![CDATA[Kako bi isključili URLove ili ekstenzije datoteka.]]></item>
+                
+                <item name="wcf.acp.option.category.websnapr"><![CDATA[WebSnapr]]></item>
+                <item name="wcf.acp.option.category.websnapr.description"><![CDATA[]]></item>
         </category>
 </language>

websnapr/it.xml

@@ -7 +7 @@
                 <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>
         </category>
 </language>

websnapr/options.xml

@@ -3 +3 @@
 <data>
         <import>
+                <categories>
+                        <category name="websnapr">
+                                <parent>general.page</parent>
+                        </category>
+                </categories>
                 <options>
                         <option name="websnapr_key">
-                                <categoryname>headscript.plugins</categoryname>
+                                <categoryname>websnapr</categoryname>
                                 <optiontype>text</optiontype>
                                 <defaultvalue><![CDATA[]]></defaultvalue>
                         </option>
                         <option name="websnapr_regex">
-                                <categoryname>headscript.plugins</categoryname>
+                                <categoryname>websnapr</categoryname>
                                 <optiontype>text</optiontype>
                                 <defaultvalue><![CDATA[\.(rar|zip|gz|tar|sql|doc|xls|exe|mov|wav|mp3|avi|mid|mpeg|mpg|swf|js|psd|ppt|cdr|iso)$]]></defaultvalue>

websnapr/package.xml

@@ -5 +5 @@
                 <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>
-                <version>1.2.2</version>
+                <version>2.0.0</version>
                 <date>DATE</date>
                 <plugin>com.woltlab.wcf</plugin>
@@ -18 +18 @@
         <requiredpackages>
                 <requiredpackage minversion="1.0.0">com.woltlab.wcf</requiredpackage>
-                <requiredpackage minversion="1.0.0" file="requirements/de.easy-coding.wcf.headscript.tar.gz">de.easy-coding.wcf.headscript</requiredpackage>
         </requiredpackages>
 
@@ -34 +33 @@
         </instructions>
         
+        <instructions type="update" fromversion="1.2.2">
+                <files>files.tar</files>
+                <templates>templates.tar</templates>
+                <languages languagecode="de">de.xml</languages>
+                <languages languagecode="de-informal">de-informal.xml</languages>
+                <languages languagecode="en">en.xml</languages>
+                <languages languagecode="fr">fr.xml</languages>
+                <languages languagecode="it">it.xml</languages>
+                <languages languagecode="hr">hr.xml</languages>
+                <options>options.xml</options>
+        </instructions>
+        
         <instructions type="update" fromversion="1.2.1">
                 <files>files.tar</files>
+                <templates>templates.tar</templates>
+                <languages languagecode="de">de.xml</languages>
+                <languages languagecode="de-informal">de-informal.xml</languages>
+                <languages languagecode="en">en.xml</languages>
+                <languages languagecode="fr">fr.xml</languages>
+                <languages languagecode="it">it.xml</languages>
+                <languages languagecode="hr">hr.xml</languages>
+                <options>options.xml</options>
         </instructions>
         

websnapr/templates/WebSnapr.tpl

@@ -2 +2 @@
         //<![CDATA[
         var websnapr_regex = /{WEBSNAPR_REGEX}/;
-        var bubbleImagePath = '{@RELATIVE_WCF_DIR}images/WebSnapr.png';
-        var developerKey = '{WEBSNAPR_KEY}';
+        var websnapr_key = '{WEBSNAPR_KEY}';
         //]]>
 </script>
+<script type="text/javascript" src="http://www.websnapr.com/js/websnapr.js"></script>
 <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/WebSnapr.js"></script>