From: Michael M Slusarz <slusarz@curecanti.org>
Date: Thu, 30 Jul 2009 18:32:26 +0000 (-0600)
Subject: No need to include prototype.js if including other script files
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=0a70ce52cdd66d0213a84aa542dfe81eecb42fd3;p=horde.git

No need to include prototype.js if including other script files
---

diff --git a/babel/lib/Babel.php b/babel/lib/Babel.php
index 52125f2d7..b0183480e 100644
--- a/babel/lib/Babel.php
+++ b/babel/lib/Babel.php
@@ -15,9 +15,9 @@ class Babel {
 	/* Check if an hooks file exist */
 	if (file_exists(BABEL_BASE . '/config/hooks.php')) {
 	    include_once BABEL_BASE . '/config/hooks.php';
-	    
+
 	    $func = '_babel_hook_' . $fname;
-	    
+
 	    if (function_exists($func)) {
 		$res = call_user_func($func, $info);
 	    } else {
@@ -27,47 +27,47 @@ class Babel {
 	    Translate_Display::warning(_("Hook file doesn't exist"));
 	}
     }
-    
+
     function displayLanguage() {
 	global $lang, $app;
-	
+
 	if (!isset(Horde_Nls::$config['languages'][$lang])) {
 	    return;
 	}
-	
+
 	$res = sprintf(_("Language: %s (%s)"), Horde_Nls::$config['languages'][$lang], $lang);
 	if ($app) {
 	    $res .= '&nbsp; | &nbsp; ' . sprintf(_("Module: %s"), $app);
 	}
-	
+
 	return $res;
     }
 
-    
+
     function ModuleSelection() {
 	$html = '';
 	$html .= '<span style="float:right">';
 	$html .= '<form action="' . Horde::selfUrl() . '" method="post" name="moduleSelector">';
 	$html .= '<select name="module" onchange="moduleSubmit()">';
-	
+
 	$apps = array('ALL' => _("All Applications")) +  Babel::listApps();
-	
+
 	foreach($apps as $app => $desc) {
 	    if (!Babel::hasPermission("module:$app")) {
 		continue;
 	    }
-	    
+
 	    if (Horde_Util::getFormData('module') == $app) {
 		$html .= '<option class="control" value="' . $app . '" selected>' .  '+ ' . $desc;
 	    } else {
 		$html .= '<option value="' . $app . '">' . '&#8211; ' . $desc;
 	    }
 	}
-	
+
 	$html .= '</select>';
 	$html .= '</form>';
 	$html .= '</span>';
-	
+
 	$html .= '<script language="JavaScript" type="text/javascript">' . "\n";
 	$html .= '<!--' . "\n";
 	$html .= 'var loading;' . "\n";
@@ -80,39 +80,39 @@ class Babel {
 	$html .= '</script>' . "\n";
 	return $html;
     }
-    
+
     function LanguageSelection() {
 	global $app;
-	
+
 	$html = '';
 	$html .= '<span style="float:right">';
 	$html .= '<form action="' . Horde::selfUrl() . '" method="post" name="languageSelector">';
 	$html .= '&nbsp;';
 	$html .= '<input type="hidden" name="module" value="' . $app . '">';
 	$html .= '<select name="display_language" onchange="languageSubmit()">';
-	
+
 	$tests =  Horde_Nls::$config['languages'];
-	
+
 	// Unset English
 	unset($tests['en_US']);
-	
+
 	foreach($tests as $dir => $desc) {
 	    if (!Babel::hasPermission("language:$dir")) {
 		continue;
 	    }
-	    
+
 	    if (isset($_SESSION['babel']['language']) && $dir == $_SESSION['babel']['language']) {
 		$html .= '<option class="control" value="' . $dir . '" selected>' .  '+ ' . $desc;
 	    } else {
 		$html .= '<option value="' . $dir . '">' . '&#8211; ' . $desc;
 	    }
 	}
-	
+
 	$html .= '</select>';
 	$html .= '&nbsp;';
 	$html .= '</form>';
 	$html .= '</span>';
-	
+
 	$html .= '<script language="JavaScript" type="text/javascript">' . "\n";
 	$html .= '<!--' . "\n";
 	$html .= 'var loading;' . "\n";
@@ -125,36 +125,36 @@ class Babel {
 	$html .= '</script>' . "\n";
 	return $html;
     }
-    
+
     function listApps($all = false) {
 	global $registry;
 
 	$res = array();
-	
+
 	if ($all) {
 	    $res['ALL'] = _("All Applications");
 	}
-	
+
 	foreach ($registry->applications as $app => $params) {
 	    if ($params['status'] == 'heading' || $params['status'] == 'block') {
 		continue;
 	    }
-	    
+
 	    if (isset($params['fileroot']) && !is_dir($params['fileroot'])) {
 		continue;
 	    }
-	    
+
 	    if (preg_match('/_reports$/', $app) || preg_match('/_tools$/', $app)) {
 		continue;
 	    }
-	    
+
 	    if (Babel::hasPermission("module:$app")) {
 		$res[$app] = sprintf("%s (%s)", $params['name'], $app);
 	    }
 	}
 	return $res;
     }
-      
+
     /**
      * Returns the value of the specified permission for $userId.
      *
@@ -163,16 +163,16 @@ class Babel {
     function hasPermission($permission, $filter = null, $perm = null)
     {
 	global $perms;
-	
+
 	$userId = Horde_Auth::getAuth();
 	$admin = ($userId == 'admin') ? true : false;
-	
+
 	if ($admin || !$perms->exists('babel:' . $permission)) {
 	    return true;
 	}
-	
+
 	$allowed = $perms->getPermissions('babel:' . $permission);
-	
+
 	switch ($filter) {
 	 case 'tabs':
 	    if ($perm) {
@@ -191,7 +191,7 @@ class Babel {
         global $registry;
 
 	$menu = new Horde_Menu();
-	
+
         $menu->addArray(array('url' => Horde::applicationUrl('index.php'),
 			      'text' => _("_General"),
 			      'icon' => 'list.png'));
@@ -201,19 +201,19 @@ class Babel {
 				  'text' => _("_View"),
 				  'icon' => 'view.png'));
 	}
-	
+
 	if (Babel::hasPermission('stats')) {
 	    $menu->addArray(array('url' => Horde::applicationUrl('stats.php'),
 				  'text' => _("_Stats"),
 				  'icon' => 'extract.png'));
 	}
-	
+
 	if (Babel::hasPermission('extract')) {
 	    $menu->addArray(array('url' => Horde::applicationUrl('extract.php'),
 				  'text' => _("_Extract"),
 				  'icon' => 'extract.png'));
 	}
-	
+
 	if (Babel::hasPermission('make')) {
 	    $menu->addArray(array('url' => Horde::applicationUrl('make.php'),
 				  'text' => _("_Make"),
@@ -238,20 +238,20 @@ class Babel {
      **/
     function sendEmail($email, $type = 'html', $attachments = array()) {
 	global $client, $scopserv;
-	
+
 	include_once("Mail.php");
 	include_once("Mail/mime.php");
 
 	$headers["From"]    = $email['from'];
 	$headers["Subject"] = $email['subject'];
-	
+
 	$mime = new Mail_Mime();
 	if ($type == 'html') {
 	    $mime->setHtmlBody($email['content']);
 	} else {
 	    $mime->setTxtBody($email['content']);
 	}
-	
+
 	if (!empty($attachments)) {
 	    foreach ($attachments as $info) {
 		$mime->addAttachment($info['file'],
@@ -259,23 +259,22 @@ class Babel {
 				     $info['name'], false);
 	    }
 	}
-	
+
 	$body = $mime->get();
 	$hdrs = $mime->headers($headers);
-	
+
 	$mail_object = &Mail::factory("mail");
 	return $mail_object->send($email['to'], $hdrs, $body);
     }
 
 
     function RB_init() {
-	Horde::addScriptFile('prototype.js', 'horde', true);
 	Horde::addScriptFile('effects.js', 'horde', true);
 	Horde::addScriptFile('redbox.js', 'horde', true);
     }
-    
+
     function RB_start($secs = 30) {
-	
+
 	$msg = '';
 	$msg .= '<table width=100% id="RB_confirm"><tr><td>';
 	$msg .= '<b>' . _("Please be patient ...") . '</b>';
@@ -291,9 +290,9 @@ class Babel {
 		$msg .= addslashes(sprintf(_("Can take up to %d minutes !"), $min));
 	    }
 	}
-	
+
 	$msg .= '</td><td><img src="themes/graphics/redbox_spinner.gif">';
-	
+
 	$msg .= '</td></tr></table>';
 	echo '<script>';
 	echo 'RedBox.loading();';
@@ -307,5 +306,5 @@ class Babel {
 	echo 'RedBox.close();';
 	echo '</script>';
     }
-    
+
 }
diff --git a/chora/annotate.php b/chora/annotate.php
index 788ab7a39..da5e95269 100644
--- a/chora/annotate.php
+++ b/chora/annotate.php
@@ -46,7 +46,6 @@ $extraLink = sprintf('<a href="%s">%s</a> | <a href="%s">%s</a>',
                      Chora::url('co', $where, array('r' => $rev)), _("View"),
                      Chora::url('co', $where, array('r' => $rev, 'p' => 1)), _("Download"));
 
-Horde::addScriptFile('prototype.js', 'chora', true);
 Horde::addScriptFile('annotate.js', 'chora', true);
 
 $js_vars = array(
diff --git a/chora/browsedir.php b/chora/browsedir.php
index 79611a5b5..4da275ba6 100644
--- a/chora/browsedir.php
+++ b/chora/browsedir.php
@@ -67,7 +67,6 @@ if ($VC->hasFeature('branches')) {
 $printAllCols = count($fileList);
 $sortdirclass = $acts['sbt'] ? 'sortdown' : 'sortup';
 
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('tables.js', 'horde', true);
 require CHORA_TEMPLATES . '/common-header.inc';
 require CHORA_TEMPLATES . '/menu.inc';
diff --git a/chora/browsefile.php b/chora/browsefile.php
index ac7ee6f5b..0f76d9505 100644
--- a/chora/browsefile.php
+++ b/chora/browsefile.php
@@ -46,7 +46,6 @@ if ($VC->hasFeature('branches')) {
     }
 }
 
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('tables.js', 'horde', true);
 Horde::addScriptFile('QuickFinder.js', 'horde', true);
 Horde::addScriptFile('revlog.js', 'chora', true);
diff --git a/chora/co.php b/chora/co.php
index d93e6e0c8..df32463d7 100644
--- a/chora/co.php
+++ b/chora/co.php
@@ -85,7 +85,6 @@ if (!$plain) {
     $log_print = Chora::formatLogMessage($log->queryLog());
     $author = Chora::showAuthorName($log->queryAuthor(), true);
 
-    Horde::addScriptFile('prototype.js', 'horde', true);
     Horde::addScriptFile('stripe.js', 'horde', true);
     require CHORA_TEMPLATES . '/common-header.inc';
     require CHORA_TEMPLATES . '/menu.inc';
diff --git a/chora/diff.php b/chora/diff.php
index df97b80e5..f8bea1ae9 100644
--- a/chora/diff.php
+++ b/chora/diff.php
@@ -80,7 +80,6 @@ foreach ($VC->getRevisionRange($fl, $r1, $r2) as $val) {
 /* Get list of diff types. */
 $diff_types = array_flip($VC->availableDiffTypes());
 
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('stripe.js', 'horde', true);
 require CHORA_TEMPLATES . '/common-header.inc';
 require CHORA_TEMPLATES . '/menu.inc';
diff --git a/chora/patchsets.php b/chora/patchsets.php
index 17dcde2b3..0ac012b64 100644
--- a/chora/patchsets.php
+++ b/chora/patchsets.php
@@ -42,7 +42,6 @@ if (empty($patchsets)) {
 
 $extraLink = Chora::getFileViews($where, 'patchsets');
 
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('tables.js', 'horde', true);
 
 // JS search not needed if showing a single patchset
diff --git a/chora/stats.php b/chora/stats.php
index cb042afbf..48b4d7d0b 100644
--- a/chora/stats.php
+++ b/chora/stats.php
@@ -29,7 +29,6 @@ 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('prototype.js', 'horde', true);
 Horde::addScriptFile('tables.js', 'horde', true);
 require CHORA_TEMPLATES . '/common-header.inc';
 require CHORA_TEMPLATES . '/menu.inc';
diff --git a/drag_n_drop_portal/index.php b/drag_n_drop_portal/index.php
index 51782d710..07cace878 100644
--- a/drag_n_drop_portal/index.php
+++ b/drag_n_drop_portal/index.php
@@ -29,7 +29,6 @@ $layout_html = $view->toHtml();
 
 $title = _("Edit yout profile page");
 
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('effects.js', 'horde', true);
 Horde::addScriptFile('redbox.js', 'horde', true);
 require HORDE_TEMPLATES . '/common-header.inc';
diff --git a/folks/search.php b/folks/search.php
index a0fde7b54..e6e5f06ba 100644
--- a/folks/search.php
+++ b/folks/search.php
@@ -82,7 +82,6 @@ if (Horde_Auth::isAuthenticated()) {
 }
 
 Horde::addScriptFile('stripe.js', 'horde', true);
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('effects.js', 'horde', true);
 Horde::addScriptFile('redbox.js', 'horde', true);
 Horde::addScriptFile('search.js', 'folks', true);
diff --git a/gollem/clipboard.php b/gollem/clipboard.php
index 9f3ef9d71..9754063af 100644
--- a/gollem/clipboard.php
+++ b/gollem/clipboard.php
@@ -16,7 +16,6 @@ require_once dirname(__FILE__) . '/lib/base.php';
 $dir = Horde_Util::getFormData('dir');
 
 $title = _("Clipboard");
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('tables.js', 'horde', true);
 require GOLLEM_TEMPLATES . '/common-header.inc';
 Gollem::menu();
diff --git a/gollem/manager.php b/gollem/manager.php
index 2470d3730..2d2cb516c 100644
--- a/gollem/manager.php
+++ b/gollem/manager.php
@@ -555,7 +555,6 @@ $js_code = array(
     'var warn_recursive = ' . intval($GLOBALS['prefs']->getValue('recursive_deletes') == 'warn'),
 );
 
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('manager.js', 'gollem', true);
 Horde::addScriptFile('popup.js', 'gollem', true);
 Horde::addScriptFile('tables.js', 'horde', true);
diff --git a/imp/acl.php b/imp/acl.php
index 91bbe5783..a755ba53c 100644
--- a/imp/acl.php
+++ b/imp/acl.php
@@ -197,7 +197,6 @@ $t->set('rights', $rightsval);
 $t->set('width', round(100 / (count($rightsval) + 1)) . '%');
 $t->set('prefsurl', $prefs_url);
 
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('acl.js', 'imp', true);
 echo $t->fetch(IMP_TEMPLATES . '/acl/acl.html');
 if (!$chunk) {
diff --git a/imp/compose.php b/imp/compose.php
index 42808fe02..e3ca9b8d5 100644
--- a/imp/compose.php
+++ b/imp/compose.php
@@ -1218,7 +1218,6 @@ if ($redirect) {
     $template_output = $t->fetch(IMP_TEMPLATES . '/compose/compose.html');
 }
 
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('compose.js', 'imp', true);
 require IMP_TEMPLATES . '/common-header.inc';
 Horde::addInlineScript($js_code);
diff --git a/imp/contacts.php b/imp/contacts.php
index 7f1aeb57f..fcba21ef3 100644
--- a/imp/contacts.php
+++ b/imp/contacts.php
@@ -99,7 +99,6 @@ $template->set('sa', $selected_addresses);
 
 /* Display the form. */
 $title = _("Address Book");
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('contacts.js', 'imp', true);
 require IMP_TEMPLATES . '/common-header.inc';
 Horde::addInlineScript(array(
diff --git a/imp/fetchmailprefs.php b/imp/fetchmailprefs.php
index 3de6c80fd..07fef9813 100644
--- a/imp/fetchmailprefs.php
+++ b/imp/fetchmailprefs.php
@@ -181,7 +181,6 @@ if (empty($actionID)) {
 }
 
 Prefs_UI::generateHeader(null, $chunk);
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('fetchmailprefs.js', 'imp', true);
 
 $charset = Horde_Nls::getCharset();
diff --git a/imp/folders.php b/imp/folders.php
index 2b7a95190..5bfc0214b 100644
--- a/imp/folders.php
+++ b/imp/folders.php
@@ -35,7 +35,6 @@ function _image($name, $alt, $type)
 }
 
 require_once dirname(__FILE__) . '/lib/base.php';
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('folders.js', 'imp', true);
 
 /* Redirect back to the mailbox if folder use is not allowed. */
diff --git a/imp/lib/Ajax/Imple/ContactAutoCompleter.php b/imp/lib/Ajax/Imple/ContactAutoCompleter.php
index ff3cf207b..27f55eef5 100644
--- a/imp/lib/Ajax/Imple/ContactAutoCompleter.php
+++ b/imp/lib/Ajax/Imple/ContactAutoCompleter.php
@@ -52,7 +52,6 @@ class IMP_Ajax_Imple_ContactAutoCompleter extends Horde_Ajax_Imple_Base
      */
     public function attach()
     {
-        Horde::addScriptFile('prototype.js', 'horde', true);
         Horde::addScriptFile('effects.js', 'horde', true);
         Horde::addScriptFile('autocomplete.js', 'horde', true);
 
diff --git a/imp/lib/Block/summary.php b/imp/lib/Block/summary.php
index d644ff453..9ab3da351 100644
--- a/imp/lib/Block/summary.php
+++ b/imp/lib/Block/summary.php
@@ -103,7 +103,6 @@ class Horde_Block_imp_summary extends Horde_Block
         if ($prefs->getValue('nav_popup')) {
             // Always include these scripts so they'll be there if
             // there's new mail in later dynamic updates.
-            Horde::addScriptFile('prototype.js', 'horde', true);
             Horde::addScriptFile('effects.js', 'horde', true);
             Horde::addScriptFile('redbox.js', 'horde', true);
         }
diff --git a/imp/lib/DIMP.php b/imp/lib/DIMP.php
index 63e6f1ecf..231dea247 100644
--- a/imp/lib/DIMP.php
+++ b/imp/lib/DIMP.php
@@ -63,7 +63,6 @@ class DIMP
     {
         // Need to include script files before we start output
         $core_scripts = array(
-            array('prototype.js', 'horde', true),
             array('effects.js', 'horde', true),
             array('horde.js', 'horde', true),
             array('DimpCore.js', 'imp', true),
diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
index 46546f03b..5c9a97e79 100644
--- a/imp/lib/IMP.php
+++ b/imp/lib/IMP.php
@@ -405,7 +405,6 @@ class IMP
         if (($view != 'mimp') &&
             $GLOBALS['prefs']->getValue('compose_popup') &&
             $GLOBALS['browser']->hasFeature('javascript')) {
-            Horde::addScriptFile('prototype.js', 'horde', true);
             Horde::addScriptFile('imp.js', 'imp', true);
             if (isset($args['to'])) {
                 $args['to'] = addcslashes($args['to'], '\\"');
@@ -587,7 +586,6 @@ class IMP
 
         if (($_SESSION['imp']['protocol'] != 'pop') &&
             $prefs->getValue('fetchmail_menu')) {
-            Horde::addScriptFile('prototype.js', 'horde', true);
             Horde::addScriptFile('effects.js', 'horde', true);
             Horde::addScriptFile('redbox.js', 'horde', true);
             Horde::addScriptFile('dialog.js', 'imp', true);
@@ -762,7 +760,6 @@ class IMP
         }
         $t_html = str_replace("\n", ' ', $t->fetch(IMP_TEMPLATES . '/newmsg/alert.html'));
 
-        Horde::addScriptFile('prototype.js', 'horde', true);
         Horde::addScriptFile('effects.js', 'horde', true);
         Horde::addScriptFile('redbox.js', 'horde', true);
         return 'RedBox.overlay = false; RedBox.showHtml(\'' . addcslashes($t_html, "'/") . '\');';
@@ -1230,7 +1227,6 @@ class IMP
     static public function passphraseDialogJS($type, $action = null,
                                               $params = array())
     {
-        Horde::addScriptFile('prototype.js', 'horde', true);
         Horde::addScriptFile('effects.js', 'horde', true);
         Horde::addScriptFile('redbox.js', 'horde', true);
         Horde::addScriptFile('dialog.js', 'imp', true);
diff --git a/imp/lib/Mime/Viewer/Html.php b/imp/lib/Mime/Viewer/Html.php
index 421613cab..a060b00f4 100644
--- a/imp/lib/Mime/Viewer/Html.php
+++ b/imp/lib/Mime/Viewer/Html.php
@@ -199,8 +199,7 @@ class IMP_Horde_Mime_Viewer_Html extends Horde_Mime_Viewer_Html
             $addr_check = ($GLOBALS['prefs']->getValue('html_image_addrbook') && $this->_inAddressBook());
 
             if (!$view_img && !$addr_check) {
-                $data .= Horde_Util::bufferOutput(array('Horde', 'addScriptFile'), 'prototype.js', 'horde', true) .
-                    Horde_Util::bufferOutput(array('Horde', 'addScriptFile'), 'imp.js', 'imp', true);
+                $data .= Horde_Util::bufferOutput(array('Horde', 'addScriptFile'), 'imp.js', 'imp', true);
 
                 // Unblock javascript code in js/src/imp.js
                 $cleanhtml['status'][] = array(
diff --git a/imp/lib/Mime/Viewer/Smime.php b/imp/lib/Mime/Viewer/Smime.php
index c18b8bac2..22ffbd108 100644
--- a/imp/lib/Mime/Viewer/Smime.php
+++ b/imp/lib/Mime/Viewer/Smime.php
@@ -71,7 +71,6 @@ class IMP_Horde_Mime_Viewer_Smime extends Horde_Mime_Viewer_Driver
         } else {
             /* We need to insert JavaScript code now if S/MIME support is
              * active. */
-            Horde::addScriptFile('prototype.js', 'horde', true);
             Horde::addScriptFile('imp.js', 'imp', true);
         }
 
diff --git a/imp/lib/UI/Message.php b/imp/lib/UI/Message.php
index ec58aecef..50c4cc68f 100644
--- a/imp/lib/UI/Message.php
+++ b/imp/lib/UI/Message.php
@@ -397,8 +397,6 @@ class IMP_UI_Message
             $addr_count = count($addr_array);
             $ret = '<span class="nowrap">' . implode(',</span> <span class="nowrap">', $addr_array) . '</span>';
             if ($link && $addr_count > 15) {
-                Horde::addScriptFile('prototype.js', 'horde', true);
-
                 $ret = '<span>' .
                     '<span onclick="[ this, this.next(), this.next(1) ].invoke(\'toggle\')" class="widget largeaddrlist">' . sprintf(_("[Show Addresses - %d recipients]"), $addr_count) . '</span>' .
                     '<span onclick="[ this, this.previous(), this.next() ].invoke(\'toggle\')" class="widget largeaddrlist" style="display:none">' . _("[Hide Addresses]") . '</span>' .
diff --git a/imp/lib/prefs.php b/imp/lib/prefs.php
index 6b0eef3e7..646bb8be4 100644
--- a/imp/lib/prefs.php
+++ b/imp/lib/prefs.php
@@ -250,7 +250,6 @@ if (!Horde_Auth::isAuthenticated('imp')) {
  * HEAD. */
 switch ($group) {
 case 'flags':
-    Horde::addScriptFile('prototype.js', 'horde', true);
     Horde::addScriptFile('colorpicker.js', 'horde', true);
     Horde::addScriptFile('flagmanagement.js', 'imp', true);
 
diff --git a/imp/mailbox.php b/imp/mailbox.php
index 71babe61e..70c28b18b 100644
--- a/imp/mailbox.php
+++ b/imp/mailbox.php
@@ -386,7 +386,6 @@ if ($vfolder || $search_mbox) {
     $pagetitle = $title = htmlspecialchars($title);
 }
 
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('effects.js', 'horde', true);
 Horde::addScriptFile('redbox.js', 'horde', true);
 Horde::addScriptFile('mailbox.js', 'imp', true);
diff --git a/imp/message.php b/imp/message.php
index 8958e0074..6b980c261 100644
--- a/imp/message.php
+++ b/imp/message.php
@@ -714,7 +714,6 @@ $m_template->set('headers', $hdrs);
 $m_template->set('msgtext', $msgtext);
 
 /* Output message page now. */
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('effects.js', 'horde', true);
 Horde::addScriptFile('imp.js', 'imp', true);
 Horde::addScriptFile('message.js', 'imp', true);
diff --git a/imp/pgp.php b/imp/pgp.php
index 67adb0eca..2e434be36 100644
--- a/imp/pgp.php
+++ b/imp/pgp.php
@@ -304,7 +304,6 @@ Prefs_UI::generateHeader('pgp', $chunk);
 $t = new Horde_Template();
 $t->setOption('gettext', true);
 if ($prefs->getValue('use_pgp')) {
-    Horde::addScriptFile('prototype.js', 'horde', true);
     Horde::addScriptFile('imp.js', 'imp', true);
     $t->set('pgpactive', true);
     $t->set('overview-help', Horde_Help::link('imp', 'pgp-overview'));
diff --git a/imp/search.php b/imp/search.php
index 48040b3a0..bca7e2d62 100644
--- a/imp/search.php
+++ b/imp/search.php
@@ -340,7 +340,6 @@ if (empty($search['mbox'])) {
 }
 
 $title = _("Message Search");
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('stripe.js', 'horde', true);
 Horde::addScriptFile('search.js', 'imp', true);
 require IMP_TEMPLATES . '/common-header.inc';
diff --git a/ingo/filters.php b/ingo/filters.php
index 12456d4e1..a37c794dc 100644
--- a/ingo/filters.php
+++ b/ingo/filters.php
@@ -139,7 +139,6 @@ case 'apply_filters':
 /* Get the list of rules now. */
 $filter_list = $filters->getFilterList();
 
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('tooltips.js', 'horde', true);
 Horde::addScriptFile('stripe.js', 'horde', true);
 $title = _("Filter Rules");
diff --git a/kronolith/lib/Ajax/Imple/ContactAutoCompleter.php b/kronolith/lib/Ajax/Imple/ContactAutoCompleter.php
index d97946498..a8f9d80ff 100644
--- a/kronolith/lib/Ajax/Imple/ContactAutoCompleter.php
+++ b/kronolith/lib/Ajax/Imple/ContactAutoCompleter.php
@@ -38,7 +38,6 @@ class Kronolith_Ajax_Imple_ContactAutoCompleter extends Horde_Ajax_Imple_Base
      */
     public function attach()
     {
-        Horde::addScriptFile('prototype.js', 'horde', true);
         Horde::addScriptFile('effects.js', 'horde', true);
         Horde::addScriptFile('autocomplete.js', 'horde', true);
 
diff --git a/kronolith/lib/Ajax/Imple/TagAutoCompleter.php b/kronolith/lib/Ajax/Imple/TagAutoCompleter.php
index e51f7b251..b10d8c3ef 100644
--- a/kronolith/lib/Ajax/Imple/TagAutoCompleter.php
+++ b/kronolith/lib/Ajax/Imple/TagAutoCompleter.php
@@ -39,7 +39,6 @@ class Kronolith_Ajax_Imple_TagAutoCompleter extends Horde_Ajax_Imple_Base
      */
     public function attach()
     {
-        Horde::addScriptFile('prototype.js', 'horde', true);
         Horde::addScriptFile('effects.js', 'horde', true);
         Horde::addScriptFile('autocomplete.js', 'horde', true);
 
diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index 052d9e123..3d1d38331 100644
--- a/kronolith/lib/Kronolith.php
+++ b/kronolith/lib/Kronolith.php
@@ -69,7 +69,6 @@ class Kronolith
     public static function header($title, $scripts = array())
     {
         // Need to include script files before we start output
-        Horde::addScriptFile('prototype.js', 'horde', true);
         Horde::addScriptFile('effects.js', 'horde', true);
         Horde::addScriptFile('horde.js', 'horde', true);
         Horde::addScriptFile('dragdrop2.js', 'horde', true);
diff --git a/kronolith/templates/common-header.inc b/kronolith/templates/common-header.inc
index d556fb8fa..52112099c 100644
--- a/kronolith/templates/common-header.inc
+++ b/kronolith/templates/common-header.inc
@@ -1,6 +1,5 @@
 <?php
 
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('effects.js', 'horde', true);
 Horde::addScriptFile('views.js', 'kronolith', true);
 Horde::addScriptFile('stripe.js', 'horde', true);
diff --git a/nag/list.php b/nag/list.php
index 081579009..e7fe3ce33 100644
--- a/nag/list.php
+++ b/nag/list.php
@@ -88,7 +88,6 @@ $print_view = (bool)$vars->print;
 if (!$print_view) {
     Horde::addScriptFile('popup.js', 'horde', true);
     Horde::addScriptFile('tooltips.js', 'horde', true);
-    Horde::addScriptFile('prototype.js', 'horde', true);
     Horde::addScriptFile('effects.js', 'horde', true);
     Horde::addScriptFile('QuickFinder.js', 'horde', true);
     $print_link = Horde::applicationUrl(Horde_Util::addParameter('list.php', array('print' => 1)));
diff --git a/nag/tasks/index.php b/nag/tasks/index.php
index d6c040c15..82170021a 100644
--- a/nag/tasks/index.php
+++ b/nag/tasks/index.php
@@ -47,7 +47,6 @@ $actionID = null;
 
 Horde::addScriptFile('popup.js', 'horde', true);
 Horde::addScriptFile('tooltips.js', 'horde', true);
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('effects.js', 'horde', true);
 Horde::addScriptFile('QuickFinder.js', 'horde', true);
 
diff --git a/news/lib/Block/jonah.php b/news/lib/Block/jonah.php
index 5cb05e44f..0de51fc14 100755
--- a/news/lib/Block/jonah.php
+++ b/news/lib/Block/jonah.php
@@ -49,11 +49,10 @@ class Horde_Block_News_jonah extends Horde_Block {
         }
         $html .= '</select></form>';
 
-        Horde::addScriptFile('prototype.js', 'horde', true);
         Horde::addScriptFile('effects.js', 'horde', true);
         Horde::addScriptFile('redbox.js', 'horde', true);
         Horde::addScriptFile('feed.js', 'news', true);
 
         return $html;
     }
-}
\ No newline at end of file
+}
diff --git a/skoli/data.php b/skoli/data.php
index 316225d34..91d5876b1 100644
--- a/skoli/data.php
+++ b/skoli/data.php
@@ -176,7 +176,6 @@ case 'export':
 
 $title = _("Export Classes");
 
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('effects.js', 'horde', true);
 Horde::addScriptFile('redbox.js', 'horde', true);
 require SKOLI_TEMPLATES . '/common-header.inc';
diff --git a/skoli/list.php b/skoli/list.php
index eae37c64f..7aa3ec90b 100644
--- a/skoli/list.php
+++ b/skoli/list.php
@@ -102,7 +102,6 @@ default:
 
 Horde::addScriptFile('popup.js', 'horde', true);
 Horde::addScriptFile('tooltips.js', 'horde', true);
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('effects.js', 'horde', true);
 Horde::addScriptFile('QuickFinder.js', 'horde', true);
 
diff --git a/skoli/search.php b/skoli/search.php
index 019329918..220318a07 100644
--- a/skoli/search.php
+++ b/skoli/search.php
@@ -122,7 +122,6 @@ if ($conf['objects']['allow_absences']) {
 $title = _("Search");
 $notification->push('document.skoli_searchform.stext.focus();', 'javascript');
 
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('QuickFinder.js', 'horde', true);
 Horde::addScriptFile('effects.js', 'horde', true);
 Horde::addScriptFile('redbox.js', 'horde', true);
@@ -148,8 +147,8 @@ if ($actionID == 'search') {
 
             switch ($entry['type']) {
             case 'mark':
-                $details = $entry['subject'] . ': ' . $entry['mark'] . 
-                           ($classes[$entry['classid']]->get('marks') == 'percent' ? '%' : '') . 
+                $details = $entry['subject'] . ': ' . $entry['mark'] .
+                           ($classes[$entry['classid']]->get('marks') == 'percent' ? '%' : '') .
                            ' (' . $entry['weight'] . '), ' . $entry['title'];
                 break;
 
@@ -158,8 +157,8 @@ if ($actionID == 'search') {
                 break;
 
             case 'outcome':
-                $details = $entry['outcome'] . ': ' . 
-                           (isset($entry['completed']) && $entry['completed'] != '' ? _("Completed") : _("Open")) . 
+                $details = $entry['outcome'] . ': ' .
+                           (isset($entry['completed']) && $entry['completed'] != '' ? _("Completed") : _("Open")) .
                            (isset($entry['comment']) && $entry['comment'] != '' ? ', ' . $entry['comment'] : '');
                 break;
 
diff --git a/skoli/templates/panel.inc b/skoli/templates/panel.inc
index a65b4d65a..a023bf6b7 100644
--- a/skoli/templates/panel.inc
+++ b/skoli/templates/panel.inc
@@ -1,5 +1,4 @@
 <?php
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('QuickFinder.js', 'horde', true);
 
 $current_user = Horde_Auth::getAuth();
diff --git a/turba/contact.php b/turba/contact.php
index 024518cc9..baab1dd0b 100644
--- a/turba/contact.php
+++ b/turba/contact.php
@@ -102,7 +102,6 @@ if ($own_source == $source && $own_id == $contact->getValue('__key')) {
 }
 
 $title = $view->getTitle();
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('contact_tabs.js', 'turba', true);
 require TURBA_TEMPLATES . '/common-header.inc';
 if ($print_view) {
diff --git a/turba/lib/View/Browse.php b/turba/lib/View/Browse.php
index 72c821eab..09d6df5ad 100644
--- a/turba/lib/View/Browse.php
+++ b/turba/lib/View/Browse.php
@@ -383,7 +383,6 @@ class Turba_View_Browse {
             $templates[] = '/browse/header.inc';
         }
 
-        Horde::addScriptFile('prototype.js', 'horde', true);
         Horde::addScriptFile('QuickFinder.js', 'horde', true);
         Horde::addScriptFile('effects.js', 'horde', true);
         Horde::addScriptFile('redbox.js', 'horde', true);
diff --git a/turba/search.php b/turba/search.php
index e8851fc45..7b729c915 100644
--- a/turba/search.php
+++ b/turba/search.php
@@ -182,7 +182,6 @@ if ($_SESSION['turba']['search_mode'] == 'basic') {
     $notification->push('document.directory_search.name.focus();', 'javascript');
 }
 
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('QuickFinder.js', 'horde', true);
 Horde::addScriptFile('effects.js', 'horde', true);
 Horde::addScriptFile('redbox.js', 'horde', true);
diff --git a/turba/templates/prefs/columnselect.inc b/turba/templates/prefs/columnselect.inc
index 20f3f3e33..4a9c26baf 100644
--- a/turba/templates/prefs/columnselect.inc
+++ b/turba/templates/prefs/columnselect.inc
@@ -1,6 +1,5 @@
 <?php if (!$prefs->isLocked('columns')):
 
-Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('effects.js', 'horde', true);
 Horde::addScriptFile('dragdrop.js', 'horde', true);