From 41049274ab79a97faa0c7841d31f59ddb6fe7cb9 Mon Sep 17 00:00:00 2001
From: Ian <aristophian@googlemail.com>
Date: Tue, 10 Jun 2014 10:24:10 +0200
Subject: [PATCH] fix for enablePopup mode

---
 serendipity_event_linktrimmer/ChangeLog                    | 4 ++++
 serendipity_event_linktrimmer/plugin_linktrimmer.tpl       | 7 ++++++-
 serendipity_event_linktrimmer/plugin_linktrimmer_old.tpl   | 2 +-
 .../serendipity_event_linktrimmer.php                      | 4 +++-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/serendipity_event_linktrimmer/ChangeLog b/serendipity_event_linktrimmer/ChangeLog
index 707dba14..c9f09052 100644
--- a/serendipity_event_linktrimmer/ChangeLog
+++ b/serendipity_event_linktrimmer/ChangeLog
@@ -1,3 +1,7 @@
+1.5:
+----
+    * Fix for enablePopup in >= 2.0
+
 1.4:
 ----
     * Adapted backend markup for 2.0 backend.
diff --git a/serendipity_event_linktrimmer/plugin_linktrimmer.tpl b/serendipity_event_linktrimmer/plugin_linktrimmer.tpl
index fdba43f3..cba99aaf 100644
--- a/serendipity_event_linktrimmer/plugin_linktrimmer.tpl
+++ b/serendipity_event_linktrimmer/plugin_linktrimmer.tpl
@@ -44,7 +44,7 @@
     <h3>{$CONST.PLUGIN_LINKTRIMMER_NAME}</h3>
 {/if}
     <form action="?" method="post">
-        <input type="hidden" name="txtarea" value="{$linktrimmer_txtarea|escape:url}">
+        <input type="hidden" name="txtarea" value="{$linktrimmer_txtarea|escape:'url'}">
         <fieldset id="main_linktrimmer" class="">
         {if $linktrimmer_external}
             <legend>{$CONST.PLUGIN_LINKTRIMMER_NAME}</legend>
@@ -70,8 +70,13 @@
 
     {if $linktrimmer_url != '' && $linktrimmer_external}
             <script>
+        {if !$linktrimmer_ispopup}
                 window.parent.parent.serendipity.serendipity_imageSelector_addToBody('<a href="{$linktrimmer_url|escape}" title="{$linktrimmer_origurl|escape}">{$linktrimmer_origurl|escape}</a>', '{$linktrimmer_txtarea|escape}');
                 window.parent.parent.$.magnificPopup.close();
+        {else}
+                self.opener.serendipity_imageSelector_addToBody('<a href="{$linktrimmer_url|escape}" title="{$linktrimmer_origurl|escape}">{$linktrimmer_origurl|escape}</a>', '{$linktrimmer_txtarea|escape}');
+                self.close();
+        {/if}
             </script>
     {elseif $linktrimmer_url != ''}
             <div class="form_field">
diff --git a/serendipity_event_linktrimmer/plugin_linktrimmer_old.tpl b/serendipity_event_linktrimmer/plugin_linktrimmer_old.tpl
index 0a6e7b56..643a9269 100644
--- a/serendipity_event_linktrimmer/plugin_linktrimmer_old.tpl
+++ b/serendipity_event_linktrimmer/plugin_linktrimmer_old.tpl
@@ -22,7 +22,7 @@
 
 <div class="linktrimmer">
     <form action="?" method="post">
-        <input type="hidden" name="txtarea" value="{$linktrimmer_txtarea|@escape:url}" />
+        <input type="hidden" name="txtarea" value="{$linktrimmer_txtarea|@escape:'url'}" />
         <fieldset>
             <legend>{$CONST.PLUGIN_LINKTRIMMER_NAME}</legend>
 
diff --git a/serendipity_event_linktrimmer/serendipity_event_linktrimmer.php b/serendipity_event_linktrimmer/serendipity_event_linktrimmer.php
index 2e401002..cf5eda27 100644
--- a/serendipity_event_linktrimmer/serendipity_event_linktrimmer.php
+++ b/serendipity_event_linktrimmer/serendipity_event_linktrimmer.php
@@ -26,7 +26,7 @@ class serendipity_event_linktrimmer extends serendipity_event {
             'php'         => '4.1.0'
         ));
 
-        $propbag->add('version',       '1.4');
+        $propbag->add('version',       '1.5');
         $propbag->add('author',        'Garvin Hicking, Ian');
         $propbag->add('stackable',     false);
         $propbag->add('configuration', array('prefix', 'frontpage', 'domain'));
@@ -202,6 +202,7 @@ class serendipity_event_linktrimmer extends serendipity_event {
         }
 
         $serendipity['smarty']->assign(array(
+            'linktrimmer_ispopup'     => $serendipity['enablePopup'],
             'linktrimmer_error'       => $error,
             'linktrimmer_url'         => $url,
             'linktrimmer_origurl'     => $_REQUEST['linktrimmer_url'],
@@ -347,6 +348,7 @@ class serendipity_event_linktrimmer extends serendipity_event {
                             $_REQUEST[$val[0]] = $val[1];
                         }
                     }
+
                     switch($uri_part) {
                         case 'plugin_linktrimmer.gif':
                             header('Content-Type: image/gif');