Changeset 758 for trunk/GoogleSearch

Timestamp:

06/23/08 22:37:23 (17 months ago)

Author:

mpaschal

Message:

Merge changes to GoogleSearch? plugin as shipped in extras/
BugzID: 69005

Location:

trunk/GoogleSearch/plugins/GoogleSearch

Files:

• GoogleSearch.pl (modified) (1 diff)
• lib/GoogleSearch/L10N.pm (modified) (1 diff)
• lib/GoogleSearch/L10N/de.pm (added)
• lib/GoogleSearch/L10N/en_us.pm (modified) (1 diff)
• lib/GoogleSearch/L10N/es.pm (added)
• lib/GoogleSearch/L10N/fr.pm (added)
• lib/GoogleSearch/L10N/ja.pm (modified) (1 diff)
• lib/GoogleSearch/L10N/nl.pm (added)
• php/block.mtgooglesearch.php (modified) (4 diffs)
• php/function.mtgooglesearchresult.php (modified) (2 diffs)
• tmpl/config.tmpl (modified) (1 diff)

trunk/GoogleSearch/plugins/GoogleSearch/GoogleSearch.pl

@@ +1 @@
+# Movable Type (r) Open Source (C) 2005-2008 Six Apart, Ltd.
+# This program is distributed under the terms of the
+# GNU General Public License, version 2.
+#
+# $Id: GoogleSearch.pl 1174 2008-01-08 21:02:50Z bchoate $
+
 # GoogleSearch plugin for Movable Type
 # Author: Six Apart (http://www.sixapart.com)
-# Released under the Artistic License
-#
-# $Id: GoogleSearch.pl 32163 2006-06-23 14:05:22Z ytakayama $
+# Released under the Artistic and GPLv2 License
 
 package MT::Plugin::GoogleSearch;

trunk/GoogleSearch/plugins/GoogleSearch/lib/GoogleSearch/L10N.pm

@@ +1 @@
+# Movable Type (r) Open Source (C) 2001-2008 Six Apart, Ltd.
+# This program is distributed under the terms of the
+# GNU General Public License, version 2.
+#
+# $Id: L10N.pm 1174 2008-01-08 21:02:50Z bchoate $
+
 # GoogleSearch plugin for Movable Type
 # Author: Six Apart (http://www.sixapart.com)
-# Released under the Artistic License
-#
-# $Id: L10N.pm 30952 2006-06-13 09:20:43Z jallen $
+# Released under the Artistic and GPLv2 License
 
 package GoogleSearch::L10N;

trunk/GoogleSearch/plugins/GoogleSearch/lib/GoogleSearch/L10N/en_us.pm

@@ +1 @@
+# Movable Type (r) Open Source (C) 2001-2008 Six Apart, Ltd.
+# This program is distributed under the terms of the
+# GNU General Public License, version 2.
+#
+# $Id: en_us.pm 1174 2008-01-08 21:02:50Z bchoate $
+
 # GoogleSearch plugin for Movable Type
 # Author: Six Apart (http://www.sixapart.com)
-# Released under the Artistic License
-#
-# $Id: en_us.pm 30952 2006-06-13 09:20:43Z jallen $
+# Released under the Artistic and GPLv2 License
 
 package GoogleSearch::L10N::en_us;

trunk/GoogleSearch/plugins/GoogleSearch/lib/GoogleSearch/L10N/ja.pm

@@ +1 @@
+# Movable Type (r) Open Source (C) 2001-2008 Six Apart, Ltd.
+# This program is distributed under the terms of the
+# GNU General Public License, version 2.
+#
+# $Id: ja.pm 1174 2008-01-08 21:02:50Z bchoate $
+
 # GoogleSearch plugin for Movable Type
 # Author: Six Apart (http://www.sixapart.com)
-# Released under the Artistic License
-#
-# $Id: ja.pm 30952 2006-06-13 09:20:43Z jallen $
+# Released under the Artistic and GPLv2 License
 
 package GoogleSearch::L10N::ja;

trunk/GoogleSearch/plugins/GoogleSearch/php/block.mtgooglesearch.php

@@ -1 +1 @@
 <?php
