From 3e4697eb51ae1b5a9662db3d9eea273e7664408d Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Wed, 6 Nov 2013 17:21:56 +0100
Subject: [PATCH] migrated and improved two functions regarding PDO stuff, refs
 #1287

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 .../aps/function.domainHasApsInstances.php    | 22 ++++++++++---------
 .../function.domainHasMainSubDomains.php      |  3 +--
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/lib/functions/aps/function.domainHasApsInstances.php b/lib/functions/aps/function.domainHasApsInstances.php
index 4d20de6e..dd0e0bab 100644
--- a/lib/functions/aps/function.domainHasApsInstances.php
+++ b/lib/functions/aps/function.domainHasApsInstances.php
@@ -26,17 +26,19 @@
  *
  * @return boolean
  */
-function domainHasApsInstances($domainid = 0)
-{
-	global $db, $settings, $theme;
+function domainHasApsInstances($domainid = 0) {
+
+	global $settings, $theme;
 	
-	if($settings['aps']['aps_active'] == '1')
-	{
-		if($domainid > 0)
-		{
-			$instances = $db->query_first("SELECT COUNT(`ID`) AS `count` FROM `" . TABLE_APS_SETTINGS . "` WHERE `Name`='main_domain' AND `Value`='" . (int)$domainid . "'");
-			if((int)$instances['count'] != 0)
-			{
+	if ($settings['aps']['aps_active'] == '1') {
+		if ($domainid > 0) {
+			$instances_stmt = Database::prepare("
+				SELECT COUNT(`ID`) AS `count` FROM `" . TABLE_APS_SETTINGS . "`
+				WHERE `Name` = 'main_domain' AND `Value` = :domainid"
+			);
+			$instances = Database::pexecute_first($instances_stmt, array('domainid' => $domainid));
+
+			if ((int)$instances['count'] != 0) {
 				return true;
 			}
 		}
diff --git a/lib/functions/froxlor/function.domainHasMainSubDomains.php b/lib/functions/froxlor/function.domainHasMainSubDomains.php
index 62295a43..d6d162ae 100644
--- a/lib/functions/froxlor/function.domainHasMainSubDomains.php
+++ b/lib/functions/froxlor/function.domainHasMainSubDomains.php
@@ -29,8 +29,7 @@ function domainHasMainSubDomains($id = 0) {
 		SELECT COUNT(`id`) as `mainsubs` FROM `".TABLE_PANEL_DOMAINS."`
 		WHERE `ismainbutsubto` = :id"
 	);
-	Database::pexecute($result_stmt, array('id' => $id));
-	$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
+	$result = Database::pexecute_first($result_stmt, array('id' => $id));
 
 	if (isset($result['mainsubs'])
 		&& $result['mainsubs'] > 0