Changeset 349 for trunk/phpbms/include

Timestamp:

10/22/07 13:27:09 (5 years ago)

Author:

brieb

Message:

Fixed problem with reserved constant in certain PHP versions.
If you load this change set on a current working database, make sure to
manually run the SQL in the update-nextver.sql on your database.

Also, you may need to flush your browser cache so the javaScript is re-loaded properly.

Location:

trunk/phpbms/include

Files:

• common_functions.php (modified) (1 diff)
• jstransport.php (modified) (1 diff)
• session.php (modified) (1 diff)

trunk/phpbms/include/common_functions.php

@@ -434 +434 @@
         if($number<0)
                 $currency.="-";
-        $currency.=CURRENCY_SYMBOL.number_format(abs($number),CURRENCY_ACCURACY,DECIMAL_SYMBOL,THOUSANDS_SEPARATOR);
+        $currency.=CURRENCY_SYM.number_format(abs($number),CURRENCY_ACCURACY,DECIMAL_SYMBOL,THOUSANDS_SEPARATOR);
         return $currency;
 }
 
 function currencyToNumber($currency){
-        $number=str_replace(CURRENCY_SYMBOL,"",$currency);
+        $number=str_replace(CURRENCY_SYM,"",$currency);
         $number=str_replace(THOUSANDS_SEPARATOR,"",$number);
         $number=str_replace(DECIMAL_SYMBOL,".",$number);

trunk/phpbms/include/jstransport.php

@@ -31 +31 @@
 
         //currency formating
-        ?>CURRENCY_SYMBOL="<?php echo htmlQuotes(CURRENCY_SYMBOL)?>";<?php
+        ?>CURRENCY_SYM="<?php echo htmlQuotes(CURRENCY_SYM)?>";<?php
 
         ?>CURRENCY_ACCURACY=<?php echo CURRENCY_ACCURACY?>;<?php

trunk/phpbms/include/session.php

@@ -316 +316 @@
                         return false;
                 } else {
-                        while($therecord=$this->db->fetchArray($queryresult))
+                        while($therecord=$this->db->fetchArray($queryresult)){
+                        
+                                //old versions used a reserved constant in certain php versions
+                                if($therecord["name"] == "currency_symbol")
+                                        $therecord["name"] = "currency_sym";
+                                        
                                 if(!defined(strtoupper($therecord["name"])))
                                         define(strtoupper($therecord["name"]),$therecord["value"]);
+                                        
+                        }//end while
 
                         // This following code is for windows boxen, because they lack some server varables as well