From b30b448b53387b619ce7d1a6ac96306abccbeaba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no> Date: Mon, 2 Mar 2009 11:46:21 +0000 Subject: [PATCH] removed pass by reference git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1358 44740490-163a-0410-bde0-09ae8108e29a --- .../ldapstatus/lib/Auth/Backend/Test/StandardLDAPTest.php | 5 +++-- modules/ldapstatus/lib/Tester.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/ldapstatus/lib/Auth/Backend/Test/StandardLDAPTest.php b/modules/ldapstatus/lib/Auth/Backend/Test/StandardLDAPTest.php index d6780b282..8367702ed 100755 --- a/modules/ldapstatus/lib/Auth/Backend/Test/StandardLDAPTest.php +++ b/modules/ldapstatus/lib/Auth/Backend/Test/StandardLDAPTest.php @@ -185,8 +185,9 @@ class sspmod_ldapstatus_Auth_Backend_Test_StandardLDAPTest extends sspmod_feide_ $tester->tick('getTestOrg'); // Get organization and organizationUnit data. - $this->getOrg(&$attributes, $this->location->getValue('testUser')); - $this->getOrgUnits(&$attributes, $this->location->getValue('testUser')); + $this->getOrg($attributes, $this->location->getValue('testUser')); + $this->getOrgUnits($attributes, $this->location->getValue('testUser')); + #echo('<pre>'); print_r($attributes); exit; $result['getTestOrg'] = array(TRUE,$tester->tack('getTestOrg')); } catch(Exception $e) { $tester->log('LDAP Test user attributes failed:' . $e->getMessage()); diff --git a/modules/ldapstatus/lib/Tester.php b/modules/ldapstatus/lib/Tester.php index 89df654d3..ef8da951b 100644 --- a/modules/ldapstatus/lib/Tester.php +++ b/modules/ldapstatus/lib/Tester.php @@ -88,7 +88,7 @@ class sspmod_ldapstatus_Tester { $this->log('ldapstatus phpping(): ping [' . $host . ':' . $port . ']' ); $timeout = 1.0; - $socket = @fsockopen($host, $port, &$errno, $errstr, $timeout); + $socket = @fsockopen($host, $port, $errno, $errstr, $timeout); if ($socket) @fclose($socket); if ($errno) { return array(FALSE, $errno . ':' . $errstr . ' [' . $host . ':' . $port . ']'); -- GitLab