From bb0c7702e7f2698aa73c94c891e74ef7d97e5e97 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 12 Jan 2012 05:18:54 -0500
Subject: [PATCH] Allow subqueries of strings in remote API.
---
server/lib/classes/db_mysql.inc.php | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index 7e0c561..3c89c74 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -34,6 +34,8 @@
var $dbUser = ''; // database authorized user
var $dbPass = ''; // user's password
var $dbCharset = 'utf8';// Database charset
+ var $dbNewLink = false; // Return a new linkID when connect is called again
+ var $dbClientFlags = 0; // MySQL Client falgs
var $linkId = 0; // last result of mysql_connect()
var $queryId = 0; // last result of mysql_query()
var $record = array(); // last record fetched
@@ -53,6 +55,8 @@
$this->dbUser = $conf['db_user'];
$this->dbPass = $conf['db_password'];
$this->dbCharset = $conf['db_charset'];
+ $this->dbNewLink = $conf['db_new_link'];
+ $this->dbClientFlags = $conf['db_client_flags'];
//$this->connect();
}
@@ -79,7 +83,7 @@
{
if($this->linkId == 0)
{
- $this->linkId = @mysql_connect($this->dbHost, $this->dbUser, $this->dbPass);
+ $this->linkId = @mysql_connect($this->dbHost, $this->dbUser, $this->dbPass, $this->dbNewLink, $this->dbClientFlags);
if(!$this->linkId)
{
$this->updateError('DB::connect()-> mysql_connect');
@@ -294,7 +298,11 @@
//print_r($diff_num);
//print_r($diffrec_full);
$diffstr = $app->db->quote(serialize($diffrec_full));
- $username = $app->db->quote($_SESSION['s']['user']['username']);
+ if(isset($_SESSION)) {
+ $username = $app->db->quote($_SESSION['s']['user']['username']);
+ } else {
+ $username = 'admin';
+ }
$dbidx = $primary_field.':'.$primary_id;
if($action == 'INSERT') $action = 'i';
--
Gitblit v1.9.1