Add warning about magic_quotes_* in configtest.

[squirrelmail.git] / src / addressbook.php

diff --git a/src/addressbook.php b/src/addressbook.php
index a75a8f7eb470cf0e3a7194ce9407779daaefdbc9..dfb02d8f6af59de70d255b436475d816b16459f7 100644 (file)
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -21,7 +21,6 @@ include('../include/init.php');
 /* address book functions */
 require_once(SM_PATH . 'functions/addressbook.php');
 include_once(SM_PATH . 'templates/util_addressbook.php');
-include_once(SM_PATH . 'templates/util_global.php');
 
 /* form functions */
 require_once(SM_PATH . 'functions/forms.php');
@@ -266,18 +265,18 @@ if ($showaddrlist) {
         
     $oTemplate->display('addressbook_list.tpl');
     
+//FIXME: Remove HTML from here!
     echo "</form>\n";
 }
 
 /* Display the "new address" form */
+//FIXME: Remove HTML from here!
 echo '<a name="AddAddress"></a>' . "\n";
 abook_create_form($form_url,'addaddr',_("Add to address book"),_("Add address"),$defdata);
 echo "</form>\n";
 
 /* Hook for extra address book blocks */
-echo "<!-- start of addressbook_bottom hook-->\n";
-do_hook('addressbook_bottom');
-echo "\n<!-- end of addressbook_bottom hook-->\n";
+do_hook('addressbook_bottom', $null);
 
 $oTemplate->display('footer.tpl');
-?>
\ No newline at end of file
+?>