From 78fd3f9eaf63e8d7c79a458a73e2a14a3ae7ca97 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Tue, 9 Jun 2009 17:16:59 -0600 Subject: [PATCH] Convert to new Horde_Util package --- babel/edit.php | 17 ++- babel/extract.php | 2 +- babel/lib/Babel.php | 2 +- babel/lib/Display.php | 4 +- babel/lib/Translate.php | 2 +- babel/lib/base.php | 7 +- babel/make.php | 2 +- babel/stats.php | 4 +- babel/templates/common-header.inc | 2 +- babel/upload.php | 4 +- babel/view.php | 44 +++--- babel/viewsource.php | 6 +- chora/annotate.php | 6 +- chora/browsedir.php | 2 +- chora/browsefile.php | 4 +- chora/co.php | 4 +- chora/cvsgraph.php | 2 +- chora/diff.php | 12 +- chora/lib/Chora.php | 10 +- chora/patchsets.php | 2 +- chora/templates/checkout/checkout.inc | 4 +- chora/templates/common-header.inc | 4 +- chora/templates/diff/hr/header.inc | 6 +- chora/templates/directory/header.inc | 2 +- chora/templates/log/footer.inc | 4 +- chora/templates/log/header.inc | 4 +- chora/test.php | 6 +- crumb/addclient.php | 3 +- crumb/contactsearch.php | 3 +- crumb/templates/common-header.inc | 2 +- drag_n_drop_portal/block.php | 4 +- drag_n_drop_portal/params.php | 6 +- drag_n_drop_portal/save.php | 2 +- drag_n_drop_portal/templates/portal/params.php | 6 +- fima/account.php | 12 +- fima/accounts.php | 20 +-- fima/data.php | 14 +- fima/ledgers/create.php | 2 +- fima/ledgers/delete.php | 4 +- fima/ledgers/edit.php | 2 +- fima/lib/Block/tree_menu.php | 2 +- fima/lib/Driver/sql.php | 20 +-- fima/lib/Fima.php | 8 +- fima/lib/Forms/CreateLedger.php | 3 - fima/lib/Forms/DeleteLedger.php | 3 - fima/lib/Forms/EditLedger.php | 3 - fima/lib/Forms/account.php | 3 - fima/lib/base.php | 2 +- fima/lib/prefs.php | 6 +- fima/postings.php | 95 +++++++------ fima/report.php | 34 ++--- fima/search.php | 2 +- fima/templates/accounts/accounts.inc | 2 +- fima/templates/common-header.inc | 2 +- fima/templates/data/export.inc | 2 +- fima/templates/data/import.inc | 2 +- fima/templates/ledgers_list.php | 8 +- fima/templates/postings/header.inc | 6 +- fima/templates/postings/navbar.inc | 4 +- fima/templates/postings/posting_headers.inc | 8 +- fima/templates/reports/graph.inc | 4 +- fima/templates/reports/reports.inc | 2 +- fima/templates/reports/table.inc | 8 +- fima/templates/search/search.inc | 4 +- folks/account/approve.php | 6 +- folks/account/renew.php | 6 +- folks/account/resetpassword.php | 10 +- folks/account/signup.php | 4 +- folks/account/tabs.php | 3 +- folks/account/username.php | 4 +- folks/activity.php | 7 +- folks/birthday.php | 11 +- folks/config/hooks.php.dist | 10 +- folks/edit/activity.php | 6 +- folks/edit/comments.php | 4 +- folks/edit/edit.php | 4 +- folks/edit/friends/add.php | 8 +- folks/edit/friends/approve.php | 4 +- folks/edit/friends/blacklist.php | 4 +- folks/edit/friends/groups.php | 18 +-- folks/edit/friends/reject.php | 4 +- folks/edit/password.php | 16 +-- folks/edit/tabs.php | 6 +- folks/friends.php | 5 +- folks/lib/Auth/folks.php | 4 +- folks/lib/Driver.php | 2 +- folks/lib/Folks.php | 4 +- folks/lib/Forms/Login.php | 2 +- folks/lib/base.php | 4 +- folks/list.php | 11 +- folks/login.php | 8 +- folks/new.php | 7 +- folks/online.php | 11 +- folks/perms.php | 58 ++++---- folks/popularity.php | 7 +- folks/report.php | 11 +- folks/save_search.php | 15 +- folks/search.php | 17 ++- folks/templates/block/users.php | 2 +- folks/templates/common-header.inc | 2 +- folks/templates/edit/activity.php | 2 +- folks/templates/edit/friends.php | 2 +- folks/templates/edit/groups.php | 8 +- folks/templates/edit/header.php | 4 +- folks/templates/list/list.php | 6 +- folks/templates/list/search.php | 4 +- folks/templates/user/actions.php | 8 +- folks/templates/user/authenticated.php | 2 +- folks/templates/user/user.php | 4 +- folks/user.php | 7 +- framework/Image/lib/Horde/Image.php | 7 +- framework/Image/lib/Horde/Image/Gd.php | 2 +- framework/Image/lib/Horde/Image/Im.php | 6 +- framework/Image/lib/Horde/Image/Imagick.php | 4 +- framework/Image/tests/im.php | 6 +- framework/Model/lib/Horde/Form.php | 24 +--- framework/Model/lib/Horde/Form/Renderer/Xhtml.php | 2 +- framework/Model/lib/Horde/Form/Type/Boolean.php | 2 +- framework/Model/lib/Horde/Form/Type/String.php | 2 +- .../Model/lib/Horde/Form/VarRenderer/Xhtml.php | 30 ++-- framework/Model/www/test.php | 3 +- framework/Rdo/www/Table_Helper.php | 4 +- framework/Rdo/www/crud.php | 15 +- framework/Rdo/www/index.php | 3 +- .../lib/Horde/Service/Vimeo/Simple.php | 2 +- framework/Vcs/lib/Horde/Vcs/Cvs.php | 2 +- framework/Vcs/lib/Horde/Vcs/Svn.php | 2 +- imp/acl.php | 16 +-- imp/ajax.php | 98 ++++++------- imp/attachment.php | 12 +- imp/cache.php | 4 +- imp/compose-dimp.php | 56 ++++---- imp/compose-mimp.php | 50 +++---- imp/compose.php | 156 ++++++++++----------- imp/config/hooks.php.dist | 4 +- imp/config/prefs.php.dist | 4 +- imp/contacts.php | 16 +-- imp/fetchmailprefs.php | 32 ++--- imp/filterprefs.php | 18 +-- imp/folders-mimp.php | 4 +- imp/folders.php | 46 +++--- imp/imple.php | 2 +- imp/lib/Block/summary.php | 10 +- imp/lib/Block/tree_folders.php | 4 +- imp/lib/Compose.php | 70 ++++----- imp/lib/Contents.php | 22 +-- imp/lib/Fetchmail/Account.php | 2 +- imp/lib/Folder.php | 2 +- imp/lib/IMP.php | 50 +++---- imp/lib/Identity/imp.php | 11 +- imp/lib/Imap/Tree.php | 2 +- imp/lib/Imple/ContactAutoCompleter.php | 2 +- imp/lib/Imple/SpellChecker.php | 2 +- imp/lib/MIMP.php | 4 +- .../Maintenance/Task/delete_sentmail_monthly.php | 2 +- .../Maintenance/Task/rename_sentmail_monthly.php | 2 +- imp/lib/Maintenance/Task/tos_agreement.php | 2 +- imp/lib/Message.php | 2 +- imp/lib/Mime/Viewer/Html.php | 24 ++-- imp/lib/Mime/Viewer/Images.php | 6 +- imp/lib/Mime/Viewer/Itip.php | 14 +- imp/lib/Mime/Viewer/Pdf.php | 2 +- imp/lib/Mime/Viewer/Pgp.php | 6 +- imp/lib/Mime/Viewer/Plain.php | 6 +- imp/lib/Mime/Viewer/Smime.php | 6 +- imp/lib/Mime/Viewer/Tnef.php | 4 +- imp/lib/Mime/Viewer/Zip.php | 6 +- imp/lib/Search.php | 4 +- imp/lib/Session.php | 10 +- imp/lib/UI/Compose.php | 2 +- imp/lib/UI/Message.php | 6 +- imp/lib/Views/ShowMessage.php | 4 +- imp/lib/api.php | 4 +- imp/lib/base.php | 18 +-- imp/lib/prefs.php | 34 ++--- imp/login.php | 30 ++-- imp/mailbox-mimp.php | 38 ++--- imp/mailbox.php | 80 +++++------ imp/message-dimp.php | 4 +- imp/message-mimp.php | 46 +++--- imp/message.php | 64 ++++----- imp/pgp.php | 70 ++++----- imp/redirect.php | 38 ++--- imp/rss.php | 2 +- imp/saveimage.php | 10 +- imp/search.php | 40 +++--- imp/smime.php | 56 ++++---- imp/stationery.php | 32 ++--- imp/templates/chunks/compose.php | 2 +- imp/templates/common-header.inc | 22 +-- imp/templates/compose/compose-mimp.inc | 14 +- imp/templates/compose/redirect-mimp.inc | 2 +- imp/templates/login/mobile.inc | 2 +- imp/test.php | 6 +- imp/thread.php | 14 +- imp/view.php | 24 ++-- ingo/blacklist.php | 10 +- ingo/filters.php | 28 ++-- ingo/forward.php | 3 +- ingo/lib/Driver/ldap.php | 4 +- ingo/lib/Ingo.php | 4 +- ingo/lib/Script/imap.php | 8 +- ingo/lib/Script/sieve.php | 8 +- ingo/lib/Storage/prefs.php | 4 +- ingo/lib/Storage/sql.php | 20 +-- ingo/lib/base.php | 2 +- ingo/rule.php | 34 ++--- ingo/script.php | 2 +- ingo/spam.php | 5 +- ingo/templates/blacklist/blacklist.inc | 2 +- ingo/templates/common-header.inc | 2 +- ingo/templates/filters/header.inc | 2 +- ingo/templates/filters/settings.inc | 2 +- ingo/templates/menu.inc | 2 +- ingo/templates/rule/header.inc | 2 +- ingo/templates/script/activate.inc | 8 +- ingo/templates/whitelist/whitelist.inc | 2 +- ingo/test.php | 6 +- ingo/vacation.php | 3 +- ingo/whitelist.php | 4 +- jeta/test.php | 6 +- koward/lib/Koward.php | 4 +- koward/lib/Koward/Cli.php | 5 +- koward/lib/Koward/Controller/IndexController.php | 8 +- koward/lib/Koward/Controller/ObjectController.php | 18 +-- koward/lib/Koward/Form/Actions.php | 6 +- koward/lib/Koward/View/Index/login.html.php | 2 +- koward/lib/Koward/View/Object/delete.html.php | 2 +- koward/www/horde/config/prefs.php.dist | 2 +- kronolith/add.php | 14 +- kronolith/ajax.php | 52 +++---- kronolith/attend.php | 10 +- kronolith/attendees.php | 35 +++-- kronolith/calendars/create.php | 2 +- kronolith/calendars/delete.php | 4 +- kronolith/calendars/edit.php | 2 +- kronolith/calendars/index.php | 2 +- kronolith/calendars/info.php | 4 +- kronolith/calendars/remote_edit.php | 2 +- kronolith/calendars/remote_subscribe.php | 2 +- kronolith/calendars/remote_unsubscribe.php | 4 +- kronolith/contacts.php | 10 +- kronolith/data.php | 30 ++-- kronolith/day.php | 2 +- kronolith/delete.php | 38 ++--- kronolith/edit.php | 38 ++--- kronolith/event.php | 10 +- kronolith/fb.php | 6 +- kronolith/feed/index.php | 6 +- kronolith/imple.php | 2 +- kronolith/lib/Block/month.php | 4 +- kronolith/lib/Block/monthlist.php | 2 +- kronolith/lib/Block/prevmonthlist.php | 2 +- kronolith/lib/Block/summary.php | 4 +- kronolith/lib/Driver/Sql.php | 4 +- kronolith/lib/Event.php | 128 ++++++++--------- kronolith/lib/Event/Holidays.php | 2 +- kronolith/lib/Forms/CreateCalendar.php | 3 - kronolith/lib/Forms/DeleteCalendar.php | 3 - kronolith/lib/Forms/EditCalendar.php | 3 - kronolith/lib/Forms/EditRemoteCalendar.php | 3 - kronolith/lib/Forms/SubscribeRemoteCalendar.php | 3 - kronolith/lib/Forms/UnsubscribeRemoteCalendar.php | 3 - kronolith/lib/FreeBusy/View.php | 6 +- kronolith/lib/Imple/ContactAutoCompleter.php | 2 +- kronolith/lib/Imple/TagAutoCompleter.php | 2 +- kronolith/lib/Kronolith.php | 76 +++++----- kronolith/lib/Maintenance/kronolith.php | 2 +- kronolith/lib/Tagger.php | 2 +- kronolith/lib/Views/Day.php | 6 +- kronolith/lib/Views/DeleteEvent.php | 10 +- kronolith/lib/Views/EditEvent.php | 10 +- kronolith/lib/Views/Event.php | 6 +- kronolith/lib/Views/ExportEvent.php | 2 +- kronolith/lib/Views/Month.php | 10 +- kronolith/lib/Views/Week.php | 2 +- kronolith/lib/Views/Year.php | 6 +- kronolith/lib/api.php | 8 +- kronolith/lib/base.php | 4 +- kronolith/lib/prefs.php | 22 +-- kronolith/lib/tests/allday.phpt | 1 - kronolith/lib/tests/bug7068.phpt | 1 - kronolith/month.php | 2 +- kronolith/new.php | 20 +-- kronolith/perms.php | 68 ++++----- kronolith/pref_api.php | 8 +- kronolith/scripts/agenda.php | 2 +- kronolith/search.php | 14 +- kronolith/templates/attendees/attendees.inc | 2 +- kronolith/templates/calendar_list.php | 20 +-- kronolith/templates/common-header.inc | 4 +- kronolith/templates/contacts/contacts.inc | 2 +- kronolith/templates/data/export.inc | 2 +- kronolith/templates/data/import.inc | 2 +- kronolith/templates/delete/delete.inc | 4 +- kronolith/templates/delete/one.inc | 6 +- kronolith/templates/edit/edit.inc | 6 +- kronolith/templates/edit/javascript.inc | 6 +- kronolith/templates/panel.inc | 2 +- kronolith/templates/perms/perms.inc | 2 +- kronolith/templates/prefs/fb_cals_select.inc | 2 +- kronolith/templates/search/search.inc | 10 +- kronolith/templates/search/search_advanced.inc | 4 +- kronolith/templates/week/head.inc | 2 +- kronolith/test.php | 6 +- kronolith/view.php | 6 +- kronolith/week.php | 2 +- kronolith/workweek.php | 2 +- kronolith/year.php | 2 +- news/add.php | 17 ++- news/admin/categories/delete.php | 6 +- news/admin/categories/edit.php | 4 +- news/admin/categories/index.php | 4 +- news/admin/sources/delete.php | 6 +- news/admin/sources/edit.php | 2 +- news/admin/sources/index.php | 6 +- news/admin/tabs.php | 4 +- news/browse.php | 6 +- news/content_edit.php | 6 +- news/delete.php | 7 +- news/delete_file.php | 13 +- news/diff.php | 6 +- news/edit.php | 14 +- news/feed.php | 2 +- news/files.php | 14 +- news/lib/Block/category.php | 6 +- news/lib/Block/sources.php | 4 +- news/lib/Categories.php | 6 +- news/lib/Driver/sql.php | 2 +- news/lib/Forms/Search.php | 9 +- news/lib/News.php | 20 +-- news/lib/Search.php | 9 +- news/lib/View.php | 4 +- news/lib/base.php | 2 +- news/mail.php | 6 +- news/news.php | 6 +- news/note.php | 4 +- news/pdf.php | 4 +- news/print.php | 4 +- news/reads.php | 4 +- news/search.php | 8 +- news/tags.php | 4 +- news/templates/common-header.inc | 2 +- news/templates/edit/info.php | 10 +- news/templates/edit/row.php | 18 +-- news/templates/news/blog.php | 2 +- news/templates/news/info.php | 8 +- news/templates/news/today.php | 4 +- news/templates/news/tools.php | 6 +- news/templates/reads/row.inc | 4 +- news/trackback.php | 10 +- skoli/add.php | 4 +- skoli/classes/create.php | 2 +- skoli/classes/delete.php | 4 +- skoli/classes/edit.php | 2 +- skoli/data.php | 24 ++-- skoli/entry.php | 15 +- skoli/lib/Block/tree_menu.php | 2 +- skoli/lib/Forms/CreateClass.php | 3 - skoli/lib/Forms/DeleteClass.php | 3 - skoli/lib/Forms/EditClass.php | 3 - skoli/lib/Forms/Entry.php | 3 - skoli/lib/Skoli.php | 8 +- skoli/list.php | 13 +- skoli/pref_api.php | 8 +- skoli/search.php | 20 +-- skoli/templates/classes/list.php | 8 +- skoli/templates/common-header.inc | 4 +- skoli/templates/data/export.inc | 4 +- skoli/templates/entry/delete.inc | 2 +- skoli/templates/list/classes.inc | 6 +- skoli/templates/list/headers.inc | 22 +-- skoli/templates/list/students.inc | 4 +- skoli/templates/panel.inc | 2 +- skoli/templates/search/entries.inc | 4 +- skoli/templates/search/headers.inc | 8 +- timeobjects/lib/Driver/Weatherdotcom.php | 18 +-- timeobjects/lib/base.php | 4 +- 378 files changed, 1913 insertions(+), 2023 deletions(-) diff --git a/babel/edit.php b/babel/edit.php index fa642bb9f..dc2ccf2f9 100644 --- a/babel/edit.php +++ b/babel/edit.php @@ -26,16 +26,15 @@ require_once dirname(__FILE__) . '/lib/base.php'; require_once BABEL_BASE . '/lib/Gettext/PO.php'; require_once 'Horde/Form.php'; -require_once 'Horde/Variables.php'; require_once 'Horde/Form/Renderer.php'; require_once 'Horde/Form/Action.php'; require_once 'Horde/UI/Tabs.php'; -$app = Util::getFormData('module'); +$app = Horde_Util::getFormData('module'); $show = 'edit'; -$vars = &Variables::getDefaultVariables(); +$vars = &Horde_Variables::getDefaultVariables(); if ($app) { $napp = ($app == 'horde') ? '' : $app; @@ -46,28 +45,28 @@ if ($app) { /* Set up the template fields. */ $template->set('menu', Babel::getMenu('string')); -$template->set('notify', Util::bufferOutput(array($notification, 'notify'), array('listeners' => 'status'))); +$template->set('notify', Horde_Util::bufferOutput(array($notification, 'notify'), array('listeners' => 'status'))); /* Create upload form */ $form = &new Horde_Form($vars, _("Edit Translation"), $show); /* Validate form if submitted */ -if ($app && Util::getFormData('submitbutton') == _("Save")) { +if ($app && Horde_Util::getFormData('submitbutton') == _("Save")) { if ($form->validate($vars, false)) { $form->getInfo($vars, $form_values); foreach($meta_params as $k => $v) { - if ($val = Util::getFormData($k)) { + if ($val = Horde_Util::getFormData($k)) { $po->meta[$k] = $val; } } $po->save($pofile); - if (Util::getFormData('url') == 'view') { + if (Horde_Util::getFormData('url') == 'view') { $url = Horde::applicationUrl('view.php'); - $url = Util::addParameter($url, array('module' => $app)); + $url = Horde_Util::addParameter($url, array('module' => $app)); header('Location: ' . $url); exit; } @@ -85,7 +84,7 @@ if (!$app) { $vars->set('module', $app); $form->addHidden('', 'url', 'text', false); - $vars->set('url', Util::getFormData('url')); + $vars->set('url', Horde_Util::getFormData('url')); foreach($meta_params as $k => $v) { $form->addVariable($k, $k, 'text', false, false); diff --git a/babel/extract.php b/babel/extract.php index 1ab3aba08..2c60a5c20 100644 --- a/babel/extract.php +++ b/babel/extract.php @@ -27,7 +27,7 @@ if ($app) { echo $template->fetch(BABEL_TEMPLATES . '/layout.html'); -$vars = &Variables::getDefaultVariables(); +$vars = &Horde_Variables::getDefaultVariables(); /* Create upload form */ $form = &new Horde_Form($vars, _("Extract Translation"), 'extract'); diff --git a/babel/lib/Babel.php b/babel/lib/Babel.php index 8037f0262..0197732ff 100644 --- a/babel/lib/Babel.php +++ b/babel/lib/Babel.php @@ -57,7 +57,7 @@ class Babel { continue; } - if (Util::getFormData('module') == $app) { + if (Horde_Util::getFormData('module') == $app) { $html .= '