Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

[quix0rs-gnu-social.git] / plugins / LinkPreview / LinkPreviewPlugin.php

diff --git a/plugins/LinkPreview/LinkPreviewPlugin.php b/plugins/LinkPreview/LinkPreviewPlugin.php
index d887ca0408a6ad3492753acce547967c5e0f41aa..2cc077d90e7b030a41ee82169b2a2907e3ceab6b 100644 (file)
--- a/plugins/LinkPreview/LinkPreviewPlugin.php
+++ b/plugins/LinkPreview/LinkPreviewPlugin.php
@@ -50,8 +50,19 @@ class LinkPreviewPlugin extends Plugin
     function onEndShowScripts($action)
     {
         $user = common_current_user();
-        if ($user) {
-            $action->script('plugins/LinkPreview/linkpreview.js');
+        if ($user && common_config('attachments', 'process_links')) {
+            if (common_config('site', 'minify')) {
+                $js = 'linkpreview.min.js';
+            } else {
+                $js = 'linkpreview.js';
+            }
+            $action->script($this->path($js));
+            $data = json_encode(array(
+                'api' => common_local_url('oembedproxy'),
+                'width' => common_config('attachments', 'thumbwidth'),
+                'height' => common_config('attachments', 'thumbheight'),
+            ));
+            $action->inlineScript('$(function() {SN.Init.LinkPreview && SN.Init.LinkPreview('.$data.');})');
         }
         return true;
     }
@@ -67,10 +78,11 @@ class LinkPreviewPlugin extends Plugin
      */
     function onAutoload($cls)
     {
-        switch ($cls)
+        $lower = strtolower($cls);
+        switch ($lower)
         {
-        case 'LinkpreviewAction':
-            require_once dirname(__FILE__) . '/linkpreviewaction.php';
+        case 'oembedproxyaction':
+            require_once dirname(__FILE__) . '/' . $lower . '.php';
             return false;
         default:
             return true;
@@ -86,8 +98,8 @@ class LinkPreviewPlugin extends Plugin
      */
     function onStartInitializeRouter($m)
     {
-        $m->connect('main/preview/link',
-                array('action' => 'linkpreview'));
+        $m->connect('main/oembed/proxy',
+                array('action' => 'oembedproxy'));
 
         return true;
     }