From: Jan Schneider Date: Wed, 3 Mar 2010 13:13:51 +0000 (+0100) Subject: Start ajax methods with lowercase character. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=0618a51766a95138e898e1a9e6fc4935f8bfdfeb;p=horde.git Start ajax methods with lowercase character. --- diff --git a/framework/Ajax/lib/Horde/Ajax/Application/Base.php b/framework/Ajax/lib/Horde/Ajax/Application/Base.php index 9acc00c9a..534334861 100644 --- a/framework/Ajax/lib/Horde/Ajax/Application/Base.php +++ b/framework/Ajax/lib/Horde/Ajax/Application/Base.php @@ -114,7 +114,7 @@ abstract class Horde_Ajax_Application_Base * * @param Horde_Variables $vars None used. */ - public function LogOut($vars) + public function logOut($vars) { Horde::redirect(str_replace('&', '&', Horde::getServiceLink('logout', $this->_app))); exit; diff --git a/imp/js/DimpBase.js b/imp/js/DimpBase.js index 32b62f339..9eb6ead70 100644 --- a/imp/js/DimpBase.js +++ b/imp/js/DimpBase.js @@ -233,7 +233,7 @@ var DimpBase = { this.highlightSidebar('appportal'); location.hash = encodeURIComponent(loc); DimpCore.setTitle(DIMP.text.portal); - DimpCore.doAction('ShowPortal', {}, { callback: this._portalCallback.bind(this) }); + DimpCore.doAction('showPortal', {}, { callback: this._portalCallback.bind(this) }); break; case 'options': @@ -368,7 +368,7 @@ var DimpBase = { this.viewport = new ViewPort({ // Mandatory config - ajax_url: DIMP.conf.URI_AJAX + 'ViewPort', + ajax_url: DIMP.conf.URI_AJAX + 'viewPort', container: container, onContent: function(r, mode) { var bg, re, u, @@ -719,7 +719,7 @@ var DimpBase = { case 'ctx_folder_empty': tmp = baseelt.up('LI'); if (window.confirm(DIMP.text.empty_folder.replace(/%s/, tmp.readAttribute('title')))) { - DimpCore.doAction('EmptyFolder', { mbox: tmp.retrieve('mbox') }, { callback: this._emptyFolderCallback.bind(this) }); + DimpCore.doAction('emptyFolder', { mbox: tmp.retrieve('mbox') }, { callback: this._emptyFolderCallback.bind(this) }); } break; @@ -727,7 +727,7 @@ var DimpBase = { case 'ctx_vfolder_delete': tmp = baseelt.up('LI'); if (window.confirm(DIMP.text.delete_folder.replace(/%s/, tmp.readAttribute('title')))) { - DimpCore.doAction('DeleteMailbox', { mbox: tmp.retrieve('mbox') }, { callback: this.mailboxCallback.bind(this) }); + DimpCore.doAction('deleteMailbox', { mbox: tmp.retrieve('mbox') }, { callback: this.mailboxCallback.bind(this) }); } break; @@ -1146,7 +1146,7 @@ var DimpBase = { this.loadingImg('msg', true); - DimpCore.doAction('ShowPreview', this.viewport.addRequestParams(params || {}), { uids: this.viewport.createSelection('dataob', this.pp), callback: this._loadPreviewCallback.bind(this) }); + DimpCore.doAction('showPreview', this.viewport.addRequestParams(params || {}), { uids: this.viewport.createSelection('dataob', this.pp), callback: this._loadPreviewCallback.bind(this) }); }, _loadPreviewCallback: function(resp) @@ -1439,7 +1439,7 @@ var DimpBase = { } $(check).down('A').update('[' + DIMP.text.check + ']'); - DimpCore.doAction('Poll', args); + DimpCore.doAction('poll', args); }, pollCallback: function(r) @@ -1585,7 +1585,7 @@ var DimpBase = { dropbase = (drop == $('dropbase')); if (dropbase || (ftype != 'special' && !this.isSubfolder(drag, drop))) { - DimpCore.doAction('RenameMailbox', { old_name: drag.retrieve('mbox'), new_parent: dropbase ? '' : foldername, new_name: drag.retrieve('l') }, { callback: this.mailboxCallback.bind(this) }); + DimpCore.doAction('renameMailbox', { old_name: drag.retrieve('mbox'), new_parent: dropbase ? '' : foldername, new_name: drag.retrieve('l') }, { callback: this.mailboxCallback.bind(this) }); } } else if (ftype != 'container') { sel = this.viewport.getSelected(); @@ -1600,11 +1600,11 @@ var DimpBase = { if (uids.size()) { if (e.memo.dragevent.ctrlKey) { - DimpCore.doAction('CopyMessages', this.viewport.addRequestParams({ mboxto: foldername }), { uids: uids }); + DimpCore.doAction('copyMessages', this.viewport.addRequestParams({ mboxto: foldername }), { uids: uids }); } else if (this.folder != foldername) { // Don't allow drag/drop to the current folder. this.updateFlag(uids, '\\deleted', true); - DimpCore.doAction('MoveMessages', this.viewport.addRequestParams({ mboxto: foldername }), { uids: uids }); + DimpCore.doAction('moveMessages', this.viewport.addRequestParams({ mboxto: foldername }), { uids: uids }); } } } @@ -2188,7 +2188,7 @@ var DimpBase = { case 'rename': folder = folder.up('LI'); if (folder.retrieve('l') != val) { - action = 'RenameMailbox'; + action = 'renameMailbox'; params = { old_name: folder.retrieve('mbox'), new_parent: folder.up().hasClassName('folderlist') ? '' : folder.up(1).previous().retrieve('mbox'), @@ -2199,7 +2199,7 @@ var DimpBase = { case 'create': case 'createsub': - action = 'CreateMailbox'; + action = 'createMailbox'; params = { mbox: val }; if (mode == 'createsub') { params.parent = folder.up('LI').retrieve('mbox'); @@ -2435,7 +2435,7 @@ var DimpBase = { cback = this._folderLoadCallback.bind(this); } - DimpCore.doAction('ListMailboxes', params, { callback: cback }); + DimpCore.doAction('listMailboxes', params, { callback: cback }); }, // Folder actions. @@ -2658,7 +2658,7 @@ var DimpBase = { subscribeFolder: function(f, sub) { var fid = this.getFolderId(f); - DimpCore.doAction('Subscribe', { mbox: f, sub: Number(sub) }); + DimpCore.doAction('subscribe', { mbox: f, sub: Number(sub) }); if (this.showunsub) { [ $(fid) ].invoke(sub ? 'removeClassName' : 'addClassName', 'unsubFolder'); @@ -2710,7 +2710,7 @@ var DimpBase = { reportSpam: function(spam, opts) { opts = opts || {}; - if (this._doMsgAction('ReportSpam', opts, { spam: spam })) { + if (this._doMsgAction('reportSpam', opts, { spam: spam })) { // Indicate to the user that something is happening (since spam // reporting may not be instantaneous). this.loadingImg('viewport', true); @@ -2722,7 +2722,7 @@ var DimpBase = { blacklist: function(blacklist, opts) { opts = opts || {}; - this._doMsgAction('Blacklist', opts, { blacklist: blacklist }); + this._doMsgAction('blacklist', opts, { blacklist: blacklist }); }, // opts = 'mailbox', 'uid' @@ -2742,7 +2742,7 @@ var DimpBase = { opts.vs = vs; - this._doMsgAction('DeleteMessages', opts, {}); + this._doMsgAction('deleteMessages', opts, {}); this.updateFlag(vs, '\\deleted', true); }, @@ -2780,7 +2780,7 @@ var DimpBase = { this.updateFlag(vs, flag, set); if (!opts.noserver) { - DimpCore.doAction('FlagMessages', this.viewport.addRequestParams({ flags: flags.toJSON(), view: this.folder }), { uids: vs }); + DimpCore.doAction('flagMessages', this.viewport.addRequestParams({ flags: flags.toJSON(), view: this.folder }), { uids: vs }); } }, @@ -2788,7 +2788,7 @@ var DimpBase = { // mbox = (string) The mailbox to flag flagAll: function(type, set, mbox) { - DimpCore.doAction('FlagAll', { flags: [ type ].toJSON(), set: Number(set), mbox: mbox }, { callback: this._flagAllCallback.bind(this) }); + DimpCore.doAction('flagAll', { flags: [ type ].toJSON(), set: Number(set), mbox: mbox }, { callback: this._flagAllCallback.bind(this) }); }, hasFlag: function(f, r) @@ -2839,12 +2839,12 @@ var DimpBase = { /* Miscellaneous folder actions. */ purgeDeleted: function() { - DimpCore.doAction('PurgeDeleted', this.viewport.addRequestParams({})); + DimpCore.doAction('purgeDeleted', this.viewport.addRequestParams({})); }, modifyPoll: function(folder, add) { - DimpCore.doAction('ModifyPoll', { add: Number(add), mbox: folder }, { callback: this._modifyPollCallback.bind(this) }); + DimpCore.doAction('modifyPoll', { add: Number(add), mbox: folder }, { callback: this._modifyPollCallback.bind(this) }); }, _modifyPollCallback: function(r) diff --git a/imp/js/DimpCore.js b/imp/js/DimpCore.js index b24dfdeed..0de9b124f 100644 --- a/imp/js/DimpCore.js +++ b/imp/js/DimpCore.js @@ -289,7 +289,7 @@ var DimpCore = { logout: function(url) { this.is_logout = true; - this.redirect(url || (DIMP.conf.URI_AJAX + 'LogOut')); + this.redirect(url || (DIMP.conf.URI_AJAX + 'logOut')); }, redirect: function(url, force) @@ -487,7 +487,7 @@ var DimpCore = { break; case 'ctx_contacts_add': - this.doAction('AddContact', { name: baseelt.retrieve('personal'), email: baseelt.retrieve('email') }, {}, true); + this.doAction('addContact', { name: baseelt.retrieve('personal'), email: baseelt.retrieve('email') }, {}, true); break; } }, @@ -519,9 +519,9 @@ var DimpCore = { /* Catch dialog actions. */ document.observe('IMPDialog:success', function(e) { switch (e.memo) { - case 'PGPPersonal': - case 'PGPSymmetric': - case 'SMIMEPersonal': + case 'pgpPersonal': + case 'pgpSymmetric': + case 'smimePersonal': IMPDialog.noreload = true; this.reloadMessage({}); break; diff --git a/imp/js/compose-dimp.js b/imp/js/compose-dimp.js index 7a3d2da66..31970b41a 100644 --- a/imp/js/compose-dimp.js +++ b/imp/js/compose-dimp.js @@ -22,7 +22,7 @@ var DimpCompose = { !DIMP.conf_compose.qreply) { DIMP.baseWindow.focus(); } - DimpCore.doAction(DIMP.conf_compose.auto_save_interval_val ? 'DeleteDraft' : 'CancelCompose', { imp_compose: $F('composeCache') }, { ajaxopts: { asynchronous: DIMP.conf_compose.qreply } }); + DimpCore.doAction(DIMP.conf_compose.auto_save_interval_val ? 'deleteDraft' : 'cancelCompose', { imp_compose: $F('composeCache') }, { ajaxopts: { asynchronous: DIMP.conf_compose.qreply } }); this.updateDraftsMailbox(); return this.closeCompose(); } @@ -146,9 +146,9 @@ var DimpCompose = { this.skip_spellcheck = true; } - if (action == 'SendMessage' || action == 'SaveDraft') { + if (action == 'sendMessage' || action == 'saveDraft') { switch (action) { - case 'SendMessage': + case 'sendMessage': if (($F('subject') == '') && !window.confirm(DIMP.text_compose.nosubject)) { return; @@ -175,7 +175,7 @@ var DimpCompose = { c.setStyle({ cursor: 'wait' }); this.skip_spellcheck = false; - if (action == 'AddAttachment') { + if (action == 'addAttachment') { // We need a submit action here because browser security models // won't let us access files on user's filesystem otherwise. this.uploading = true; @@ -192,7 +192,7 @@ var DimpCompose = { // Can't disable until we send the message - or else nothing // will get POST'ed. - if (action == 'SendMessage' || action == 'SaveDraft') { + if (action == 'sendMessage' || action == 'saveDraft') { this.setDisabled(true); } } @@ -311,11 +311,11 @@ var DimpCompose = { this.rte.destroy(); this.RTELoading('show'); - DimpCore.doAction('Html2Text', { text: text }, { callback: this.setMessageText.bind(this), ajaxopts: { asynchronous: false } }); + DimpCore.doAction('html2Text', { text: text }, { callback: this.setMessageText.bind(this), ajaxopts: { asynchronous: false } }); this.RTELoading('hide'); } else { if (!noupdate) { - DimpCore.doAction('Text2Html', { text: $F('composeMessage') }, { callback: this.setMessageText.bind(this), ajaxopts: { asynchronous: false } }); + DimpCore.doAction('text2Html', { text: $F('composeMessage') }, { callback: this.setMessageText.bind(this), ajaxopts: { asynchronous: false } }); } config = Object.clone(IMP.ckeditor_config); @@ -422,7 +422,7 @@ var DimpCompose = { this.auto_save_interval = new PeriodicalExecuter(function() { var curr_hash = MD5.hash($('to', 'cc', 'bcc', 'subject').invoke('getValue').join('\0') + (IMP_Compose_Base.editor_on ? this.rte.getData() : $F('composeMessage'))); if (this.last_msg && curr_hash != this.last_msg) { - this.uniqueSubmit('AutoSaveDraft'); + this.uniqueSubmit('autoSaveDraft'); } this.last_msg = curr_hash; }.bind(this), DIMP.conf_compose.auto_save_interval_val * 60); @@ -572,7 +572,7 @@ var DimpCompose = { if (!$('attach_list').childElements().size()) { $('attach_list').hide(); } - DimpCore.doAction('DeleteAttach', { atc_indices: ids, imp_compose: $F('composeCache') }); + DimpCore.doAction('deleteAttach', { atc_indices: ids, imp_compose: $F('composeCache') }); }, resizeMsgArea: function() @@ -618,7 +618,7 @@ var DimpCompose = { uploadAttachment: function() { var u = $('upload'); - this.uniqueSubmit('AddAttachment'); + this.uniqueSubmit('addAttachment'); u.next().hide(); u.replace(new Element('SPAN', { id: 'upload_wait' }).insert(DIMP.text_compose.uploading + ' (' + $F(u) + ')')); }, @@ -679,7 +679,7 @@ var DimpCompose = { case 'draft_button': case 'send_button': if (!this.disabled) { - this.uniqueSubmit(id == 'send_button' ? 'SendMessage' : 'SaveDraft'); + this.uniqueSubmit(id == 'send_button' ? 'sendMessage' : 'saveDraft'); } break; @@ -726,9 +726,9 @@ var DimpCompose = { }); if (id.startsWith('reply')) { $('to_loading_img').show(); - DimpCore.doAction('GetReplyData', { headeronly: 1, imp_compose: $F('composeCache'), type: 'reply' }, { callback: this.swapToAddressCallback.bind(this) }); + DimpCore.doAction('getReplyData', { headeronly: 1, imp_compose: $F('composeCache'), type: 'reply' }, { callback: this.swapToAddressCallback.bind(this) }); } else { - DimpCore.doAction('GetForwardData', { dataonly: 1, imp_compose: $F('composeCache'), type: (id == 'fwdattachnotice' ? 'forward_body' : 'forward_attach') }, { callback: this.forwardAddCallback.bind(this) }); + DimpCore.doAction('getForwardData', { dataonly: 1, imp_compose: $F('composeCache'), type: (id == 'fwdattachnotice' ? 'forward_body' : 'forward_attach') }, { callback: this.forwardAddCallback.bind(this) }); } e.stop(); return; diff --git a/imp/js/compose.js b/imp/js/compose.js index f131313b8..7a619a289 100644 --- a/imp/js/compose.js +++ b/imp/js/compose.js @@ -384,9 +384,9 @@ Event.observe(window, 'beforeunload', ImpCompose.onBeforeUnload.bind(ImpCompose) /* Catch dialog actions. */ document.observe('IMPDialog:success', function(e) { switch (e.memo) { - case 'PGPPersonal': - case 'PGPSymmetric': - case 'SMIMEPersonal': + case 'pgpPersonal': + case 'pgpSymmetric': + case 'smimePersonal': IMPDialog.noreload = true; ImpCompose.uniqSubmit('send_message'); break; diff --git a/imp/js/fullmessage-dimp.js b/imp/js/fullmessage-dimp.js index 7125faa88..d919fc494 100644 --- a/imp/js/fullmessage-dimp.js +++ b/imp/js/fullmessage-dimp.js @@ -21,14 +21,14 @@ var DimpFullmessage = { case 'reply_all': case 'reply_auto': case 'reply_list': - func = 'GetReplyData'; + func = 'getReplyData'; break; case 'forward_auto': case 'forward_attach': case 'forward_body': case 'forward_both': - func = 'GetForwardData'; + func = 'getForwardData'; break; } diff --git a/imp/lib/Ajax/Application.php b/imp/lib/Ajax/Application.php index 9350bab37..70752ef85 100644 --- a/imp/lib/Ajax/Application.php +++ b/imp/lib/Ajax/Application.php @@ -61,7 +61,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * 'd' - (array) Mailboxes that were deleted. * */ - public function CreateMailbox() + public function createMailbox() { if (!$this->_vars->mbox) { return false; @@ -104,7 +104,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * 'd' - (array) Mailboxes that were deleted. * */ - public function DeleteMailbox() + public function deleteMailbox() { if (!$this->_vars->mbox) { return false; @@ -149,7 +149,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * 'd' - (array) Mailboxes that were deleted. * */ - public function RenameMailbox() + public function renameMailbox() { if (!$this->_vars->old_name || !$this->_vars->new_name) { return false; @@ -189,7 +189,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * 'mbox' - (string) The mailbox that was emptied. * */ - public function EmptyMailbox() + public function emptyMailbox() { if (!$this->_vars->mbox) { return false; @@ -223,7 +223,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * 'set' - (integer) 1 if the flag was set. Unset otherwise. * */ - public function FlagAll() + public function flagAll() { $flags = Horde_Serialize::unserialize($this->_vars->flags, Horde_Serialize::JSON); if (!$this->_vars->mbox || empty($flags)) { @@ -274,7 +274,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * 'quota' - (array) See _getQuota(). * */ - public function ListMailboxes() + public function listMailboxes() { $imptree = $GLOBALS['injector']->getInstance('IMP_Imap_Tree'); @@ -357,7 +357,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * 'ViewPort' - (object) See _viewPortData(). * */ - public function Poll() + public function poll() { $changed = false; @@ -401,7 +401,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * as the values. * */ - public function ModifyPoll() + public function modifyPoll() { if (!$this->_vars->mbox) { return false; @@ -442,7 +442,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * * @return boolean True on success, false on failure. */ - public function Subscribe() + public function subscribe() { if (!$GLOBALS['prefs']->getValue('subscribe')) { return false; @@ -475,7 +475,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * 'ViewPort' - (object) See _viewPortData(). * */ - public function ViewPort() + public function viewPort() { if (!$this->_vars->view) { return false; @@ -522,7 +522,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * @return mixed False on failure, or an object (see * _generateDeleteResult() for format). */ - public function MoveMessages() + public function moveMessages() { $indices = $GLOBALS['imp_imap']->ob()->utils->fromSequenceString($this->_vars->uid); if (!$this->_vars->mboxto || empty($indices)) { @@ -576,7 +576,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * as the values. * */ - public function CopyMessages() + public function copyMessages() { $indices = $GLOBALS['imp_imap']->ob()->utils->fromSequenceString($this->_vars->uid); if (!$this->_vars->mboxto || empty($indices)) { @@ -611,7 +611,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * 'ViewPort' - (object) See _viewPortData(). * */ - public function FlagMessages() + public function flagMessages() { $indices = $GLOBALS['imp_imap']->ob()->utils->fromSequenceString($this->_vars->uid); if (!$this->_vars->flags || empty($indices)) { @@ -672,7 +672,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * @return mixed False on failure, or an object (see * _generateDeleteResult() for format). */ - public function DeleteMessages() + public function deleteMessages() { $indices = $GLOBALS['imp_imap']->ob()->utils->fromSequenceString($this->_vars->uid); if (empty($indices)) { @@ -701,7 +701,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * * @return boolean True on success, false on failure. */ - public function AddContact() + public function addContact() { // Allow name to be empty. if (!$this->_vars->email) { @@ -733,7 +733,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * @return mixed False on failure, or an object (see * _generateDeleteResult() for format). */ - public function ReportSpam() + public function reportSpam() { $change = $this->_changed(false); $indices = $GLOBALS['imp_imap']->ob()->utils->fromSequenceString($this->_vars->uid); @@ -766,7 +766,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * @return mixed False on failure, or an object (see * _generateDeleteResult() for format). */ - public function Blacklist() + public function blacklist() { $indices = $GLOBALS['imp_imap']->ob()->utils->fromSequenceString($this->_vars->uid); if (empty($indices)) { @@ -816,7 +816,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * entry - don't do mailbox poll here). * */ - public function ShowPreview() + public function showPreview() { $indices = $GLOBALS['imp_imap']->ob()->utils->fromSequenceString($this->_vars->uid); if (count($indices) != 1) { @@ -878,7 +878,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * 'text' - (string) The converted text. * */ - public function Html2Text() + public function html2Text() { $result = new stdClass; // Need to replace line endings or else IE won't display line endings @@ -901,7 +901,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * 'text' - (string) The converted text. * */ - public function Text2Html() + public function text2Html() { $result = new stdClass; $result->text = Horde_Text_Filter::filter($this->_vars->text, 'text2html', array('parselevel' => Horde_Text_Filter_Text2html::MICRO_LINKURL)); @@ -937,7 +937,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * 'ViewPort' - (object) See _viewPortData(). * */ - public function GetForwardData() + public function getForwardData() { try { $imp_compose = IMP_Compose::singleton($this->_vars->imp_compose); @@ -1000,7 +1000,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * 'ViewPort' - (object) See _viewPortData(). * */ - public function GetReplyData() + public function getReplyData() { try { $imp_compose = IMP_Compose::singleton($this->_vars->imp_compose); @@ -1044,7 +1044,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * * @return boolean True. */ - public function CancelCompose() + public function cancelCompose() { $imp_compose = IMP_Compose::singleton($this->_vars->imp_compose); $imp_compose->destroy(false); @@ -1062,7 +1062,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * * @return boolean True. */ - public function DeleteDraft() + public function deleteDraft() { $imp_compose = IMP_Compose::singleton($this->_vars->imp_compose); $imp_compose->destroy(false); @@ -1086,7 +1086,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * * @return boolean True. */ - public function DeleteAttach() + public function deleteAttach() { if ($this->_vars->atc_indices) { $imp_compose = IMP_Compose::singleton($this->_vars->imp_compose); @@ -1108,7 +1108,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * 'portal' - (string) The portal HTML data. * */ - public function ShowPortal() + public function showPortal() { // Load the block list. Blocks are located in $dimp_block_list. // KEY: Block label; VALUE: Horde_Block object @@ -1187,7 +1187,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * @return mixed False on failure, or an object (see * _generateDeleteResult() for format). */ - public function PurgeDeleted() + public function purgeDeleted() { $indices = $GLOBALS['imp_imap']->ob()->utils->fromSequenceString($this->_vars->uid); $change = $this->_changed($indices); @@ -1235,7 +1235,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * * @return boolean True on success, false on failure. */ - public function SendMDN() + public function sendMDN() { if (!$this->_vars->view || !$this->_vars->uid) { return false; @@ -1270,7 +1270,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * 'success' - (integer) 1 on success, 0 on failure. * */ - public function PGPSymmetric() + public function pgpSymmetric() { $result = new stdClass; $result->success = 0; @@ -1309,7 +1309,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * 'success' - (integer) 1 on success, 0 on failure. * */ - public function PGPPersonal() + public function pgpPersonal() { $result = new stdClass; $result->success = false; @@ -1348,7 +1348,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * 'success' - (integer) 1 on success, 0 on failure. * */ - public function SMIMEPersonal() + public function smimePersonal() { $result = new stdClass; $result->success = false; @@ -1388,7 +1388,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * 'success' - (integer) 1 on success, 0 on failure. * */ - public function AddAttachment() + public function addAttachment() { $imp_compose = IMP_Compose::singleton($this->_vars->composeCache); @@ -1411,7 +1411,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * * @return object See self::_dimpDraftAction(). */ - public function AutoSaveDraft() + public function autoSaveDraft() { return $this->_dimpDraftAction(); } @@ -1421,7 +1421,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * * @return object See self::_dimpDraftAction(). */ - public function SaveDraft() + public function saveDraft() { return $this->_dimpDraftAction(); } @@ -1453,7 +1453,7 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base * 'uid' - (integer) TODO * */ - public function SendMessage() + public function sendMessage() { list($result, $imp_compose, $headers, $identity) = $this->_dimpComposeSetup(); if (!IMP::canCompose()) { diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php index 44432972d..59c45a514 100644 --- a/imp/lib/IMP.php +++ b/imp/lib/IMP.php @@ -1066,15 +1066,15 @@ class IMP Horde::addScriptFile('dialog.js', 'imp'); switch ($type) { - case 'PGPPersonal': + case 'pgpPersonal': $text = _("Enter your personal PGP passphrase."); break; - case 'PGPSymmetric': + case 'pgpSymmetric': $text = _("Enter the passphrase used to encrypt this message."); break; - case 'SMIMEPersonal': + case 'smimePersonal': $text = _("Enter your personal S/MIME passphrase."); break; } diff --git a/imp/lib/Mime/Viewer/Pgp.php b/imp/lib/Mime/Viewer/Pgp.php index 8877a33c5..5ec351d11 100644 --- a/imp/lib/Mime/Viewer/Pgp.php +++ b/imp/lib/Mime/Viewer/Pgp.php @@ -222,7 +222,7 @@ class IMP_Horde_Mime_Viewer_Pgp extends Horde_Mime_Viewer_Driver /* Ask for the correct passphrase if this is encrypted * symmetrically. */ - $status[] = Horde::link('#', '', '', '', IMP::passphraseDialogJS('PGPSymmetric', array('symmetricid' => $symmetric_id)) . ';return false;') . _("You must enter the passphrase used to encrypt this message to view it.") . ''; + $status[] = Horde::link('#', '', '', '', IMP::passphraseDialogJS('pgpSymmetric', array('symmetricid' => $symmetric_id)) . ';return false;') . _("You must enter the passphrase used to encrypt this message to view it.") . ''; return null; } @@ -252,7 +252,7 @@ class IMP_Horde_Mime_Viewer_Pgp extends Horde_Mime_Viewer_Driver if (is_null($personal_pass)) { /* Ask for the private key's passphrase if this is * encrypted asymmetrically. */ - $status[] = Horde::link('#', '', '', '', IMP::passphraseDialogJS('PGPPersonal') . ';return false;') . _("You must enter the passphrase for your PGP private key to view this message.") . ''; + $status[] = Horde::link('#', '', '', '', IMP::passphraseDialogJS('pgpPersonal') . ';return false;') . _("You must enter the passphrase for your PGP private key to view this message.") . ''; return null; } } else { diff --git a/imp/lib/Mime/Viewer/Smime.php b/imp/lib/Mime/Viewer/Smime.php index 8c2a05edd..b3cc1f377 100644 --- a/imp/lib/Mime/Viewer/Smime.php +++ b/imp/lib/Mime/Viewer/Smime.php @@ -195,7 +195,7 @@ class IMP_Horde_Mime_Viewer_Smime extends Horde_Mime_Viewer_Driver /* Make sure we have a passphrase. */ $passphrase = $this->_impsmime->getPassphrase(); if (is_null($passphrase)) { - $status[] = Horde::link('#', '', '', '', IMP::passphraseDialogJS('SMIMEPersonal') . ';return false;') . _("You must enter the passphrase for your S/MIME private key to view this data.") . ''; + $status[] = Horde::link('#', '', '', '', IMP::passphraseDialogJS('smimePersonal') . ';return false;') . _("You must enter the passphrase for your S/MIME private key to view this data.") . ''; return null; } diff --git a/imp/lib/Ui/Compose.php b/imp/lib/Ui/Compose.php index 0be880e2c..bc4cbdb70 100644 --- a/imp/lib/Ui/Compose.php +++ b/imp/lib/Ui/Compose.php @@ -305,15 +305,15 @@ class IMP_Ui_Compose { switch ($type) { case 'pgp': - $js = IMP::passphraseDialogJS('PGPPersonal'); + $js = IMP::passphraseDialogJS('pgpPersonal'); break; case 'pgp_symm': - $js = IMP::passphraseDialogJS('PGPSymmetric', array('symmetricid' => 'imp_compose_' . $cacheid)); + $js = IMP::passphraseDialogJS('pgpSymmetric', array('symmetricid' => 'imp_compose_' . $cacheid)); break; case 'smime': - $js = IMP::passphraseDialogJS('SMIMEPersonal'); + $js = IMP::passphraseDialogJS('smimePersonal'); break; } diff --git a/imp/lib/Views/ShowMessage.php b/imp/lib/Views/ShowMessage.php index e654c5a50..8237f80b5 100644 --- a/imp/lib/Views/ShowMessage.php +++ b/imp/lib/Views/ShowMessage.php @@ -257,7 +257,7 @@ class IMP_Views_ShowMessage /* Do MDN processing now. */ if ($imp_ui->MDNCheck($mailbox, $uid, $mime_headers)) { - $result['msgtext'] .= $imp_ui->formatStatusMsg(array(array('text' => array(_("The sender of this message is requesting a Message Disposition Notification from you when you have read this message."), sprintf(_("Click %s to send the notification message."), Horde::link('', '', '', '', 'DimpCore.doAction(\'SendMDN\',{folder:\'' . $mailbox . '\',uid:' . $uid . '}); return false;', '', '') . _("HERE") . ''))))); + $result['msgtext'] .= $imp_ui->formatStatusMsg(array(array('text' => array(_("The sender of this message is requesting a Message Disposition Notification from you when you have read this message."), sprintf(_("Click %s to send the notification message."), Horde::link('', '', '', '', 'DimpCore.doAction(\'sendMDN\',{folder:\'' . $mailbox . '\',uid:' . $uid . '}); return false;', '', '') . _("HERE") . ''))))); } /* Build body text. This needs to be done before we build the diff --git a/imp/pgp.php b/imp/pgp.php index 3e40f1680..f8bdd4e28 100644 --- a/imp/pgp.php +++ b/imp/pgp.php @@ -292,7 +292,7 @@ if ($prefs->getValue('use_pgp')) { $t->set('sendkey', Horde::link($selfURL->copy()->add('actionID', 'send_public_key'), _("Send Key to Public Keyserver"))); $t->set('personalkey-public-help', Horde_Help::link('imp', 'pgp-personalkey-public')); $passphrase = $imp_pgp->getPassphrase('personal'); - $t->set('passphrase', (empty($passphrase)) ? Horde::link('#', _("Enter Passphrase"), null, null, IMP::passphraseDialogJS('PGPPersonal') . ';return false;') . _("Enter Passphrase") : Horde::link($selfURL->copy()->add('actionID', 'unset_passphrase'), _("Unload Passphrase")) . _("Unload Passphrase")); + $t->set('passphrase', (empty($passphrase)) ? Horde::link('#', _("Enter Passphrase"), null, null, IMP::passphraseDialogJS('pgpPersonal') . ';return false;') . _("Enter Passphrase") : Horde::link($selfURL->copy()->add('actionID', 'unset_passphrase'), _("Unload Passphrase")) . _("Unload Passphrase")); $t->set('viewprivate', Horde::link($selfURL->copy()->add('actionID', 'view_personal_private_key'), _("View Personal Private Key"), null, 'view_key')); $t->set('infoprivate', Horde::link($selfURL->copy()->add('actionID', 'info_personal_private_key'), _("Information on Personal Private Key"), null, 'info_key')); $t->set('personalkey-private-help', Horde_Help::link('imp', 'pgp-personalkey-private')); diff --git a/imp/smime.php b/imp/smime.php index a6a9129dc..74f7ff5cb 100644 --- a/imp/smime.php +++ b/imp/smime.php @@ -203,7 +203,7 @@ if ($openssl_check && $prefs->getValue('use_smime')) { $t->set('viewpublic', Horde::link($selfURL->copy()->add('actionID', 'view_personal_public_key'), _("View Personal Public Key"), null, 'view_key')); $t->set('infopublic', Horde::link($selfURL->copy()->add('actionID', 'info_personal_public_key'), _("Information on Personal Public Key"), null, 'info_key')); $passphrase = $imp_smime->getPassphrase(); - $t->set('passphrase', empty($passphrase) ? Horde::link('#', _("Enter Passphrase"), null, null, IMP::passphraseDialogJS('SMIMEPersonal') . ';return false;') . _("Enter Passphrase") : Horde::link($selfURL->copy()->add('actionID', 'unset_passphrase'), _("Unload Passphrase")) . _("Unload Passphrase")); + $t->set('passphrase', empty($passphrase) ? Horde::link('#', _("Enter Passphrase"), null, null, IMP::passphraseDialogJS('smimePersonal') . ';return false;') . _("Enter Passphrase") : Horde::link($selfURL->copy()->add('actionID', 'unset_passphrase'), _("Unload Passphrase")) . _("Unload Passphrase")); $t->set('viewprivate', Horde::link($selfURL->copy()->add('actionID', 'view_personal_private_key'), _("View Personal Private Key"), null, 'view_key')); $t->set('deletekeypair', addslashes(_("Are you sure you want to delete your keypair? (This is NOT recommended!)"))); $t->set('personalkey-delete-help', Horde_Help::link('imp', 'smime-delete-personal-certs')); diff --git a/imp/templates/chunks/compose.php b/imp/templates/chunks/compose.php index 8b8563099..f8fe20584 100644 --- a/imp/templates/chunks/compose.php +++ b/imp/templates/chunks/compose.php @@ -19,7 +19,7 @@ $save_attach = $GLOBALS['prefs']->getValue('save_attachments'); $compose_disable = !IMP::canCompose(); ?> -
+ diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js index 090201810..6d6f48530 100644 --- a/kronolith/js/kronolith.js +++ b/kronolith/js/kronolith.js @@ -229,7 +229,7 @@ KronolithCore = { logout: function() { this.is_logout = true; - this.redirect(Kronolith.conf.URI_AJAX + 'LogOut'); + this.redirect(Kronolith.conf.URI_AJAX + 'logOut'); }, redirect: function(url) @@ -364,7 +364,7 @@ KronolithCore = { }); }); this.startLoading('search', query); - this.doAction('SearchEvents', + this.doAction('searchEvents', { cals: cals.toJSON(), query: query }, function(r) { // Hide spinner. @@ -1103,7 +1103,7 @@ KronolithCore = { calendar = cal.join('|'); this.startLoading(calendar, start + end); this.storeCache($H(), calendar); - this.doAction('ListEvents', + this.doAction('listEvents', { start: start, end: end, cal: calendar, @@ -1643,7 +1643,7 @@ KronolithCore = { loading = true; this.loading++; $('kronolithLoading').show(); - this.doAction('ListTasks', + this.doAction('listTasks', { type: type, list: list }, function(r) { @@ -1915,7 +1915,7 @@ KronolithCore = { this.updateTasklistDropDown(); if (id) { RedBox.loading(); - this.doAction('GetTask', { list: tasklist, id: id }, this.editTaskCallback.bind(this)); + this.doAction('getTask', { list: tasklist, id: id }, this.editTaskCallback.bind(this)); } else { $('kronolithTaskId').clear(); $('kronolithTaskOldList').clear(); @@ -2055,7 +2055,7 @@ KronolithCore = { taskid = $F('kronolithTaskId'); this.loading++; $('kronolithLoading').show(); - this.doAction('SaveTask', + this.doAction('saveTask', $H($('kronolithTaskForm').serialize({ hash: true })) .merge({ sig: this.tasktype }), function(r) { @@ -2082,7 +2082,7 @@ KronolithCore = { this.editCalendarCallback(calendar); } else { RedBox.loading(); - this.doAction('ChunkContent', { chunk: 'calendar' }, function(r) { + this.doAction('chunkContent', { chunk: 'calendar' }, function(r) { if (r.response.chunk) { RedBox.showHtml(r.response.chunk); this.editCalendarCallback(calendar); @@ -2219,7 +2219,7 @@ KronolithCore = { var type = form.id.replace(/kronolithCalendarForm/, ''), data = form.serialize({ hash: true }); - this.doAction('SaveCalendar', + this.doAction('saveCalendar', data, function(r) { if (r.response.saved) { @@ -2710,7 +2710,7 @@ KronolithCore = { Horde_Calendar.hideCal(); var cal = $F('kronolithEventCalendar'), eventid = $F('kronolithEventId'); - this.doAction('DeleteEvent', + this.doAction('deleteEvent', { cal: cal, id: eventid }, function(r) { if (r.response.deleted) { @@ -2734,7 +2734,7 @@ KronolithCore = { case 'kronolithTaskDelete': var tasklist = $F('kronolithTaskOldList'), taskid = $F('kronolithTaskId'); - this.doAction('DeleteTask', + this.doAction('deleteTask', { list: tasklist, id: taskid }, function(r) { if (r.response.deleted) { @@ -3046,7 +3046,7 @@ KronolithCore = { var taskid = elt.up('tr.kronolithTaskRow', 0).retrieve('taskid'), tasklist = elt.up('tr.kronolithTaskRow', 0).retrieve('tasklist'); this.toggleCompletionClass(taskid); - this.doAction('ToggleCompletion', + this.doAction('toggleCompletion', { list: tasklist, id: taskid }, function(r) { if (r.response.toggled) { @@ -3084,7 +3084,7 @@ KronolithCore = { e.stop(); return; } - this.doAction('GetRemoteInfo', + this.doAction('getRemoteInfo', params, function(r) { if (r.response.success) { @@ -3109,7 +3109,7 @@ KronolithCore = { params.username = $F('kronolithCalendarremoteUsername'); params.password = $F('kronolithCalendarremotePassword'); } - this.doAction('GetRemoteInfo', + this.doAction('getRemoteInfo', params, function(r) { if (r.response.success) { @@ -3144,7 +3144,7 @@ KronolithCore = { var form = elt.up('form'), type = form.id.replace(/kronolithCalendarForm/, ''), calendar = $F('kronolithCalendar' + type + 'Id'); - this.doAction('DeleteCalendar', + this.doAction('deleteCalendar', { type: type, calendar: calendar }, function(r) { if (r.response.deleted) { @@ -3214,7 +3214,7 @@ KronolithCore = { calendar = calClass + '_' + calendar; break; } - this.doAction('SaveCalPref', { toggle_calendar: calendar }); + this.doAction('saveCalPref', { toggle_calendar: calendar }); e.stop(); return; } @@ -3256,7 +3256,7 @@ KronolithCore = { drop.insert(el); this.startLoading(cal, start + end); - this.doAction('UpdateEvent', + this.doAction('updateEvent', { cal: cal, id: eventid, view: this.view, @@ -3381,7 +3381,7 @@ KronolithCore = { end: event.value.end }); } this.doAction( - 'UpdateEvent', + 'updateEvent', { cal: event.value.calendar, id: event.key, view: this.view, @@ -3431,10 +3431,10 @@ KronolithCore = { $('kronolithEventSave').show(); $('kronolithEventDelete').show(); $('kronolithEventForm').down('.kronolithFormActions .kronolithSeparator').show(); - this.doAction('ListTopTags', {}, this.topTags); + this.doAction('listTopTags', {}, this.topTags); if (id) { RedBox.loading(); - this.doAction('GetEvent', { cal: calendar, id: id, date: date }, this.editEventCallback.bind(this)); + this.doAction('getEvent', { cal: calendar, id: id, date: date }, this.editEventCallback.bind(this)); } else { $('kronolithEventTags').autocompleter.init(); var d; @@ -3479,7 +3479,7 @@ KronolithCore = { end = viewDates[1].dateString(); $('kronolithEventTags').autocompleter.shutdown(); this.startLoading(cal, start + end); - this.doAction('SaveEvent', + this.doAction('saveEvent', $H($('kronolithEventForm').serialize({ hash: true })) .merge({ view: this.view, @@ -3506,7 +3506,7 @@ KronolithCore = { $('kronolithQuickinsert').fade(); this.startLoading(null, start + end); - this.doAction('QuickSaveEvent', + this.doAction('quickSaveEvent', $H({ text: text, view: this.view, view_start: start, @@ -3657,7 +3657,7 @@ KronolithCore = { var tr = new Element('tr'), i; if (attendee.e) { this.fbLoading++; - this.doAction('GetFreeBusy', + this.doAction('getFreeBusy', { email: attendee.e }, function(r) { this.fbLoading--; diff --git a/kronolith/lib/Ajax/Application.php b/kronolith/lib/Ajax/Application.php index 69dd03330..7825ffb07 100644 --- a/kronolith/lib/Ajax/Application.php +++ b/kronolith/lib/Ajax/Application.php @@ -24,7 +24,7 @@ class Kronolith_Ajax_Application extends Horde_Ajax_Application_Base /** * TODO */ - public function ListEvents() + public function listEvents() { $start = new Horde_Date($this->_vars->start); $end = new Horde_Date($this->_vars->end); @@ -49,7 +49,7 @@ class Kronolith_Ajax_Application extends Horde_Ajax_Application_Base /** * TODO */ - public function GetEvent() + public function getEvent() { $result = new stdClass; @@ -73,7 +73,7 @@ class Kronolith_Ajax_Application extends Horde_Ajax_Application_Base /** * TODO */ - public function SaveEvent() + public function saveEvent() { $result = $this->_signedResponse($this->_vars->cal); @@ -102,7 +102,7 @@ class Kronolith_Ajax_Application extends Horde_Ajax_Application_Base /** * TODO */ - public function QuickSaveEvent() + public function quickSaveEvent() { try { $event = Kronolith::quickAdd($this->_vars->text, Kronolith::getDefaultCalendar(Horde_Perms::EDIT)); @@ -116,7 +116,7 @@ class Kronolith_Ajax_Application extends Horde_Ajax_Application_Base /** * TODO */ - public function UpdateEvent() + public function updateEvent() { $result = $this->_signedResponse($this->_vars->cal); @@ -183,7 +183,7 @@ class Kronolith_Ajax_Application extends Horde_Ajax_Application_Base /** * TODO */ - public function DeleteEvent() + public function deleteEvent() { $result = new stdClass; @@ -216,7 +216,7 @@ class Kronolith_Ajax_Application extends Horde_Ajax_Application_Base /** * TODO */ - public function SearchEvents() + public function searchEvents() { $query = Horde_Serialize::unserialize($this->_vars->query, Horde_Serialize::JSON); if (!isset($query->start)) { @@ -255,7 +255,7 @@ class Kronolith_Ajax_Application extends Horde_Ajax_Application_Base /** * TODO */ - public function ListTasks() + public function listTasks() { if (!$GLOBALS['registry']->hasMethod('tasks/listTasks')) { return false; @@ -280,7 +280,7 @@ class Kronolith_Ajax_Application extends Horde_Ajax_Application_Base /** * TODO */ - public function GetTask() + public function getTask() { if (!$GLOBALS['registry']->hasMethod('tasks/getTask') || !isset($this->_vars->id) || @@ -306,7 +306,7 @@ class Kronolith_Ajax_Application extends Horde_Ajax_Application_Base /** * TODO */ - public function SaveTask() + public function saveTask() { if (!$GLOBALS['registry']->hasMethod('tasks/updateTask') || !$GLOBALS['registry']->hasMethod('tasks/addTask')) { @@ -369,7 +369,7 @@ class Kronolith_Ajax_Application extends Horde_Ajax_Application_Base /** * TODO */ - public function DeleteTask() + public function deleteTask() { $result = new stdClass; @@ -392,7 +392,7 @@ class Kronolith_Ajax_Application extends Horde_Ajax_Application_Base /** * TODO */ - public function ToggleCompletion() + public function toggleCompletion() { $result = new stdClass; @@ -413,7 +413,7 @@ class Kronolith_Ajax_Application extends Horde_Ajax_Application_Base /** * TODO */ - public function ListTopTags() + public function listTopTags() { $this->notify = false; $tagger = new Kronolith_Tagger(); @@ -429,7 +429,7 @@ class Kronolith_Ajax_Application extends Horde_Ajax_Application_Base /** * TODO */ - public function GetFreeBusy() + public function getFreeBusy() { $result = new stdClass; try { @@ -443,7 +443,7 @@ class Kronolith_Ajax_Application extends Horde_Ajax_Application_Base /** * TODO */ - public function SearchCalendars() + public function searchCalendars() { $result = new stdClass; $result->events = 'Searched for calendars: ' . $this->_vars->title; @@ -453,7 +453,7 @@ class Kronolith_Ajax_Application extends Horde_Ajax_Application_Base /** * TODO */ - public function SaveCalendar() + public function saveCalendar() { $calendar_id = $this->_vars->calendar; $result = new stdClass; @@ -575,7 +575,7 @@ class Kronolith_Ajax_Application extends Horde_Ajax_Application_Base /** * TODO */ - public function DeleteCalendar() + public function deleteCalendar() { $calendar_id = $this->_vars->calendar; $result = new stdClass; @@ -632,7 +632,7 @@ class Kronolith_Ajax_Application extends Horde_Ajax_Application_Base /** * TODO */ - public function GetRemoteInfo() + public function getRemoteInfo() { $params = array('timeout' => 15); if ($user = $this->_vars->username) { @@ -671,12 +671,12 @@ class Kronolith_Ajax_Application extends Horde_Ajax_Application_Base /** * TODO */ - public function SaveCalPref() + public function saveCalPref() { return false; } - public function ChunkContent() + public function chunkContent() { $chunk = basename(Horde_Util::getPost('chunk')); $result = new stdClass;