From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1000739-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 423681382C5
for <garchives@archives.gentoo.org>; Tue, 30 Jan 2018 18:16:29 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BB96FE0D37;
Tue, 30 Jan 2018 18:16:19 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.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 977EAE0D36
for <gentoo-commits@lists.gentoo.org>; Tue, 30 Jan 2018 18:16:19 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 7B8D2335C77
for <gentoo-commits@lists.gentoo.org>; Tue, 30 Jan 2018 18:16:18 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 4A70A1E7
for <gentoo-commits@lists.gentoo.org>; Tue, 30 Jan 2018 18:16:14 +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: <1517330162.cbb2b1f5e4b53a08bece7af5426468694a4b0922.grknight@gentoo>
Subject: [gentoo-commits] proj/bouncer:master commit in: php/lib/
X-VCS-Repository: proj/bouncer
X-VCS-Files: php/lib/csv.php php/lib/util.php
X-VCS-Directories: php/lib/
X-VCS-Committer: grknight
X-VCS-Committer-Name: Brian Evans
X-VCS-Revision: cbb2b1f5e4b53a08bece7af5426468694a4b0922
X-VCS-Branch: master
Date: Tue, 30 Jan 2018 18:16:14 +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: 291b63d1-1e5e-4055-82e9-e85756e2ac7c
X-Archives-Hash: b15bd467ff005f46bf5d6e33bd76e03c
commit: cbb2b1f5e4b53a08bece7af5426468694a4b0922
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 30 16:36:02 2018 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Jan 30 16:36:02 2018 +0000
URL: https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=cbb2b1f5
Remove old references
php/lib/csv.php | 18 +++++++++---------
php/lib/util.php | 4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/php/lib/csv.php b/php/lib/csv.php
index 12dff67..832866f 100644
--- a/php/lib/csv.php
+++ b/php/lib/csv.php
@@ -166,7 +166,7 @@ function csv_csv_to_array($string)
{
$return = array();
$length = strlen($string);
-
+
// create a temp file and write the string to it
$tmpfname = tempnam('/tmp', 'csvlib');
$fh = fopen($tmpfname, 'w');
@@ -194,23 +194,23 @@ function csv_csv_to_array($string)
* @param string $enclosure enclosure character, default to '"'
* @return &array the two dimensional array with the csv file content, or an empty if an error occured
*/
-function &csv_csv_file_to_array($filepath, $delimiter=',', $enclosure='"')
+function csv_csv_file_to_array($filepath, $delimiter=',', $enclosure='"')
{
$return = array();
-
+
if (!file_exists($filepath) || !is_readable($filepath))
return $return;
-
- $fh =& fopen($filepath, 'r');
+
+ $fh = fopen($filepath, 'r');
$size = filesize($filepath)+1;
- while ($data =& fgetcsv($fh, $size, $delimiter, $enclosure))
+ while ($data = fgetcsv($fh, $size, $delimiter, $enclosure))
{
$return[] = $data;
}
-
+
fclose($fh);
-
+
return $return;
}
-?>
+
diff --git a/php/lib/util.php b/php/lib/util.php
index fa95114..c058e2d 100644
--- a/php/lib/util.php
+++ b/php/lib/util.php
@@ -311,9 +311,9 @@ function array_order_by(&$array, $key=null, $order=null, $retain_keys=TRUE, $cas
foreach($x as $row_key => $uselessvalue)
{
if ($retain_keys)
- $return_arr[$row_key] =& $array[$row_key];
+ $return_arr[$row_key] = $array[$row_key];
else
- $return_arr[] =& $array[$row_key];
+ $return_arr[] = $array[$row_key];
}
return $return_arr;