createSearchID -> createSearchId

diff --git a/imp/lib/Auth.php b/imp/lib/Auth.php
index 2cb784a..25b0468 100644 (file)
--- a/imp/lib/Auth.php
+++ b/imp/lib/Auth.php
@@ -352,7 +352,7 @@ class IMP_Auth
             if (!$GLOBALS['prefs']->getValue('use_vinbox') &&
                 $imp_search->isVINBOXFolder($init_url)) {
                 $init_url = 'folders.php';
-            } elseif (($imp_search->createSearchID($init_url) == $init_url) &&
+            } elseif (($imp_search->createSearchId($init_url) == $init_url) &&
                       !$imp_search->isVFolder($init_url)) {
                 $init_url = 'INBOX';
                 if (!$GLOBALS['prefs']->isLocked('initial_page')) {

diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
index 03c3f82..c54cfbb 100644 (file)
--- a/imp/lib/IMP.php
+++ b/imp/lib/IMP.php
@@ -970,7 +970,7 @@ class IMP
             if (($_SESSION['imp']['protocol'] != 'pop') &&
                 $GLOBALS['prefs']->getValue('use_vinbox') &&
                 ($vinbox_id = $GLOBALS['prefs']->getValue('vinbox_id'))) {
-                $t->set('vinbox', Horde::link(self::generateIMPUrl('mailbox.php', $GLOBALS['injector']->getInstance('IMP_Search')->createSearchID($vinbox_id))));
+                $t->set('vinbox', Horde::link(self::generateIMPUrl('mailbox.php', $GLOBALS['injector']->getInstance('IMP_Search')->createSearchId($vinbox_id))));
             }
         } else {
             $t->set('msg', ($var == 1) ? _("You have 1 new message.") : sprintf(_("You have %s new messages."), $var));

diff --git a/imp/lib/Imap/Tree.php b/imp/lib/Imap/Tree.php
index 9bba967..f0a3acd 100644 (file)
--- a/imp/lib/Imap/Tree.php
+++ b/imp/lib/Imap/Tree.php
@@ -605,7 +605,7 @@ class IMP_Imap_Tree implements ArrayAccess, Iterator, Serializable
 
         $id = $this->_convertName($id, true);
         $vfolder_base = ($id == self::VFOLDER_KEY);
-        $search_id = $GLOBALS['injector']->getInstance('IMP_Search')->createSearchID($id);
+        $search_id = $GLOBALS['injector']->getInstance('IMP_Search')->createSearchId($id);
 
         if ($vfolder_base ||
             (isset($this->_tree[$search_id]) &&
@@ -1321,7 +1321,7 @@ class IMP_Imap_Tree implements ArrayAccess, Iterator, Serializable
         $adds = $id = array();
 
         foreach ($id_list as $key => $val) {
-            $id[$GLOBALS['injector']->getInstance('IMP_Search')->createSearchID($key)] = $val;
+            $id[$GLOBALS['injector']->getInstance('IMP_Search')->createSearchId($key)] = $val;
         }
 
         foreach (array_keys($id) as $key) {

diff --git a/imp/lib/Search.php b/imp/lib/Search.php
index 8b7994b..a75f168 100644 (file)
--- a/imp/lib/Search.php
+++ b/imp/lib/Search.php
@@ -768,7 +768,7 @@ class IMP_Search implements Serializable
      */
     public function editUrl($id)
     {
-        return Horde::url('search.php')->add(array('edit_query' => $this->createSearchID($this->_strip($id))));
+        return Horde::url('search.php')->add(array('edit_query' => $this->createSearchId($id)));
     }
 
     /**
@@ -783,7 +783,7 @@ class IMP_Search implements Serializable
         return Horde::url('folders.php')->add(array(
             'actionID' => 'delete_search_query',
             'folders_token' => Horde::getRequestToken('imp.folders'),
-            'queryid' => $this->createSearchID($this->_strip($id))
+            'queryid' => $this->createSearchId($id)
         ));
     }
 
@@ -833,7 +833,7 @@ class IMP_Search implements Serializable
      *
      * @return string  The canonical search query ID.
      */
-    public function createSearchID($id)
+    public function createSearchId($id)
     {
         return self::MBOX_PREFIX . $this->_strip($id);
     }

diff --git a/imp/lib/Tree/Flist.php b/imp/lib/Tree/Flist.php
index 410b1e1..59afc56 100644 (file)
--- a/imp/lib/Tree/Flist.php
+++ b/imp/lib/Tree/Flist.php
@@ -107,7 +107,7 @@ class IMP_Tree_Flist extends Horde_Tree_Select
                     $vfolder_list[] = array(
                         'l' => $injector->getInstance('Horde_Text_Filter')->filter($val, 'space2html', array('encode' => true)),
                         'sel' => (IMP::$mailbox == $id),
-                        'v' => IMP::formMbox($imp_search->createSearchID($id), true)
+                        'v' => IMP::formMbox($imp_search->createSearchId($id), true)
                     );
                 }
                 $t->set('vfolder', $vfolder_list);

diff --git a/imp/mailbox-mimp.php b/imp/mailbox-mimp.php
index 4a45c4c..87f3fd3 100644 (file)
--- a/imp/mailbox-mimp.php
+++ b/imp/mailbox-mimp.php
@@ -117,7 +117,7 @@ case 'rs':
 
         /* Create the search query and reset the global mailbox variable. */
         $sq = $imp_search->createSearchQuery($query, array(IMP::$mailbox), array(), _("Search Results"));
-        IMP::setCurrentMailboxInfo($imp_search->createSearchID($sq));
+        IMP::setCurrentMailboxInfo($imp_search->createSearchId($sq));
 
         /* Need to re-calculate these values. */
         $readonly = $imp_imap->isReadOnly(IMP::$mailbox);

diff --git a/imp/mailbox.php b/imp/mailbox.php
index e725100..d11dc10 100644 (file)
--- a/imp/mailbox.php
+++ b/imp/mailbox.php
@@ -310,7 +310,7 @@ if (!$preview_tooltip) {
 
 $unread = $imp_mailbox->unseenMessages(Horde_Imap_Client::SORT_RESULTS_COUNT);
 $vtrash = $imp_search->isVTrashFolder(IMP::$mailbox)
-    ? $imp_search->createSearchID($search_mbox)
+    ? $imp_search->createSearchId($search_mbox)
     : null;
 
 Horde::addInlineScript(array(

diff --git a/imp/search-basic.php b/imp/search-basic.php
index 343c375..dde491e 100644 (file)
--- a/imp/search-basic.php
+++ b/imp/search-basic.php
@@ -38,7 +38,7 @@ if ($vars->search_basic_mailbox) {
     $id = $imp_ui_search->processBasicSearch($vars->search_mailbox, $vars->search_criteria, $vars->search_criteria_text, $vars->search_criteria_not, $vars->search_flags);
 
     /* Redirect to the mailbox screen. */
-    Horde::url('mailbox.php', true)->add('mailbox', $imp_search->createSearchID($id))->redirect();
+    Horde::url('mailbox.php', true)->add('mailbox', $imp_search->createSearchId($id))->redirect();
 }
 
 $f_fields = $s_fields = array();

diff --git a/imp/search.php b/imp/search.php
index 3cb7038..0fa2abd 100644 (file)
--- a/imp/search.php
+++ b/imp/search.php
@@ -73,7 +73,7 @@ if ($vars->criteria_form) {
     }
 
     /* Redirect to the mailbox page. */
-    $id = $imp_search->createSearchID($id);
+    $id = $imp_search->createSearchId($id);
     if ($dimp_view) {
         /* Output javascript code to close the IFRAME and load the search
          * mailbox in DIMP. */