[phpldapadmin/f19] Fix compatibility with php >= 5.5

[Dmitry Butskoy]

commit 6eb994d80035ec58393b0c2a3ad3faa06ea4350a
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date:   Tue Nov 12 03:53:15 2013 +0400

    Fix compatibility with php >= 5.5

 phpldapadmin-1.2.3-php5_5.patch |   25 +++++++++++++++++++++++--
 phpldapadmin.spec               |    8 +++++++-
 2 files changed, 30 insertions(+), 3 deletions(-)
---
diff --git a/phpldapadmin-1.2.3-php5_5.patch b/phpldapadmin-1.2.3-php5_5.patch
index 0457b57..8545ad2 100644
--- a/phpldapadmin-1.2.3-php5_5.patch
+++ b/phpldapadmin-1.2.3-php5_5.patch
@@ -1,6 +1,18 @@
+diff -Nrbu phpldapadmin-1.2.3/lib/PageRender.php phpldapadmin-1.2.3-OK/lib/PageRender.php
+--- phpldapadmin-1.2.3/lib/PageRender.php	2012-10-01 10:54:14.000000000 +0400
++++ phpldapadmin-1.2.3-OK/lib/PageRender.php	2013-11-12 03:44:40.518144839 +0400
+@@ -287,7 +287,7 @@
+ 						break;
+ 
+ 					default:
+-						$vals[$i] = password_hash($passwordvalue,$enc);
++						$vals[$i] = pla_password_hash($passwordvalue,$enc);
+ 				}
+ 
+ 				$vals = array_unique($vals);
 diff -Nrbu phpldapadmin-1.2.3/lib/ds_ldap.php phpldapadmin-1.2.3-OK/lib/ds_ldap.php
 --- phpldapadmin-1.2.3/lib/ds_ldap.php	2012-10-01 10:54:14.000000000 +0400
-+++ phpldapadmin-1.2.3-OK/lib/ds_ldap.php	2013-06-18 16:03:52.295235583 +0400
++++ phpldapadmin-1.2.3-OK/lib/ds_ldap.php	2013-11-12 03:40:56.638343739 +0400
 @@ -1117,12 +1117,14 @@
  		if (is_array($dn)) {
  			$a = array();
@@ -20,7 +32,7 @@ diff -Nrbu phpldapadmin-1.2.3/lib/ds_ldap.php phpldapadmin-1.2.3-OK/lib/ds_ldap.
  	public function getRootDSE($method=null) {
 diff -Nrbu phpldapadmin-1.2.3/lib/functions.php phpldapadmin-1.2.3-OK/lib/functions.php
 --- phpldapadmin-1.2.3/lib/functions.php	2012-10-01 10:54:14.000000000 +0400
-+++ phpldapadmin-1.2.3-OK/lib/functions.php	2013-06-18 16:03:52.330235281 +0400
++++ phpldapadmin-1.2.3-OK/lib/functions.php	2013-11-12 03:44:17.298065264 +0400
 @@ -2127,7 +2127,7 @@
   *        crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, sha512, or clear.
   * @return string The hashed password.
@@ -48,6 +60,15 @@ diff -Nrbu phpldapadmin-1.2.3/lib/functions.php phpldapadmin-1.2.3-OK/lib/functi
  				return true;
  			else
  				return false;
+@@ -2392,7 +2392,7 @@
+ 
+ 		# SHA512 crypted passwords
+ 		case 'sha512':
+-			if (strcasecmp(password_hash($plainpassword,'sha512'),'{SHA512}'.$cryptedpassword) == 0)
++			if (strcasecmp(pla_password_hash($plainpassword,'sha512'),'{SHA512}'.$cryptedpassword) == 0)
+ 				return true;
+ 			else
+ 				return false;
 @@ -2565,12 +2565,14 @@
  		$a = array();
  
diff --git a/phpldapadmin.spec b/phpldapadmin.spec
index eafc23a..79c2144 100644
--- a/phpldapadmin.spec
+++ b/phpldapadmin.spec
@@ -2,7 +2,7 @@
 Name: phpldapadmin
 Summary: Web-based tool for managing LDAP servers
 Version: 1.2.3
-Release: 3%{?dist}
+Release: 5%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 URL: http://phpldapadmin.sourceforge.net
@@ -127,6 +127,12 @@ fi
 
 
 %changelog
+* Tue Nov 12 2013 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.2.3-5
+- Fix compatibility patch for php >= 5.5 (#974928)
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Tue Jun 18 2013 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.2.3-3
 - Add compatibility patch for php >= 5.5