From 586e3011ebc8ac6e2bbb51966c9d66e39e277dbb Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 23 Jun 2009 17:43:08 -0600
Subject: [PATCH] Better way of adding JS files to flags page.

---
 imp/lib/prefs.php                      | 26 ++++++++++++++++++++------
 imp/templates/prefs/flagmanagement.inc |  9 ---------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/imp/lib/prefs.php b/imp/lib/prefs.php
index e7538f550..021f19f5d 100644
--- a/imp/lib/prefs.php
+++ b/imp/lib/prefs.php
@@ -159,11 +159,11 @@ function handle_soundselect($updated)
 function handle_flagmanagement($updated)
 {
     $imp_flags = &IMP_Imap_Flags::singleton();
-    $flag_action = Horde_Util::getFormData('flag_action');
-    $flag_data = Horde_Util::getFormData('flag_data');
+    $action = Horde_Util::getFormData('flag_action');
+    $data = Horde_Util::getFormData('flag_data');
 
-    if ($flag_action == 'add') {
-        $imp_flags->addFlag($flag_data);
+    if ($action == 'add') {
+        $imp_flags->addFlag($data);
         return false;
     }
 
@@ -173,9 +173,9 @@ function handle_flagmanagement($updated)
     foreach ($imp_flags->getList() as $key => $val) {
         $md5 = hash('md5', $key);
 
-        switch ($flag_action) {
+        switch ($action) {
         case 'delete':
-            if ($flag_data == ('bg_' . $md5)) {
+            if ($data == ('bg_' . $md5)) {
                 $imp_flags->deleteFlag($key);
                 return false;
             }
@@ -264,3 +264,17 @@ if (!$GLOBALS['registry']->call('mail/server')) {
     header('Location: ' . Horde_Util::addParameter(Horde::applicationUrl('redirect.php'), 'url', Horde::selfUrl(true)));
     exit;
 }
+
+/* Add necessary javascript files here (so they are added to the document
+ * HEAD. */
+switch ($group) {
+case 'flags':
+    Horde::addScriptFile('prototype.js', 'horde', true);
+    Horde::addScriptFile('colorpicker.js', 'horde', true);
+    Horde::addScriptFile('flagmanagement.js', 'imp', true);
+
+    IMP::addInlineScript(array(
+        'ImpFlagmanagement.new_prompt = ' . Horde_Serialize::serialize(_("Please enter the label for the new flag:"), Horde_Serialize::JSON, NLS::getCharset())
+    ));
+    break;
+}
diff --git a/imp/templates/prefs/flagmanagement.inc b/imp/templates/prefs/flagmanagement.inc
index 7b243f7ee..02f80af77 100644
--- a/imp/templates/prefs/flagmanagement.inc
+++ b/imp/templates/prefs/flagmanagement.inc
@@ -1,9 +1,4 @@
 <?php
-/* Add necessary javascript files. */
-Horde::addScriptFile('prototype.js', 'horde', true);
-Horde::addScriptFile('colorpicker.js', 'horde', true);
-Horde::addScriptFile('flagmanagement.js', 'imp', true);
-
 /* Get the list of flags. */
 $imp_flags = &IMP_Imap_Flags::singleton();
 $flaglist = $imp_flags->getList(array('div' => true, 'fgcolor' => true));
@@ -12,10 +7,6 @@ $flaglist = $imp_flags->getList(array('div' => true, 'fgcolor' => true));
 $picker_img = Horde::img('colorpicker.png', _("Color Picker"), '', $registry->getImageDir('horde'));
 $delete_img = Horde::img('delete.png');
 
-IMP::addInlineScript(array(
-    'ImpFlagmanagement.new_prompt = ' . Horde_Serialize::serialize(_("Please enter the label for the new flag:"), Horde_Serialize::JSON, NLS::getCharset())
-));
-
 ?>
 <input type="hidden" name="flag_action" id="flag_action" />
 <input type="hidden" name="flag_data" id="flag_data" />
-- 
2.11.0