Преглед изворни кода

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

Thijs Kinkhorst пре 18 година
родитељ
комит
7f8507d3d2
3 измењених фајлова са 8 додато и 8 уклоњено
  1. 2 2
      functions/db_prefs.php
  2. 3 3
      functions/file_prefs.php
  3. 3 3
      functions/prefs.php

+ 2 - 2
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;
         }

+ 3 - 3
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;
         }

+ 3 - 3
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;
             }
         }