remove some HTML from within functions. Unneeded HTML to be precise.

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

diff --git a/functions/db_prefs.php b/functions/db_prefs.php
index 0c203840809bb31f4cb0013583e07dbd3b05ee30..f11d49fe93ef92a06708b750dd44e3f7dfd39e16 100644 (file)
--- a/functions/db_prefs.php
+++ b/functions/db_prefs.php
@@ -165,9 +165,9 @@ class dbPrefs {
         /* test if Pear DB class is available and freak out if it is not */
         if (! class_exists('DB')) {
             // same error also in abook_database.php
-            $this->error  = _("Could not include PEAR database functions required for the database backend.") . "<br />\n";
+            $this->error  = _("Could not include PEAR database functions required for the database backend.") . "\n";
             $this->error .= sprintf(_("Is PEAR installed, and is the include path set correctly to find %s?"),
-                              '<tt>DB.php</tt>') . "<br />\n";
+                              'DB.php') . "\n";
             $this->error .= _("Please contact your system administrator and report this error.");
             return false;
         }

diff --git a/functions/file_prefs.php b/functions/file_prefs.php
index c15dcd37b841fa9521ce728b85ce774792e8906c..028541f20b18e5ab15a2a55b3c6e895762dd0942 100644 (file)
--- a/functions/file_prefs.php
+++ b/functions/file_prefs.php
@@ -240,9 +240,9 @@ function checkForPrefs($data_dir, $username, $filename = '') {
                 $uid = $user_data['name'];
             }
             $errTitle = _("Could not create initial preference file!");
-            $errString = $errTitle . "<br />\n" .
-                       sprintf( _("%s should be writable by user %s"), $data_dir, $uid ) . "<br />\n" .
-                       _("Please contact your system administrator and report this error.") . "<br />\n";
+            $errString = $errTitle . "\n" .
+                       sprintf( _("%s should be writable by user %s."), $data_dir, $uid ) . "\n" .
+                       _("Please contact your system administrator and report this error.") ;
             logout_error( $errString, $errTitle );
             exit;
         }

diff --git a/functions/prefs.php b/functions/prefs.php
index f54b899c6437534f898bffe08556d2b65c244b3b..36d7eb23738228d5df1dd60672ad5c0048b190f6 100644 (file)
--- a/functions/prefs.php
+++ b/functions/prefs.php
@@ -96,9 +96,9 @@ function getHashedDir($username, $dir, $hash_dirs = '') {
         $real_hash_dir .= '/' . $hash_dirs[$h];
         if (!@is_dir($real_hash_dir)) {
             if (!@mkdir($real_hash_dir, 0770)) {
-                echo sprintf(_("Error creating directory %s."), $real_hash_dir) . '<br />' .
-                     _("Could not create hashed directory structure!") . "<br />\n" .
-                     _("Please contact your system administrator and report this error.") . "<br />\n";
+                error_box ( sprintf(_("Error creating directory %s."), $real_hash_dir) . "\n" .
+                     _("Could not create hashed directory structure!") . "\n" .
+                     _("Please contact your system administrator and report this error.") );
                 exit;
             }
         }