From 0926e56fca57b4c76355ca32f0f09cd35fa5f7df Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Tue, 6 Oct 2009 12:56:44 -0600 Subject: [PATCH] Convert to new Horde::addScriptFile() usage --- ansel/browse.php | 2 +- ansel/faces/custom.php | 8 ++++---- ansel/faces/gallery.php | 4 ++-- ansel/faces/search/image_define.php | 8 ++++---- ansel/gallery.php | 4 ++-- ansel/gallery/sort.php | 4 ++-- ansel/image.php | 12 +++++------ ansel/lib/Ajax/Imple/EditCaption.php | 6 +++--- ansel/lib/Ajax/Imple/LocationAutoCompleter.php | 4 ++-- ansel/lib/Block/my_galleries.php | 2 +- ansel/lib/Block/recently_added_geodata.php | 4 ++-- ansel/lib/View/GalleryRenderer/Gallery.php | 2 +- ansel/lib/View/GalleryRenderer/GalleryLightbox.php | 6 +++--- ansel/lib/View/Image.php | 4 ++-- ansel/lib/View/Slideshow.php | 2 +- ansel/lib/Widget/Geotag.php | 6 +++--- ansel/lib/Widget/ImageFaces.php | 2 +- ansel/map_edit.php | 2 +- ansel/templates/image/upload.inc | 4 ++-- babel/lib/Babel.php | 4 ++-- beatnik/listzones.php | 2 +- beatnik/viewzone.php | 2 +- chora/annotate.php | 2 +- chora/browsedir.php | 2 +- chora/browsefile.php | 6 +++--- chora/co.php | 2 +- chora/diff.php | 2 +- chora/patchsets.php | 4 ++-- chora/stats.php | 2 +- drag_n_drop_portal/index.php | 4 ++-- fima/accounts.php | 2 +- fima/ledgers/index.php | 2 +- fima/lib/Fima.php | 2 +- folks/activity.php | 2 +- folks/birthday.php | 2 +- folks/edit/activity.php | 2 +- folks/edit/comments.php | 2 +- folks/edit/friends/add.php | 2 +- folks/edit/tabs.php | 2 +- folks/friends.php | 2 +- folks/lib/Block/activities.php | 4 ++-- folks/lib/Block/friends.php | 4 ++-- folks/lib/Block/know.php | 4 ++-- folks/lib/Block/my_comments.php | 2 +- folks/lib/Block/new.php | 4 ++-- folks/lib/Block/random.php | 4 ++-- folks/lib/Block/recent.php | 4 ++-- folks/list.php | 2 +- folks/new.php | 2 +- folks/online.php | 2 +- folks/popularity.php | 2 +- folks/search.php | 8 ++++---- folks/user.php | 2 +- framework/Model/lib/Horde/Form/Renderer/Xhtml.php | 4 ++-- .../Model/lib/Horde/Form/VarRenderer/Xhtml.php | 10 ++++----- gollem/clipboard.php | 2 +- gollem/manager.php | 4 ++-- gollem/selectlist.php | 2 +- gollem/templates/prefs/columnselect.inc | 2 +- imp/acl.php | 2 +- imp/compose-dimp.php | 2 +- imp/compose.php | 4 ++-- imp/contacts.php | 2 +- imp/folders.php | 6 ++---- imp/index-dimp.php | 24 +++++++++++----------- imp/lib/Ajax/Imple/ContactAutoCompleter.php | 6 +++--- imp/lib/Application.php | 12 +++++------ imp/lib/Block/summary.php | 4 ++-- imp/lib/Dimp.php | 8 ++++---- imp/lib/IMP.php | 12 +++++------ imp/lib/Mime/Viewer/Html.php | 2 +- imp/lib/Mime/Viewer/Smime.php | 2 +- imp/mailbox.php | 8 ++++---- imp/message-dimp.php | 6 +++--- imp/message.php | 6 +++--- imp/pgp.php | 2 +- imp/search.php | 6 +++--- imp/smime.php | 2 +- ingo/filters.php | 6 +++--- ingo/lib/Ingo.php | 2 +- ingo/rule.php | 2 +- kronolith/calendars/index.php | 2 +- kronolith/day.php | 2 +- kronolith/lib/Ajax/Imple/ContactAutoCompleter.php | 4 ++-- kronolith/lib/Ajax/Imple/TagAutoCompleter.php | 6 +++--- kronolith/lib/Block/month.php | 2 +- kronolith/lib/Block/monthlist.php | 2 +- kronolith/lib/Block/prevmonthlist.php | 2 +- kronolith/lib/Block/summary.php | 2 +- kronolith/lib/Kronolith.php | 12 +++++------ kronolith/lib/View/EditEvent.php | 2 +- kronolith/month.php | 2 +- kronolith/new.php | 2 +- kronolith/search.php | 2 +- kronolith/templates/common-header.inc | 6 +++--- kronolith/templates/edit/edit.inc | 2 +- kronolith/templates/edit/edit_timespan.inc | 4 ++-- kronolith/templates/panel.inc | 8 ++++---- kronolith/week.php | 2 +- kronolith/workweek.php | 2 +- kronolith/year.php | 2 +- nag/lib/UI/VarRenderer/nag.php | 2 +- nag/list.php | 6 +++--- nag/search.php | 2 +- nag/tasklists/index.php | 2 +- nag/tasks/index.php | 6 +++--- nag/templates/list.html.php | 2 +- nag/templates/panel.inc | 2 +- nag/view.php | 2 +- news/admin/categories/index.php | 2 +- news/admin/sources/index.php | 2 +- news/edit.php | 2 +- news/lib/Block/jonah.php | 6 +++--- news/lib/Block/my_comments.php | 2 +- news/reads.php | 2 +- skoli/classes/index.php | 2 +- skoli/data.php | 4 ++-- skoli/list.php | 8 ++++---- skoli/search.php | 8 ++++---- skoli/templates/panel.inc | 2 +- turba/addressbooks/index.php | 2 +- turba/contact.php | 2 +- turba/lib/Block/minisearch.php | 2 +- turba/lib/View/Browse.php | 6 +++--- turba/minisearch.php | 2 +- turba/search.php | 6 +++--- turba/templates/prefs/columnselect.inc | 4 ++-- 127 files changed, 243 insertions(+), 245 deletions(-) diff --git a/ansel/browse.php b/ansel/browse.php index 347f4d9ca..d95fb12b9 100644 --- a/ansel/browse.php +++ b/ansel/browse.php @@ -8,7 +8,7 @@ require_once dirname(__FILE__) . '/lib/base.php'; -Horde::addScriptFile('prototype.js', 'horde', true); +Horde::addScriptFile('prototype.js', 'horde'); $layout = new Horde_Block_Layout_View( @unserialize($prefs->getValue('myansel_layout')), Horde::applicationUrl('browse_edit.php'), diff --git a/ansel/faces/custom.php b/ansel/faces/custom.php index 95fdc0f9c..30e26f772 100644 --- a/ansel/faces/custom.php +++ b/ansel/faces/custom.php @@ -65,11 +65,11 @@ $width = $y2 - $y1; $title = _("Create a new face"); Horde::addScriptFile('builder.js'); -Horde::addScriptFile('effects.js', 'horde', true); -Horde::addScriptFile('controls.js', 'horde', true); -Horde::addScriptFile('dragdrop.js', 'horde', true); +Horde::addScriptFile('effects.js', 'horde'); +Horde::addScriptFile('controls.js', 'horde'); +Horde::addScriptFile('dragdrop.js', 'horde'); Horde::addScriptFile('cropper.js'); -Horde::addScriptFile('stripe.js', 'horde', true); +Horde::addScriptFile('stripe.js', 'horde'); require ANSEL_TEMPLATES . '/common-header.inc'; require ANSEL_TEMPLATES . '/menu.inc'; diff --git a/ansel/faces/gallery.php b/ansel/faces/gallery.php index 8214f9453..21a2aa6b5 100644 --- a/ansel/faces/gallery.php +++ b/ansel/faces/gallery.php @@ -48,8 +48,8 @@ $pager = new Horde_UI_Pager( $pager->preserve('gallery', $gallery_id); $title = sprintf(_("Searching for faces in %s"), Horde::link(Ansel::getUrlFor('view', array('gallery' => $gallery_id, 'view' => 'Gallery'))) . $gallery->get('name') . ''); -Horde::addScriptFile('stripe.js', 'horde', true); -Horde::addScriptFile('popup.js', 'horde', true); +Horde::addScriptFile('stripe.js', 'horde'); +Horde::addScriptFile('popup.js', 'horde'); require ANSEL_TEMPLATES . '/common-header.inc'; require ANSEL_TEMPLATES . '/menu.inc'; require ANSEL_TEMPLATES . '/faces/gallery.inc'; diff --git a/ansel/faces/search/image_define.php b/ansel/faces/search/image_define.php index 35f60f688..2468384f7 100644 --- a/ansel/faces/search/image_define.php +++ b/ansel/faces/search/image_define.php @@ -46,10 +46,10 @@ if (count($faces) > 1) { $height = $x2 - $x1; $width = $y2 - $y1; -Horde::addScriptFile('scriptaculous.js', 'horde', true); -Horde::addScriptFile('builder.js', 'ansel', true); -Horde::addScriptFile('cropper.js', 'ansel', true); -Horde::addScriptFile('stripe.js', 'horde', true); +Horde::addScriptFile('scriptaculous.js', 'horde'); +Horde::addScriptFile('builder.js', 'ansel'); +Horde::addScriptFile('cropper.js', 'ansel'); +Horde::addScriptFile('stripe.js', 'horde'); require ANSEL_TEMPLATES . '/common-header.inc'; require ANSEL_TEMPLATES . '/menu.inc'; diff --git a/ansel/gallery.php b/ansel/gallery.php index fb2d1ed60..de22af104 100644 --- a/ansel/gallery.php +++ b/ansel/gallery.php @@ -380,7 +380,7 @@ default: exit; } -Horde::addScriptFile('stripe.js', 'horde', true); +Horde::addScriptFile('stripe.js', 'horde'); require ANSEL_TEMPLATES . '/common-header.inc'; /* Attach the slug check action to the form */ @@ -388,7 +388,7 @@ $imple = Horde_Ajax_Imple::factory(array('ansel', 'GallerySlugCheck'), array('slug' => $gallery_slug, 'bindTo' => 'gallery_slug')); $imple->attach(); -Horde::addScriptFile('popup.js', 'horde', true); +Horde::addScriptFile('popup.js', 'horde'); require ANSEL_TEMPLATES . '/menu.inc'; require ANSEL_TEMPLATES . '/gallery/gallery.inc'; require $registry->get('templates', 'horde') . '/common-footer.inc'; diff --git a/ansel/gallery/sort.php b/ansel/gallery/sort.php index 66129bab6..68f9873a8 100644 --- a/ansel/gallery/sort.php +++ b/ansel/gallery/sort.php @@ -55,8 +55,8 @@ case 'Sort': exit; } -Horde::addScriptFile('effects.js', 'horde', true); -Horde::addScriptFile('dragdrop.js', 'horde', true); +Horde::addScriptFile('effects.js', 'horde'); +Horde::addScriptFile('dragdrop.js', 'horde'); $title = sprintf(_("%s :: Sort"), $gallery->get('name')); require ANSEL_TEMPLATES . '/common-header.inc'; require ANSEL_TEMPLATES . '/menu.inc'; diff --git a/ansel/image.php b/ansel/image.php index e9cd97e23..af6ab9b4d 100644 --- a/ansel/image.php +++ b/ansel/image.php @@ -312,9 +312,9 @@ case 'resizeedit': /* js and css files */ Horde::addScriptFile('builder.js'); - Horde::addScriptFile('effects.js', 'horde', true); - Horde::addScriptFile('controls.js', 'horde', true); - Horde::addScriptFile('dragdrop.js', 'horde', true); + Horde::addScriptFile('effects.js', 'horde'); + Horde::addScriptFile('controls.js', 'horde'); + Horde::addScriptFile('dragdrop.js', 'horde'); Horde::addScriptFile('cropper.js'); Ansel::attachStylesheet('cropper.css'); } elseif ($actionID == 'resizeedit') { @@ -322,9 +322,9 @@ case 'resizeedit': // TODO: Combine these cases $geometry = $image->getDimensions('full'); Horde::addScriptFile('builder.js'); - Horde::addScriptFile('effects.js', 'horde', true); - Horde::addScriptFile('slider.js', 'horde', true); - Horde::addScriptFile('dragdrop.js', 'horde', true); + Horde::addScriptFile('effects.js', 'horde'); + Horde::addScriptFile('slider.js', 'horde'); + Horde::addScriptFile('dragdrop.js', 'horde'); } require ANSEL_TEMPLATES . '/common-header.inc'; diff --git a/ansel/lib/Ajax/Imple/EditCaption.php b/ansel/lib/Ajax/Imple/EditCaption.php index f991ce1e9..519bda7c7 100644 --- a/ansel/lib/Ajax/Imple/EditCaption.php +++ b/ansel/lib/Ajax/Imple/EditCaption.php @@ -24,9 +24,9 @@ class Ansel_Ajax_Imple_EditCaption extends Horde_Ajax_Imple_Base public function attach() { - Horde::addScriptFile('effects.js', 'horde', true); - Horde::addScriptFile('controls.js', 'horde', true); - Horde::addScriptFile('editcaption.js', 'ansel', true); + Horde::addScriptFile('effects.js', 'horde'); + Horde::addScriptFile('controls.js', 'horde'); + Horde::addScriptFile('editcaption.js', 'ansel'); $params = array('input' => 'value', 'id' => $this->_params['id']); diff --git a/ansel/lib/Ajax/Imple/LocationAutoCompleter.php b/ansel/lib/Ajax/Imple/LocationAutoCompleter.php index ec69f66c8..52a18b6ad 100644 --- a/ansel/lib/Ajax/Imple/LocationAutoCompleter.php +++ b/ansel/lib/Ajax/Imple/LocationAutoCompleter.php @@ -25,8 +25,8 @@ class Ansel_Ajax_Imple_LocationAutoCompleter extends Horde_Ajax_Imple_Base public function attach() { - Horde::addScriptFile('autocomplete.js', 'horde', true); - Horde::addScriptFile('effects.js', 'horde', true); + Horde::addScriptFile('autocomplete.js', 'horde'); + Horde::addScriptFile('effects.js', 'horde'); $url = $this->_getUrl('LocationAutoCompleter', 'ansel', array('input' => $this->_params['triggerId'])); diff --git a/ansel/lib/Block/my_galleries.php b/ansel/lib/Block/my_galleries.php index 6a92a7ee6..92678c588 100644 --- a/ansel/lib/Block/my_galleries.php +++ b/ansel/lib/Block/my_galleries.php @@ -37,7 +37,7 @@ class Horde_Block_ansel_my_galleries extends Horde_Block { function _content() { - Horde::addScriptFile('ToolTips.js', 'horde', true); + Horde::addScriptFile('ToolTips.js', 'horde'); /* Get the top level galleries */ $galleries = $GLOBALS['ansel_storage']->listGalleries( PERMS_EDIT, Horde_Auth::getAuth(), null, false, 0, diff --git a/ansel/lib/Block/recently_added_geodata.php b/ansel/lib/Block/recently_added_geodata.php index f3d520fd2..29f4b3275 100644 --- a/ansel/lib/Block/recently_added_geodata.php +++ b/ansel/lib/Block/recently_added_geodata.php @@ -52,8 +52,8 @@ class Horde_Block_ansel_recently_added_geodata extends Horde_Block { { require_once dirname(__FILE__) . '/../base.php'; - Horde::addExternalScriptFile('http://maps.google.com/maps?file=api&v=2&sensor=false&key=' . $GLOBALS['conf']['api']['googlemaps'], 'ansel'); - Horde::addExternalScriptFile('http://gmaps-utility-library.googlecode.com/svn/trunk/markermanager/1.1/src/markermanager.js', 'ansel'); + Horde::addScriptFile('http://maps.google.com/maps?file=api&v=2&sensor=false&key=' . $GLOBALS['conf']['api']['googlemaps'], 'ansel', array('external' => true)); + Horde::addScriptFile('http://gmaps-utility-library.googlecode.com/svn/trunk/markermanager/1.1/src/markermanager.js', 'ansel', array('external' => true)); Horde::addScriptFile('googlemap.js'); if ($this->_params['gallery'] != 'all') { $gallery = $this->_getGallery(); diff --git a/ansel/lib/View/GalleryRenderer/Gallery.php b/ansel/lib/View/GalleryRenderer/Gallery.php index 5b70d7aa3..30bd1f09a 100644 --- a/ansel/lib/View/GalleryRenderer/Gallery.php +++ b/ansel/lib/View/GalleryRenderer/Gallery.php @@ -121,7 +121,7 @@ class Ansel_View_GalleryRenderer_Gallery extends Ansel_View_GalleryRenderer_Base if (!empty($option_copy)) { $action_links[] = Horde::link('#', '', 'widget', '', 'copySelected(); return false;') . _("Copy") . ''; } - Horde::addScriptFile('popup.js', 'horde', true); + Horde::addScriptFile('popup.js', 'horde'); include ANSEL_TEMPLATES . '/view/gallery.inc'; return ob_get_clean(); } diff --git a/ansel/lib/View/GalleryRenderer/GalleryLightbox.php b/ansel/lib/View/GalleryRenderer/GalleryLightbox.php index b482ff223..7b75d7bc1 100644 --- a/ansel/lib/View/GalleryRenderer/GalleryLightbox.php +++ b/ansel/lib/View/GalleryRenderer/GalleryLightbox.php @@ -26,9 +26,9 @@ class Ansel_View_GalleryRenderer_GalleryLightbox extends Ansel_View_GalleryRende // Attach the script and CSS files here if we aren't being called via the api if (empty($this->view->api)) { Ansel::attachStylesheet('lightbox.css'); - Horde::addScriptFile('effects.js', 'horde', true); - Horde::addScriptFile('lightbox.js', 'ansel', true); - Horde::addScriptFile('popup.js', 'horde', true); + Horde::addScriptFile('effects.js', 'horde'); + Horde::addScriptFile('lightbox.js', 'ansel'); + Horde::addScriptFile('popup.js', 'horde'); } } diff --git a/ansel/lib/View/Image.php b/ansel/lib/View/Image.php index 88b862c0b..1a8d35c57 100644 --- a/ansel/lib/View/Image.php +++ b/ansel/lib/View/Image.php @@ -92,8 +92,8 @@ class Ansel_View_Image extends Ansel_View_Base /* Any script files we may need if not calling via the api */ if (empty($this->_params['api'])) { - Horde::addScriptFile('effects.js', 'horde', true); - Horde::addScriptFile('stripe.js', 'horde', true); + Horde::addScriptFile('effects.js', 'horde'); + Horde::addScriptFile('stripe.js', 'horde'); } } diff --git a/ansel/lib/View/Slideshow.php b/ansel/lib/View/Slideshow.php index 605c8391a..161050fa4 100644 --- a/ansel/lib/View/Slideshow.php +++ b/ansel/lib/View/Slideshow.php @@ -15,7 +15,7 @@ class Ansel_View_Slideshow extends Ansel_View_Image public function __construct($params = array()) { parent::__construct($params); - Horde::addScriptFile('slideshow.js', 'ansel', true); + Horde::addScriptFile('slideshow.js', 'ansel'); } protected function _html() diff --git a/ansel/lib/Widget/Geotag.php b/ansel/lib/Widget/Geotag.php index f43826aea..786604d39 100644 --- a/ansel/lib/Widget/Geotag.php +++ b/ansel/lib/Widget/Geotag.php @@ -59,10 +59,10 @@ class Ansel_Widget_Geotag extends Ansel_Widget_Base } // Bring in googlemap.js now that we know we need it. - Horde::addExternalScriptFile('http://maps.google.com/maps?file=api&v=2&sensor=false&key=' . $GLOBALS['conf']['api']['googlemaps'], 'ansel'); - Horde::addExternalScriptFile('http://gmaps-utility-library.googlecode.com/svn/trunk/markermanager/1.1/src/markermanager.js', 'ansel'); + Horde::addScriptFile('http://maps.google.com/maps?file=api&v=2&sensor=false&key=' . $GLOBALS['conf']['api']['googlemaps'], 'ansel', array('external' => true)); + Horde::addScriptFile('http://gmaps-utility-library.googlecode.com/svn/trunk/markermanager/1.1/src/markermanager.js', 'ansel', array('external' => true)); Horde::addScriptFile('googlemap.js'); - Horde::addScriptFile('popup.js', 'horde', true); + Horde::addScriptFile('popup.js', 'horde'); $html = $this->_htmlBegin() . "\n"; $content = '
'; diff --git a/ansel/lib/Widget/ImageFaces.php b/ansel/lib/Widget/ImageFaces.php index 337a4d032..81655a4f7 100644 --- a/ansel/lib/Widget/ImageFaces.php +++ b/ansel/lib/Widget/ImageFaces.php @@ -119,7 +119,7 @@ class Ansel_Widget_ImageFaces extends Ansel_Widget_Base $html .= $faces_html . '
'; // Include the needed javascript - Horde::addScriptFile('imagefaces.js', 'ansel', true); + Horde::addScriptFile('imagefaces.js', 'ansel'); return $html; } diff --git a/ansel/map_edit.php b/ansel/map_edit.php index 4eb0b2992..f1355dad6 100644 --- a/ansel/map_edit.php +++ b/ansel/map_edit.php @@ -11,7 +11,7 @@ require_once dirname(__FILE__) . '/lib/base.php'; /* Script includes */ -Horde::addExternalScriptFile('http://maps.google.com/maps?file=api&v=2&sensor=false&key=' . $GLOBALS['conf']['api']['googlemaps'], 'ansel'); +Horde::addScriptFile('http://maps.google.com/maps?file=api&v=2&sensor=false&key=' . $GLOBALS['conf']['api']['googlemaps'], 'ansel', array('external' => true)); Horde::addScriptFile('googlemap.js', 'ansel'); Horde::addScriptFile('googlemap_edit.js', 'ansel'); diff --git a/ansel/templates/image/upload.inc b/ansel/templates/image/upload.inc index 11eaf7db6..1dfcb498c 100644 --- a/ansel/templates/image/upload.inc +++ b/ansel/templates/image/upload.inc @@ -8,8 +8,8 @@ if ($browser->getPlatform() == 'win' && Horde::showService('help')) { } if (!empty($haveImages)) { - Horde::addScriptFile('effects.js', 'horde', true); - Horde::addScriptFile('carousel.js', 'ansel', true); + Horde::addScriptFile('effects.js', 'horde'); + Horde::addScriptFile('carousel.js', 'ansel'); } $graphic_dir = Horde::applicationUrl($GLOBALS['registry']->getImageDir(), true); diff --git a/babel/lib/Babel.php b/babel/lib/Babel.php index 6eb4b0a4a..a3ecaf97e 100644 --- a/babel/lib/Babel.php +++ b/babel/lib/Babel.php @@ -265,8 +265,8 @@ class Babel { function RB_init() { - Horde::addScriptFile('effects.js', 'horde', true); - Horde::addScriptFile('redbox.js', 'horde', true); + Horde::addScriptFile('effects.js', 'horde'); + Horde::addScriptFile('redbox.js', 'horde'); } function RB_start($secs = 30) { diff --git a/beatnik/listzones.php b/beatnik/listzones.php index 7f55e1538..364cac4d7 100644 --- a/beatnik/listzones.php +++ b/beatnik/listzones.php @@ -51,7 +51,7 @@ foreach ($fields as $field_id => $field) { // Add javascript navigation and striping Horde::addScriptFile('beatnik.js'); -Horde::addScriptFile('stripe.js', 'horde', true); +Horde::addScriptFile('stripe.js', 'horde'); // Initialization complete. Render the page. require BEATNIK_TEMPLATES . '/common-header.inc'; diff --git a/beatnik/viewzone.php b/beatnik/viewzone.php index a4459e723..ff25f3e36 100644 --- a/beatnik/viewzone.php +++ b/beatnik/viewzone.php @@ -20,7 +20,7 @@ if (is_a($zonedata, 'PEAR_Error')) { } $title = $_SESSION['beatnik']['curdomain']['zonename']; -Horde::addScriptFile('stripe.js', 'horde', true); +Horde::addScriptFile('stripe.js', 'horde'); require BEATNIK_TEMPLATES . '/common-header.inc'; require BEATNIK_TEMPLATES . '/menu.inc'; diff --git a/chora/annotate.php b/chora/annotate.php index da5e95269..7e7d443cf 100644 --- a/chora/annotate.php +++ b/chora/annotate.php @@ -46,7 +46,7 @@ $extraLink = sprintf('%s | %s', Chora::url('co', $where, array('r' => $rev)), _("View"), Chora::url('co', $where, array('r' => $rev, 'p' => 1)), _("Download")); -Horde::addScriptFile('annotate.js', 'chora', true); +Horde::addScriptFile('annotate.js', 'chora'); $js_vars = array( 'ANNOTATE_URL' => Horde_Util::addParameter(Horde::applicationUrl('annotate.php'), array('actionID' => 'log', 'f' => $where, 'rev' => ''), null, false), diff --git a/chora/browsedir.php b/chora/browsedir.php index 1de3b3205..008bc8c1f 100644 --- a/chora/browsedir.php +++ b/chora/browsedir.php @@ -67,7 +67,7 @@ if ($VC->hasFeature('branches')) { $printAllCols = count($fileList); $sortdirclass = $acts['sbt'] ? 'sortdown' : 'sortup'; -Horde::addScriptFile('tables.js', 'horde', true); +Horde::addScriptFile('tables.js', 'horde'); require CHORA_TEMPLATES . '/common-header.inc'; require CHORA_TEMPLATES . '/menu.inc'; require CHORA_TEMPLATES . '/headerbar.inc'; diff --git a/chora/browsefile.php b/chora/browsefile.php index 0f76d9505..aee8ae889 100644 --- a/chora/browsefile.php +++ b/chora/browsefile.php @@ -46,9 +46,9 @@ if ($VC->hasFeature('branches')) { } } -Horde::addScriptFile('tables.js', 'horde', true); -Horde::addScriptFile('QuickFinder.js', 'horde', true); -Horde::addScriptFile('revlog.js', 'chora', true); +Horde::addScriptFile('tables.js', 'horde'); +Horde::addScriptFile('QuickFinder.js', 'horde'); +Horde::addScriptFile('revlog.js', 'chora'); require CHORA_TEMPLATES . '/common-header.inc'; require CHORA_TEMPLATES . '/menu.inc'; require CHORA_TEMPLATES . '/headerbar.inc'; diff --git a/chora/co.php b/chora/co.php index df32463d7..8ce1de4ab 100644 --- a/chora/co.php +++ b/chora/co.php @@ -85,7 +85,7 @@ if (!$plain) { $log_print = Chora::formatLogMessage($log->queryLog()); $author = Chora::showAuthorName($log->queryAuthor(), true); - Horde::addScriptFile('stripe.js', 'horde', true); + Horde::addScriptFile('stripe.js', 'horde'); require CHORA_TEMPLATES . '/common-header.inc'; require CHORA_TEMPLATES . '/menu.inc'; require CHORA_TEMPLATES . '/headerbar.inc'; diff --git a/chora/diff.php b/chora/diff.php index f8bea1ae9..7d3bd3586 100644 --- a/chora/diff.php +++ b/chora/diff.php @@ -80,7 +80,7 @@ foreach ($VC->getRevisionRange($fl, $r1, $r2) as $val) { /* Get list of diff types. */ $diff_types = array_flip($VC->availableDiffTypes()); -Horde::addScriptFile('stripe.js', 'horde', true); +Horde::addScriptFile('stripe.js', 'horde'); require CHORA_TEMPLATES . '/common-header.inc'; require CHORA_TEMPLATES . '/menu.inc'; require CHORA_TEMPLATES . '/headerbar.inc'; diff --git a/chora/patchsets.php b/chora/patchsets.php index 277e1a94a..45abc95b6 100644 --- a/chora/patchsets.php +++ b/chora/patchsets.php @@ -47,11 +47,11 @@ if (empty($patchsets)) { $extraLink = Chora::getFileViews($where, 'patchsets'); -Horde::addScriptFile('tables.js', 'horde', true); +Horde::addScriptFile('tables.js', 'horde'); // JS search not needed if showing a single patchset if ($ps_id) { - Horde::addScriptFile('QuickFinder.js', 'horde', true); + Horde::addScriptFile('QuickFinder.js', 'horde'); } require CHORA_TEMPLATES . '/common-header.inc'; diff --git a/chora/stats.php b/chora/stats.php index 48b4d7d0b..836b47bcb 100644 --- a/chora/stats.php +++ b/chora/stats.php @@ -29,7 +29,7 @@ foreach ($fl->queryLogs() as $lg) { arsort($stats); $title = sprintf(_("Statistics for %s"), Horde_Text_Filter::filter($where, 'space2html', array('charset' => Horde_Nls::getCharset(), 'encode' => true, 'encode_all' => true))); -Horde::addScriptFile('tables.js', 'horde', true); +Horde::addScriptFile('tables.js', 'horde'); require CHORA_TEMPLATES . '/common-header.inc'; require CHORA_TEMPLATES . '/menu.inc'; require CHORA_TEMPLATES . '/headerbar.inc'; diff --git a/drag_n_drop_portal/index.php b/drag_n_drop_portal/index.php index 07cace878..d515a1739 100644 --- a/drag_n_drop_portal/index.php +++ b/drag_n_drop_portal/index.php @@ -29,8 +29,8 @@ $layout_html = $view->toHtml(); $title = _("Edit yout profile page"); -Horde::addScriptFile('effects.js', 'horde', true); -Horde::addScriptFile('redbox.js', 'horde', true); +Horde::addScriptFile('effects.js', 'horde'); +Horde::addScriptFile('redbox.js', 'horde'); require HORDE_TEMPLATES . '/common-header.inc'; require HORDE_TEMPLATES . '/menu/menu.inc'; ?> diff --git a/fima/accounts.php b/fima/accounts.php index b7fc28fd4..799320fc9 100644 --- a/fima/accounts.php +++ b/fima/accounts.php @@ -86,7 +86,7 @@ if (!$print_view) { $print_link = Horde::applicationUrl(Horde_Util::addParameter('accounts.php', array('print' => 1))); } -Horde::addScriptFile('tables.js', 'horde', true); +Horde::addScriptFile('tables.js', 'horde'); $title = _("My Accounts"); require FIMA_TEMPLATES . '/common-header.inc'; diff --git a/fima/ledgers/index.php b/fima/ledgers/index.php index ce03959e8..737308ad3 100644 --- a/fima/ledgers/index.php +++ b/fima/ledgers/index.php @@ -35,7 +35,7 @@ $edit_img = Horde::img('edit.png', _("Edit"), null, $registry->getImageDir('hord $perms_img = Horde::img('perms.png', _("Change Permissions"), null, $registry->getImageDir('horde')); $delete_img = Horde::img('delete.png', _("Delete"), null, $registry->getImageDir('horde')); -Horde::addScriptFile('tables.js', 'turba', true); +Horde::addScriptFile('tables.js', 'turba'); $title = _("Manage Ledgers"); require FIMA_TEMPLATES . '/common-header.inc'; require FIMA_TEMPLATES . '/menu.inc'; diff --git a/fima/lib/Fima.php b/fima/lib/Fima.php index e9ae5c184..7862a83ba 100644 --- a/fima/lib/Fima.php +++ b/fima/lib/Fima.php @@ -423,7 +423,7 @@ class Fima { if ($GLOBALS['browser']->hasFeature('dom')) { $html .= '' . "\n"; $html .= ''; - $html .= Horde::addScriptFile('open_calendar.js', 'horde'); + $html .= Horde::addScriptFile('open_calendar.js', 'horde', array('direct' => false)); if (!isset($GLOBALS['fima_gotocontrol'])) { $GLOBALS['fima_gotocontrol'] = true; $html .= '' . "\n"; diff --git a/folks/activity.php b/folks/activity.php index 731900175..7f260cdff 100644 --- a/folks/activity.php +++ b/folks/activity.php @@ -39,7 +39,7 @@ $pager = new Horde_UI_Pager('page', $pager->preserve($criteria); $list_url = Folks::getUrlFor('list', 'activity'); -Horde::addScriptFile('stripe.js', 'horde', true); +Horde::addScriptFile('stripe.js', 'horde'); require FOLKS_TEMPLATES . '/common-header.inc'; require FOLKS_TEMPLATES . '/menu.inc'; diff --git a/folks/birthday.php b/folks/birthday.php index 1b9d1702d..f2f7c3b21 100644 --- a/folks/birthday.php +++ b/folks/birthday.php @@ -51,7 +51,7 @@ $pager = new Horde_UI_Pager('page', $pager->preserve($criteria); $list_url = Folks::getUrlFor('list', 'birthday'); -Horde::addScriptFile('stripe.js', 'horde', true); +Horde::addScriptFile('stripe.js', 'horde'); require FOLKS_TEMPLATES . '/common-header.inc'; require FOLKS_TEMPLATES . '/menu.inc'; diff --git a/folks/edit/activity.php b/folks/edit/activity.php index 63fb3cc45..6351b67a3 100644 --- a/folks/edit/activity.php +++ b/folks/edit/activity.php @@ -53,7 +53,7 @@ if ($activities instanceof PEAR_Error) { $delete_url = Horde::applicationUrl('edit/activity.php'); $delete_img = Horde::img('delete.png', '', '', $registry->getImageDir('horde')); -Horde::addScriptFile('tables.js', 'horde', true); +Horde::addScriptFile('tables.js', 'horde'); require FOLKS_TEMPLATES . '/common-header.inc'; require FOLKS_TEMPLATES . '/menu.inc'; diff --git a/folks/edit/comments.php b/folks/edit/comments.php index 51b75e29d..9942eb272 100644 --- a/folks/edit/comments.php +++ b/folks/edit/comments.php @@ -83,7 +83,7 @@ if (!$form->isSubmitted()) { } } -Horde::addScriptFile('tables.js', 'horde', true); +Horde::addScriptFile('tables.js', 'horde'); require FOLKS_TEMPLATES . '/common-header.inc'; require FOLKS_TEMPLATES . '/menu.inc'; diff --git a/folks/edit/friends/add.php b/folks/edit/friends/add.php index 8f6058c06..96572069b 100644 --- a/folks/edit/friends/add.php +++ b/folks/edit/friends/add.php @@ -65,7 +65,7 @@ if ($user) { $friend_form = new Folks_AddFriend_Form($vars, _("Add or remove user"), 'blacklist'); -Horde::addScriptFile('tables.js', 'horde', true); +Horde::addScriptFile('tables.js', 'horde'); require FOLKS_TEMPLATES . '/common-header.inc'; require FOLKS_TEMPLATES . '/menu.inc'; diff --git a/folks/edit/tabs.php b/folks/edit/tabs.php index b21af4116..05fc15355 100644 --- a/folks/edit/tabs.php +++ b/folks/edit/tabs.php @@ -35,4 +35,4 @@ if ($conf['facebook']['enabled']) { } -Horde::addScriptFile('tables.js', 'horde', true); +Horde::addScriptFile('tables.js', 'horde'); diff --git a/folks/friends.php b/folks/friends.php index a5249ecdc..18c8d9f14 100644 --- a/folks/friends.php +++ b/folks/friends.php @@ -66,7 +66,7 @@ if ($activities instanceof PEAR_Error) { exit; } -Horde::addScriptFile('stripe.js', 'horde', true); +Horde::addScriptFile('stripe.js', 'horde'); require FOLKS_TEMPLATES . '/common-header.inc'; require FOLKS_TEMPLATES . '/menu.inc'; diff --git a/folks/lib/Block/activities.php b/folks/lib/Block/activities.php index 03295f607..c7fd4f214 100644 --- a/folks/lib/Block/activities.php +++ b/folks/lib/Block/activities.php @@ -64,10 +64,10 @@ class Horde_Block_Folks_activities extends Horde_Block { krsort($list); $list = array_slice($list, 0, $this->_params['limit']); - Horde::addScriptFile('stripe.js', 'horde', true); + Horde::addScriptFile('stripe.js', 'horde'); ob_start(); require FOLKS_TEMPLATES . '/block/activities.php'; return ob_get_clean(); } -} \ No newline at end of file +} diff --git a/folks/lib/Block/friends.php b/folks/lib/Block/friends.php index 1139a5515..31e830fcb 100644 --- a/folks/lib/Block/friends.php +++ b/folks/lib/Block/friends.php @@ -86,10 +86,10 @@ class Horde_Block_Folks_friends extends Horde_Block { 'name' => _("Send message")); } - Horde::addScriptFile('stripe.js', 'horde', true); + Horde::addScriptFile('stripe.js', 'horde'); ob_start(); require FOLKS_TEMPLATES . '/block/users.php'; return ob_get_clean(); } -} \ No newline at end of file +} diff --git a/folks/lib/Block/know.php b/folks/lib/Block/know.php index 2f49e033a..0394f587f 100644 --- a/folks/lib/Block/know.php +++ b/folks/lib/Block/know.php @@ -52,10 +52,10 @@ class Horde_Block_Folks_know extends Horde_Block { 'name' => _("Send message")); } - Horde::addScriptFile('stripe.js', 'horde', true); + Horde::addScriptFile('stripe.js', 'horde'); ob_start(); require FOLKS_TEMPLATES . '/block/users.php'; return ob_get_clean(); } -} \ No newline at end of file +} diff --git a/folks/lib/Block/my_comments.php b/folks/lib/Block/my_comments.php index e5c210d8e..e0821fa8b 100644 --- a/folks/lib/Block/my_comments.php +++ b/folks/lib/Block/my_comments.php @@ -51,7 +51,7 @@ class Horde_Block_folks_my_comments extends Horde_Block { return $threads; } - Horde::addScriptFile('tables.js', 'horde', true); + Horde::addScriptFile('tables.js', 'horde'); $html = '' . '' . ''; diff --git a/folks/lib/Block/new.php b/folks/lib/Block/new.php index 244abc8a2..a576ffb7f 100644 --- a/folks/lib/Block/new.php +++ b/folks/lib/Block/new.php @@ -64,10 +64,10 @@ class Horde_Block_Folks_new extends Horde_Block { 'name' => _("Send message")); } - Horde::addScriptFile('stripe.js', 'horde', true); + Horde::addScriptFile('stripe.js', 'horde'); ob_start(); require FOLKS_TEMPLATES . '/block/users.php'; return ob_get_clean(); } -} \ No newline at end of file +} diff --git a/folks/lib/Block/random.php b/folks/lib/Block/random.php index bf9436ac4..c575cbe1c 100644 --- a/folks/lib/Block/random.php +++ b/folks/lib/Block/random.php @@ -65,10 +65,10 @@ class Horde_Block_Folks_random extends Horde_Block { 'name' => _("Send message")); } - Horde::addScriptFile('stripe.js', 'horde', true); + Horde::addScriptFile('stripe.js', 'horde'); ob_start(); require FOLKS_TEMPLATES . '/block/users.php'; return ob_get_clean(); } -} \ No newline at end of file +} diff --git a/folks/lib/Block/recent.php b/folks/lib/Block/recent.php index 7a57e855f..093d5a703 100644 --- a/folks/lib/Block/recent.php +++ b/folks/lib/Block/recent.php @@ -59,10 +59,10 @@ class Horde_Block_Folks_recent extends Horde_Block { 'name' => _("Send message")); } - Horde::addScriptFile('stripe.js', 'horde', true); + Horde::addScriptFile('stripe.js', 'horde'); ob_start(); require FOLKS_TEMPLATES . '/block/users.php'; return ob_get_clean(); } -} \ No newline at end of file +} diff --git a/folks/list.php b/folks/list.php index 9d0ca50cf..94b9403e8 100644 --- a/folks/list.php +++ b/folks/list.php @@ -51,7 +51,7 @@ $pager = new Horde_UI_Pager('page', $pager->preserve($criteria); $list_url = Folks::getUrlFor('list', 'list'); -Horde::addScriptFile('stripe.js', 'horde', true); +Horde::addScriptFile('stripe.js', 'horde'); require FOLKS_TEMPLATES . '/common-header.inc'; require FOLKS_TEMPLATES . '/menu.inc'; diff --git a/folks/new.php b/folks/new.php index c58a127a4..8de12b98b 100644 --- a/folks/new.php +++ b/folks/new.php @@ -39,7 +39,7 @@ $pager = new Horde_UI_Pager('page', $pager->preserve($criteria); $list_url = Folks::getUrlFor('list', 'new'); -Horde::addScriptFile('stripe.js', 'horde', true); +Horde::addScriptFile('stripe.js', 'horde'); require FOLKS_TEMPLATES . '/common-header.inc'; require FOLKS_TEMPLATES . '/menu.inc'; diff --git a/folks/online.php b/folks/online.php index 77915c396..a412c9837 100644 --- a/folks/online.php +++ b/folks/online.php @@ -51,7 +51,7 @@ $pager = new Horde_UI_Pager('page', $pager->preserve($criteria); $list_url = Folks::getUrlFor('list', 'online'); -Horde::addScriptFile('stripe.js', 'horde', true); +Horde::addScriptFile('stripe.js', 'horde'); require FOLKS_TEMPLATES . '/common-header.inc'; require FOLKS_TEMPLATES . '/menu.inc'; diff --git a/folks/popularity.php b/folks/popularity.php index 68990c8b7..6fcbe0053 100644 --- a/folks/popularity.php +++ b/folks/popularity.php @@ -39,7 +39,7 @@ $pager = new Horde_UI_Pager('page', $pager->preserve($criteria); $list_url = Folks::getUrlFor('list', 'popularity'); -Horde::addScriptFile('stripe.js', 'horde', true); +Horde::addScriptFile('stripe.js', 'horde'); require FOLKS_TEMPLATES . '/common-header.inc'; require FOLKS_TEMPLATES . '/menu.inc'; require FOLKS_TEMPLATES . '/list/list.php'; diff --git a/folks/search.php b/folks/search.php index e6e5f06ba..08d5b78db 100644 --- a/folks/search.php +++ b/folks/search.php @@ -81,10 +81,10 @@ if (Horde_Auth::isAuthenticated()) { } } -Horde::addScriptFile('stripe.js', 'horde', true); -Horde::addScriptFile('effects.js', 'horde', true); -Horde::addScriptFile('redbox.js', 'horde', true); -Horde::addScriptFile('search.js', 'folks', true); +Horde::addScriptFile('stripe.js', 'horde'); +Horde::addScriptFile('effects.js', 'horde'); +Horde::addScriptFile('redbox.js', 'horde'); +Horde::addScriptFile('search.js', 'folks'); require FOLKS_TEMPLATES . '/common-header.inc'; require FOLKS_TEMPLATES . '/menu.inc'; diff --git a/folks/user.php b/folks/user.php index be2469c66..90f520fd6 100644 --- a/folks/user.php +++ b/folks/user.php @@ -61,7 +61,7 @@ if ($user == Horde_Auth::getAuth()) { } } -Horde::addScriptFile('stripe.js', 'horde', true); +Horde::addScriptFile('stripe.js', 'horde'); $title = sprintf(_("%s's profile"), $user); require FOLKS_TEMPLATES . '/common-header.inc'; diff --git a/framework/Model/lib/Horde/Form/Renderer/Xhtml.php b/framework/Model/lib/Horde/Form/Renderer/Xhtml.php index f989bb73b..9468c5828 100644 --- a/framework/Model/lib/Horde/Form/Renderer/Xhtml.php +++ b/framework/Model/lib/Horde/Form/Renderer/Xhtml.php @@ -15,7 +15,7 @@ class Horde_Form_Renderer_Xhtml extends Horde_Form_Renderer { $open_section = $form->getOpenSection(); /* Add the javascript for the toggling the sections. */ - Horde::addScriptFile('form_sections.js', 'horde', true); + Horde::addScriptFile('form_sections.js', 'horde'); echo ' @@ -75,7 +75,7 @@
' . _("Title") . '' . _("User") . '
- + false)); ?> js('start')) . '\'); return false;') . Horde::img('calendar.png', _("Set start date"), 'id="startimg"', $GLOBALS['registry']->getImageDir('horde')) . ''; endif; ?> false)); echo Horde::link('#', _("Select a date"), '', '', 'openCalendar(\'endimg\', \'end\', \'' . addslashes($event->js('end')) . '\'); return false;') . Horde::img('calendar.png', _("Set end date"), 'id="endimg"', $GLOBALS['registry']->getImageDir('horde')) . ''; endif; ?> diff --git a/kronolith/templates/panel.inc b/kronolith/templates/panel.inc index 9a4cafe43..8f5b4f72c 100644 --- a/kronolith/templates/panel.inc +++ b/kronolith/templates/panel.inc @@ -7,9 +7,9 @@ function toggleTags(domid) } 'calendar-info'), $registry->getImageDir('horde')); @@ -146,4 +146,4 @@ $ta->attach(); - \ No newline at end of file + diff --git a/kronolith/week.php b/kronolith/week.php index ad2438ec2..279404bd7 100644 --- a/kronolith/week.php +++ b/kronolith/week.php @@ -14,7 +14,7 @@ require_once dirname(__FILE__) . '/lib/base.php'; $view = Kronolith::getView('Week'); $title = sprintf(_("Week %d"), $view->week); -Horde::addScriptFile('tooltips.js', 'horde', true); +Horde::addScriptFile('tooltips.js', 'horde'); require KRONOLITH_TEMPLATES . '/common-header.inc'; require KRONOLITH_TEMPLATES . '/menu.inc'; diff --git a/kronolith/workweek.php b/kronolith/workweek.php index 14534dc2c..02f9b4a27 100644 --- a/kronolith/workweek.php +++ b/kronolith/workweek.php @@ -14,7 +14,7 @@ require_once dirname(__FILE__) . '/lib/base.php'; $view = Kronolith::getView('WorkWeek'); $title = sprintf(_("Week %d"), $view->week); -Horde::addScriptFile('tooltips.js', 'horde', true); +Horde::addScriptFile('tooltips.js', 'horde'); require KRONOLITH_TEMPLATES . '/common-header.inc'; require KRONOLITH_TEMPLATES . '/menu.inc'; diff --git a/kronolith/year.php b/kronolith/year.php index 6bacf7059..5a1dfd7be 100644 --- a/kronolith/year.php +++ b/kronolith/year.php @@ -14,7 +14,7 @@ require_once dirname(__FILE__) . '/lib/base.php'; $view = Kronolith::getView('Year'); $title = $view->year; -Horde::addScriptFile('tooltips.js', 'horde', true); +Horde::addScriptFile('tooltips.js', 'horde'); require KRONOLITH_TEMPLATES . '/common-header.inc'; require KRONOLITH_TEMPLATES . '/menu.inc'; diff --git a/nag/lib/UI/VarRenderer/nag.php b/nag/lib/UI/VarRenderer/nag.php index 27df2cb8f..0178e3708 100644 --- a/nag/lib/UI/VarRenderer/nag.php +++ b/nag/lib/UI/VarRenderer/nag.php @@ -111,7 +111,7 @@ class Horde_UI_VarRenderer_nag extends Horde_UI_VarRenderer_html { buildDayWidget('start[day]', $start_date['mday'], $javascript_start) . ' ' . $this->buildMonthWidget('start[month]', $start_date['mon'], $javascript_start) . ' ' . $this->buildYearWidget('start[year]', 3, $start_date['year'], $javascript_start) ?> hasFeature('javascript')) { -Horde::addScriptFile('open_calendar.js', 'horde'); +Horde::addScriptFile('open_calendar.js', 'horde', array('direct' => false)); echo ''; echo Horde::link('#', _("Select a date"), '', '', 'openCalendar(\'startimg\', \'start\', \'document.' . $form->getName() . '.start_date[1].checked = true;\'); return false;') . Horde::img('calendar.png', _("Calendar"), 'align="top" id="startimg"', $GLOBALS['registry']->getImageDir('horde')) . ''; } ?> diff --git a/nag/list.php b/nag/list.php index c5df2a1f9..3d2406617 100644 --- a/nag/list.php +++ b/nag/list.php @@ -84,9 +84,9 @@ default: break; } -Horde::addScriptFile('tooltips.js', 'horde', true); -Horde::addScriptFile('effects.js', 'horde', true); -Horde::addScriptFile('QuickFinder.js', 'horde', true); +Horde::addScriptFile('tooltips.js', 'horde'); +Horde::addScriptFile('effects.js', 'horde'); +Horde::addScriptFile('QuickFinder.js', 'horde'); require NAG_TEMPLATES . '/common-header.inc'; require NAG_TEMPLATES . '/menu.inc'; diff --git a/nag/search.php b/nag/search.php index 1b0355e12..2c8ce266c 100644 --- a/nag/search.php +++ b/nag/search.php @@ -10,7 +10,7 @@ require_once dirname(__FILE__) . '/lib/base.php'; $title = _("Search"); $notification->push('document.search.search_pattern.focus()', 'javascript'); -Horde::addScriptFile('prototype.js', 'horde', true); +Horde::addScriptFile('prototype.js', 'horde'); require NAG_TEMPLATES . '/common-header.inc'; require NAG_TEMPLATES . '/menu.inc'; require NAG_TEMPLATES . '/search/search.inc'; diff --git a/nag/tasklists/index.php b/nag/tasklists/index.php index 1d2c75154..8a768301b 100644 --- a/nag/tasklists/index.php +++ b/nag/tasklists/index.php @@ -52,7 +52,7 @@ $edit_img = Horde::img('edit.png', _("Edit"), null, $registry->getImageDir('hord $perms_img = Horde::img('perms.png', _("Change Permissions"), null, $registry->getImageDir('horde')); $delete_img = Horde::img('delete.png', _("Delete"), null, $registry->getImageDir('horde')); -Horde::addScriptFile('tables.js', 'horde', true); +Horde::addScriptFile('tables.js', 'horde'); $title = _("Manage Task Lists"); require NAG_TEMPLATES . '/common-header.inc'; require NAG_TEMPLATES . '/menu.inc'; diff --git a/nag/tasks/index.php b/nag/tasks/index.php index 6eee7c9bf..e8b2294f3 100644 --- a/nag/tasks/index.php +++ b/nag/tasks/index.php @@ -44,9 +44,9 @@ $tasks = $search_results; $title = sprintf(_("Search: Results for \"%s\""), $search); $actionID = null; -Horde::addScriptFile('tooltips.js', 'horde', true); -Horde::addScriptFile('effects.js', 'horde', true); -Horde::addScriptFile('QuickFinder.js', 'horde', true); +Horde::addScriptFile('tooltips.js', 'horde'); +Horde::addScriptFile('effects.js', 'horde'); +Horde::addScriptFile('QuickFinder.js', 'horde'); require NAG_TEMPLATES . '/common-header.inc'; require NAG_TEMPLATES . '/menu.inc'; diff --git a/nag/templates/list.html.php b/nag/templates/list.html.php index fe7d0a8a1..4a793be75 100644 --- a/nag/templates/list.html.php +++ b/nag/templates/list.html.php @@ -53,7 +53,7 @@ if ($tasks->hasTasks()) { require NAG_TEMPLATES . '/list/task_footers.inc'; if ($dynamic_sort) { - Horde::addScriptFile('tables.js', 'horde', true); + Horde::addScriptFile('tables.js', 'horde'); } } else { require NAG_TEMPLATES . '/list/empty.inc'; diff --git a/nag/templates/panel.inc b/nag/templates/panel.inc index 239f0309d..812596e60 100644 --- a/nag/templates/panel.inc +++ b/nag/templates/panel.inc @@ -1,6 +1,6 @@ 'tasklist-info'), $registry->getImageDir('horde')); diff --git a/nag/view.php b/nag/view.php index e895bed11..e07c86ef6 100644 --- a/nag/view.php +++ b/nag/view.php @@ -94,7 +94,7 @@ if (!empty($task->uid)) { $title = $task->name; $links = array(); -Horde::addScriptFile('stripe.js', 'horde', true); +Horde::addScriptFile('stripe.js', 'horde'); $taskurl = Horde_Util::addParameter('task.php', array('task' => $task_id, diff --git a/news/admin/categories/index.php b/news/admin/categories/index.php index fc2c5f3b8..90a08fb1a 100644 --- a/news/admin/categories/index.php +++ b/news/admin/categories/index.php @@ -39,7 +39,7 @@ $view = new News_View(); $view->categories = $categories; $view->add_url = Horde::link($edit_url, _("Add New")) . _("Add New") . ''; -Horde::addScriptFile('tables.js', 'horde', true); +Horde::addScriptFile('tables.js', 'horde'); require NEWS_BASE . '/templates/common-header.inc'; require NEWS_BASE . '/templates/menu.inc'; echo $tabs->render('cetegories'); diff --git a/news/admin/sources/index.php b/news/admin/sources/index.php index d03b78e3f..a3fa19395 100644 --- a/news/admin/sources/index.php +++ b/news/admin/sources/index.php @@ -41,7 +41,7 @@ $view = new News_View(); $view->sources = $sources; $view->add_url = Horde::link($edit_url, _("Add New")) . _("Add New") . ''; -Horde::addScriptFile('tables.js', 'horde', true); +Horde::addScriptFile('tables.js', 'horde'); require NEWS_BASE . '/templates/common-header.inc'; require NEWS_BASE . '/templates/menu.inc'; echo $tabs->render('sources'); diff --git a/news/edit.php b/news/edit.php index c6851d928..702c1e3b0 100644 --- a/news/edit.php +++ b/news/edit.php @@ -192,7 +192,7 @@ if ($rows instanceof PEAR_Error) { $pager = News_Search::getPager($binds[1], $count, $browse_url); // Output -Horde::addScriptFile('tables.js', 'horde', true); +Horde::addScriptFile('tables.js', 'horde'); require_once NEWS_TEMPLATES . '/common-header.inc'; require_once NEWS_TEMPLATES . '/menu.inc'; diff --git a/news/lib/Block/jonah.php b/news/lib/Block/jonah.php index 0de51fc14..05b89641f 100755 --- a/news/lib/Block/jonah.php +++ b/news/lib/Block/jonah.php @@ -49,9 +49,9 @@ class Horde_Block_News_jonah extends Horde_Block { } $html .= ''; - Horde::addScriptFile('effects.js', 'horde', true); - Horde::addScriptFile('redbox.js', 'horde', true); - Horde::addScriptFile('feed.js', 'news', true); + Horde::addScriptFile('effects.js', 'horde'); + Horde::addScriptFile('redbox.js', 'horde'); + Horde::addScriptFile('feed.js', 'news'); return $html; } diff --git a/news/lib/Block/my_comments.php b/news/lib/Block/my_comments.php index 480b1a20d..8dc457701 100644 --- a/news/lib/Block/my_comments.php +++ b/news/lib/Block/my_comments.php @@ -51,7 +51,7 @@ class Horde_Block_news_my_comments extends Horde_Block { return $threads; } - Horde::addScriptFile('tables.js', 'horde', true); + Horde::addScriptFile('tables.js', 'horde'); $html = '' . '' . ''; diff --git a/news/reads.php b/news/reads.php index 8a1c8b1a4..0fb28368d 100644 --- a/news/reads.php +++ b/news/reads.php @@ -35,7 +35,7 @@ if ($result instanceof PEAR_Error) { exit; } -Horde::addScriptFile('tables.js', 'horde', true); +Horde::addScriptFile('tables.js', 'horde'); Horde::includeScriptFiles(); Horde::includeStylesheetFiles(); diff --git a/skoli/classes/index.php b/skoli/classes/index.php index 3257fe571..890a3e06b 100644 --- a/skoli/classes/index.php +++ b/skoli/classes/index.php @@ -32,7 +32,7 @@ $edit_img = Horde::img('edit.png', _("Edit"), null, $registry->getImageDir('hord $perms_img = Horde::img('perms.png', _("Change Permissions"), null, $registry->getImageDir('horde')); $delete_img = Horde::img('delete.png', _("Delete"), null, $registry->getImageDir('horde')); -Horde::addScriptFile('tables.js', 'horde', true); +Horde::addScriptFile('tables.js', 'horde'); $title = _("Manage Classes"); require SKOLI_TEMPLATES . '/common-header.inc'; require SKOLI_TEMPLATES . '/menu.inc'; diff --git a/skoli/data.php b/skoli/data.php index 91d5876b1..157f225f0 100644 --- a/skoli/data.php +++ b/skoli/data.php @@ -176,8 +176,8 @@ case 'export': $title = _("Export Classes"); -Horde::addScriptFile('effects.js', 'horde', true); -Horde::addScriptFile('redbox.js', 'horde', true); +Horde::addScriptFile('effects.js', 'horde'); +Horde::addScriptFile('redbox.js', 'horde'); require SKOLI_TEMPLATES . '/common-header.inc'; require SKOLI_TEMPLATES . '/menu.inc'; require SKOLI_TEMPLATES . '/data/export.inc'; diff --git a/skoli/list.php b/skoli/list.php index 1f6018898..59caacc89 100644 --- a/skoli/list.php +++ b/skoli/list.php @@ -100,9 +100,9 @@ default: break; } -Horde::addScriptFile('tooltips.js', 'horde', true); -Horde::addScriptFile('effects.js', 'horde', true); -Horde::addScriptFile('QuickFinder.js', 'horde', true); +Horde::addScriptFile('tooltips.js', 'horde'); +Horde::addScriptFile('effects.js', 'horde'); +Horde::addScriptFile('QuickFinder.js', 'horde'); require SKOLI_TEMPLATES . '/common-header.inc'; require SKOLI_TEMPLATES . '/menu.inc'; @@ -152,7 +152,7 @@ if (count($list) > 0) { require SKOLI_TEMPLATES . '/list/footers.inc'; if ($dynamic_sort) { - Horde::addScriptFile('tables.js', 'horde', true); + Horde::addScriptFile('tables.js', 'horde'); } } else { require SKOLI_TEMPLATES . '/list/empty.inc'; diff --git a/skoli/search.php b/skoli/search.php index 220318a07..1a9b0ab32 100644 --- a/skoli/search.php +++ b/skoli/search.php @@ -122,9 +122,9 @@ if ($conf['objects']['allow_absences']) { $title = _("Search"); $notification->push('document.skoli_searchform.stext.focus();', 'javascript'); -Horde::addScriptFile('QuickFinder.js', 'horde', true); -Horde::addScriptFile('effects.js', 'horde', true); -Horde::addScriptFile('redbox.js', 'horde', true); +Horde::addScriptFile('QuickFinder.js', 'horde'); +Horde::addScriptFile('effects.js', 'horde'); +Horde::addScriptFile('redbox.js', 'horde'); require SKOLI_TEMPLATES . '/common-header.inc'; require SKOLI_TEMPLATES . '/menu.inc'; reset($classes); @@ -176,7 +176,7 @@ if ($actionID == 'search') { require SKOLI_TEMPLATES . '/search/footers.inc'; if ($dynamic_sort) { - Horde::addScriptFile('tables.js', 'horde', true); + Horde::addScriptFile('tables.js', 'horde'); } } else { require SKOLI_TEMPLATES . '/search/empty.inc'; diff --git a/skoli/templates/panel.inc b/skoli/templates/panel.inc index a032e206a..3bfda7d7d 100644 --- a/skoli/templates/panel.inc +++ b/skoli/templates/panel.inc @@ -1,5 +1,5 @@ getImageDir('hord $perms_img = Horde::img('perms.png', _("Change Permissions"), null, $registry->getImageDir('horde')); $delete_img = Horde::img('delete.png', _("Delete"), null, $registry->getImageDir('horde')); -Horde::addScriptFile('tables.js', 'horde', true); +Horde::addScriptFile('tables.js', 'horde'); $title = _("Manage Address Books"); require TURBA_TEMPLATES . '/common-header.inc'; require TURBA_TEMPLATES . '/menu.inc'; diff --git a/turba/contact.php b/turba/contact.php index b87d089b4..032186ce0 100644 --- a/turba/contact.php +++ b/turba/contact.php @@ -99,7 +99,7 @@ if ($own_source == $source && $own_id == $contact->getValue('__key')) { } $title = $view->getTitle(); -Horde::addScriptFile('contact_tabs.js', 'turba', true); +Horde::addScriptFile('contact_tabs.js', 'turba'); require TURBA_TEMPLATES . '/common-header.inc'; require TURBA_TEMPLATES . '/menu.inc'; echo '
'; diff --git a/turba/lib/Block/minisearch.php b/turba/lib/Block/minisearch.php index 0de9ebaab..fa04a19e1 100644 --- a/turba/lib/Block/minisearch.php +++ b/turba/lib/Block/minisearch.php @@ -34,7 +34,7 @@ class Horde_Block_turba_minisearch extends Horde_Block { require_once dirname(__FILE__) . '/../base.php'; if ($GLOBALS['browser']->hasFeature('iframes')) { - Horde::addScriptFile('prototype.js', 'horde', true); + Horde::addScriptFile('prototype.js', 'horde'); return Horde_Util::bufferOutput( 'include', TURBA_TEMPLATES . '/block/minisearch.inc'); diff --git a/turba/lib/View/Browse.php b/turba/lib/View/Browse.php index 920059232..f1cbe0212 100644 --- a/turba/lib/View/Browse.php +++ b/turba/lib/View/Browse.php @@ -387,9 +387,9 @@ class Turba_View_Browse { $templates[] = '/browse/header.inc'; } - Horde::addScriptFile('QuickFinder.js', 'horde', true); - Horde::addScriptFile('effects.js', 'horde', true); - Horde::addScriptFile('redbox.js', 'horde', true); + Horde::addScriptFile('QuickFinder.js', 'horde'); + Horde::addScriptFile('effects.js', 'horde'); + Horde::addScriptFile('redbox.js', 'horde'); require TURBA_TEMPLATES . '/common-header.inc'; require TURBA_TEMPLATES . '/menu.inc'; foreach ($templates as $template) { diff --git a/turba/minisearch.php b/turba/minisearch.php index e0589cecf..ec2fde603 100644 --- a/turba/minisearch.php +++ b/turba/minisearch.php @@ -44,7 +44,7 @@ if (!is_null($search)) { } } -Horde::addScriptFile('prototype.js', 'horde', true); +Horde::addScriptFile('prototype.js', 'horde'); $bodyClass = 'summary'; require TURBA_TEMPLATES . '/common-header.inc'; diff --git a/turba/search.php b/turba/search.php index 7b729c915..3d6f6afd8 100644 --- a/turba/search.php +++ b/turba/search.php @@ -182,9 +182,9 @@ if ($_SESSION['turba']['search_mode'] == 'basic') { $notification->push('document.directory_search.name.focus();', 'javascript'); } -Horde::addScriptFile('QuickFinder.js', 'horde', true); -Horde::addScriptFile('effects.js', 'horde', true); -Horde::addScriptFile('redbox.js', 'horde', true); +Horde::addScriptFile('QuickFinder.js', 'horde'); +Horde::addScriptFile('effects.js', 'horde'); +Horde::addScriptFile('redbox.js', 'horde'); require TURBA_TEMPLATES . '/common-header.inc'; require TURBA_TEMPLATES . '/menu.inc'; require TURBA_TEMPLATES . '/browse/search.inc'; diff --git a/turba/templates/prefs/columnselect.inc b/turba/templates/prefs/columnselect.inc index 4a9c26baf..8301b017e 100644 --- a/turba/templates/prefs/columnselect.inc +++ b/turba/templates/prefs/columnselect.inc @@ -1,7 +1,7 @@ isLocked('columns')): -Horde::addScriptFile('effects.js', 'horde', true); -Horde::addScriptFile('dragdrop.js', 'horde', true); +Horde::addScriptFile('effects.js', 'horde'); +Horde::addScriptFile('dragdrop.js', 'horde'); global $cfgSources, $attributes; $sources = Turba::getColumns(); -- 2.11.0
' . _("Title") . '' . _("User") . '