From bc04a27cb087240e10845a6c22739ee82617b85a Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Mon, 30 Nov 2009 00:36:38 -0700 Subject: [PATCH] UI -> Ui --- imp/ajax.php | 4 ++-- imp/compose-dimp.php | 4 ++-- imp/compose-mimp.php | 6 +++--- imp/compose.php | 4 ++-- imp/folders.php | 2 +- imp/lib/Auth.php | 2 +- imp/lib/Block/Newmail.php | 2 +- imp/lib/Compose.php | 4 ++-- imp/lib/Imap/Flags.php | 4 ++-- imp/lib/LoginTasks/SystemTask/UpgradeFromImp4.php | 2 +- imp/lib/Mime/Viewer/Plain.php | 2 +- imp/lib/{UI => Ui}/Compose.php | 4 ++-- imp/lib/{UI => Ui}/Folder.php | 4 ++-- imp/lib/{UI => Ui}/Mailbox.php | 4 ++-- imp/lib/{UI => Ui}/Message.php | 4 ++-- imp/lib/{UI => Ui}/Search.php | 4 ++-- imp/lib/Views/Compose.php | 2 +- imp/lib/Views/ListMessages.php | 2 +- imp/lib/Views/ShowMessage.php | 6 +++--- imp/mailbox-mimp.php | 2 +- imp/mailbox.php | 2 +- imp/message-dimp.php | 6 +++--- imp/message-mimp.php | 2 +- imp/message.php | 2 +- imp/rss.php | 2 +- imp/search-basic.php | 2 +- imp/search.php | 4 ++-- imp/thread.php | 2 +- 28 files changed, 45 insertions(+), 45 deletions(-) rename imp/lib/{UI => Ui}/Compose.php (98%) rename imp/lib/{UI => Ui}/Folder.php (98%) rename imp/lib/{UI => Ui}/Mailbox.php (98%) rename imp/lib/{UI => Ui}/Message.php (99%) rename imp/lib/{UI => Ui}/Search.php (98%) diff --git a/imp/ajax.php b/imp/ajax.php index c5917081c..f4eff0ced 100644 --- a/imp/ajax.php +++ b/imp/ajax.php @@ -586,7 +586,7 @@ case 'GetForwardData': try { $imp_contents = IMP_Contents::singleton($idx_string); $imp_compose = IMP_Compose::singleton(Horde_Util::getPost('imp_compose')); - $imp_ui = new IMP_UI_Compose(); + $imp_ui = new IMP_Ui_Compose(); $fwd_msg = $imp_ui->getForwardData($imp_compose, $imp_contents, $idx_string); $header = $fwd_msg['headers']; $header['replytype'] = 'forward'; @@ -782,7 +782,7 @@ case 'SendMDN': break; } - $imp_ui = new IMP_UI_Message(); + $imp_ui = new IMP_Ui_Message(); $imp_ui->MDNCheck($mbox, $uid, $reset($fetch_ret[$uid]['headertext']), true); break; diff --git a/imp/compose-dimp.php b/imp/compose-dimp.php index 3dbb9a487..962b1f1a1 100644 --- a/imp/compose-dimp.php +++ b/imp/compose-dimp.php @@ -52,8 +52,8 @@ if (!$prefs->isLocked('default_identity')) { /* Initialize the IMP_Compose:: object. */ $imp_compose = IMP_Compose::singleton(Horde_Util::getFormData('composeCache')); -/* Init IMP_UI_Compose:: object. */ -$imp_ui = new IMP_UI_Compose(); +/* Init IMP_Ui_Compose:: object. */ +$imp_ui = new IMP_Ui_Compose(); if (count($_POST)) { $result = new stdClass; diff --git a/imp/compose-mimp.php b/imp/compose-mimp.php index 8fee69590..610b09ffe 100644 --- a/imp/compose-mimp.php +++ b/imp/compose-mimp.php @@ -85,7 +85,7 @@ case 'd': case _("Expand Names"): $action = Horde_Util::getFormData('action'); - $imp_ui = new IMP_UI_Compose(); + $imp_ui = new IMP_Ui_Compose(); $header['to'] = $imp_ui->expandAddresses(Horde_Util::getFormData('to'), $imp_compose); if ($action !== 'rc') { if ($prefs->getValue('compose_cc')) { @@ -132,7 +132,7 @@ case _("Redirect"): break; } - $imp_ui = new IMP_UI_Compose(); + $imp_ui = new IMP_Ui_Compose(); $f_to = $imp_ui->getAddressList(Horde_Util::getFormData('to')); @@ -202,7 +202,7 @@ case _("Send"): $header['replyto'] = $identity->getValue('replyto_addr'); $header['subject'] = Horde_Util::getFormData('subject'); - $imp_ui = new IMP_UI_Compose(); + $imp_ui = new IMP_Ui_Compose(); $header['to'] = $imp_ui->getAddressList(Horde_Util::getFormData('to')); if ($prefs->getValue('compose_cc')) { diff --git a/imp/compose.php b/imp/compose.php index 7d4daced8..a8c11a6c0 100644 --- a/imp/compose.php +++ b/imp/compose.php @@ -158,8 +158,8 @@ try { $notification->push($e); } -/* Init IMP_UI_Compose:: object. */ -$imp_ui = new IMP_UI_Compose(); +/* Init IMP_Ui_Compose:: object. */ +$imp_ui = new IMP_Ui_Compose(); /* Set the default charset & encoding. * $charset - charset to use when sending messages diff --git a/imp/folders.php b/imp/folders.php index a43f3523a..9209a061a 100644 --- a/imp/folders.php +++ b/imp/folders.php @@ -425,7 +425,7 @@ if (!empty($newmsgs)) { } /* Get the tree images. */ -$imp_ui_folder = new IMP_UI_Folder(); +$imp_ui_folder = new IMP_Ui_Folder(); $tree_imgs = $imp_ui_folder->getTreeImages($raw_rows, array('expand_url' => $folders_url)); /* Add some further information to the $raw_rows array. */ diff --git a/imp/lib/Auth.php b/imp/lib/Auth.php index 6f33859be..3198d0cd8 100644 --- a/imp/lib/Auth.php +++ b/imp/lib/Auth.php @@ -464,7 +464,7 @@ class IMP_Auth } /* Is the HTML editor available? */ - $imp_ui = new IMP_UI_Compose(); + $imp_ui = new IMP_Ui_Compose(); $editor = Horde_Editor::singleton('Ckeditor', array('no_notify' => true)); $sess['rteavail'] = $editor->supportedByBrowser(); diff --git a/imp/lib/Block/Newmail.php b/imp/lib/Block/Newmail.php index 9903bfd3a..03269aa02 100644 --- a/imp/lib/Block/Newmail.php +++ b/imp/lib/Block/Newmail.php @@ -36,7 +36,7 @@ class IMP_Block_Newmail extends Horde_Block $html .= '' . _("No unread messages") . ''; } else { $charset = Horde_Nls::getCharset(); - $imp_ui = new IMP_UI_Mailbox('INBOX'); + $imp_ui = new IMP_Ui_Mailbox('INBOX'); $shown = empty($this->_params['msgs_shown']) ? 3 : $this->_params['msgs_shown']; try { diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php index fa9833dbb..897b1d5eb 100644 --- a/imp/lib/Compose.php +++ b/imp/lib/Compose.php @@ -1352,7 +1352,7 @@ class IMP_Compose } if (in_array($type, array('reply_auto', 'reply_list', '*'))) { - $imp_ui = new IMP_UI_Message(); + $imp_ui = new IMP_Ui_Message(); $list_info = $imp_ui->getListInformation($h); if ($list_info['exists']) { $header['to'] = $list_info['reply_list']; @@ -2477,7 +2477,7 @@ class IMP_Compose return; } - $imp_ui = new IMP_UI_Compose(); + $imp_ui = new IMP_Ui_Compose(); $headers = array(); foreach (array('to', 'cc', 'bcc', 'subject') as $val) { diff --git a/imp/lib/Imap/Flags.php b/imp/lib/Imap/Flags.php index 40f0919ac..c8c4db236 100644 --- a/imp/lib/Imap/Flags.php +++ b/imp/lib/Imap/Flags.php @@ -272,7 +272,7 @@ class IMP_Imap_Flags } if (!empty($options['priority'])) { - $imp_msg_ui = new IMP_UI_Message(); + $imp_msg_ui = new IMP_Ui_Message(); switch ($imp_msg_ui->getXpriority($options['priority'])) { case 'high': $process['highpri'] = $f['highpri']; @@ -285,7 +285,7 @@ class IMP_Imap_Flags } if (!empty($options['atc'])) { - $imp_mbox_ui = new IMP_UI_Mailbox(); + $imp_mbox_ui = new IMP_Ui_Mailbox(); if ($type = $imp_mbox_ui->getAttachmentType($options['atc']->getType())) { $process[$type] = $f[$type]; } diff --git a/imp/lib/LoginTasks/SystemTask/UpgradeFromImp4.php b/imp/lib/LoginTasks/SystemTask/UpgradeFromImp4.php index 5ba8b7ac5..c47b2d05f 100644 --- a/imp/lib/LoginTasks/SystemTask/UpgradeFromImp4.php +++ b/imp/lib/LoginTasks/SystemTask/UpgradeFromImp4.php @@ -67,7 +67,7 @@ class IMP_LoginTasks_SystemTask_UpgradeFromImp4 extends Horde_LoginTasks_SystemT return; } - $imp_ui_search = new IMP_UI_Search(); + $imp_ui_search = new IMP_Ui_Search(); foreach ($vfolders as $id => $vfolder) { /* If this is already a stdClass object, we have already diff --git a/imp/lib/Mime/Viewer/Plain.php b/imp/lib/Mime/Viewer/Plain.php index 7424e74d1..51256f320 100644 --- a/imp/lib/Mime/Viewer/Plain.php +++ b/imp/lib/Mime/Viewer/Plain.php @@ -94,7 +94,7 @@ class IMP_Horde_Mime_Viewer_Plain extends Horde_Mime_Viewer_Plain (($show == 'thread') && (basename(Horde::selfUrl()) == 'thread.php')); if (!$hideBlocks && in_array($show, array('list', 'listthread'))) { $header = $this->_params['contents']->getHeaderOb(); - $imp_ui = new IMP_UI_Message(); + $imp_ui = new IMP_Ui_Message(); $list_info = $imp_ui->getListInformation($header); $hideBlocks = $list_info['exists']; } diff --git a/imp/lib/UI/Compose.php b/imp/lib/Ui/Compose.php similarity index 98% rename from imp/lib/UI/Compose.php rename to imp/lib/Ui/Compose.php index 516a6fbbc..2b427982c 100644 --- a/imp/lib/UI/Compose.php +++ b/imp/lib/Ui/Compose.php @@ -1,6 +1,6 @@ * @package IMP */ -class IMP_UI_Compose +class IMP_Ui_Compose { /** */ diff --git a/imp/lib/UI/Folder.php b/imp/lib/Ui/Folder.php similarity index 98% rename from imp/lib/UI/Folder.php rename to imp/lib/Ui/Folder.php index bb19e14f4..b726089e3 100644 --- a/imp/lib/UI/Folder.php +++ b/imp/lib/Ui/Folder.php @@ -1,6 +1,6 @@ * @package IMP */ -class IMP_UI_Folder +class IMP_Ui_Folder { /** * Temporary array used to determine tree levels. diff --git a/imp/lib/UI/Mailbox.php b/imp/lib/Ui/Mailbox.php similarity index 98% rename from imp/lib/UI/Mailbox.php rename to imp/lib/Ui/Mailbox.php index 556b283aa..9de3a8161 100644 --- a/imp/lib/UI/Mailbox.php +++ b/imp/lib/Ui/Mailbox.php @@ -1,6 +1,6 @@ * @package IMP */ -class IMP_UI_Mailbox +class IMP_Ui_Mailbox { /** * The current mailbox. diff --git a/imp/lib/UI/Message.php b/imp/lib/Ui/Message.php similarity index 99% rename from imp/lib/UI/Message.php rename to imp/lib/Ui/Message.php index eb1ed7c44..df70048ee 100644 --- a/imp/lib/UI/Message.php +++ b/imp/lib/Ui/Message.php @@ -1,6 +1,6 @@ * @package IMP */ -class IMP_UI_Message +class IMP_Ui_Message { /** * Return a list of "basic" headers w/gettext translations. diff --git a/imp/lib/UI/Search.php b/imp/lib/Ui/Search.php similarity index 98% rename from imp/lib/UI/Search.php rename to imp/lib/Ui/Search.php index 489ed7733..7eb6581dc 100644 --- a/imp/lib/UI/Search.php +++ b/imp/lib/Ui/Search.php @@ -1,6 +1,6 @@ * @package IMP */ -class IMP_UI_Search +class IMP_Ui_Search { /** * Creates a search query. diff --git a/imp/lib/Views/Compose.php b/imp/lib/Views/Compose.php index ce8105e03..58cb717d0 100644 --- a/imp/lib/Views/Compose.php +++ b/imp/lib/Views/Compose.php @@ -87,7 +87,7 @@ class IMP_Views_Compose $compose_html = $GLOBALS['prefs']->getValue('compose_html'); $rte = true; - $imp_ui = new IMP_UI_Compose(); + $imp_ui = new IMP_Ui_Compose(); $imp_ui->initRTE(!$compose_html); } diff --git a/imp/lib/Views/ListMessages.php b/imp/lib/Views/ListMessages.php index 5bb7a4777..5cf732eef 100644 --- a/imp/lib/Views/ListMessages.php +++ b/imp/lib/Views/ListMessages.php @@ -270,7 +270,7 @@ class IMP_Views_ListMessages /* Get mailbox information. */ $overview = $imp_mailbox->getMailboxArray($msglist, array('headers' => array('list-post', 'x-priority'), 'structure' => $GLOBALS['prefs']->getValue('atc_flag'))); $charset = Horde_Nls::getCharset(); - $imp_ui = new IMP_UI_Mailbox($folder); + $imp_ui = new IMP_Ui_Mailbox($folder); $no_flags_hook = false; /* Display message information. */ diff --git a/imp/lib/Views/ShowMessage.php b/imp/lib/Views/ShowMessage.php index e42b7931b..c53b12515 100644 --- a/imp/lib/Views/ShowMessage.php +++ b/imp/lib/Views/ShowMessage.php @@ -131,8 +131,8 @@ class IMP_Views_ShowMessage $envelope = $fetch_ret[$uid]['envelope']; $mime_headers = reset($fetch_ret[$uid]['headertext']); - /* Get the IMP_UI_Message:: object. */ - $imp_ui = new IMP_UI_Message(); + /* Get the IMP_Ui_Message:: object. */ + $imp_ui = new IMP_Ui_Message(); /* Develop the list of Headers to display now. Deal with the 'basic' * header information first since there are various manipulations @@ -199,7 +199,7 @@ class IMP_Views_ShowMessage if ($preview) { /* Get minidate. */ - $imp_mailbox_ui = new IMP_UI_Mailbox(); + $imp_mailbox_ui = new IMP_Ui_Mailbox(); $minidate = $imp_mailbox_ui->getDate($envelope['date']); if (empty($minidate)) { $minidate = _("Unknown Date"); diff --git a/imp/mailbox-mimp.php b/imp/mailbox-mimp.php index 1521cf8bf..28052264b 100644 --- a/imp/mailbox-mimp.php +++ b/imp/mailbox-mimp.php @@ -109,7 +109,7 @@ $curr_time -= $curr_time % 60; $msgs = array(); $sortpref = IMP::getSort($imp_mbox['mailbox']); -$imp_ui = new IMP_UI_Mailbox($imp_mbox['mailbox']); +$imp_ui = new IMP_Ui_Mailbox($imp_mbox['mailbox']); /* Build the array of message information. */ $mbox_info = $imp_mailbox->getMailboxArray(range($pageOb['begin'], $pageOb['end']), array('headers' => array('x-priority'))); diff --git a/imp/mailbox.php b/imp/mailbox.php index dd792e8a2..c162f672e 100644 --- a/imp/mailbox.php +++ b/imp/mailbox.php @@ -678,7 +678,7 @@ if ($pageOb['msgcount']) { /* Initialize repetitively used variables. */ $fromlinkstyle = $prefs->getValue('from_link'); -$imp_ui = new IMP_UI_Mailbox($imp_mbox['mailbox']); +$imp_ui = new IMP_Ui_Mailbox($imp_mbox['mailbox']); /* Display message information. */ $msgs = array(); diff --git a/imp/message-dimp.php b/imp/message-dimp.php index fac7d31ad..eaec9a0da 100644 --- a/imp/message-dimp.php +++ b/imp/message-dimp.php @@ -19,7 +19,7 @@ if (!$uid || !$folder) { exit; } -$imp_ui = new IMP_UI_Message(); +$imp_ui = new IMP_Ui_Message(); $readonly = $imp_imap->isReadOnly($folder); $args = array( @@ -64,8 +64,8 @@ if (!$disable_compose) { ); $compose_result = IMP_Views_Compose::showCompose($compose_args); - /* Init IMP_UI_Compose:: object. */ - $imp_ui = new IMP_UI_Compose(); + /* Init IMP_Ui_Compose:: object. */ + $imp_ui = new IMP_Ui_Compose(); /* Attach spellchecker & auto completer. */ $imp_ui->attachAutoCompleter(array('to', 'cc', 'bcc')); diff --git a/imp/message-mimp.php b/imp/message-mimp.php index cc53f9f41..7f72f6a90 100644 --- a/imp/message-mimp.php +++ b/imp/message-mimp.php @@ -29,7 +29,7 @@ if (!$imp_mailbox->isValidIndex(false)) { } $imp_message = IMP_Message::singleton(); -$imp_ui = new IMP_UI_Message(); +$imp_ui = new IMP_Ui_Message(); /* Determine if mailbox is readonly. */ $readonly = $imp_imap->isReadOnly($imp_mbox['mailbox']); diff --git a/imp/message.php b/imp/message.php index d70997092..49f8a69c7 100644 --- a/imp/message.php +++ b/imp/message.php @@ -68,7 +68,7 @@ $uid = $index_array['uid']; $indices_array = array($mailbox_name => array($uid)); $imp_flags = IMP_Imap_Flags::singleton(); -$imp_ui = new IMP_UI_Message(); +$imp_ui = new IMP_Ui_Message(); switch ($actionID) { case 'blacklist': diff --git a/imp/rss.php b/imp/rss.php index b719ef924..d3c082ca0 100644 --- a/imp/rss.php +++ b/imp/rss.php @@ -57,7 +57,7 @@ if ($new_mail) { $ids = $imp_search->runSearchQuery($query, $mailbox, Horde_Imap_Client::SORT_DATE, 1); if (!empty($ids)) { - $imp_ui = new IMP_UI_Mailbox($imp_mbox['mailbox']); + $imp_ui = new IMP_Ui_Mailbox($imp_mbox['mailbox']); $overview = $imp_mailbox->getMailboxArray(array_slice($ids, 0, 20), array('preview' => $prefs->getValue('preview_enabled'))); diff --git a/imp/search-basic.php b/imp/search-basic.php index 4a08e8679..343098ef3 100644 --- a/imp/search-basic.php +++ b/imp/search-basic.php @@ -27,7 +27,7 @@ if ($_SESSION['imp']['protocol'] == 'pop') { /* If search_basic_mbox is set, we are processing the search query. */ $search_mailbox = Horde_Util::getFormData('search_basic_mbox'); if ($search_mailbox) { - $imp_ui_search = new IMP_UI_Search(); + $imp_ui_search = new IMP_Ui_Search(); $id = $imp_ui_search->processBasicSearch($search_mailbox, Horde_Util::getFormData('search_criteria'), Horde_Util::getFormData('search_criteria_text'), Horde_Util::getFormData('search_criteria_not'), Horde_Util::getFormData('search_flags')); /* Redirect to the mailbox screen. */ diff --git a/imp/search.php b/imp/search.php index 8a5288b88..e4ae7a1ec 100644 --- a/imp/search.php +++ b/imp/search.php @@ -52,7 +52,7 @@ if (!empty($criteria)) { $folders = Horde_Util::getFormData('search_folders_form'); /* Create the search query. */ - $imp_ui_search = new IMP_UI_Search(); + $imp_ui_search = new IMP_Ui_Search(); $query = $imp_ui_search->createQuery($criteria); /* Save the search if requested. */ @@ -95,7 +95,7 @@ if ($subscribe || !Horde_Util::getFormData('show_unsub')) { list($raw_rows,) = $imp_imap_tree->build($mask); -$imp_ui_folder = new IMP_UI_Folder(); +$imp_ui_folder = new IMP_Ui_Folder(); $tree_imgs = $imp_ui_folder->getTreeImages($raw_rows); $folders = array(); diff --git a/imp/thread.php b/imp/thread.php index 20f238605..ddf048d91 100644 --- a/imp/thread.php +++ b/imp/thread.php @@ -74,7 +74,7 @@ if ($mode == 'thread') { } $charset = Horde_Nls::getCharset(); -$imp_ui = new IMP_UI_Message(); +$imp_ui = new IMP_Ui_Message(); foreach ($loop_array as $mbox => $idxlist) { $fetch_res = $GLOBALS['imp_imap']->ob()->fetch($mbox, array( -- 2.11.0