-function smarty_block_MTGoogleSearch($args, $content, &$ctx, &$repeat) {
+# Movable Type (r) Open Source (C) 2001-2008 Six Apart, Ltd.
+# This program is distributed under the terms of the
+# GNU General Public License, version 2.
+#
+# $Id$
+
+function smarty_block_mtgooglesearch($args, $content, &$ctx, &$repeat) {
     $localvars = array('google_result_item', 'google_results', '_result_count');
     if (!isset($content)) {
@@ -24 +30 @@
             $query = $entry['entry_title'];
         } elseif ($args['excerpt']) {
-            $query = smarty_function_MTEntryExcerpt(array(), $ctx);
+            $query = smarty_function_mtentryexcerpt(array(), $ctx);
         } elseif ($args['keywords']) {
             $query = $entry['entry_keywords'];
+        } elseif ($args['tags']) {
+            $query = "";
+            $tags = $ctx->mt->db->fetch_entry_tags(array('entry_id' => $entry['entry_id'], 'blog_id' => $blog->id));
+            if (isset($tags)) {
+                foreach($tags as $tag) {
+                    $query .= '"'.$tag['tag_name'].'" ';
+                }
+            }
         } else {
             $query = $args['query'];
         }
 
+        if ($query == '') {
+            $query = $entry['entry_title'];
+        }
+
         global $mt;
-        $lang = $mt->config['DefaultLanguage'];
+        $lang = $mt->config('DefaultLanguage');
         if ($lang == 'ja') {
-            $charset = $mt->config['PublishCharset'];
+            $charset = $mt->config('PublishCharset');
             $query = mb_convert_encoding($query, 'utf-8', $charset);
         }
@@ -52 +70 @@
             }
             else {
-                return $ctx->error('You need a Google API key to use &lt;MTGoogleSearch>');
+                return $ctx->error('You need a Google API key to use &lt;mtgooglesearch>');
             }
         }
 
-        $wsdl = new SOAP_WSDL($mt->config['PHPDir'].DIRECTORY_SEPARATOR."plugins".DIRECTORY_SEPARATOR."GoogleSearch.wsdl");
+        $wsdl = new SOAP_WSDL(dirname(__FILE__).DIRECTORY_SEPARATOR."GoogleSearch.wsdl");
         $proxy = $wsdl->getProxy();
         $result = $proxy->doGoogleSearch(
@@ -78 +96 @@
         } else {
             // We have proper search results
-            foreach ($result->resultElements as $index => $item) {
-                $summary = $item->summary;
-                $url = $item->URL;
-                $snippet = $item->snippet;
-                $title = $item->title;
+            if ($result->resultElements) {
+                foreach ($result->resultElements as $index => $item) {
+                    $summary = $item->summary;
+                    $url = $item->URL;
+                    $snippet = $item->snippet;
+                    $title = $item->title;
                 
-                $set = array(
-                    'summary' => $summary,
-                    'URL' => $url,
-                    'snippet' => $snippet,
-                    'title' => $title
-                );
+                    $set = array(
+                        'summary' => $summary,
+                        'URL' => $url,
+                        'snippet' => $snippet,
+                        'title' => $title
+                    );
                 
-                $google_results[] = $set;
+                    $google_results[] = $set;
+                }
             }
             $ctx->stash('google_results', $google_results);

trunk/GoogleSearch/plugins/GoogleSearch/php/function.mtgooglesearchresult.php

@@ -1 +1 @@
 <?php
-function smarty_function_MTGoogleSearchResult($args, &$ctx) {
+# Movable Type (r) Open Source (C) 2001-2008 Six Apart, Ltd.
+# This program is distributed under the terms of the
+# GNU General Public License, version 2.
+#
+# $Id$
+
+function smarty_function_mtgooglesearchresult($args, &$ctx) {
     $result = $ctx->stash('google_result_item');
     $prop = $args['property'];
@@ -8 +14 @@
 
     global $mt;
-    $lang = $mt->config['DefaultLanguage'];
+    $lang = $mt->config('DefaultLanguage');
     if ($lang == 'ja') {
-        $charset = $mt->config['PublishCharset'];
+        $charset = $mt->config('PublishCharset');
         $s = mb_convert_encoding($result[$prop], $charset, 'utf-8');
     }else{

trunk/GoogleSearch/plugins/GoogleSearch/tmpl/config.tmpl

@@ -1 @@
-<div class="setting">
-    <div class="label">
-        <label for="google_api_key"><MT_TRANS phrase="Google API Key:"></label>
-    </div>
-    <div class="field">
+    <mtapp:setting
+        id="google_api_key"
+        label="<__trans phrase="Google API Key">"
+        hint="<__trans phrase="If you wish to use any of the Google API functionality, you will need a Google API key. Paste it in here.">">
         <input type="text" name="google_api_key" id="google_api_key" value="<TMPL_VAR NAME=GOOGLE_API_KEY ESCAPE=HTML>" />
-        <p><MT_TRANS phrase="If you wish to use any of the Google API functionality, you will need a Google API key. Paste it in here."></p>
-    </div> 
-</div>
+    </mtapp:setting>