X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fgettext.php;h=924904b9d6d9a373ee93bbf3f7729a8c392c2de2;hb=6b6c2e0605175300c0b4597f7e62348bb8bbf3b2;hp=75edf2d0ddc53838189b1405e02849e1c26b6593;hpb=99f538bfa29509bdeaca672e1e5092a636266b38;p=squirrelmail.git

diff --git a/functions/gettext.php b/functions/gettext.php
index 75edf2d0..924904b9 100644
--- a/functions/gettext.php
+++ b/functions/gettext.php
@@ -3,7 +3,7 @@
 /**
  * gettext.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Alternate to the system's built-in gettext.
@@ -15,33 +15,35 @@
  * $Id$
  */
 
+require_once(SM_PATH . 'functions/global.php');
+
 global $gettext_php_domain, $gettext_php_dir, $gettext_php_loaded,
  $gettext_php_translateStrings, $gettext_php_loaded_language,
  $gettext_php_short_circuit;
 
 if (! isset($gettext_php_loaded)) {
     $gettext_php_loaded = false;
-    session_register('gettext_php_loaded');
+    sqsession_register($gettext_php_loaded, 'gettext_php_loaded');
 }
 if (! isset($gettext_php_domain)) {
     $gettext_php_domain = '';
-    session_register('gettext_php_domain');
+    sqsession_register($gettext_php_domain, 'gettext_php_domain');
 }
 if (! isset($gettext_php_dir)) {
     $gettext_php_dir = '';
-    session_register('gettext_php_dir');
+    sqsession_register($gettext_php_dir, 'gettext_php_dir');
 }
 if (! isset($gettext_php_translateStrings)) {
     $gettext_php_translateStrings = array();
-    session_register('gettext_php_translateStrings');
+    sqsession_register($gettext_php_translateStrings, 'gettext_php_translateStrings');
 }
 if (! isset($gettext_php_loaded_language)) {
     $gettext_php_loaded_language = '';
-    session_register('gettext_php_loaded_language');
+    sqsession_register($gettext_php_loaded_language, 'gettext_php_loaded_language');
 }
 if (! isset($gettext_php_short_circuit)) {
     $gettext_php_short_circuit = false;
-    session_register('gettext_php_short_circuit');
+    sqsession_register($gettext_php_short_circuit, 'gettext_php_short_circuit');
 }
 
 function gettext_php_load_strings() {
@@ -79,10 +81,11 @@ function gettext_php_load_strings() {
     $key = '';
     $SkipRead = false;
     while (! feof($file)) {
-        if (! $SkipRead)
+        if (! $SkipRead) {
             $line = trim(fgets($file, 4096));
-        else
+        } else {
             $SkipRead = false;
+        }
         
         if (ereg('^msgid "(.*)"$', $line, $match)) {
             if ($match[1] == '') {