Date: Friday, February 2, 2018 @ 16:14:29
  Author: spupykin
Revision: 288641

archrelease: copy trunk to community-any

Added:
  phpldapadmin/repos/community-any/PKGBUILD
    (from rev 288640, phpldapadmin/trunk/PKGBUILD)
  phpldapadmin/repos/community-any/disable-mcrypt.patch
    (from rev 288640, phpldapadmin/trunk/disable-mcrypt.patch)
  phpldapadmin/repos/community-any/phpldapadmin-1.2.3-php5_5.patch
    (from rev 288640, phpldapadmin/trunk/phpldapadmin-1.2.3-php5_5.patch)
  phpldapadmin/repos/community-any/phpldapadmin-1.2.3-php7_2.patch
    (from rev 288640, phpldapadmin/trunk/phpldapadmin-1.2.3-php7_2.patch)
  phpldapadmin/repos/community-any/sort-in-templates.patch
    (from rev 288640, phpldapadmin/trunk/sort-in-templates.patch)
Deleted:
  phpldapadmin/repos/community-any/PKGBUILD
  phpldapadmin/repos/community-any/disable-mcrypt.patch
  phpldapadmin/repos/community-any/phpldapadmin-1.2.3-php5_5.patch
  phpldapadmin/repos/community-any/phpldapadmin-1.2.3-php7_2.patch

---------------------------------+
 PKGBUILD                        |   87 +++++++++---------
 disable-mcrypt.patch            |   72 +++++++--------
 phpldapadmin-1.2.3-php5_5.patch |  176 +++++++++++++++++++-------------------
 phpldapadmin-1.2.3-php7_2.patch |   60 ++++++------
 sort-in-templates.patch         |   12 ++
 5 files changed, 211 insertions(+), 196 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD    2018-02-02 16:14:09 UTC (rev 288640)
