Fix FIXME in functions/addressbook.php

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11598 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/addressbook.php b/functions/addressbook.php
index 14ffb3e8e52c0646d64696d47d34272757c3a298..9e9d02958e2ee43b86d4a1bc4fed871f2c1c0281 100644 (file)
--- a/functions/addressbook.php
+++ b/functions/addressbook.php
@@ -1,5 +1,4 @@
 <?php
 <?php

-

 /**
  * functions/addressbook.php - Functions and classes for the addressbook system
  *
 /**
  * functions/addressbook.php - Functions and classes for the addressbook system
  *


@@ -12,10 +11,6 @@
  * @subpackage addressbook
  */
 
  * @subpackage addressbook
  */
 

-/** required includes */
-// FIXME, NO display code in functions files
-include_once(SM_PATH . 'templates/util_global.php');
-

 /**
  * Create and initialize an addressbook object.
  * @param boolean $showerr display any address book init errors. html page header
 /**
  * Create and initialize an addressbook object.
  * @param boolean $showerr display any address book init errors. html page header

diff --git a/src/addressbook.php b/src/addressbook.php
index efb02285e5b80ddad2e643446ecbde1fd644d99c..d5e4ccd769594c427fdcd3e5bf8c711e42aaea26 100644 (file)
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -21,6 +21,7 @@ include('../include/init.php');
 /* address book functions */
 require_once(SM_PATH . 'functions/addressbook.php');
 include_once(SM_PATH . 'templates/util_addressbook.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');
 
 /* form functions */
 require_once(SM_PATH . 'functions/forms.php');


@@ -188,14 +189,7 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P
                     /* Handle error messages */
                     if (!$r) {
                         /* Display error */
                     /* Handle error messages */
                     if (!$r) {
                         /* Display error */

-                        echo html_tag( 'table',
-                                html_tag( 'tr',
-                                    html_tag( 'td',
-                                        "\n". '<strong><font color="' . $color[2] .
-                                        '">' . _("ERROR") . ': ' . $abook->error . '</font></strong>' ."\n",
-                                        'center' )
-                                    ),
-                                'center', '', 'width="100%"' );
+                        plain_error_message( _("ERROR") .': '. $abook->error);

 
                         /* Display the "new address" form again */
                         abook_create_form($form_url,'editaddr',_("Update address"),_("Update address"),$newdata);
 
                         /* Display the "new address" form again */
                         abook_create_form($form_url,'editaddr',_("Update address"),_("Update address"),$newdata);