From 51a035a3339b2b54461d23354290f4925bd8b226 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Tue, 4 Aug 2009 17:07:30 -0600 Subject: [PATCH] Proper class naming conventions for Imp_Mimp and Imp_Dimp --- imp/ajax.php | 10 +++++----- imp/compose-dimp.php | 10 +++++----- imp/compose-mimp.php | 2 +- imp/index-dimp.php | 4 ++-- imp/js/DimpBase.js | 2 +- imp/lib/Api.php | 2 +- imp/lib/{DIMP.php => Dimp.php} | 2 +- imp/lib/{MIMP.php => Mimp.php} | 2 +- imp/lib/Views/ShowMessage.php | 2 +- imp/mailbox-mimp.php | 2 +- imp/message-dimp.php | 6 +++--- imp/message-mimp.php | 2 +- imp/templates/chunks/compose.php | 2 +- imp/templates/chunks/message.php | 2 +- imp/templates/folders/folders-mimp.inc | 2 +- imp/templates/index/index-dimp.inc | 2 +- imp/templates/javascript_defs_dimp.php | 2 +- 17 files changed, 28 insertions(+), 28 deletions(-) rename imp/lib/{DIMP.php => Dimp.php} (99%) rename imp/lib/{MIMP.php => Mimp.php} (99%) diff --git a/imp/ajax.php b/imp/ajax.php index 2e5f68cde..9ed06c554 100644 --- a/imp/ajax.php +++ b/imp/ajax.php @@ -196,7 +196,7 @@ case 'CreateFolder': $new = $imptree->createMailboxName(Horde_Util::getPost('parent'), $new); $result = $imp_folder->create($new, $prefs->getValue('subscribe')); if ($result) { - $result = DIMP::getFolderResponse($imptree); + $result = IMP_Dimp::getFolderResponse($imptree); } } catch (Horde_Exception $e) { $notification->push($e, 'horde.error'); @@ -215,7 +215,7 @@ case 'DeleteFolder': $imp_folder = IMP_Folder::singleton(); $result = $imp_folder->delete(array($mbox)); if ($result) { - $result = DIMP::getFolderResponse($imptree); + $result = IMP_Dimp::getFolderResponse($imptree); } break; @@ -239,7 +239,7 @@ case 'RenameFolder': if ($old != $new) { $result = $imp_folder->rename($old, $new); if ($result) { - $result = DIMP::getFolderResponse($imptree); + $result = IMP_Dimp::getFolderResponse($imptree); } } } catch (Horde_Exception $e) { @@ -291,7 +291,7 @@ case 'ListFolders': if (Horde_Util::getPost('unsub')) { $mask |= IMP_Imap_Tree::FLIST_UNSUB; } - $result = DIMP::getFolderResponse($imptree, array('a' => $imptree->folderList($mask), 'c' => array(), 'd' => array())); + $result = IMP_Dimp::getFolderResponse($imptree, array('a' => $imptree->folderList($mask), 'c' => array(), 'd' => array())); $quota = _getQuota(); if (!is_null($quota)) { @@ -523,7 +523,7 @@ case 'GetForwardData': $result = new stdClass; // Can't open read-only since we need to store the message cache id. $result->imp_compose = $imp_compose->getCacheId(); - $result->fwd_list = DIMP::getAttachmentInfo($imp_compose); + $result->fwd_list = IMP_Dimp::getAttachmentInfo($imp_compose); $result->body = $fwd_msg['body']; $result->header = $header; $result->format = $fwd_msg['format']; diff --git a/imp/compose-dimp.php b/imp/compose-dimp.php index 558571c99..87ff8b633 100644 --- a/imp/compose-dimp.php +++ b/imp/compose-dimp.php @@ -66,7 +66,7 @@ if (count($_POST)) { if ($action == 'add_attachment') { if ($_SESSION['imp']['file_upload'] && $imp_compose->addFilesFromUpload('file_')) { - $info = DIMP::getAttachmentInfo($imp_compose); + $info = IMP_Dimp::getAttachmentInfo($imp_compose); $result->success = 1; $result->info = end($info); $result->imp_compose = $imp_compose->getCacheId(); @@ -182,12 +182,12 @@ if (count($_POST)) { if (!empty($GLOBALS['conf']['maillog']['use_maillog'])) { $in_reply_to = $imp_compose->getMetadata('in_reply_to'); if (!empty($in_reply_to) && - ($tmp = DIMP::getMsgLogInfo($in_reply_to))) { + ($tmp = IMP_Dimp::getMsgLogInfo($in_reply_to))) { $result->log = $tmp; } } - $res = DIMP::getFolderResponse($imptree); + $res = IMP_Dimp::getFolderResponse($imptree); if (!empty($res)) { $result->folder = $res['a'][0]; } @@ -325,7 +325,7 @@ Horde::addInlineScript($compose_result['js']); /* Some actions, like adding forwards, may return error messages so explicitly * display those messages now. */ -Horde::addInlineScript(array(DIMP::notify()), 'dom'); +Horde::addInlineScript(array(IMP_Dimp::notify()), 'dom'); /* Javascript to be run on window load. */ $compose_result['js_onload'][] = 'DimpCompose.fillForm(' . Horde_Serialize::serialize($msg, Horde_Serialize::JSON) . ', ' . Horde_Serialize::serialize($header, Horde_Serialize::JSON) . ', "' . (($type == 'new' || $type == 'forward') ? 'to' : 'message') . '", true)'; @@ -335,7 +335,7 @@ $scripts = array( array('compose-dimp.js', 'imp', true) ); -DIMP::header(_("Message Composition"), $scripts); +IMP_Dimp::header(_("Message Composition"), $scripts); echo $t->fetch('compose.html'); Horde::includeScriptFiles(); Horde::outputInlineScript(); diff --git a/imp/compose-mimp.php b/imp/compose-mimp.php index 64f7b66da..afa7ab762 100644 --- a/imp/compose-mimp.php +++ b/imp/compose-mimp.php @@ -255,7 +255,7 @@ foreach (array('to', 'cc', 'bcc', 'subject') as $val) { $menu = new Horde_Mobile_card('o', _("Menu")); $mset = &$menu->add(new Horde_Mobile_linkset()); -MIMP::addMIMPMenu($mset, 'compose'); +IMP_Mimp::addMIMPMenu($mset, 'compose'); if ($actionID == 'rc') { require IMP_TEMPLATES . '/compose/redirect-mimp.inc'; diff --git a/imp/index-dimp.php b/imp/index-dimp.php index defadbc8d..904753b2c 100644 --- a/imp/index-dimp.php +++ b/imp/index-dimp.php @@ -45,11 +45,11 @@ if (!empty($site_menu)) { } Horde::addInlineScript($js_code, true); -DIMP::header('', $scripts); +IMP_Dimp::header('', $scripts); /* Get application folders list. */ $application_folders = array(); -foreach (DIMP::menuList() as $app) { +foreach (IMP_Dimp::menuList() as $app) { if ($registry->get('status', $app) != 'inactive' && $registry->hasPermission($app, PERMS_SHOW)) { $application_folders[] = array( diff --git a/imp/js/DimpBase.js b/imp/js/DimpBase.js index 3e181a34a..223577126 100644 --- a/imp/js/DimpBase.js +++ b/imp/js/DimpBase.js @@ -1989,7 +1989,7 @@ var DimpBase = { }, // Folder actions. - // For format of the ob object, see DIMP::_createFolderElt(). + // For format of the ob object, see IMP_Dimp::_createFolderElt(). createFolder: function(ob) { var div, f_node, ftype, li, ll, parent_e, tmp, diff --git a/imp/lib/Api.php b/imp/lib/Api.php index 6625287ed..b3bc34bf7 100644 --- a/imp/lib/Api.php +++ b/imp/lib/Api.php @@ -483,7 +483,7 @@ class IMP_Api extends Horde_Registry_Api $GLOBALS['imp_authentication'] = 'throw'; require_once dirname(__FILE__) . '/base.php'; if (IMP::getViewMode() == 'dimp') { - Horde::addInlineScript(array(DIMP::notify(true)), 'dom'); + Horde::addInlineScript(array(IMP_Dimp::notify(true)), 'dom'); return; } } catch (Horde_Exception $e) {} diff --git a/imp/lib/DIMP.php b/imp/lib/Dimp.php similarity index 99% rename from imp/lib/DIMP.php rename to imp/lib/Dimp.php index 1edd2c94f..b9c272244 100644 --- a/imp/lib/DIMP.php +++ b/imp/lib/Dimp.php @@ -10,7 +10,7 @@ * @author Michael Slusarz * @package IMP */ -class DIMP +class IMP_Dimp { /** * Output a dimp-style action (menubar) link. diff --git a/imp/lib/MIMP.php b/imp/lib/Mimp.php similarity index 99% rename from imp/lib/MIMP.php rename to imp/lib/Mimp.php index 22f437623..78e3b0c6d 100644 --- a/imp/lib/MIMP.php +++ b/imp/lib/Mimp.php @@ -11,7 +11,7 @@ * @author Michael Slusarz * @package IMP */ -class MIMP +class IMP_Mimp { /** * Take a Horde_Mobile_card and add global menu items. diff --git a/imp/lib/Views/ShowMessage.php b/imp/lib/Views/ShowMessage.php index 8cc0357f4..e9b9fe473 100644 --- a/imp/lib/Views/ShowMessage.php +++ b/imp/lib/Views/ShowMessage.php @@ -191,7 +191,7 @@ class IMP_Views_ShowMessage /* Grab maillog information. */ if (!empty($GLOBALS['conf']['maillog']['use_maillog']) && - ($tmp = DIMP::getMsgLogInfo($envelope['message-id']))) { + ($tmp = IMP_Dimp::getMsgLogInfo($envelope['message-id']))) { $result['log'] = $tmp; } diff --git a/imp/mailbox-mimp.php b/imp/mailbox-mimp.php index f5b87df75..a78fbd366 100644 --- a/imp/mailbox-mimp.php +++ b/imp/mailbox-mimp.php @@ -229,5 +229,5 @@ foreach ($nav as $n) { } } -MIMP::addMIMPMenu($mset, 'mailbox'); +IMP_Mimp::addMIMPMenu($mset, 'mailbox'); require IMP_TEMPLATES . '/mailbox/mailbox-mimp.inc'; diff --git a/imp/message-dimp.php b/imp/message-dimp.php index d22bdd195..87d8c2c0d 100644 --- a/imp/message-dimp.php +++ b/imp/message-dimp.php @@ -32,7 +32,7 @@ $show_msg = new IMP_Views_ShowMessage(); $show_msg_result = $show_msg->showMessage($args); if (isset($show_msg_result['error'])) { echo Horde::wrapInlineScript(array( - DIMP::notify(), + IMP_Dimp::notify(), 'parent.close()' )); exit; @@ -78,9 +78,9 @@ if (!$disable_compose) { } Horde::addInlineScript($js_out); -Horde::addInlineScript(array(DIMP::notify()), 'dom'); +Horde::addInlineScript(array(IMP_Dimp::notify()), 'dom'); -DIMP::header($show_msg_result['subject'], $scripts); +IMP_Dimp::header($show_msg_result['subject'], $scripts); echo "\n"; require IMP_TEMPLATES . '/chunks/message.php'; Horde::includeScriptFiles(); diff --git a/imp/message-mimp.php b/imp/message-mimp.php index f512ea954..2fdc135ab 100644 --- a/imp/message-mimp.php +++ b/imp/message-mimp.php @@ -344,7 +344,7 @@ if (isset($prev_link)) { $mset->add(new Horde_Mobile_link(sprintf(_("To %s"), IMP::getLabel($imp_mbox['mailbox'])), $mailbox_link)); -MIMP::addMIMPMenu($mset, 'message'); +IMP_Mimp::addMIMPMenu($mset, 'message'); $mimp_render->set('title', $display_headers['subject']); diff --git a/imp/templates/chunks/compose.php b/imp/templates/chunks/compose.php index 64261efdd..2e07f1502 100644 --- a/imp/templates/chunks/compose.php +++ b/imp/templates/chunks/compose.php @@ -28,7 +28,7 @@ function _createDAcompose($text, $image, $id) } else { $params['title'] = $text; } - echo DIMP::actionButton($params); + echo IMP_Dimp::actionButton($params); } ?> diff --git a/imp/templates/chunks/message.php b/imp/templates/chunks/message.php index c2f25bc9a..a9b53480f 100644 --- a/imp/templates/chunks/message.php +++ b/imp/templates/chunks/message.php @@ -23,7 +23,7 @@ function _createDAfmsg($text, $image, $id, $class = '', $show_text = true) } else { $params['tooltip'] = $text; } - echo DIMP::actionButton($params); + echo IMP_Dimp::actionButton($params); } ?> diff --git a/imp/templates/folders/folders-mimp.inc b/imp/templates/folders/folders-mimp.inc index 37a447be9..6cc7265c8 100644 --- a/imp/templates/folders/folders-mimp.inc +++ b/imp/templates/folders/folders-mimp.inc @@ -32,7 +32,7 @@ $mset->add(new Horde_Mobile_link(_("Refresh"), $selfurl)); if ($subscribe) { $mset->add(new Horde_Mobile_link($sub_text, $sub_link)); } -MIMP::addMIMPMenu($mset, 'folders'); +IMP_Mimp::addMIMPMenu($mset, 'folders'); $mimp_render->add($menu); $mimp_render->display(); diff --git a/imp/templates/index/index-dimp.inc b/imp/templates/index/index-dimp.inc index 390cc4d1c..d050534d3 100644 --- a/imp/templates/index/index-dimp.inc +++ b/imp/templates/index/index-dimp.inc @@ -30,7 +30,7 @@ function _createDA($text, $image, $id = null, $class = '', $show_text = true) } else { $params['tooltip'] = $text; } - echo DIMP::actionButton($params); + echo IMP_Dimp::actionButton($params); } function _simpleButton($id, $text, $image, $imagedir = null) diff --git a/imp/templates/javascript_defs_dimp.php b/imp/templates/javascript_defs_dimp.php index 6628f955b..0f7a317d0 100644 --- a/imp/templates/javascript_defs_dimp.php +++ b/imp/templates/javascript_defs_dimp.php @@ -13,7 +13,7 @@ $horde_webroot = $GLOBALS['registry']->get('webroot', 'horde'); $app_urls = $code = $flags = array(); -foreach (DIMP::menuList() as $app) { +foreach (IMP_Dimp::menuList() as $app) { $app_urls[$app] = Horde::url($GLOBALS['registry']->getInitialPage($app), true); } -- 2.11.0