From 0cf200b1eaa312b96da25b86c1dcdd0182c40cb1 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Tue, 4 Aug 2009 15:52:41 -0600 Subject: [PATCH] Use Horde::getServiceLink() to generate prefsapi link --- gollem/js/manager.js | 4 ++-- gollem/templates/javascript_defs.php | 2 +- imp/config/hooks.php.dist | 2 +- imp/js/DimpBase.js | 2 +- imp/templates/javascript_defs_dimp.php | 8 ++++---- kronolith/js/calendar-panel.js | 2 +- kronolith/lib/Kronolith.php | 3 +-- kronolith/templates/javascript_defs.php | 2 +- nag/templates/list/task_headers.inc | 8 ++++---- nag/templates/panel.inc | 2 +- skoli/templates/list/headers.inc | 12 ++++++------ skoli/templates/panel.inc | 2 +- skoli/templates/search/headers.inc | 4 ++-- 13 files changed, 26 insertions(+), 27 deletions(-) diff --git a/gollem/js/manager.js b/gollem/js/manager.js index bc31c6280..62ecc7dae 100644 --- a/gollem/js/manager.js +++ b/gollem/js/manager.js @@ -362,8 +362,8 @@ var Gollem = { doPrefsUpdate: function(column, sortDown) { try { - new Ajax.Request(GollemVar.prefs_api, { parameters: { app: 'gollem', pref: 'sortby', value: column.substring(1) } }); - new Ajax.Request(GollemVar.prefs_api, { parameters: { app: 'gollem', pref: 'sortdir', value: sortDown } }); + new Ajax.Request(GollemVar.prefs_api, { parameters: { pref: 'sortby', value: column.substring(1) } }); + new Ajax.Request(GollemVar.prefs_api, { parameters: { pref: 'sortdir', value: sortDown } }); } catch (e) {} } }; diff --git a/gollem/templates/javascript_defs.php b/gollem/templates/javascript_defs.php index 71e82e6b2..b68990427 100644 --- a/gollem/templates/javascript_defs.php +++ b/gollem/templates/javascript_defs.php @@ -5,7 +5,7 @@ $charset = Horde_Nls::getCharset(); /* Variables used in core javascript files. */ $var = array( 'empty_input' => intval($GLOBALS['browser']->hasQuirk('empty_file_input_value')), - 'prefs_api' => Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/prefs/', true, -1) + 'prefs_api' => Horde::getServiceLink('prefsapi', 'gollem') ); /* Gettext strings used in core javascript files. */ diff --git a/imp/config/hooks.php.dist b/imp/config/hooks.php.dist index 6a2dfd230..975ca1e84 100644 --- a/imp/config/hooks.php.dist +++ b/imp/config/hooks.php.dist @@ -183,7 +183,7 @@ class IMP_Hooks // return $GLOBALS['registry']->get('webroot', 'turba'); // // case 'prefs': -// return $GLOBALS['registry']->get('webroot', 'horde') . '/services/prefs.php?app=horde'; +// return Horde::getServiceLink('options', 'horde'); // // default: // return ''; diff --git a/imp/js/DimpBase.js b/imp/js/DimpBase.js index 93adfa6a1..3e181a34a 100644 --- a/imp/js/DimpBase.js +++ b/imp/js/DimpBase.js @@ -2411,7 +2411,7 @@ var DimpBase = { /* Pref updating function. */ _updatePrefs: function(pref, value) { - new Ajax.Request(DimpCore.addURLParam(DIMP.conf.URI_PREFS), { parameters: { app: 'imp', pref: pref, value: value } }); + new Ajax.Request(DimpCore.addURLParam(DIMP.conf.URI_PREFS), { parameters: { pref: pref, value: value } }); }, /* Onload function. */ diff --git a/imp/templates/javascript_defs_dimp.php b/imp/templates/javascript_defs_dimp.php index 4466747ad..6628f955b 100644 --- a/imp/templates/javascript_defs_dimp.php +++ b/imp/templates/javascript_defs_dimp.php @@ -43,14 +43,14 @@ foreach ($imp_flags->getList() as $val) { /* Variables used in core javascript files. */ $code['conf'] = array_filter(array( // URL variables - 'URI_AJAX' => Horde::applicationUrl('ajax.php', true, -1), + 'URI_AJAX' => Horde::applicationUrl('ajax.php'), 'URI_COMPOSE' => Horde::applicationUrl('compose-dimp.php'), - 'URI_DIMP' => Horde::applicationUrl('index-dimp.php', true, -1), + 'URI_DIMP' => Horde::applicationUrl('index-dimp.php'), 'URI_MESSAGE' => Horde::applicationUrl('message-dimp.php'), - 'URI_PREFS' => Horde::url($horde_webroot . '/services/prefs/', true, -1), + 'URI_PREFS' => Horde::getServiceLink('prefsapi', 'imp'), 'URI_PREFS_IMP' => str_replace('&', '&', Horde::getServiceLink('options', 'imp')), 'URI_TIMEOUT' => Horde_Auth::getLogoutUrl(array('reason' => Horde_Auth::REASON_SESSION)), - 'URI_VIEW' => Horde::applicationUrl('view.php', true, -1), + 'URI_VIEW' => Horde::applicationUrl('view.php'), 'SESSION_ID' => defined('SID') ? SID : '', diff --git a/kronolith/js/calendar-panel.js b/kronolith/js/calendar-panel.js index 824bb3f0d..552d8d7d6 100644 --- a/kronolith/js/calendar-panel.js +++ b/kronolith/js/calendar-panel.js @@ -10,7 +10,7 @@ function sbarToggle() body.addClassName('rightPanel'); } - new Ajax.Request(KronolithVar.pref_api_url, { parameters: { app: 'kronolith', pref: 'show_panel', value: pref_value } }); + new Ajax.Request(KronolithVar.pref_api_url, { parameters: { pref: 'show_panel', value: pref_value } }); } function removeTag(tagid) diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php index 007b5e281..5fa886cf1 100644 --- a/kronolith/lib/Kronolith.php +++ b/kronolith/lib/Kronolith.php @@ -128,7 +128,6 @@ class Kronolith /* Variables used in core javascript files. */ $code['conf'] = array( 'URI_AJAX' => Horde::url($kronolith_webroot . '/ajax.php', true, -1), - 'URI_PREFS' => Horde::url($horde_webroot . '/services/prefs/', true, -1), 'URI_IMG' => $registry->getImageDir() . '/', //'URI_VIEW' => Horde_Util::addParameter(Horde::url($imp_webroot . '/view.php', true, -1), array('actionID' => 'view_source', 'id' => 0), null, false), 'SESSION_ID' => defined('SID') ? SID : '', @@ -1211,7 +1210,7 @@ class Kronolith $myemail = $ident->getValue('from_addr'); if (!$myemail) { - $notification->push(sprintf(_("You do not have an email address configured in your Personal Information Options. You must set one %shere%s before event notifications can be sent."), Horde::link(Horde_Util::addParameter(Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/prefs.php'), array('app' => 'horde', 'group' => 'identities'))), ''), 'horde.error', array('content.raw')); + $notification->push(sprintf(_("You do not have an email address configured in your Personal Information Options. You must set one %shere%s before event notifications can be sent."), Horde::link(Horde_Util::addParameter(Horde::getServiceLink('options', 'kronolith'), array('app' => 'horde', 'group' => 'identities'))), ''), 'horde.error', array('content.raw')); return; } diff --git a/kronolith/templates/javascript_defs.php b/kronolith/templates/javascript_defs.php index ff1500f04..2b3358c53 100644 --- a/kronolith/templates/javascript_defs.php +++ b/kronolith/templates/javascript_defs.php @@ -8,7 +8,7 @@ $charset = Horde_Nls::getCharset(); /* Variables used in core javascript files. */ $var = array( 'view_url' => Horde::applicationUrl('view.php'), - 'pref_api_url' => Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/prefs/', true, -1), + 'pref_api_url' => Horde::getServiceLink('prefsapi', 'kronolith'), 'calendar_info_url' => Horde::applicationUrl('calendars/info.php', true), 'page_title' => $GLOBALS['registry']->get('name') . ' :: ', ); diff --git a/nag/templates/list/task_headers.inc b/nag/templates/list/task_headers.inc index dc0fe17a8..cfbf96f64 100644 --- a/nag/templates/list/task_headers.inc +++ b/nag/templates/list/task_headers.inc @@ -15,10 +15,10 @@ function table_sortCallback(tableId, column, sortDown) function doPrefsUpdate(column, sortDown) { - baseurl = 'get('webroot', 'horde') . '/services/prefs/', true, -1) ?>'; + baseurl = ''; try { - new Ajax.Request(baseurl, { parameters: { app: 'nag', pref: 'sortby', value: encodeURIComponent(column.substring(1)) } }); - new Ajax.Request(baseurl, { parameters: { app: 'nag', pref: 'sortdir', value: encodeURIComponent(sortDown) } }); + new Ajax.Request(baseurl, { parameters: { pref: 'sortby', value: encodeURIComponent(column.substring(1)) } }); + new Ajax.Request(baseurl, { parameters: { pref: 'sortdir', value: encodeURIComponent(sortDown) } }); } catch (e) {} } @@ -65,7 +65,7 @@ function doPrefsUpdate(column, sortDown) isLocked('categories') || !$GLOBALS['prefs']->isLocked('category_colors'))) { - $categoryUrl = Horde_Util::addParameter(Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/prefs.php'), array('app' => 'horde', 'group' => 'categories')); + $categoryUrl = Horde_Util::addParameter(Horde::getServiceLink('options', 'horde'), array('group' => 'categories')); echo ' ' . Horde::link($categoryUrl, _("Edit categories and colors"), '', '_blank', Horde::popupJs($categoryUrl, array('urlencode' => true)) . 'return false;') . Horde::img('colorpicker.png', _("Edit categories and colors"), '', $GLOBALS['registry']->getImageDir('horde')) . ''; } ?> diff --git a/nag/templates/panel.inc b/nag/templates/panel.inc index cbe938f21..239f0309d 100644 --- a/nag/templates/panel.inc +++ b/nag/templates/panel.inc @@ -30,7 +30,7 @@ function sbarToggle() Element.addClassName(document.body, 'rightPanel'); } - new Ajax.Request('get('webroot', 'horde') . '/services/prefs/', true, -1) ?>', { parameters: { app: 'nag', pref: 'show_panel', value: pref_value } }); + new Ajax.Request('', { parameters: { pref: 'show_panel', value: pref_value } }); } document.observe('dom:loaded', function() { diff --git a/skoli/templates/list/headers.inc b/skoli/templates/list/headers.inc index 8b3969ada..b5e970a31 100644 --- a/skoli/templates/list/headers.inc +++ b/skoli/templates/list/headers.inc @@ -16,18 +16,18 @@ function table_sortCallback(tableId, column, sortDown) function doPrefsUpdate(column, sortDown) { - baseurl = 'get('webroot', 'horde') . '/services/prefs/', true, -1) ?>'; + baseurl = ''; try { column = column.substring(1); prefscope = 'class'; if (column == 'lastentry' || column == 'comment') { prefscope = 'student'; } - new Ajax.Request(baseurl, { parameters: { app: 'skoli', pref: 'sortby_' + prefscope, value: encodeURIComponent(column) } }); - new Ajax.Request(baseurl, { parameters: { app: 'skoli', pref: 'sortdir_' + prefscope, value: encodeURIComponent(sortDown) } }); + new Ajax.Request(baseurl, { parameters: { pref: 'sortby_' + prefscope, value: encodeURIComponent(column) } }); + new Ajax.Request(baseurl, { parameters: { pref: 'sortdir_' + prefscope, value: encodeURIComponent(sortDown) } }); if (column == 'name') { - new Ajax.Request(baseurl, { parameters: { app: 'skoli', pref: 'sortby_student', value: encodeURIComponent(column) } }); - new Ajax.Request(baseurl, { parameters: { app: 'skoli', pref: 'sortdir_student', value: encodeURIComponent(sortDown) } }); + new Ajax.Request(baseurl, { parameters: { pref: 'sortby_student', value: encodeURIComponent(column) } }); + new Ajax.Request(baseurl, { parameters: { pref: 'sortdir_student', value: encodeURIComponent(sortDown) } }); } } catch (e) {} } @@ -85,7 +85,7 @@ function doPrefsUpdate(column, sortDown) isLocked('categories') || !$GLOBALS['prefs']->isLocked('category_colors'))) { - $categoryUrl = Horde_Util::addParameter(Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/prefs.php'), array('app' => 'horde', 'group' => 'categories')); + $categoryUrl = Horde_Util::addParameter(Horde::getServiceLink('options', 'horde'), array('group' => 'categories')); echo ' ' . Horde::link($categoryUrl, _("Edit categories and colors"), '', '_blank', Horde::popupJs($categoryUrl, array('urlencode' => true)) . 'return false;') . Horde::img('colorpicker.png', _("Edit categories and colors"), '', $GLOBALS['registry']->getImageDir('horde')) . ''; } ?> diff --git a/skoli/templates/panel.inc b/skoli/templates/panel.inc index a023bf6b7..a032e206a 100644 --- a/skoli/templates/panel.inc +++ b/skoli/templates/panel.inc @@ -26,7 +26,7 @@ function sbarToggle() Element.addClassName(document.body, 'rightPanel'); } - new Ajax.Request('get('webroot', 'horde') . '/services/prefs/', true, -1) ?>', { parameters: { app: 'skoli', pref: 'show_panel', value: pref_value } }); + new Ajax.Request('', { parameters: { pref: 'show_panel', value: pref_value } }); } diff --git a/skoli/templates/search/headers.inc b/skoli/templates/search/headers.inc index fbf3345fe..b512c1701 100644 --- a/skoli/templates/search/headers.inc +++ b/skoli/templates/search/headers.inc @@ -15,10 +15,10 @@ function table_sortCallback(tableId, column, sortDown) function doPrefsUpdate(column, sortDown) { - baseurl = 'get('webroot', 'horde') . '/services/prefs/', true, -1) ?>'; + baseurl = ''; try { column = column.substring(1); - new Ajax.Request(baseurl, { parameters: { app: 'skoli', pref: 'sortby', value: encodeURIComponent(column) } }); + new Ajax.Request(baseurl, { parameters: { pref: 'sortby', value: encodeURIComponent(column) } }); } catch (e) {} } -- 2.11.0