|
@@ -20,17 +20,14 @@ define('SM_PATH','../');
|
|
|
|
|
|
/** SquirrelMail required files. */
|
|
/** SquirrelMail required files. */
|
|
include_once(SM_PATH . 'include/validate.php');
|
|
include_once(SM_PATH . 'include/validate.php');
|
|
-require_once(SM_PATH . 'functions/display_messages.php');
|
|
|
|
-require_once(SM_PATH . 'functions/addressbook.php');
|
|
|
|
-require_once(SM_PATH . 'functions/forms.php');
|
|
|
|
|
|
+/* plain_error_message() */
|
|
|
|
+include_once(SM_PATH . 'functions/display_messages.php');
|
|
|
|
+/* address book functions */
|
|
|
|
+include_once(SM_PATH . 'functions/addressbook.php');
|
|
|
|
+/* form functions */
|
|
|
|
+include_once(SM_PATH . 'functions/forms.php');
|
|
|
|
|
|
/** lets get the global vars we may need */
|
|
/** lets get the global vars we may need */
|
|
-sqgetGlobalVar('key', $key, SQ_COOKIE);
|
|
|
|
-
|
|
|
|
-sqgetGlobalVar('username', $username, SQ_SESSION);
|
|
|
|
-sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION);
|
|
|
|
-sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION);
|
|
|
|
-sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
|
|
|
|
|
|
|
|
/* From the address form */
|
|
/* From the address form */
|
|
sqgetGlobalVar('addaddr', $addaddr, SQ_POST);
|
|
sqgetGlobalVar('addaddr', $addaddr, SQ_POST);
|
|
@@ -390,7 +387,7 @@ echo '<a name="AddAddress"></a>' . "\n";
|
|
abook_create_form($form_url,'addaddr',_("Add to address book"),_("Add address"),$defdata);
|
|
abook_create_form($form_url,'addaddr',_("Add to address book"),_("Add address"),$defdata);
|
|
echo "</form>\n";
|
|
echo "</form>\n";
|
|
|
|
|
|
-/* Add hook for anything that wants on the bottom */
|
|
|
|
|
|
+/* Hook for extra address book blocks */
|
|
echo "<!-- start of addressbook_bottom hook-->\n";
|
|
echo "<!-- start of addressbook_bottom hook-->\n";
|
|
do_hook('addressbook_bottom');
|
|
do_hook('addressbook_bottom');
|
|
echo "\n<!-- end of addressbook_bottom hook-->\n";
|
|
echo "\n<!-- end of addressbook_bottom hook-->\n";
|