Changeset 294

Timestamp:

08/30/07 12:16:20 (5 years ago)

Author:

brieb

Message:

Fixed #174 - Pound Symbol not showing correctly on PDFs
Fixed API processing.
Fixed demo enabled mass Email

Location:

trunk/phpbms

Files:

• include/session.php (modified) (3 diffs)
• modules/bms/include/clients.php (modified) (1 diff)

trunk/phpbms/include/session.php

@@ -350 +350 @@
                 }
                 
-                if($db->numRows($queryresult)){
+                if($this->db->numRows($queryresult)){
                         //We found a record that matches in the database
                         // populate the session and go in
-                        $_SESSION["userinfo"]=$db->fetchArray($queryresult);
+                        $_SESSION["userinfo"]=$this->db->fetchArray($queryresult);
                 
                         $querystatement="UPDATE users SET modifieddate=modifieddate, lastlogin=Now() WHERE id = ".$_SESSION["userinfo"]["id"];
-                        $queryresult=@ $db->query($querystatement);
+                        $queryresult=@ $this->db->query($querystatement);
                         if(!$queryresult) {
                                 $error = new appError(-730,"","Error Updaingt User Login Time",true,true,true,"json");
@@ -421 +421 @@
                         $db = new db();
                         $phpbmsSession->db = $db;
-                        
+
+                        include_once("common_functions.php");                   
                         $phpbmsSession->loadSettings($sqlEncoding);
                         $phpbms = new phpbms($db);
         
-                        include_once("common_functions.php");
         
                         if(!$phpbmsSession->verifyAPILogin($_POST["phpbmsusername"],$_POST["phpbmspassword"],ENCRYPTION_SEED))
@@ -441 +441 @@
                 $phpbmsSession->db = $db;
                 
-                $phpbmsSession->loadSettings();
+                $phpbmsSession->loadSettings($sqlEncoding);
                 
                 include_once("common_functions.php");

trunk/phpbms/modules/bms/include/clients.php

@@ -133 +133 @@
                 
                 function massEmail(){
-                        $_SESSION["emailids"]= $this->idsArray;
-                        goURL("modules/bms/clients_email.php");
+                        if(DEMO_ENABLED != "true"){
+                                $_SESSION["emailids"]= $this->idsArray;
+                                goURL("modules/bms/clients_email.php");
+                        } else {
+                                return "mass e-mail feature disabled in demo";
+                        }
                 }