A few more replacements of Horde_Util::closeWindowJS()

diff --git a/hermes/start.php b/hermes/start.php
index b208f53..32c314d 100644 (file)
--- a/hermes/start.php
+++ b/hermes/start.php
@@ -34,7 +34,10 @@ if ($form->validate($vars)) {
                           'time' => $now);
     $prefs->setValue('running_timers', serialize($timers), false);
 
-    Horde_Util::closeWindowJS('alert(\'' . addslashes(sprintf(_("The stop watch \"%s\" has been started and will appear in the sidebar at the next refresh."), $vars->get('description'))) . '\');');
+    echo Horde::wrapInlineScript(array(
+        'alert(\'' . addslashes(sprintf(_("The stop watch \"%s\" has been started and will appear in the sidebar at the next refresh."), $vars->get('description'))),
+        'window.close();'
+    ));
     exit;
 }
 

diff --git a/trean/add.php b/trean/add.php
index 17d108c..9958b12 100644 (file)
--- a/trean/add.php
+++ b/trean/add.php
@@ -61,7 +61,7 @@ case 'add_bookmark':
         $notification->push(sprintf(_("There was an error adding the bookmark: %s"), $result->getMessage()), 'horde.error');
     } else {
         if (Horde_Util::getFormData('popup')) {
-            Horde_Util::closeWindowJS();
+            echo Horde::wrapInlineScript(array('window.close();'));
         } elseif (Horde_Util::getFormData('iframe')) {
             $notification->push(_("Bookmark Added"), 'horde.success');
             require TREAN_TEMPLATES . '/common-header.inc';

diff --git a/trean/edit.php b/trean/edit.php
index 4e54ee5..e0a60f2 100644 (file)
--- a/trean/edit.php
+++ b/trean/edit.php
@@ -91,7 +91,7 @@ case 'save':
 
     if (Horde_Util::getFormData('popup')) {
         if ($notification->count() <= 1) {
-            Horde_Util::closeWindowJS();
+            echo Horde::wrapInlineScript(array('window.close();'));
         } else {
             $notification->notify();
         }