From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1000728-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id A947E1382C5
	for <garchives@archives.gentoo.org>; Tue, 30 Jan 2018 18:16:21 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id C9BA8E0D26;
	Tue, 30 Jan 2018 18:16:17 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id AB809E0CEA
	for <gentoo-commits@lists.gentoo.org>; Tue, 30 Jan 2018 18:16:17 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id BDE7D335C63
	for <gentoo-commits@lists.gentoo.org>; Tue, 30 Jan 2018 18:16:16 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id A4D341DE
	for <gentoo-commits@lists.gentoo.org>; Tue, 30 Jan 2018 18:16:13 +0000 (UTC)
From: "Brian Evans" <grknight@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" <grknight@gentoo.org>
Message-ID: <1517326639.2d323e26c63a2f1d11f347a6bb725c095965bda2.grknight@gentoo>
Subject: [gentoo-commits] proj/bouncer:master commit in: php/lib/
X-VCS-Repository: proj/bouncer
X-VCS-Files: php/lib/db.php php/lib/util.php
X-VCS-Directories: php/lib/
X-VCS-Committer: grknight
X-VCS-Committer-Name: Brian Evans
X-VCS-Revision: 2d323e26c63a2f1d11f347a6bb725c095965bda2
X-VCS-Branch: master
Date: Tue, 30 Jan 2018 18:16:13 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 27c01415-45c7-4757-91e7-7cb4c2198948
X-Archives-Hash: 8436b855df4ee0e57815034a2ff18077

commit:     2d323e26c63a2f1d11f347a6bb725c095965bda2
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 30 15:37:19 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Jan 30 15:37:19 2018 +0000
URL:        https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=2d323e26

fix library comments and convert util query

 php/lib/db.php   | 4 ++--
 php/lib/util.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/php/lib/db.php b/php/lib/db.php
index ae20f9e..003be70 100644
--- a/php/lib/db.php
+++ b/php/lib/db.php
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Minimal wrappers for core PHP mysql_* functions.
+ *  Minimal wrappers for core PHP PDO functions.
  *  @package mirror
  *  @subpackage lib
  */
@@ -109,7 +109,7 @@ public static function get($query,$type=PDO::FETCH_BOTH,$col_id=NULL,$parameters
 }
 
 /**
- *  Since PHP's mysql_insert_id() sometimes throws an error, this is the replacement
+ *  Wrapper for PDOStatement::lastInsertId()
  *  @param PDO $dbh optional dbh to get the last inserted id from
  *  @return int the return value of MySQL's last_insert_id()
  */

diff --git a/php/lib/util.php b/php/lib/util.php
index af64fbb..8f8e1e4 100644
--- a/php/lib/util.php
+++ b/php/lib/util.php
@@ -13,7 +13,7 @@ function microtime_float()
 {
     list($usec, $sec) = explode(" ", microtime());
     return ((float)$usec + (float)$sec);
-} 
+}
 
 /**
  *	Add a message to SESSION['messages'] array.
@@ -157,8 +157,8 @@ function emptify_in_array($array, $needle)
  */
 function record_exists($table,$column,$val,$extra=NULL)
 {
-	$result = db_query("SELECT * FROM {$table} WHERE {$column}='{$val}' {$extra}");
-	if ($result&&mysql_num_rows($result)>0)
+	$result = DB::query("SELECT * FROM {$table} WHERE {$column}='{$val}' {$extra}");
+	if ($result&&$result->rowCount()>0)
 	{
 		return true;
 	}