Move constants into IMP::.

diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
index 9f4cedd..dc308d7 100644 (file)
--- a/imp/lib/IMP.php
+++ b/imp/lib/IMP.php
@@ -34,6 +34,10 @@ class IMP
     /* IMP internal string used to separate indexes. */
     const IDX_SEP = '\0';
 
+    /* Preferences constants. */
+    const PREF_NO_FOLDER = '\0nofolder';
+    const PREF_VTRASH = '\0vtrash';
+
     /* Storage place for an altered version of the current URL. */
     static public $newUrl = null;
 

diff --git a/imp/lib/prefs.php b/imp/lib/prefs.php
index 6454b7b..6e800c8 100644 (file)
--- a/imp/lib/prefs.php
+++ b/imp/lib/prefs.php
@@ -8,9 +8,6 @@
  * @package Horde_Prefs
  */
 
-define('IMP_PREF_NO_FOLDER', '%nofolder');
-define('IMP_PREF_VTRASH', '%vtrash');
-
 function handle_sentmailselect($updated)
 {
     global $conf, $prefs, $identity;
@@ -46,7 +43,7 @@ function handlefolders($updated, $pref, $folder, $new)
         $folder = Horde_Util::getFormData($folder);
         if (isset($folder) && !$prefs->isLocked($pref)) {
             $new = Horde_String::convertCharset(Horde_Util::getFormData($new), Horde_Nls::getCharset(), 'UTF7-IMAP');
-            if ($folder == IMP_PREF_NO_FOLDER) {
+            if ($folder == IMP::PREF_NO_FOLDER) {
                 $prefs->setValue($pref, '');
             } else {
                 if (empty($folder) && !empty($new)) {
@@ -77,7 +74,7 @@ function handle_trashselect($updated)
     global $prefs;
     $ret = true;
 
-    if (Horde_Util::getFormData('trash') == IMP_PREF_VTRASH) {
+    if (Horde_Util::getFormData('trash') == IMP::PREF_VTRASH) {
         if ($prefs->isLocked('use_vtrash')) {
             $ret = false;
         } else {

diff --git a/imp/templates/prefs/draftsselect.inc b/imp/templates/prefs/draftsselect.inc
index c13f8a3..0afc1b4 100644 (file)
--- a/imp/templates/prefs/draftsselect.inc
+++ b/imp/templates/prefs/draftsselect.inc
@@ -20,7 +20,7 @@ function newDraftsFolderName()
 <?php echo Horde::label('drafts', _("Drafts folder:")) ?><br />
 <input type="hidden" name="drafts_new" value="" />
 <select id="drafts" name="drafts" onchange="newDraftsFolderName();">
- <option value="<?php echo IMP_PREF_NO_FOLDER ?>"><?php echo _("None") ?></option>
+ <option value="<?php echo IMP::PREF_NO_FOLDER ?>"><?php echo _("None") ?></option>
  <?php echo IMP::flistSelect(array('heading' => _("Create a new drafts folder"), 'filter' => array('INBOX'), 'selected' => IMP::folderPref($prefs->getValue('drafts_folder'), true), 'new_folder' => true)) ?>
 </select>
 <br />

diff --git a/imp/templates/prefs/spamselect.inc b/imp/templates/prefs/spamselect.inc
index a8e46e1..44e16ac 100644 (file)
--- a/imp/templates/prefs/spamselect.inc
+++ b/imp/templates/prefs/spamselect.inc
@@ -18,6 +18,6 @@ function newSpamFolderName()
 </script>
 
 <?php echo Horde::label('spam', _("Spam folder:")) ?><br />
-<select id="spam" name="spam" onchange="newSpamFolderName();"><option value="<?php echo IMP_PREF_NO_FOLDER ?>"><?php echo _("None") ?></option><?php echo IMP::flistSelect(array('heading' => _("Create a new Spam folder"), 'filter' => array('INBOX'), 'selected' => IMP::folderPref($prefs->getValue('spam_folder'), true), 'new_folder' => true)) ?></select>
+<select id="spam" name="spam" onchange="newSpamFolderName();"><option value="<?php echo IMP::PREF_NO_FOLDER ?>"><?php echo _("None") ?></option><?php echo IMP::flistSelect(array('heading' => _("Create a new Spam folder"), 'filter' => array('INBOX'), 'selected' => IMP::folderPref($prefs->getValue('spam_folder'), true), 'new_folder' => true)) ?></select>
 <input type="hidden" name="spam_new" value="" />
 <?php endif; ?>

diff --git a/imp/templates/prefs/trashselect.inc b/imp/templates/prefs/trashselect.inc
index 5b9beed..9f6d074 100644 (file)
--- a/imp/templates/prefs/trashselect.inc
+++ b/imp/templates/prefs/trashselect.inc
@@ -21,7 +21,7 @@ function newTrashFolderName()
 <?php
     $use_vtrash = $prefs->getValue('use_vtrash');
     echo '<option value="' . IMP_PREF_NO_FOLDER . '">' . _("None") . '</option>' .
-    '<option value="' . IMP_PREF_VTRASH . '"' . (($use_vtrash) ? ' selected="selected"' : '') . '>' . _("Use Virtual Trash") . '</option>' .
+    '<option value="' . IMP::PREF_VTRASH . '"' . (($use_vtrash) ? ' selected="selected"' : '') . '>' . _("Use Virtual Trash") . '</option>' .
     IMP::flistSelect(array('heading' => _("Create a new trash folder"), 'filter' => array('INBOX'), 'selected' => ($use_vtrash ? null : IMP::folderPref($prefs->getValue('trash_folder'), true)), 'new_folder' => true));
 ?>
 </select>