Changeset 357

Timestamp:

11/09/07 10:35:04 (5 years ago)

Author:

brieb

Message:

Fixes #209 - Finished reserved constant conversion.

Location:

trunk/phpbms

Files:

• ChangeLog (modified) (2 diffs)
• install/updatev0.92.sql (added)
• install/updatexml.php (modified) (1 diff)
• modules/base/include/adminsettings_include.php (modified) (1 diff)

trunk/phpbms/ChangeLog

@@ +1 @@
+phpBMS v0.92
+http://phpbms.org/browser/tags/phpbms-0.92
+ * Sales Order line item editing
+ * Sales Order line item re-ordering
+
+The complete list of closed tickets can be found here: http://phpbms.org/query?status=closed&milestone=0.92
+
 phpBMS v0.9
 http://phpbms.org/browser/tags/phpbms-0.9
@@ -10 +17 @@
  * Recoded/formatted Sales Order PDFs
 
-The complete list of closed tickets can be found here: http://phpbms.org/query?status=closed&milestone=0.8
+The complete list of closed tickets can be found here: http://phpbms.org/query?status=closed&milestone=0.9
 
 phpBMS v0.8

trunk/phpbms/install/updatexml.php

@@ -254 +254 @@
                                         
                                         //Processing Data Structure Changes
-                                        //$thereturn .= processSQLfile($db,"updatev0.9.sql");
+                                        $thereturn .= processSQLfile($db,"updatev0.92.sql");
                                 
                                         //Updating Module Table

trunk/phpbms/modules/base/include/adminsettings_include.php

@@ -84 +84 @@
                         if(defined(strtoupper($settingname))){
                                 if(constant(strtoupper($settingname)) != $settingvalue){
-                                        $updatestatement = "UPDATE settings SET value ='".$settingvalue."' WHERE name='".mysql_real_escape_string($settingname)."'";
+                                
+                                        $updatestatement = "
+                                                UPDATE 
+                                                        settings 
+                                                SET 
+                                                        value ='".$settingvalue."' 
+                                                WHERE 
+                                                        name='".mysql_real_escape_string($settingname)."'";
+                                                        
                                         $updateresult = $this->db->query($updatestatement);
-                                }
+                                        
+                                        if(!$this->db->affectedRows()){
+
+                                                //check to see why the update did not work
+                                                $querystatement = "
+                                                        SELECT 
+                                                                name
+                                                        FROM
+                                                                settings
+                                                        WHERE
+                                                                name = '".mysql_real_escape_string($settingname)."'";
+                                                
+                                                $queryresult = $this->db->query($querystatement);
+                                                
+                                                if(!$this->db->numRows($queryresult)){
+                                                
+                                                        //insert the setting if need be
+                                                        $insertstatement ="
+                                                                INSERT INTO
+                                                                        settings (
+                                                                                `value`,
+                                                                                `name`,
+                                                                        ) VALUES {
+                                                                                '".$settingvalue."',
+                                                                                '".mysql_real_escape_string($settingname)."'
+                                                                        }";
+                                                                        
+                                                        $this->db-query($insertstatement);
+                                                        
+                                                }//end if
+                                        
+                                        }//end if
+                                        
+                                }//end if
                         }
                 }//end foreach