4 files changed, 63 insertions, 0 deletions

diff --git a/flakes/mypackages/pkgs/webapps/phpldapadmin/default.nix b/flakes/mypackages/pkgs/webapps/phpldapadmin/default.nix
new file mode 100644
index 0000000..da32f97
--- /dev/null
+++ b/flakes/mypackages/pkgs/webapps/phpldapadmin/default.nix
@@ -0,0 +1,27 @@
+{ config ? "/etc/phpldapadmin/config.php", fetchurl, fetchFromGitHub, stdenv, optipng }:
+stdenv.mkDerivation rec {
+  version = "1.2.5";
+  name = "phpldapadmin-${version}";
+  src = fetchFromGitHub {
+    owner = "leenooks";
+    repo = "phpLDAPadmin";
+    rev = "8f4ced96f9c63a09510a5bccb2189a8b92fb29ba";
+    sha256 = "1x6xc3xbvw3aj46i5ds06a8h6mfljxdv3argxrzz02l541ra6ni7";
+  };
+  patches = [
+    #./ldap-php5_5.patch
+    #./ldap-disable-mcrypt.patch
+    #./ldap-php7_2.patch
+    ./ldap-sort-in-templates.patch
+    ./ldap-align-button.patch
+    ./ldap-fix-password.patch
+    ];
+  buildInputs = [ optipng ];
+  buildPhase = ''
+    find -name '*.png' -exec optipng -quiet -force -fix {} \;
+  '';
+  installPhase = ''
+    cp -a . $out
+    ln -sf ${config} $out/config/config.php
+  '';
+}
diff --git a/flakes/mypackages/pkgs/webapps/phpldapadmin/ldap-align-button.patch b/flakes/mypackages/pkgs/webapps/phpldapadmin/ldap-align-button.patch
new file mode 100644
index 0000000..d9a5504
--- /dev/null
+++ b/flakes/mypackages/pkgs/webapps/phpldapadmin/ldap-align-button.patch
@@ -0,0 +1,11 @@
+--- a/htdocs/update_confirm.php 2012-10-01 08:54:14.000000000 +0200
++++ b/htdocs/update_confirm.php 2018-06-06 15:47:44.122398888 +0200
+@@ -187,7 +187,7 @@
+ 
+        echo '</table>';
+ 
+-       echo '<div style="text-align: center;">';
++       echo '<div style="text-align: left;">';
+        echo '<br />';
+        // @todo cant use AJAX here, it affects file uploads.
+        printf('<input type="submit" value="%s" />',
diff --git a/flakes/mypackages/pkgs/webapps/phpldapadmin/ldap-fix-password.patch b/flakes/mypackages/pkgs/webapps/phpldapadmin/ldap-fix-password.patch
new file mode 100644
index 0000000..d2d80e4
--- /dev/null
+++ b/flakes/mypackages/pkgs/webapps/phpldapadmin/ldap-fix-password.patch
@@ -0,0 +1,13 @@
+diff --git a/htdocs/login.php b/htdocs/login.php
+index 48f9e2e..298b07d 100644
+--- a/htdocs/login.php
++++ b/htdocs/login.php
+@@ -13,7 +13,7 @@ require './common.php';
+ 
+ $user = array();
+ $user['login'] = get_request('login');
+-$user['password'] = get_request('login_pass');
++$user['password'] = get_request('login_pass','POST',false,null,false);
+ 
+ if ($user['login'] && ! strlen($user['password']))
+        system_message(array(
diff --git a/flakes/mypackages/pkgs/webapps/phpldapadmin/ldap-sort-in-templates.patch b/flakes/mypackages/pkgs/webapps/phpldapadmin/ldap-sort-in-templates.patch
new file mode 100644
index 0000000..55a1974
--- /dev/null
+++ b/flakes/mypackages/pkgs/webapps/phpldapadmin/ldap-sort-in-templates.patch
@@ -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];
+