+++ PKGBUILD    2018-02-02 16:14:29 UTC (rev 288641)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-
-pkgname=phpldapadmin
-pkgver=1.2.3
-pkgrel=11
-pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
-arch=('any')
-url="http://phpldapadmin.sourceforge.net/";
-license=('GPL')
-depends=('libldap' 'php')
-makedepends=('optipng')
-backup=("etc/webapps/phpldapadmin/config.php")
-source=(https://downloads.sourceforge.net/project/phpldapadmin/phpldapadmin-php5/$pkgver/phpldapadmin-$pkgver.tgz
-        phpldapadmin-1.2.3-php5_5.patch
-        phpldapadmin-1.2.3-php7_2.patch
-        disable-mcrypt.patch)
-sha256sums=('aecaf8c3ce77ba3899dd31ee5ee183555b2f9349eb8e196dcd33d8a3c485ed58'
-            'ecafce992e8b68426eacdc3702268f2cb57d9ebed662b0edcc614a6e24623c76'
-            'c35a31e15a406cd2b49331a92a2ab491fd7024c4bc82e173e1f271514cfc4bc6'
-            'b31774abab4dd603ec9acbeda49adb188890173ee93042a811b5724e01edd837')
-
-build() {
-  cd "$srcdir"/phpldapadmin-${pkgver}/
-  find -name '*.png' -exec optipng -quiet -force -fix {} \;
-  # patch from https://pkgs.fedoraproject.org/cgit/phpldapadmin.git/tree/
-  patch -p1 -i "$srcdir"/phpldapadmin-1.2.3-php5_5.patch
-  # php >7 deprecates mcrypt. TODO: replace it with openssl?
-  patch -p1 -i "$srcdir"/disable-mcrypt.patch
-  patch -p1 -i "$srcdir"/phpldapadmin-1.2.3-php7_2.patch
-}
-
-package() {
-  _instdir="$pkgdir"/usr/share/webapps/phpldapadmin
-  mkdir -p ${_instdir} "$pkgdir"/etc/webapps/phpldapadmin
-  cd ${_instdir}
-
-  cp -ra "$srcdir"/phpldapadmin-${pkgver}/* .
-
-  ln -s /etc/webapps/phpldapadmin/config.php ${_instdir}/config/config.php
-  cp ${_instdir}/config/config.php.example 
"$pkgdir"/etc/webapps/phpldapadmin/config.php
-}

Copied: phpldapadmin/repos/community-any/PKGBUILD (from rev 288640, 
phpldapadmin/trunk/PKGBUILD)
===================================================================
--- PKGBUILD                            (rev 0)
+++ PKGBUILD    2018-02-02 16:14:29 UTC (rev 288641)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+
+pkgname=phpldapadmin
+pkgver=1.2.3
+pkgrel=12
+pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
+arch=('any')
+url="http://phpldapadmin.sourceforge.net/";
+license=('GPL')
+depends=('libldap' 'php')
+makedepends=('optipng')
+backup=("etc/webapps/phpldapadmin/config.php")
+source=(https://downloads.sourceforge.net/project/phpldapadmin/phpldapadmin-php5/$pkgver/phpldapadmin-$pkgver.tgz
+        phpldapadmin-1.2.3-php5_5.patch
+        phpldapadmin-1.2.3-php7_2.patch
+        disable-mcrypt.patch
+        sort-in-templates.patch)
+sha256sums=('aecaf8c3ce77ba3899dd31ee5ee183555b2f9349eb8e196dcd33d8a3c485ed58'
+            'ecafce992e8b68426eacdc3702268f2cb57d9ebed662b0edcc614a6e24623c76'
+            'c35a31e15a406cd2b49331a92a2ab491fd7024c4bc82e173e1f271514cfc4bc6'
+            'b31774abab4dd603ec9acbeda49adb188890173ee93042a811b5724e01edd837'
+            'fc2d4bdf4d43a90aa541fe20eeed494caa339eacf3f08b06539efcdbacc3578f')
+
+build() {
+  cd "$srcdir"/phpldapadmin-${pkgver}/
+  find -name '*.png' -exec optipng -quiet -force -fix {} \;
+  # patch from https://pkgs.fedoraproject.org/cgit/phpldapadmin.git/tree/
+  patch -p1 -i "$srcdir"/phpldapadmin-1.2.3-php5_5.patch
+  # php >7 deprecates mcrypt. TODO: replace it with openssl?
+  patch -p1 -i "$srcdir"/disable-mcrypt.patch
+  patch -p1 -i "$srcdir"/phpldapadmin-1.2.3-php7_2.patch
+  patch -p1 -i "$srcdir"/sort-in-templates.patch
+}
+
+package() {
+  _instdir="$pkgdir"/usr/share/webapps/phpldapadmin
+  mkdir -p ${_instdir} "$pkgdir"/etc/webapps/phpldapadmin
+  cd ${_instdir}
+
+  cp -ra "$srcdir"/phpldapadmin-${pkgver}/* .
+
+  ln -s /etc/webapps/phpldapadmin/config.php ${_instdir}/config/config.php
+  cp ${_instdir}/config/config.php.example 
"$pkgdir"/etc/webapps/phpldapadmin/config.php
+}

Deleted: disable-mcrypt.patch
===================================================================
--- disable-mcrypt.patch        2018-02-02 16:14:09 UTC (rev 288640)
+++ disable-mcrypt.patch        2018-02-02 16:14:29 UTC (rev 288641)
@@ -1,36 +0,0 @@
-diff -wbBur phpldapadmin-1.2.3/lib/functions.php 
phpldapadmin-1.2.3.my/lib/functions.php
---- phpldapadmin-1.2.3/lib/functions.php       2012-10-01 10:54:14.000000000 
+0400
-+++ phpldapadmin-1.2.3.my/lib/functions.php    2017-02-02 20:02:14.424245233 
+0300
-@@ -745,6 +745,7 @@
-       if (! trim($secret))
-               return $data;
- 
-+/*
-       if (function_exists('mcrypt_module_open') && ! empty($data)) {
-               $td = mcrypt_module_open(MCRYPT_BLOWFISH,'',MCRYPT_MODE_ECB,'');
-               $iv = 
mcrypt_create_iv(mcrypt_enc_get_iv_size($td),MCRYPT_DEV_URANDOM);
-@@ -754,7 +755,7 @@
- 
-               return $encrypted_data;
-       }
--
-+*/
-       if (file_exists(LIBDIR.'blowfish.php'))
-               require_once LIBDIR.'blowfish.php';
-       else
-@@ -801,6 +802,7 @@
-       if (! trim($secret))
-               return $encdata;
- 
-+/*
-       if (function_exists('mcrypt_module_open') && ! empty($encdata)) {
-               $td = mcrypt_module_open(MCRYPT_BLOWFISH,'',MCRYPT_MODE_ECB,'');
-               $iv = 
mcrypt_create_iv(mcrypt_enc_get_iv_size($td),MCRYPT_DEV_URANDOM);
-@@ -810,6 +812,7 @@
- 
-               return $decrypted_data;
-       }
-+*/
- 
-       if (file_exists(LIBDIR.'blowfish.php'))
-               require_once LIBDIR.'blowfish.php';

Copied: phpldapadmin/repos/community-any/disable-mcrypt.patch (from rev 288640, 
phpldapadmin/trunk/disable-mcrypt.patch)
===================================================================
--- disable-mcrypt.patch                                (rev 0)
+++ disable-mcrypt.patch        2018-02-02 16:14:29 UTC (rev 288641)
@@ -0,0 +1,36 @@
+diff -wbBur phpldapadmin-1.2.3/lib/functions.php 
phpldapadmin-1.2.3.my/lib/functions.php
+--- phpldapadmin-1.2.3/lib/functions.php       2012-10-01 10:54:14.000000000 
+0400
++++ phpldapadmin-1.2.3.my/lib/functions.php    2017-02-02 20:02:14.424245233 
+0300
+@@ -745,6 +745,7 @@
+       if (! trim($secret))
+               return $data;
+ 
++/*
+       if (function_exists('mcrypt_module_open') && ! empty($data)) {
+               $td = mcrypt_module_open(MCRYPT_BLOWFISH,'',MCRYPT_MODE_ECB,'');
+               $iv = 
mcrypt_create_iv(mcrypt_enc_get_iv_size($td),MCRYPT_DEV_URANDOM);
+@@ -754,7 +755,7 @@
+ 
+               return $encrypted_data;
+       }
+-
++*/
+       if (file_exists(LIBDIR.'blowfish.php'))
+               require_once LIBDIR.'blowfish.php';
+       else
+@@ -801,6 +802,7 @@
+       if (! trim($secret))
+               return $encdata;
+ 
++/*
+       if (function_exists('mcrypt_module_open') && ! empty($encdata)) {
+               $td = mcrypt_module_open(MCRYPT_BLOWFISH,'',MCRYPT_MODE_ECB,'');
+               $iv = 
mcrypt_create_iv(mcrypt_enc_get_iv_size($td),MCRYPT_DEV_URANDOM);
+@@ -810,6 +812,7 @@
+ 
+               return $decrypted_data;
+       }
++*/
+ 
+       if (file_exists(LIBDIR.'blowfish.php'))
+               require_once LIBDIR.'blowfish.php';

Deleted: phpldapadmin-1.2.3-php5_5.patch
===================================================================
--- phpldapadmin-1.2.3-php5_5.patch     2018-02-02 16:14:09 UTC (rev 288640)
+++ phpldapadmin-1.2.3-php5_5.patch     2018-02-02 16:14:29 UTC (rev 288641)
@@ -1,88 +0,0 @@
-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-11-12 03:40:56.638343739 
+0400
-@@ -1117,12 +1117,14 @@
-               if (is_array($dn)) {
-                       $a = array();
-                       foreach ($dn as $key => $rdn)
--                              $a[$key] = 
preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$rdn);
-+                              $a[$key] = 
preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
-+                                      function ($matches) { return 
chr(hexdec($matches[1])); }, $rdn);
- 
-                       return $a;
- 
-               } else
--                      return 
preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$dn);
-+                      return preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
-+                                      function ($matches) { return 
chr(hexdec($matches[1])); }, $dn);
-       }
- 
-       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-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.
-  */
--function password_hash($password_clear,$enc_type) {
-+function pla_password_hash($password_clear,$enc_type) {
-       if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
-               debug_log('Entered 
(%%)',1,0,__FILE__,__LINE__,__METHOD__,$fargs);
- 
-@@ -2318,7 +2318,7 @@
- 
-               # SHA crypted passwords
-               case 'sha':
--                      if 
(strcasecmp(password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0)
-+                      if 
(strcasecmp(pla_password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword) 
== 0)
-                               return true;
-                       else
-                               return false;
-@@ -2327,7 +2327,7 @@
- 
-               # MD5 crypted passwords
-               case 'md5':
--                      if( 
strcasecmp(password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0)
-+                      if( 
strcasecmp(pla_password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 
0)
-                               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();
- 
-               foreach ($dn as $key => $rdn)
--                      $a[$key] = 
preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$rdn);
-+                      $a[$key] = 
preg_replace_callback('/\\\([0-9A-Fa-f]{2})/', 
-+                              function ($matches) { return 
chr(hexdec($matches[1])); }, $rdn );
- 
-               return $a;
- 
-       } else {
--              return 
preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$dn);
-+              return preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
-+                              function ($matches) { return 
chr(hexdec($matches[1])); }, $dn);
-       }
- }
- 

Copied: phpldapadmin/repos/community-any/phpldapadmin-1.2.3-php5_5.patch (from 
rev 288640, phpldapadmin/trunk/phpldapadmin-1.2.3-php5_5.patch)
===================================================================
--- phpldapadmin-1.2.3-php5_5.patch                             (rev 0)
+++ phpldapadmin-1.2.3-php5_5.patch     2018-02-02 16:14:29 UTC (rev 288641)
@@ -0,0 +1,88 @@
+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-11-12 03:40:56.638343739 
+0400
+@@ -1117,12 +1117,14 @@
+               if (is_array($dn)) {
+                       $a = array();
+                       foreach ($dn as $key => $rdn)
+-                              $a[$key] = 
preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$rdn);
++                              $a[$key] = 
preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
++                                      function ($matches) { return 
chr(hexdec($matches[1])); }, $rdn);
+ 
+                       return $a;
+ 
+               } else
+-                      return 
preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$dn);
++                      return preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
++                                      function ($matches) { return 
chr(hexdec($matches[1])); }, $dn);
+       }
+ 
+       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-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.
+  */
+-function password_hash($password_clear,$enc_type) {
++function pla_password_hash($password_clear,$enc_type) {
+       if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
+               debug_log('Entered 
(%%)',1,0,__FILE__,__LINE__,__METHOD__,$fargs);
+ 
+@@ -2318,7 +2318,7 @@
+ 
+               # SHA crypted passwords
+               case 'sha':
+-                      if 
(strcasecmp(password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0)
++                      if 
(strcasecmp(pla_password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword) 
== 0)
+                               return true;
+                       else
+                               return false;
+@@ -2327,7 +2327,7 @@
+ 
+               # MD5 crypted passwords
+               case 'md5':
+-                      if( 
strcasecmp(password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0)
++                      if( 
strcasecmp(pla_password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 
0)
+                               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();
+ 
+               foreach ($dn as $key => $rdn)
+-                      $a[$key] = 
preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$rdn);
++                      $a[$key] = 
preg_replace_callback('/\\\([0-9A-Fa-f]{2})/', 
++                              function ($matches) { return 
chr(hexdec($matches[1])); }, $rdn );
+ 
+               return $a;
+ 
+       } else {
+-              return 
preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$dn);
++              return preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
++                              function ($matches) { return 
chr(hexdec($matches[1])); }, $dn);
+       }
+ }
+ 

Deleted: phpldapadmin-1.2.3-php7_2.patch
===================================================================
--- phpldapadmin-1.2.3-php7_2.patch     2018-02-02 16:14:09 UTC (rev 288640)
+++ phpldapadmin-1.2.3-php7_2.patch     2018-02-02 16:14:29 UTC (rev 288641)
@@ -1,30 +0,0 @@
-diff -wbBur phpldapadmin.org/lib/functions.php phpldapadmin/lib/functions.php
---- phpldapadmin.org/lib/functions.php 2017-02-02 10:03:58.000000000 -0700
-+++ phpldapadmin/lib/functions.php     2018-01-23 06:18:31.118312887 -0700
-@@ -51,7 +51,7 @@
- /**
-  * Loads class definition
-  */
--function __autoload($className) {
-+spl_autoload_register(function($className) {
-       if (file_exists(HOOKSDIR."classes/$className.php"))
-               require_once(HOOKSDIR."classes/$className.php");
-       elseif (file_exists(LIBDIR."$className.php"))
-@@ -64,7 +64,7 @@
-                       'body'=>sprintf('%s: %s [%s]',
-                               __METHOD__,_('Called to load a class that cant 
be found'),$className),
-                       'type'=>'error'));
--}
-+});
- 
- /**
-  * Strips all slashes from the specified array in place (pass by ref).
-@@ -1083,7 +1083,7 @@
- 
-               $code .= 'return $c;';
- 
--              $CACHE[$sortby] = create_function('$a, $b',$code);
-+              eval("\$CACHE[\$sortby] = function(\$a, \$b) { $code; };");
-       }
- 
-       uasort($data,$CACHE[$sortby]);

Copied: phpldapadmin/repos/community-any/phpldapadmin-1.2.3-php7_2.patch (from 
rev 288640, phpldapadmin/trunk/phpldapadmin-1.2.3-php7_2.patch)
===================================================================
--- phpldapadmin-1.2.3-php7_2.patch                             (rev 0)
+++ phpldapadmin-1.2.3-php7_2.patch     2018-02-02 16:14:29 UTC (rev 288641)
@@ -0,0 +1,30 @@
+diff -wbBur phpldapadmin.org/lib/functions.php phpldapadmin/lib/functions.php
+--- phpldapadmin.org/lib/functions.php 2017-02-02 10:03:58.000000000 -0700
++++ phpldapadmin/lib/functions.php     2018-01-23 06:18:31.118312887 -0700
+@@ -51,7 +51,7 @@
+ /**
+  * Loads class definition
+  */
+-function __autoload($className) {
++spl_autoload_register(function($className) {
+       if (file_exists(HOOKSDIR."classes/$className.php"))
+               require_once(HOOKSDIR."classes/$className.php");
+       elseif (file_exists(LIBDIR."$className.php"))
+@@ -64,7 +64,7 @@
+                       'body'=>sprintf('%s: %s [%s]',
+                               __METHOD__,_('Called to load a class that cant 
be found'),$className),
+                       'type'=>'error'));
+-}
++});
+ 
+ /**
+  * Strips all slashes from the specified array in place (pass by ref).
+@@ -1083,7 +1083,7 @@
+ 
+               $code .= 'return $c;';
+ 
+-              $CACHE[$sortby] = create_function('$a, $b',$code);
++              eval("\$CACHE[\$sortby] = function(\$a, \$b) { $code; };");
+       }
+ 
+       uasort($data,$CACHE[$sortby]);

Copied: phpldapadmin/repos/community-any/sort-in-templates.patch (from rev 
288640, phpldapadmin/trunk/sort-in-templates.patch)
===================================================================
--- sort-in-templates.patch                             (rev 0)
+++ sort-in-templates.patch     2018-02-02 16:14:29 UTC (rev 288641)
@@ -0,0 +1,12 @@
+diff -wbBur phpldapadmin-1.2.3.org/lib/TemplateRender.php 
phpldapadmin-1.2.3/lib/TemplateRender.php
+--- phpldapadmin-1.2.3.org/lib/TemplateRender.php      2012-10-01 
10:54:14.000000000 +0400
++++ phpldapadmin-1.2.3/lib/TemplateRender.php  2018-02-02 19:06:45.674760057 
+0300
+@@ -321,6 +321,8 @@
+ 
+                               $vals = array();
+ 
++                              asort($picklistvalues);
++
+                               foreach ($picklistvalues as $key => $values) {
+                                       $display = $args[3];
+ 

Reply via email to