From c359db9b00ea1ede5895a66550f6987a110cf514 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Thu, 19 Nov 2009 13:09:19 -0700 Subject: [PATCH] Horde_UI:: -> Horde_Ui --- ansel/faces/gallery.php | 2 +- ansel/faces/search/all.php | 2 +- ansel/faces/search/image_search.php | 2 +- ansel/faces/search/name.php | 2 +- ansel/faces/search/named.php | 2 +- ansel/faces/search/owner.php | 2 +- ansel/faces/search/tabs.php | 2 +- ansel/group.php | 2 +- ansel/lib/Block/cloud.php | 2 +- ansel/lib/View/GalleryRenderer/Gallery.php | 2 +- ansel/lib/View/GalleryRenderer/GalleryLightbox.php | 2 +- ansel/lib/View/List.php | 2 +- ansel/lib/View/Results.php | 2 +- babel/view.php | 2 +- beatnik/listzones.php | 2 +- fima/lib/UI/VarRenderer/fima.php | 16 +++------- fima/postings.php | 3 +- folks/account/tabs.php | 2 +- folks/activity.php | 2 +- folks/birthday.php | 2 +- folks/edit/tabs.php | 2 +- folks/list.php | 2 +- folks/new.php | 2 +- folks/online.php | 2 +- folks/popularity.php | 2 +- folks/search.php | 2 +- gollem/manager.php | 2 +- imp/search.php | 4 +-- ingo/lib/UI/VarRenderer/ingo.php | 4 +-- ingo/spam.php | 2 +- koward/lib/Koward/Controller/ObjectController.php | 36 +++++++++++----------- koward/package.xml | 2 +- kronolith/attendees.php | 2 +- kronolith/lib/Event.php | 4 +-- kronolith/lib/Kronolith.php | 4 +-- nag/lib/UI/VarRenderer/nag.php | 32 ++++++++----------- nag/list.php | 2 +- news/admin/tabs.php | 2 +- news/lib/Forms/Search.php | 2 +- news/lib/Search.php | 2 +- news/lib/TagCloud.php | 8 ++--- skoli/entry.php | 2 +- turba/contact.php | 2 +- turba/docs/CHANGES | 2 +- turba/lib/ListView.php | 6 ++-- turba/templates/browse/search.inc | 2 +- vilma/lib/Vilma.php | 4 +-- vilma/users/index.php | 2 +- 48 files changed, 90 insertions(+), 105 deletions(-) diff --git a/ansel/faces/gallery.php b/ansel/faces/gallery.php index 21a2aa6b5..04c4807ca 100644 --- a/ansel/faces/gallery.php +++ b/ansel/faces/gallery.php @@ -40,7 +40,7 @@ $customurl = Horde_Util::addParameter(Horde::applicationUrl('faces/custom.php'), $face = Ansel_Faces::factory(); $autogenerate = $face->canAutogenerate(); $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_UI_Pager( +$pager = new Horde_Ui_Pager( 'page', $vars, array('num' => $gallery->countImages(), 'url' => 'faces/gallery.php', diff --git a/ansel/faces/search/all.php b/ansel/faces/search/all.php index 332b36a70..bb01dad20 100644 --- a/ansel/faces/search/all.php +++ b/ansel/faces/search/all.php @@ -25,7 +25,7 @@ if (is_a($count, 'PEAR_Error')) { } $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_UI_Pager( +$pager = new Horde_Ui_Pager( 'page', $vars, array('num' => $count, 'url' => 'faces/search/all.php', diff --git a/ansel/faces/search/image_search.php b/ansel/faces/search/image_search.php index d3775ffee..26824915a 100644 --- a/ansel/faces/search/image_search.php +++ b/ansel/faces/search/image_search.php @@ -39,7 +39,7 @@ if (is_a($results, 'PEAR_Error')) { $title = _("Photo search"); $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_UI_Pager( +$pager = new Horde_Ui_Pager( 'page', $vars, array('num' => count($results), 'url' => 'faces/search/image_search.php', diff --git a/ansel/faces/search/name.php b/ansel/faces/search/name.php index 6c10f09a5..823d6d7b7 100644 --- a/ansel/faces/search/name.php +++ b/ansel/faces/search/name.php @@ -34,7 +34,7 @@ if (!empty($name)) { } $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_UI_Pager( +$pager = new Horde_Ui_Pager( 'page', $vars, array('num' => $count, 'url' => 'faces/search/name.php', diff --git a/ansel/faces/search/named.php b/ansel/faces/search/named.php index 3bae6979b..46d9b44a8 100644 --- a/ansel/faces/search/named.php +++ b/ansel/faces/search/named.php @@ -24,7 +24,7 @@ if (is_a($count, 'PEAR_Error')) { } $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_UI_Pager( +$pager = new Horde_Ui_Pager( 'page', $vars, array('num' => $count, 'url' => 'faces/search/named.php', diff --git a/ansel/faces/search/owner.php b/ansel/faces/search/owner.php index 715efaf78..de12591e0 100644 --- a/ansel/faces/search/owner.php +++ b/ansel/faces/search/owner.php @@ -30,7 +30,7 @@ if (is_a($count, 'PEAR_Error')) { } $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_UI_Pager( +$pager = new Horde_Ui_Pager( 'page', $vars, array('num' => $count, 'url' => 'faces/search/owner.php', diff --git a/ansel/faces/search/tabs.php b/ansel/faces/search/tabs.php index 7b6f52e22..286944821 100644 --- a/ansel/faces/search/tabs.php +++ b/ansel/faces/search/tabs.php @@ -19,7 +19,7 @@ if (!Horde_Auth::isauthenticated()) { /* Show tabs */ $vars = Horde_Variables::getDefaultVariables(); -$tabs = new Horde_UI_Tabs('search_faces', $vars); +$tabs = new Horde_Ui_Tabs('search_faces', $vars); $tabs->addTab(_("All faces"), Horde::applicationUrl('faces/search/all.php'), 'all'); $tabs->addTab(_("From my galleries"), Horde::applicationUrl('faces/search/owner.php'), 'owner'); $tabs->addTab(_("Named faces"), Horde::applicationUrl('faces/search/named.php'), 'named'); diff --git a/ansel/group.php b/ansel/group.php index f31c16486..68f2e7d9a 100644 --- a/ansel/group.php +++ b/ansel/group.php @@ -68,7 +68,7 @@ default: // Set up pager. $vars = Horde_Variables::getDefaultVariables(); -$group_pager = new Horde_UI_Pager('gbpage', $vars, +$group_pager = new Horde_Ui_Pager('gbpage', $vars, array('num' => $num_groups, 'url' => 'group.php', 'perpage' => $groups_perpage)); diff --git a/ansel/lib/Block/cloud.php b/ansel/lib/Block/cloud.php index 5b64b40e3..2ae5c5dd2 100644 --- a/ansel/lib/Block/cloud.php +++ b/ansel/lib/Block/cloud.php @@ -40,7 +40,7 @@ class Horde_Block_ansel_cloud extends Horde_Block { /* Get the tags */ $tags = Ansel_Tags::listTagInfo(null, $this->_params['count']); if (count($tags)) { - $cloud = new Horde_UI_TagCloud(); + $cloud = new Horde_Ui_TagCloud(); foreach ($tags as $id => $tag) { $link = Ansel::getUrlFor('view', array('view' => 'Results', 'tag' => $tag['tag_name'])); diff --git a/ansel/lib/View/GalleryRenderer/Gallery.php b/ansel/lib/View/GalleryRenderer/Gallery.php index 752dc1a95..ac2696980 100644 --- a/ansel/lib/View/GalleryRenderer/Gallery.php +++ b/ansel/lib/View/GalleryRenderer/Gallery.php @@ -88,7 +88,7 @@ class Ansel_View_GalleryRenderer_Gallery extends Ansel_View_GalleryRenderer_Base 'perpage' => $this->perpage, 'url_callback' => $callback); - $pager = new Horde_UI_Pager('page', $vars, $params); + $pager = new Horde_Ui_Pager('page', $vars, $params); // Note that we can't use Horde_Util::bufferOutput() here since the include // file would be included inside that method's scope, and not this one. diff --git a/ansel/lib/View/GalleryRenderer/GalleryLightbox.php b/ansel/lib/View/GalleryRenderer/GalleryLightbox.php index 0cd2dd8a1..f4b904da5 100644 --- a/ansel/lib/View/GalleryRenderer/GalleryLightbox.php +++ b/ansel/lib/View/GalleryRenderer/GalleryLightbox.php @@ -114,7 +114,7 @@ class Ansel_View_GalleryRenderer_GalleryLightbox extends Ansel_View_GalleryRende 'perpage' => $this->perpage, 'url_callback' => $callback); - $pager = new Horde_UI_Pager('page', $vars, $params); + $pager = new Horde_Ui_Pager('page', $vars, $params); /* Start buffering */ ob_start(); diff --git a/ansel/lib/View/List.php b/ansel/lib/View/List.php index b6a6c51ff..1dbc5d86a 100644 --- a/ansel/lib/View/List.php +++ b/ansel/lib/View/List.php @@ -205,7 +205,7 @@ class Ansel_View_List extends Ansel_View_Base if ($override) { $p_params['url_callback'] = null; } - $pager = new Horde_UI_Pager('page', $vars, $p_params); + $pager = new Horde_Ui_Pager('page', $vars, $p_params); $preserve = array('sort_dir' => $sortdir); if (!empty($sortby)) { $preserve['sort'] = $sortby; diff --git a/ansel/lib/View/Results.php b/ansel/lib/View/Results.php index 09db9bfaf..c968d708c 100644 --- a/ansel/lib/View/Results.php +++ b/ansel/lib/View/Results.php @@ -265,7 +265,7 @@ class Ansel_View_Results extends Ansel_View_Base $pagestart = ($page * $perpage) + 1; $pageend = min($pagestart + $numimages - 1, $pagestart + $perpage - 1); - $pager = new Horde_UI_Pager('page', $vars, array('num' => $total, + $pager = new Horde_Ui_Pager('page', $vars, array('num' => $total, 'url' => $viewurl, 'perpage' => $perpage)); ob_start(); diff --git a/babel/view.php b/babel/view.php index 741793eb3..23eded132 100644 --- a/babel/view.php +++ b/babel/view.php @@ -488,7 +488,7 @@ $viewurl = Horde_Util::addParameter($viewurl, array('editmode' => $editmode, 'module' => $app, 'filter' => $filter, 'search' => $search)); - $pager = new Horde_UI_Pager('page', $vars, array('num' => $numitem, 'url' => $viewurl, 'page_count' => 10, 'perpage' => $perpage)); + $pager = new Horde_Ui_Pager('page', $vars, array('num' => $numitem, 'url' => $viewurl, 'page_count' => 10, 'perpage' => $perpage)); echo $pager->render($page, $numitem, $viewurl); ?> diff --git a/beatnik/listzones.php b/beatnik/listzones.php index 364cac4d7..00de03997 100644 --- a/beatnik/listzones.php +++ b/beatnik/listzones.php @@ -29,7 +29,7 @@ $_SESSION['beatnik']['curpage'] = $page; $pager_vars = Horde_Variables::getDefaultVariables(); $pager_vars->set('page', $page); $perpage = $prefs->getValue('domains_perpage'); -$pager = new Horde_UI_Pager('page', $pager_vars, +$pager = new Horde_Ui_Pager('page', $pager_vars, array('num' => count($domains), 'url' => 'listzones.php', 'page_count' => 10, diff --git a/fima/lib/UI/VarRenderer/fima.php b/fima/lib/UI/VarRenderer/fima.php index a9a164fc4..717f1c9ee 100644 --- a/fima/lib/UI/VarRenderer/fima.php +++ b/fima/lib/UI/VarRenderer/fima.php @@ -1,6 +1,6 @@ * @package Fima */ -class Horde_UI_VarRenderer_fima extends Horde_UI_VarRenderer_html { +class Horde_Ui_VarRenderer_Fima extends Horde_Ui_VarRenderer_Html { - function _renderVarInput_fima_dspostings($form, &$var, &$vars) + protected function _renderVarInput_fima_dspostings($form, &$var, &$vars) { $varname = @htmlspecialchars($var->getVarName(), ENT_QUOTES, $this->_charset); $value = $var->getValue($vars); @@ -46,7 +40,7 @@ class Horde_UI_VarRenderer_fima extends Horde_UI_VarRenderer_html { . Fima::buildAccountWidget($varname . '[account]', $value['account'], 'onchange="document.getElementsByName(\'dspostings[type]\')[1].checked = true;"', false, false, array(array('type', $vars->get('type')))); } - function _renderVarInput_fima_dssubaccounts($form, &$var, &$vars) + protected function _renderVarInput_fima_dssubaccounts($form, &$var, &$vars) { $varname = @htmlspecialchars($var->getVarName(), ENT_QUOTES, $this->_charset); $value = $var->getValue($vars); diff --git a/fima/postings.php b/fima/postings.php index 3e12521a4..75804ec12 100644 --- a/fima/postings.php +++ b/fima/postings.php @@ -698,8 +698,7 @@ if ($pageOb['mode'] == 'edit') { /* Generate tabs. */ if ($pageOb['mode'] != 'transfer' && !$print_view) { - require_once 'Horde/UI/Tabs.php'; - $tabs = new Horde_UI_Tabs('postingtype', $vars); + $tabs = new Horde_Ui_Tabs('postingtype', $vars); $postingtypes = Fima::getPostingTypes(); foreach ($postingtypes as $typeValue => $typeLabel) { $tabs->addTab($typeLabel, $pageOb['url'], $typeValue); diff --git a/folks/account/tabs.php b/folks/account/tabs.php index 7c2f67c17..fb17225cc 100644 --- a/folks/account/tabs.php +++ b/folks/account/tabs.php @@ -16,7 +16,7 @@ require_once dirname(__FILE__) . '/../lib/base.php'; $auth = Horde_Auth::singleton($conf['auth']['driver']); $vars = Horde_Variables::getDefaultVariables(); -$tabs = new Horde_UI_Tabs('what', $vars); +$tabs = new Horde_Ui_Tabs('what', $vars); $tabs->addTab(_("Login"), Horde::applicationUrl('login.php'), 'login'); if ($conf['signup']['allow'] === true && $auth->hasCapability('add')) { diff --git a/folks/activity.php b/folks/activity.php index 7f260cdff..5085afb35 100644 --- a/folks/activity.php +++ b/folks/activity.php @@ -31,7 +31,7 @@ if ($users instanceof PEAR_Error) { } $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_UI_Pager('page', +$pager = new Horde_Ui_Pager('page', $vars, array('num' => $count, 'url' => 'activity.php', 'perpage' => $perpage)); diff --git a/folks/birthday.php b/folks/birthday.php index f2f7c3b21..89bad2771 100644 --- a/folks/birthday.php +++ b/folks/birthday.php @@ -43,7 +43,7 @@ if ($users instanceof PEAR_Error) { } $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_UI_Pager('page', +$pager = new Horde_Ui_Pager('page', $vars, array('num' => $count, 'url' => 'birthday.php', 'perpage' => $perpage)); diff --git a/folks/edit/tabs.php b/folks/edit/tabs.php index 05fc15355..19da84632 100644 --- a/folks/edit/tabs.php +++ b/folks/edit/tabs.php @@ -16,7 +16,7 @@ if (!Horde_Auth::isAuthenticated()) { } $vars = Horde_Variables::getDefaultVariables(); -$tabs = new Horde_UI_Tabs('what', $vars); +$tabs = new Horde_Ui_Tabs('what', $vars); $tabs->addTab(_("Edit my profile"), Horde::applicationUrl('edit/edit.php'), 'edit'); $tabs->addTab(_("Privacy"), Horde::applicationUrl('edit/privacy.php'), 'privacy'); $tabs->addTab(_("Blacklist"), Horde::applicationUrl('edit/friends/blacklist.php'), 'blacklist'); diff --git a/folks/list.php b/folks/list.php index 94b9403e8..1c055fffa 100644 --- a/folks/list.php +++ b/folks/list.php @@ -43,7 +43,7 @@ if ($users instanceof PEAR_Error) { } $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_UI_Pager('page', +$pager = new Horde_Ui_Pager('page', $vars, array('num' => $count, 'url' => 'list.php', 'perpage' => $perpage)); diff --git a/folks/new.php b/folks/new.php index 8de12b98b..5996834f8 100644 --- a/folks/new.php +++ b/folks/new.php @@ -31,7 +31,7 @@ if ($users instanceof PEAR_Error) { } $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_UI_Pager('page', +$pager = new Horde_Ui_Pager('page', $vars, array('num' => $count, 'url' => 'new.php', 'perpage' => $perpage)); diff --git a/folks/online.php b/folks/online.php index a412c9837..b761dc385 100644 --- a/folks/online.php +++ b/folks/online.php @@ -43,7 +43,7 @@ if ($users instanceof PEAR_Error) { } $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_UI_Pager('page', +$pager = new Horde_Ui_Pager('page', $vars, array('num' => $count, 'url' => 'online.php', 'perpage' => $perpage)); diff --git a/folks/popularity.php b/folks/popularity.php index 6fcbe0053..8faec7537 100644 --- a/folks/popularity.php +++ b/folks/popularity.php @@ -31,7 +31,7 @@ if ($users instanceof PEAR_Error) { } $vars = Horde_Variables::getDefaultVariables(); -$pager = new Horde_UI_Pager('page', +$pager = new Horde_Ui_Pager('page', $vars, array('num' => $count, 'url' => 'popularity.php', 'perpage' => $perpage)); diff --git a/folks/search.php b/folks/search.php index 08d5b78db..046df1eb0 100644 --- a/folks/search.php +++ b/folks/search.php @@ -60,7 +60,7 @@ if (!empty($criteria)) { } $vars = Horde_Variables::getDefaultVariables(); - $pager = new Horde_UI_Pager('page', + $pager = new Horde_Ui_Pager('page', $vars, array('num' => $count, 'url' => 'search.php', 'perpage' => $perpage)); diff --git a/gollem/manager.php b/gollem/manager.php index f98d07431..6a9fdaafc 100644 --- a/gollem/manager.php +++ b/gollem/manager.php @@ -452,7 +452,7 @@ if (is_array($list) && $numitem && $read_perms) { $vars = Horde_Variables::getDefaultVariables(); $vars->set('page', $page); - $pager = new Horde_UI_Pager('page', $vars, array('num' => $total, 'url' => $refresh_url, 'page_count' => 10, 'perpage' => $perpage)); + $pager = new Horde_Ui_Pager('page', $vars, array('num' => $total, 'url' => $refresh_url, 'page_count' => 10, 'perpage' => $perpage)); $page_caption = $pager->render(); } diff --git a/imp/search.php b/imp/search.php index c0f8d6e1f..4fc1f1c62 100644 --- a/imp/search.php +++ b/imp/search.php @@ -175,7 +175,7 @@ foreach ($imp_search->flagFields() as $key => $val) { } $t->set('f_fields', $f_fields); -Horde_UI_JsCalendar::init(); +Horde_Ui_JsCalendar::init(); /* Gettext strings for this page. */ $gettext_strings = array( @@ -194,7 +194,7 @@ $gettext_strings = array( /* Javascript data for this page. */ $js_data = array( - 'months' => Horde_UI_JsCalendar::months(), + 'months' => Horde_Ui_JsCalendar::months(), 'searchmbox' => $search_mailbox, 'types' => $types ); diff --git a/ingo/lib/UI/VarRenderer/ingo.php b/ingo/lib/UI/VarRenderer/ingo.php index f4d77ccb0..36a7382cf 100644 --- a/ingo/lib/UI/VarRenderer/ingo.php +++ b/ingo/lib/UI/VarRenderer/ingo.php @@ -11,9 +11,9 @@ * @author Jan Schneider * @package Ingo */ -class Horde_UI_VarRenderer_ingo extends Horde_UI_VarRenderer_html +class Horde_Ui_VarRenderer_Ingo extends Horde_Ui_VarRenderer_Html { - function _renderVarInput_ingo_folders(&$form, &$var, &$vars) + protected function _renderVarInput_ingo_folders(&$form, &$var, &$vars) { return Ingo::flistSelect($var->type->getFolder(), 'horde_form', 'folder'); } diff --git a/ingo/spam.php b/ingo/spam.php index c7467e2b3..617f2213d 100644 --- a/ingo/spam.php +++ b/ingo/spam.php @@ -14,7 +14,7 @@ /** * Dummy class to hold the select box created by {@link Ingo::flistSelect()}. * - * @see Horde_UI_VarRenderer_ingo + * @see Horde_Ui_VarRenderer_Ingo * @see Ingo::flistSelect() */ class Horde_Form_Type_ingo_folders extends Horde_Form_Type { diff --git a/koward/lib/Koward/Controller/ObjectController.php b/koward/lib/Koward/Controller/ObjectController.php index 7a703585d..85cee3034 100644 --- a/koward/lib/Koward/Controller/ObjectController.php +++ b/koward/lib/Koward/Controller/ObjectController.php @@ -47,14 +47,14 @@ class ObjectController extends Koward_Controller_Application $params); foreach ($this->objectlist as $uid => $info) { $this->objectlist[$uid]['edit_url'] = Horde::link( - $this->urlFor(array('controller' => 'object', + $this->urlFor(array('controller' => 'object', 'action' => 'edit', 'id' => $uid)), _("Edit")) . Horde::img('edit.png', _("Edit"), '', $GLOBALS['registry']->getImageDir('horde')) . ''; $this->objectlist[$uid]['delete_url'] = Horde::link( - $this->urlFor(array('controller' => 'object', + $this->urlFor(array('controller' => 'object', 'action' => 'delete', 'id' => $uid)), _("Delete")) . Horde::img('delete.png', _("Delete"), '', @@ -62,20 +62,20 @@ class ObjectController extends Koward_Controller_Application . ''; if ($this->koward->hasAccess('object/view/' . $this->object_type, Koward::PERM_READ)) { $this->objectlist[$uid]['view_url'] = Horde::link( - $this->urlFor(array('controller' => 'object', + $this->urlFor(array('controller' => 'object', 'action' => 'view', 'id' => $uid)), _("View")); } } } - $this->tabs = new Horde_UI_Tabs(null, Horde_Variables::getDefaultVariables()); + $this->tabs = new Horde_Ui_Tabs(null, Horde_Variables::getDefaultVariables()); foreach ($this->koward->objects as $key => $configuration) { if (!$this->koward->hasAccess($this->getPermissionId() . '/' . $key)) { continue; } $this->tabs->addTab($configuration['list_label'], - $this->urlFor(array('controller' => 'object', + $this->urlFor(array('controller' => 'object', 'action' => 'listall', 'id' => $key)), $key); @@ -100,7 +100,7 @@ class ObjectController extends Koward_Controller_Application 'action' => 'delete', 'id' => $this->params->id, 'token' => $this->koward->getRequestToken('object.delete'))); - $this->return_url = $this->urlFor(array('controller' => 'object', + $this->return_url = $this->urlFor(array('controller' => 'object', 'action' => 'listall')); if (!empty($this->params->token)) { @@ -119,7 +119,7 @@ class ObjectController extends Koward_Controller_Application $this->koward->notification->push(_("Failed to delete the object."), 'horde.error'); } - header('Location: ' . $this->urlFor(array('controller' => 'object', + header('Location: ' . $this->urlFor(array('controller' => 'object', 'action' => 'listall'))); exit; } @@ -153,7 +153,7 @@ class ObjectController extends Koward_Controller_Application try { $this->actions = new Koward_Form_Actions($this->object, $buttons); - $this->post = $this->urlFor(array('controller' => 'object', + $this->post = $this->urlFor(array('controller' => 'object', 'action' => 'view', 'id' => $this->params->id)); @@ -175,7 +175,7 @@ class ObjectController extends Koward_Controller_Application $this->koward->notification->push(_("Failed to delete the object."), 'horde.error'); } - header('Location: ' . $this->urlFor(array('controller' => 'object', + header('Location: ' . $this->urlFor(array('controller' => 'object', 'action' => 'view', 'id' => $this->params->id))); exit; @@ -197,7 +197,7 @@ class ObjectController extends Koward_Controller_Application 'id' => $this->params->id, 'action' => $action, 'token' => $this->koward->getRequestToken('object.' . $action))); - $this->return_url = $this->urlFor(array('controller' => 'object', + $this->return_url = $this->urlFor(array('controller' => 'object', 'action' => 'view', 'id' => $this->params->id)); } @@ -210,7 +210,7 @@ class ObjectController extends Koward_Controller_Application $this->form = new Koward_Form_Object($this->vars, $this->object, array('title' => _("View object"))); $this->edit = Horde::link( - $this->urlFor(array('controller' => 'object', + $this->urlFor(array('controller' => 'object', 'action' => 'edit', 'id' => $this->params->id)), _("Edit")) . Horde::img('edit.png', _("Edit"), '', @@ -297,7 +297,7 @@ class ObjectController extends Koward_Controller_Application $object = $this->form->execute(); if (!empty($object)) { - header('Location: ' . $this->urlFor(array('controller' => 'object', + header('Location: ' . $this->urlFor(array('controller' => 'object', 'action' => 'view', 'id' => $object->get(Horde_Kolab_Server_Object::ATTRIBUTE_UID)))); exit; @@ -307,7 +307,7 @@ class ObjectController extends Koward_Controller_Application $this->koward->notification->push($e->getMessage(), 'horde.error'); } - $this->post = $this->urlFor(array('controller' => $this->params['controller'], + $this->post = $this->urlFor(array('controller' => $this->params['controller'], 'action' => $this->params['action'], 'id' => $this->params->id)); @@ -343,7 +343,7 @@ class ObjectController extends Koward_Controller_Application $uids = array_keys($this->objectlist); if (count($uids) == 1) { - header('Location: ' . $this->urlFor(array('controller' => 'object', + header('Location: ' . $this->urlFor(array('controller' => 'object', 'action' => 'view', 'id' => $uids[0]))); exit; @@ -352,21 +352,21 @@ class ObjectController extends Koward_Controller_Application } else { foreach ($this->objectlist as $uid => $info) { $this->objectlist[$uid]['edit_url'] = Horde::link( - $this->urlFor(array('controller' => 'object', + $this->urlFor(array('controller' => 'object', 'action' => 'edit', 'id' => $uid)), _("Edit")) . Horde::img('edit.png', _("Edit"), '', $GLOBALS['registry']->getImageDir('horde')) . ''; $this->objectlist[$uid]['delete_url'] = Horde::link( - $this->urlFor(array('controller' => 'object', + $this->urlFor(array('controller' => 'object', 'action' => 'delete', 'id' => $uid)), _("Delete")) . Horde::img('delete.png', _("Delete"), '', $GLOBALS['registry']->getImageDir('horde')) . ''; $this->objectlist[$uid]['view_url'] = Horde::link( - $this->urlFor(array('controller' => 'object', + $this->urlFor(array('controller' => 'object', 'action' => 'view', 'id' => $uid)), _("View")); $this->objectlist[$uid]['__id'] = $uid; @@ -381,7 +381,7 @@ class ObjectController extends Koward_Controller_Application $this->koward->notification->push($e->getMessage(), 'horde.error'); } - $this->post = $this->urlFor(array('controller' => 'object', + $this->post = $this->urlFor(array('controller' => 'object', 'action' => 'search')); $this->render(); diff --git a/koward/package.xml b/koward/package.xml index 9adbdf647..52b543f68 100644 --- a/koward/package.xml +++ b/koward/package.xml @@ -259,7 +259,7 @@ http://pear.php.net/dtd/package-2.0.xsd"> pear.horde.org - Horde_UI + Ui pear.horde.org diff --git a/kronolith/attendees.php b/kronolith/attendees.php index 0171b2e1e..14ba3fe00 100644 --- a/kronolith/attendees.php +++ b/kronolith/attendees.php @@ -241,7 +241,7 @@ $delimg = Horde::img('delete.png', _("Remove Attendee"), null, $ident = &Identity::singleton(); $identities = $ident->getAll('id'); $vars = Horde_Variables::getDefaultVariables(); -$tabs = new Horde_UI_Tabs(null, $vars); +$tabs = new Horde_Ui_Tabs(null, $vars); $tabs->addTab(_("Day"), 'javascript:switchView(\'Day\')', 'Day'); $tabs->addTab(_("Work Week"), 'javascript:switchView(\'Workweek\')', 'Workweek'); $tabs->addTab(_("Week"), 'javascript:switchView(\'Week\')', 'Week'); diff --git a/kronolith/lib/Event.php b/kronolith/lib/Event.php index 6b2e1be07..e9c120613 100644 --- a/kronolith/lib/Event.php +++ b/kronolith/lib/Event.php @@ -223,7 +223,7 @@ abstract class Kronolith_Event /** * The VarRenderer class to use for printing select elements. * - * @var Horde_UI_VarRenderer + * @var Horde_Ui_VarRenderer */ private $_varRenderer; @@ -2225,7 +2225,7 @@ abstract class Kronolith_Event } if (!$this->_varRenderer) { - $this->_varRenderer = Horde_UI_VarRenderer::factory('html'); + $this->_varRenderer = Horde_Ui_VarRenderer::factory('Html'); } return '' . diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php index 80aeae00e..76547574a 100644 --- a/kronolith/lib/Kronolith.php +++ b/kronolith/lib/Kronolith.php @@ -1764,7 +1764,7 @@ class Kronolith $date = self::currentDate(); $date_stamp = $date->dateString(); - $tabs = new Horde_UI_Tabs('view', Horde_Variables::getDefaultVariables()); + $tabs = new Horde_Ui_Tabs('view', Horde_Variables::getDefaultVariables()); $tabs->preserve('date', $date_stamp); $tabs->addTab(_("Day"), Horde::applicationUrl('day.php'), @@ -1794,7 +1794,7 @@ class Kronolith return; } - $tabs = new Horde_UI_Tabs('event', Horde_Variables::getDefaultVariables()); + $tabs = new Horde_Ui_Tabs('event', Horde_Variables::getDefaultVariables()); $date = self::currentDate(); $tabs->preserve('datetime', $date->dateString()); diff --git a/nag/lib/UI/VarRenderer/nag.php b/nag/lib/UI/VarRenderer/nag.php index 0178e3708..71a94ab1a 100644 --- a/nag/lib/UI/VarRenderer/nag.php +++ b/nag/lib/UI/VarRenderer/nag.php @@ -1,6 +1,6 @@ * @package Nag */ -class Horde_UI_VarRenderer_nag extends Horde_UI_VarRenderer_html { +class Horde_Ui_VarRenderer_nag extends Horde_Ui_VarRenderer_html { - function _renderVarInput_nag_method($form, &$var, &$vars) + protected function _renderVarInput_nag_method($form, &$var, &$vars) { $varname = @htmlspecialchars($var->getVarName(), ENT_QUOTES, $this->_charset); $varvalue = $var->getValue($vars); @@ -85,7 +79,7 @@ class Horde_UI_VarRenderer_nag extends Horde_UI_VarRenderer_html { } } - function _renderVarInput_nag_start($form, &$var, &$vars) + protected function _renderVarInput_nag_start($form, &$var, &$vars) { $var->type->getInfo($vars, $var, $task_start); if ($task_start == 0) { @@ -118,7 +112,7 @@ echo Horde::link('#', _("Select a date"), '', '', 'openCalendar(\'startimg\', \' type->getInfo($vars, $var, $task_due); if ($task_due == 0) { @@ -172,7 +166,7 @@ echo Horde::link('#', _("Select a date"), '', '', 'openCalendar(\'dueimg\', \'du getVarName(), ENT_QUOTES, $this->_charset); $value = $var->getValue($vars); @@ -230,7 +224,7 @@ echo Horde::link('#', _("Select a date"), '', '', 'openCalendar(\'dueimg\', \'du * * @return string The HTML widget. */ - function buildMonthWidget($name, $default = null, $params = null) + public function buildMonthWidget($name, $default = null, $params = null) { $id = str_replace(array('[', ']'), array('_', ''), $name); @@ -291,7 +285,7 @@ echo Horde::link('#', _("Select a date"), '', '', 'openCalendar(\'dueimg\', \'du * * @return string The HTML widget. */ - function buildHourWidget($name, $default = null, $params = null) + public function buildHourWidget($name, $default = null, $params = null) { global $prefs; if (!$prefs->getValue('twentyFour')) { @@ -356,7 +350,7 @@ echo Horde::link('#', _("Select a date"), '', '', 'openCalendar(\'dueimg\', \'du return $html . ''; } - function buildAmPmWidget($name, $default = 'am', $amParams = null, $pmParams = null) + public function buildAmPmWidget($name, $default = 'am', $amParams = null, $pmParams = null) { global $prefs; if ($prefs->getValue('twentyFour')) { @@ -391,7 +385,7 @@ echo Horde::link('#', _("Select a date"), '', '', 'openCalendar(\'dueimg\', \'du * * @return string The HTML '; if (!$prefs->isLocked('show_completed')) { $listurl = Horde::applicationUrl('list.php'); - $tabs = new Horde_UI_Tabs('show_completed', $vars); + $tabs = new Horde_Ui_Tabs('show_completed', $vars); $tabs->addTab(_("_All tasks"), $listurl, Nag::VIEW_ALL); $tabs->addTab(_("Incom_plete tasks"), $listurl, Nag::VIEW_INCOMPLETE); $tabs->addTab(_("_Future tasks"), $listurl, Nag::VIEW_FUTURE); diff --git a/news/admin/tabs.php b/news/admin/tabs.php index 0efc853a5..895be1832 100644 --- a/news/admin/tabs.php +++ b/news/admin/tabs.php @@ -17,7 +17,7 @@ if (!Horde_Auth::isAdmin('news:admin')) { } $vars = Horde_Variables::getDefaultVariables(); -$tabs = new Horde_UI_Tabs('admin', $vars); +$tabs = new Horde_Ui_Tabs('admin', $vars); $tabs->addTab(_("Sources"), Horde::applicationUrl('admin/sources/index.php'), 'sources'); $tabs->addTab(_("Categories"), Horde::applicationUrl('admin/categories/index.php'), 'categories'); diff --git a/news/lib/Forms/Search.php b/news/lib/Forms/Search.php index d53b412bd..53c33f3a0 100644 --- a/news/lib/Forms/Search.php +++ b/news/lib/Forms/Search.php @@ -60,7 +60,7 @@ class News_Search extends Horde_Form { */ public function getPager($info, $count, $url) { - $pager = new Horde_UI_Pager('news_page', + $pager = new Horde_Ui_Pager('news_page', Horde_Variables::getDefaultVariables(), array('num' => $count, 'url' => $url, diff --git a/news/lib/Search.php b/news/lib/Search.php index ed8ea47d1..89cb70a4a 100644 --- a/news/lib/Search.php +++ b/news/lib/Search.php @@ -63,7 +63,7 @@ class News_Search extends Horde_Form { */ static public function getPager($info, $count, $url) { - $pager = new Horde_UI_Pager('news_page', + $pager = new Horde_Ui_Pager('news_page', Horde_Variables::getDefaultVariables(), array('num' => $count, 'url' => $url, diff --git a/news/lib/TagCloud.php b/news/lib/TagCloud.php index 1d1e86806..3206a8192 100644 --- a/news/lib/TagCloud.php +++ b/news/lib/TagCloud.php @@ -12,7 +12,7 @@ * @author Duck * @package News */ -class News_TagCloud extends Horde_UI_TagCloud { +class News_TagCloud extends Horde_Ui_TagCloud { /** * create a Element of HTML part @@ -21,9 +21,8 @@ class News_TagCloud extends Horde_UI_TagCloud { * @param array $tag * @param string $type css class of time line param * @param int $fontsize - * @access private */ - function _createHTMLTag($tag, $type, $fontsize) + protected function _createHTMLTag($tag, $type, $fontsize) { return sprintf("%s\n", $type, @@ -36,9 +35,8 @@ class News_TagCloud extends Horde_UI_TagCloud { * * @return string * @param string $html - * @access private */ - function _wrapDiv($html) + protected function _wrapDiv($html) { return $html; } diff --git a/skoli/entry.php b/skoli/entry.php index 853588ecb..5b509b9c3 100644 --- a/skoli/entry.php +++ b/skoli/entry.php @@ -84,7 +84,7 @@ if ($actionID == 'delete') { // Get tabs. $url = Horde_Util::addParameter(Horde::applicationUrl('entry.php'), 'entry', $entry['object_id']); -$tabs = new Horde_UI_Tabs('view', $vars); +$tabs = new Horde_Ui_Tabs('view', $vars); $tabs->addTab(_("View"), $url, array('tabname' => 'Entry', 'id' => 'tabEntry')); if ($share->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { $tabs->addTab(_("Edit"), $url, array('tabname' => 'EditEntry', 'id' => 'tabEditEntry')); diff --git a/turba/contact.php b/turba/contact.php index 032186ce0..3e35fd92c 100644 --- a/turba/contact.php +++ b/turba/contact.php @@ -73,7 +73,7 @@ case 'DeleteContact': // Get tabs. $url = $contact->url(); -$tabs = new Horde_UI_Tabs('view', $vars); +$tabs = new Horde_Ui_Tabs('view', $vars); $tabs->addTab(_("_View"), $url, array('tabname' => 'Contact', 'id' => 'tabContact', 'onclick' => 'return ShowTab(\'Contact\');')); if ($contact->hasPermission(PERMS_EDIT)) { diff --git a/turba/docs/CHANGES b/turba/docs/CHANGES index 962a589a6..1dc04d619 100644 --- a/turba/docs/CHANGES +++ b/turba/docs/CHANGES @@ -16,7 +16,7 @@ v2.3.3-cvs [jan] Add and fix Oracle-specific SQL scripts. [jan] Add Croatian translation (Matej Vela , Iva Rumora ). -[mjr] Fix permission checking for virtual address books. +[mjr] Fix permission checking for virtual address books. [jan] Update deleted attributes during synchronization (lst_hoe02@kwsoft.de, Request #6658). [jan] Support X-ANNIVERSARY, X-CHILDREN, and X-SPOUSE vCard fields diff --git a/turba/lib/ListView.php b/turba/lib/ListView.php index fd4e11c5a..81bdb7145 100644 --- a/turba/lib/ListView.php +++ b/turba/lib/ListView.php @@ -61,7 +61,7 @@ class Turba_ListView { /** * The HTML renderer. * - * @var Horde_UI_VarRenderer_html + * @var Horde_Ui_VarRenderer_Html */ var $renderer; @@ -114,7 +114,7 @@ class Turba_ListView { $this->list = &$list; $this->setControls($controls); - $this->renderer = Horde_UI_VarRenderer::factory('html'); + $this->renderer = Horde_Ui_VarRenderer::factory('Html'); $this->vars = new Horde_Variables(); } @@ -217,7 +217,7 @@ class Turba_ListView { $viewurl = urldecode(Horde_Util::addParameter('search.php', $params)); $vars = Horde_Variables::getDefaultVariables(); - $pager = new Horde_UI_Pager('page', $vars, + $pager = new Horde_Ui_Pager('page', $vars, array('num' => $numitem, 'url' => $viewurl, 'page_limit' => $maxpage, diff --git a/turba/templates/browse/search.inc b/turba/templates/browse/search.inc index 8d34d1e79..ff9feb9d1 100644 --- a/turba/templates/browse/search.inc +++ b/turba/templates/browse/search.inc @@ -41,7 +41,7 @@ foreach (Turba::getAddressBooks() as $key => $entry) { require_once 'Horde/UI/Tabs.php'; $sUrl = Horde::applicationUrl('search.php'); $vars = Horde_Variables::getDefaultVariables(); -$tabs = new Horde_UI_Tabs('search_mode', $vars); +$tabs = new Horde_Ui_Tabs('search_mode', $vars); $tabs->addTab(_("Basic Search"), $sUrl, 'basic'); $tabs->addTab(_("Advanced Search"), $sUrl, 'advanced'); echo $tabs->render($_SESSION['turba']['search_mode']); diff --git a/vilma/lib/Vilma.php b/vilma/lib/Vilma.php index 442b5ceba..db4846e0a 100644 --- a/vilma/lib/Vilma.php +++ b/vilma/lib/Vilma.php @@ -74,12 +74,12 @@ class Vilma { /** * Create tabs to navigate the user manager area * - * return object Horde_UI_Tabs object + * return object Horde_Ui_Tabs object */ function getUserMgrTabs(&$vars) { $url = Horde::applicationUrl('users/index.php'); - $tabs = &new Horde_UI_Tabs('section', $vars); + $tabs = &new Horde_Ui_Tabs('section', $vars); foreach (Vilma::getUserMgrTypes() as $section => $desc) { $tabs->addTab($desc['plural'], $url, $section); } diff --git a/vilma/users/index.php b/vilma/users/index.php index ac90734e7..abe217108 100644 --- a/vilma/users/index.php +++ b/vilma/users/index.php @@ -42,7 +42,7 @@ $page = Horde_Util::getGet('page', 0); $perpage = $prefs->getValue('addresses_perpage'); $url = 'users/index.php'; $url = Horde_Util::addParameter($url, 'section', $section); -$pager = new Horde_UI_Pager('page', +$pager = new Horde_Ui_Pager('page', Horde_Variables::getDefaultVariables(), array('num' => count($addresses), 'url' => $url, -- 2.11.0