Changeset 192

Timestamp:

01/25/08 20:43:37 (5 years ago)

Author:

d0nut

Message:

url format for google bbcode

Location:

bbcode.google

Files:

• files/lib/data/message/bbcode/GoogleBBCode.class.php (modified) (1 diff)
• package.xml (modified) (2 diffs)

bbcode.google/files/lib/data/message/bbcode/GoogleBBCode.class.php

@@ -11 +11 @@
  */
 class GoogleBBCode implements BBCode {
-        protected $url = 'http://www.google.%s/search?q=%s';
-        protected $defaultlang = 'com';
+        protected $url = 'http://www.google.%s/search?q=%s';
+        protected $defaultlang = 'com';
 
-        /**
-         * @see BBCode::getParsedTag()
-         */
-        public function getParsedTag($openingTag, $content, $closingTag, BBCodeParser $parser) {
+        /**
+         * @see BBCode::getParsedTag()
+         */
+        public function getParsedTag($openingTag, $content, $closingTag, BBCodeParser $parser) {
                 $lang = WCF::getLanguage()->get('wcf.bbcode.google.suffix');
                 $lang = $lang == 'wcf.bbcode.google.suffix' ? $this->defaultlang : $lang;
-                $lang = isset($openingTag['attributes'][0]) ? $openingTag['attributes'][0] : $lang;
-                $url = $content;
+                $lang = isset($openingTag['attributes'][0]) ? $openingTag['attributes'][0] : $lang;
+                if(strpos($lang, 'http://') === false) {
+                        $url = $content;
 
-                // remove base
-                if(strpos($content, '.google.')) {
-                        $var = parse_url($url);
-                        parse_str($var['query'], $output);
-                        $text = $output['q'];
-                } else {
-                        $text = $url;
-                        $url = urlencode($url);
-                        $url = sprintf($this->url, $lang, $url);
-                }
+                        // remove base
+                        if(strpos($content, '.google.')) {
+                                $var = parse_url($url);
+                                parse_str($var['query'], $output);
+                                $text = $output['q'];
+                        } else {
+                                $text = $url;
+                                $url = urlencode($url);
+                                $url = sprintf($this->url, $lang, $url);
+                        }
+                } else { // url format
+                        $url = $lang;
+                        $text = $content;
+                }
 
-                if ($parser->getOutputType() == 'text/html') {
-                        return '<a href="'.$url.'" class="google" style="background-image:url(\''.RELATIVE_WCF_DIR.'icon/wysiwyg/googleS.png\');background-repeat:no-repeat;background-position:left;padding-left:25px">'.$text.'</a>';
-                }
-                else if ($parser->getOutputType() == 'text/plain') {
-                        return $url;
-                }
-        }
+                if ($parser->getOutputType() == 'text/html') {
+                        return '<a href="'.$url.'" class="google" style="background-image:url(\''.RELATIVE_WCF_DIR.'icon/wysiwyg/googleS.png\');background-repeat:no-repeat;background-position:left;padding-left:25px">'.$text.'</a>';
+                }
+                else if ($parser->getOutputType() == 'text/plain') {
+                        return $url;
+                }
+        }
 }
 ?>

bbcode.google/package.xml

@@ -7 +7 @@
                 <packageDescription languagecode="de"><![CDATA[BBCode fÃŒr Google Suchabfrage]]></packageDescription>
                 <packageDescription languagecode="fr"><![CDATA[BBCode pour une recherche Google]]></packageDescription>
-                <version>1.1.2</version>
+                <version>1.2.0</version>
                 <date>DATE</date>
                 <plugin>com.woltlab.wcf.data.message.bbcode</plugin>
@@ -29 +29 @@
                 <languages languagecode="fr">fr.xml</languages>
                 <languages languagecode="it">it.xml</languages>
+        </instructions>
+        
+        <instructions type="update" fromversion="1.1.2">
+                <files>files.tar</files>
         </instructions>