From 661c081a778977ffd4094bf8628d95f8e31b009a Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Mon, 4 Nov 2013 22:23:49 +0100
Subject: [PATCH] fix execute of statement if variables != replacers in
 sql-prepare query

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 admin_phpsettings.php |  4 +++-
 lib/cron_shutdown.php | 17 +++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/admin_phpsettings.php b/admin_phpsettings.php
index 02a53258..5aa6527e 100644
--- a/admin_phpsettings.php
+++ b/admin_phpsettings.php
@@ -37,6 +37,7 @@ if ($page == 'overview') {
 		while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
 
 			$domainresult = false;
+			$query_params = array('id' => $row['id']);
 
 			$query = "SELECT * FROM `".TABLE_PANEL_DOMAINS."`
 					WHERE `phpsettingid` = :id
@@ -44,6 +45,7 @@ if ($page == 'overview') {
 
 			if ((int)$userinfo['domains_see_all'] == 0) {
 				$query .= " AND `adminid` = :adminid";
+				$query_params['adminid'] = $userinfo['adminid'];
 			}
 
 			if ((int)$settings['panel']['phpconfigs_hidestdsubdomain'] == 1) {
@@ -61,7 +63,7 @@ if ($page == 'overview') {
 			}
 
 			$domainresult_stmt = Database::prepare($query);
-			Database::pexecute($domainresult_stmt, array('id' => $id, 'adminid' => $userinfo['adminid']));
+			Database::pexecute($domainresult_stmt, $query_params);
 
 			$domains = '';
 			if (Database::num_rows() > 0) {
diff --git a/lib/cron_shutdown.php b/lib/cron_shutdown.php
index 8d171776..e1903c65 100644
--- a/lib/cron_shutdown.php
+++ b/lib/cron_shutdown.php
@@ -17,31 +17,28 @@
  *
  */
 
-if($settings['logger']['log_cron'] == '1')
-{
+if ($settings['logger']['log_cron'] == '1') {
 	$cronlog->setCronLog(0);
 	fwrite($debugHandler, 'Logging for cron has been shutdown' . "\n");
 }
 
+// TODO remove when completely migrated to PDO
 $db->close();
 fwrite($debugHandler, 'Closing database connection' . "\n");
 
-if(isset($db_root))
-{
+if (isset($db_root)) {
 	$db_root->close();
 	fwrite($debugHandler, 'Closing database rootconnection' . "\n");
 }
 
-if($keepLockFile === true)
-{
+if ($keepLockFile === true) {
 	fwrite($debugHandler, '=== Keep lockfile because of exception ===');
 }
 
 fclose($debugHandler);
 
-if($keepLockFile === false
-   && $cronscriptDebug === false)
-{
+if ($keepLockFile === false
+	&& $cronscriptDebug === false
+) {
 	unlink($lockfile);
 }
-