From 9eec0f0da1c14e242b6f822e983fe22678073f10 Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Fri, 4 Jun 2010 00:34:40 +0200 Subject: [PATCH] getOb() -> getData() --- fima/data.php | 6 +++--- framework/Core/lib/Horde/Core/Factory/Data.php | 2 +- kronolith/data.php | 4 ++-- mnemo/data.php | 4 ++-- nag/data.php | 4 ++-- operator/lib/Form/SearchCDR.php | 4 ++-- skoli/data.php | 4 ++-- turba/data.php | 10 +++++----- turba/vcard.php | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/fima/data.php b/fima/data.php index 69198e0ea..e9c5fee04 100644 --- a/fima/data.php +++ b/fima/data.php @@ -103,11 +103,11 @@ case 'export': switch (Horde_Util::getFormData('exportID')) { case EXPORT_CSV: - $injector->getInstance('Horde_Data')->getOb('Csv', array('cleanup' => '_cleanupData'))->exportFile(_("postings.csv"), $data, true); + $injector->getInstance('Horde_Data')->getData('Csv', array('cleanup' => '_cleanupData'))->exportFile(_("postings.csv"), $data, true); exit; case EXPORT_TSV: - $injector->getInstance('Horde_Data')->getOb('Tsv', array('cleanup' => '_cleanupData'))->exportFile(_("postings.tsv"), $data, true); + $injector->getInstance('Horde_Data')->getData('Tsv', array('cleanup' => '_cleanupData'))->exportFile(_("postings.tsv"), $data, true); exit; } break; @@ -127,7 +127,7 @@ case Horde_Data::IMPORT_FILE: if (!$error) { try { - $data = $injector->getInstance('Horde_Data')->getOb($import_format, array('cleanup' => '_cleanupData')); + $data = $injector->getInstance('Horde_Data')->getData($import_format, array('cleanup' => '_cleanupData')); $next_step = $data->nextStep($actionID, $param); } catch (Horde_Data_Exception $e) { if ($data) { diff --git a/framework/Core/lib/Horde/Core/Factory/Data.php b/framework/Core/lib/Horde/Core/Factory/Data.php index de94899ab..af8b72803 100644 --- a/framework/Core/lib/Horde/Core/Factory/Data.php +++ b/framework/Core/lib/Horde/Core/Factory/Data.php @@ -53,7 +53,7 @@ class Horde_Core_Factory_Data * @return Horde_Data_Driver The instance. * @throws Horde_Data_Exception */ - public function getOb($driver, array $params = array()) + public function getData($driver, array $params = array()) { $params['browser'] = $this->_injector->getInstance('Horde_Browser'); $params['vars'] = Horde_Variables::getDefaultVariables(); diff --git a/kronolith/data.php b/kronolith/data.php index 77d5aadd2..399bf05da 100644 --- a/kronolith/data.php +++ b/kronolith/data.php @@ -146,7 +146,7 @@ case 'export': } } - $injector->getInstance('Horde_Data')->getOb('Csv', array('cleanup' => '_cleanupData'))->exportFile(_("events.csv"), $data, true); + $injector->getInstance('Horde_Data')->getData('Csv', array('cleanup' => '_cleanupData'))->exportFile(_("events.csv"), $data, true); exit; case Horde_Data::EXPORT_ICALENDAR: @@ -184,7 +184,7 @@ case Horde_Data::IMPORT_FILE: if (!$error) { try { - $data = $injector->getInstance('Horde_Data')->getOb($import_format, array('cleanup' => '_cleanupData')); + $data = $injector->getInstance('Horde_Data')->getData($import_format, array('cleanup' => '_cleanupData')); if ($actionID == Horde_Data::IMPORT_FILE) { $cleanup = true; diff --git a/mnemo/data.php b/mnemo/data.php index 5640b63fc..d41acc77c 100644 --- a/mnemo/data.php +++ b/mnemo/data.php @@ -81,7 +81,7 @@ case 'export': unset($note['uid']); $data[] = $note; } - $injector->getInstance('Horde_Data')->getOb('Csv', array('cleanup' => '_cleanupData'))->exportFile(_("notes.csv"), $data, true); + $injector->getInstance('Horde_Data')->getData('Csv', array('cleanup' => '_cleanupData'))->exportFile(_("notes.csv"), $data, true); exit; } } @@ -95,7 +95,7 @@ case Horde_Data::IMPORT_FILE: $next_step = null; if (!$error) { try { - $data = $injector->getInstance('Horde_Data')->getOb($import_format, array('cleanup' => '_cleanupData')); + $data = $injector->getInstance('Horde_Data')->getData($import_format, array('cleanup' => '_cleanupData')); $next_step = $data->nextStep($actionID, $param); } catch (Horde_Data_Exception $e) { if ($data) { diff --git a/nag/data.php b/nag/data.php index 9cbd933d7..6ced13e5b 100644 --- a/nag/data.php +++ b/nag/data.php @@ -113,7 +113,7 @@ case 'export': unset($task['delete_link']); $data[] = $task; } - $injector->getInstance('Horde_Data')->getOb('Csv', array('cleanup' => '_cleanupData'))->exportFile(_("tasks.csv"), $data, true); + $injector->getInstance('Horde_Data')->getData('Csv', array('cleanup' => '_cleanupData'))->exportFile(_("tasks.csv"), $data, true); exit; case Horde_Data::EXPORT_ICALENDAR: @@ -139,7 +139,7 @@ case Horde_Data::IMPORT_FILE: if (!$error) { try { - $data = $injector->getInstance('Horde_Data')->getOb($import_format, array('cleanup' => '_cleanupData')); + $data = $injector->getInstance('Horde_Data')->getData($import_format, array('cleanup' => '_cleanupData')); $next_step = $data->nextStep($actionID, $param); } catch (Horde_Data_Exception $e) { if ($data) { diff --git a/operator/lib/Form/SearchCDR.php b/operator/lib/Form/SearchCDR.php index ecbc60b2a..aeacc9efa 100644 --- a/operator/lib/Form/SearchCDR.php +++ b/operator/lib/Form/SearchCDR.php @@ -125,12 +125,12 @@ class ExportCDRForm extends SearchCDRForm switch($this->_vars->get('format')) { case Horde_Data::EXPORT_CSV: $ext = 'csv'; - $fmt = $GLOBALS['injector']->getInstance('Horde_Data')->getOb('Csv'); + $fmt = $GLOBALS['injector']->getInstance('Horde_Data')->getData('Csv'); break; case Horde_Data::EXPORT_TSV: $ext = 'tsv'; - $fmt = $GLOBALS['injector']->getInstance('Horde_Data')->getOb('Tsv'); + $fmt = $GLOBALS['injector']->getInstance('Horde_Data')->getData('Tsv'); break; default: diff --git a/skoli/data.php b/skoli/data.php index 6d05f4dd2..627a10f4c 100644 --- a/skoli/data.php +++ b/skoli/data.php @@ -158,11 +158,11 @@ case 'export': switch (Horde_Util::getFormData('exportID')) { case EXPORT_CSV: - $injector->getInstance('Horde_Data')->getOb('Csv')->exportFile(_("class.csv"), $data, (Horde_Util::getFormData('student') == 'all')); + $injector->getInstance('Horde_Data')->getData('Csv')->exportFile(_("class.csv"), $data, (Horde_Util::getFormData('student') == 'all')); exit; case EXPORT_TSV: - $injector->getInstance('Horde_Data')->getOb('Tsv')->exportFile(_("class.tsv"), $data, (Horde_Util::getFormData('student') == 'all')); + $injector->getInstance('Horde_Data')->getData('Tsv')->exportFile(_("class.tsv"), $data, (Horde_Util::getFormData('student') == 'all')); exit; } diff --git a/turba/data.php b/turba/data.php index 7680be58d..fbcda3ce1 100644 --- a/turba/data.php +++ b/turba/data.php @@ -309,25 +309,25 @@ case 'export': switch ($exportType) { case Horde_Data::EXPORT_CSV: - $injector->getInstance('Horde_Data')->getOb('Csv', array('cleanup' => '_cleanupData'))->exportFile(_("contacts.csv"), $data, true); + $injector->getInstance('Horde_Data')->getData('Csv', array('cleanup' => '_cleanupData'))->exportFile(_("contacts.csv"), $data, true); exit; case Horde_Data::EXPORT_OUTLOOKCSV: - $injector->getInstance('Horde_Data')->getOb('Outlookcsv', array('cleanup' => '_cleanupData'))->exportFile(_("contacts.csv"), $data, true, array_flip($outlook_mapping)); + $injector->getInstance('Horde_Data')->getData('Outlookcsv', array('cleanup' => '_cleanupData'))->exportFile(_("contacts.csv"), $data, true, array_flip($outlook_mapping)); exit; case Horde_Data::EXPORT_TSV: - $injector->getInstance('Horde_Data')->getOb('Tsv', array('cleanup' => '_cleanupData'))->exportFile(_("contacts.tsv"), $data, true); + $injector->getInstance('Horde_Data')->getData('Tsv', array('cleanup' => '_cleanupData'))->exportFile(_("contacts.tsv"), $data, true); exit; case Horde_Data::EXPORT_VCARD: case 'vcard30': - $injector->getInstance('Horde_Data')->getOb('Vcard', array('cleanup' => '_cleanupData'))->exportFile(_("contacts.vcf"), $data, true); + $injector->getInstance('Horde_Data')->getData('Vcard', array('cleanup' => '_cleanupData'))->exportFile(_("contacts.vcf"), $data, true); exit; case 'ldif': // TODO - //$injector->getInstance('Horde_Data')->getOb('Csv', array('cleanup' => '_cleanupData')) + //$injector->getInstance('Horde_Data')->getData('Csv', array('cleanup' => '_cleanupData')) $ldif = Horde_Data::singleton(array('turba', 'ldif')); $ldif->exportFile(_("contacts.ldif"), $data, true); exit; diff --git a/turba/vcard.php b/turba/vcard.php index eb048951b..285592ed7 100644 --- a/turba/vcard.php +++ b/turba/vcard.php @@ -43,4 +43,4 @@ if (!$filename) { $filename = _("contact"); } -$injector->getInstance('Horde_Data')->getOb('Vcard')->exportFile($filename . '.vcf', array($driver->tovCard($object, '2.1', null, true)), Horde_Nls::getCharset()); +$injector->getInstance('Horde_Data')->getData('Vcard')->exportFile($filename . '.vcf', array($driver->tovCard($object, '2.1', null, true)), Horde_Nls::getCharset()); -- 2.11.0