From ae13f72f775342c7ee9fb58931a9a65a1ad45943 Mon Sep 17 00:00:00 2001 From: kink Date: Fri, 8 Jun 2007 19:50:02 +0000 Subject: [PATCH] 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 --- functions/db_prefs.php | 4 ++-- functions/file_prefs.php | 6 +++--- functions/prefs.php | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/functions/db_prefs.php b/functions/db_prefs.php index 0c203840..f11d49fe 100644 --- 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.") . "
\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?"), - 'DB.php') . "
\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 c15dcd37..028541f2 100644 --- 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 . "
\n" . - sprintf( _("%s should be writable by user %s"), $data_dir, $uid ) . "
\n" . - _("Please contact your system administrator and report this error.") . "
\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 f54b899c..36d7eb23 100644 --- 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) . '
' . - _("Could not create hashed directory structure!") . "
\n" . - _("Please contact your system administrator and report this error.") . "
\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; } } -- 2.25.1