From 575b8adb6e80a14a85562c0c4c0c04d9e453118d Mon Sep 17 00:00:00 2001
From: Kevin Yeh <kevinyeh@alum.mit.edu>
Date: Thu, 11 Jul 2013 11:27:33 -0400
Subject: [PATCH] Apply mysql port number where appropriate

---
 gacl/gacl.class.php                | 2 +-
 interface/main/backup.php          | 2 ++
 interface/main/calendar/config.php | 2 +-
 library/authentication/privDB.php  | 2 +-
 library/sql.inc                    | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/gacl/gacl.class.php b/gacl/gacl.class.php
index cda2e48fa..151307a63 100644
--- a/gacl/gacl.class.php
+++ b/gacl/gacl.class.php
@@ -146,7 +146,7 @@ class gacl {
 
                 //collect openemr sql info from include at top of script - bm 05-2009
                 global $sqlconf, $disable_utf8_flag;
-                $this->_db_host = $sqlconf["host"];
+                $this->_db_host = $sqlconf["host"].":".$sqlconf["port"];
                 $this->_db_user = $sqlconf["login"];
                 $this->_db_password = $sqlconf["pass"];
                 $this->_db_name = $sqlconf["dbase"];
diff --git a/interface/main/backup.php b/interface/main/backup.php
index 55ed4a61d..05b1b2f4e 100644
--- a/interface/main/backup.php
+++ b/interface/main/backup.php
@@ -175,6 +175,7 @@ if ($form_step == 1) {
     $cmd = "$mysql_dump_cmd -u " . escapeshellarg($sqlconf["login"]) .
     " -p" . escapeshellarg($sqlconf["pass"]) .
     " -h" . escapeshellarg($sqlconf["host"]) .
+    " --port=".escapeshellarg($sqlconf["port"]) .
     " --routines".
     " --opt --quote-names -r $file_to_compress " .
     escapeshellarg($sqlconf["dbase"]);
@@ -184,6 +185,7 @@ if ($form_step == 1) {
     $cmd = "$mysql_dump_cmd -u " . escapeshellarg($sqlconf["login"]) .
     " -p" . escapeshellarg($sqlconf["pass"]) .
     " -h" . escapeshellarg($sqlconf["host"]) .
+    " --port=".escapeshellarg($sqlconf["port"]) .
     " --opt --quote-names -r $file_to_compress " .
     escapeshellarg($sqlconf["dbase"]);
   } 
diff --git a/interface/main/calendar/config.php b/interface/main/calendar/config.php
index 8782497d3..dfaa842f0 100644
--- a/interface/main/calendar/config.php
+++ b/interface/main/calendar/config.php
@@ -28,7 +28,7 @@ $pnconfig['startpage'] = "PostCalendar";
 $pnconfig['language'] = "eng";
 $pnconfig['dbtype'] = 'mysql';
 $pnconfig['dbtabletype'] = 'MyISAM';
-$pnconfig['dbhost'] = $host;
+$pnconfig['dbhost'] = $host.":".$port;
 $pnconfig['dbuname'] = $login;
 $pnconfig['dbpass'] = $pass;
 $pnconfig['dbname'] = $dbase;
diff --git a/library/authentication/privDB.php b/library/authentication/privDB.php
index bde753366..947af3df0 100644
--- a/library/authentication/privDB.php
+++ b/library/authentication/privDB.php
@@ -51,7 +51,7 @@ function getPrivDB()
         {
             require_once($secure_config);
             $GLOBALS[PRIV_DB]=NewADOConnection("mysql_log");
-            $GLOBALS[PRIV_DB]->PConnect($secure_host, $secure_login, $secure_pass, $secure_dbase);    
+            $GLOBALS[PRIV_DB]->PConnect($secure_host.":".$secure_port, $secure_login, $secure_pass, $secure_dbase);    
         }
         else
         {
diff --git a/library/sql.inc b/library/sql.inc
index c7653a22d..1c6b111b9 100644
--- a/library/sql.inc
+++ b/library/sql.inc
@@ -139,7 +139,7 @@ $database = NewADOConnection("mysql_log"); // Use the subclassed driver which lo
 // work and is suspicious for a bug in PHP of that OS; Setting this clientFlags fixes this bug
 // and appears to not cause problems in other operating systems.
 $database->clientFlags = 128;
-$database->PConnect($host, $login, $pass, $dbase);
+$database->PConnect($host.":".$port, $login, $pass, $dbase);
 $GLOBALS['adodb']['db'] = $database;
 $GLOBALS['dbh'] = $database->_connectionID;
 
-- 
2.11.4.GIT