From 01b84f2502cd2c9ed021ea4964f29caf97a8fab7 Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Tue, 13 Apr 2010 11:26:24 -0400 Subject: [PATCH] another (last?) round of camelcase method corrections from legacy z-push code --- framework/ActiveSync/lib/Horde/ActiveSync.php | 6 +++--- .../ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php | 4 ++-- .../ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php | 12 ++++++------ .../ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php | 4 ++-- framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 10 +++++----- framework/ActiveSync/lib/Horde/ActiveSync/Sync.php | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/framework/ActiveSync/lib/Horde/ActiveSync.php b/framework/ActiveSync/lib/Horde/ActiveSync.php index 9ca0a1520..821d5f105 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync.php @@ -418,7 +418,7 @@ class Horde_ActiveSync $this->_encoder->endTag(); $importer = $this->_driver->GetContentsImporter($move['srcfldid']); - $result = $importer->ImportMessageMove($move['srcmsgid'], $move['dstfldid']); + $result = $importer->importMessageMove($move['srcmsgid'], $move['dstfldid']); // We discard the importer state for now. $this->_encoder->startTag(SYNC_MOVE_STATUS); @@ -667,10 +667,10 @@ class Horde_ActiveSync if (!$delete) { // Send change - $serverid = $importer->ImportFolderChange($serverid, $parentid, $displayname, $type); + $serverid = $importer->importFolderChange($serverid, $parentid, $displayname, $type); } else { // delete folder - $deletedstat = $importer->ImportFolderDeletion($serverid, 0); + $deletedstat = $importer->importFolderDeletion($serverid, 0); } $this->_encoder->startWBXML(); diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php b/framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php index c32d6510b..73659d544 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php @@ -188,7 +188,7 @@ class Horde_ActiveSync_Connector_Exporter * * @return boolean */ - public function FolderChange($folder) + public function folderChange($folder) { array_push($this->changed, $folder); $this->count++; @@ -203,7 +203,7 @@ class Horde_ActiveSync_Connector_Exporter * * @return boolean */ - public function FolderDeletion($id) + public function folderDeletion($id) { array_push($this->deleted, $id); $this->count++; diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php b/framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php index 94a71424e..c2683505b 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php @@ -94,7 +94,7 @@ class Horde_ActiveSync_Connector_Importer * * @return mixed The server message id or false */ - public function ImportMessageChange($id, $message) + public function importMessageChange($id, $message) { /* do nothing if it is in a dummy folder */ if ($this->_folderId == Horde_ActiveSync::FOLDER_TYPE_DUMMY) { @@ -140,7 +140,7 @@ class Horde_ActiveSync_Connector_Importer * * @return boolean */ - public function ImportMessageDeletion($id) + public function importMessageDeletion($id) { /* Do nothing if it is in a dummy folder */ if ($this->_folderId == Horde_ActiveSync::FOLDER_TYPE_DUMMY) { @@ -174,7 +174,7 @@ class Horde_ActiveSync_Connector_Importer * @param string $id Server message id * @param ?? $flags The read flags to set */ - public function ImportMessageReadFlag($id, $flags) + public function importMessageReadFlag($id, $flags) { /* Do nothing if it is a dummy folder */ if ($this->_folderId == Horde_ActiveSync::FOLDER_TYPE_DUMMY) { @@ -203,7 +203,7 @@ class Horde_ActiveSync_Connector_Importer * * @return boolean */ - public function ImportMessageMove($id, $newfolder) + public function importMessageMove($id, $newfolder) { return true; } @@ -218,7 +218,7 @@ class Horde_ActiveSync_Connector_Importer * * @return boolean */ - public function ImportFolderChange($id, $parent, $displayname, $type) + public function importFolderChange($id, $parent, $displayname, $type) { /* do nothing if it is a dummy folder */ if ($parent == Horde_ActiveSync::FOLDER_TYPE_DUMMY) { @@ -251,7 +251,7 @@ class Horde_ActiveSync_Connector_Importer * * @return boolean */ - public function ImportFolderDeletion($id, $parent) + public function importFolderDeletion($id, $parent) { /* Do nothing if it is a dummy folder */ if ($parent == Horde_ActiveSync::FOLDER_TYPE_DUMMY) { diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php index 19f26846c..043c0e13f 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php @@ -118,10 +118,10 @@ class Horde_ActiveSync_Request_FolderSync extends Horde_ActiveSync_Request_Base switch ($element[Horde_ActiveSync_Wbxml::EN_TAG]) { case SYNC_ADD: case SYNC_MODIFY: - $serverid = $importer->ImportFolderChange($folder); + $serverid = $importer->importFolderChange($folder); break; case SYNC_REMOVE: - $serverid = $importer->ImportFolderDeletion($folder); + $serverid = $importer->importFolderDeletion($folder); break; } diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php index 85723791f..2a05afbd8 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php @@ -283,16 +283,16 @@ class Horde_ActiveSync_Request_Sync extends Horde_ActiveSync_Request_Base // Currently, 'read' is only sent by the PDA when it // is ONLY setting the read flag. if (isset($appdata->read)) { - $importer->ImportMessageReadFlag($serverid, $appdata->read); + $importer->importMessageReadFlag($serverid, $appdata->read); } else { - $importer->ImportMessageChange($serverid, $appdata); + $importer->importMessageChange($serverid, $appdata); } $collection['importedchanges'] = true; } break; case Horde_ActiveSync::SYNC_ADD: if (isset($appdata)) { - $id = $importer->ImportMessageChange(false, $appdata); + $id = $importer->importMessageChange(false, $appdata); if ($clientid && $id) { $collection['clientids'][$clientid] = $id; $collection['importedchanges'] = true; @@ -304,13 +304,13 @@ class Horde_ActiveSync_Request_Sync extends Horde_ActiveSync_Request_Base $folderid = $this->_driver->getWasteBasket(); if ($folderid) { - $importer->ImportMessageMove($serverid, $folderid); + $importer->importMessageMove($serverid, $folderid); $collection['importedchanges'] = true; break; } } - $importer->ImportMessageDeletion($serverid); + $importer->importMessageDeletion($serverid); $collection['importedchanges'] = true; break; case Horde_ActiveSync::SYNC_FETCH: diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Sync.php b/framework/ActiveSync/lib/Horde/ActiveSync/Sync.php index 77521629c..7cc098d22 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Sync.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Sync.php @@ -150,12 +150,12 @@ class Horde_ActiveSync_Sync return; } - if ($flags & Horde_ActiveSync::BACKEND_DISCARD_DATA || $this->_exporter->FolderChange($folder)) { + if ($flags & Horde_ActiveSync::BACKEND_DISCARD_DATA || $this->_exporter->folderChange($folder)) { $this->_stateMachine->updateState('change', $stat); } break; case 'delete': - if ($flags & Horde_ActiveSync::BACKEND_DISCARD_DATA || $this->_exporter->FolderDeletion($change['id'])) { + if ($flags & Horde_ActiveSync::BACKEND_DISCARD_DATA || $this->_exporter->folderDeletion($change['id'])) { $this->_stateMachine->updateState('delete', $change); } break; -- 2.11.0