diff options
Diffstat (limited to 'flakes/mypackages/pkgs/webapps/phpldapadmin')
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 @@ | |||
1 | { config ? "/etc/phpldapadmin/config.php", fetchurl, fetchFromGitHub, stdenv, optipng }: | ||
2 | stdenv.mkDerivation rec { | ||
3 | version = "1.2.5"; | ||
4 | name = "phpldapadmin-${version}"; | ||
5 | src = fetchFromGitHub { | ||
6 | owner = "leenooks"; | ||
7 | repo = "phpLDAPadmin"; | ||
8 | rev = "8f4ced96f9c63a09510a5bccb2189a8b92fb29ba"; | ||
9 | sha256 = "1x6xc3xbvw3aj46i5ds06a8h6mfljxdv3argxrzz02l541ra6ni7"; | ||
10 | }; | ||
11 | patches = [ | ||
12 | #./ldap-php5_5.patch | ||
13 | #./ldap-disable-mcrypt.patch | ||
14 | #./ldap-php7_2.patch | ||
15 | ./ldap-sort-in-templates.patch | ||
16 | ./ldap-align-button.patch | ||
17 | ./ldap-fix-password.patch | ||
18 | ]; | ||
19 | buildInputs = [ optipng ]; | ||
20 | buildPhase = '' | ||
21 | find -name '*.png' -exec optipng -quiet -force -fix {} \; | ||
22 | ''; | ||
23 | installPhase = '' | ||
24 | cp -a . $out | ||
25 | ln -sf ${config} $out/config/config.php | ||
26 | ''; | ||
27 | } | ||
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 @@ | |||
1 | --- a/htdocs/update_confirm.php 2012-10-01 08:54:14.000000000 +0200 | ||
2 | +++ b/htdocs/update_confirm.php 2018-06-06 15:47:44.122398888 +0200 | ||
3 | @@ -187,7 +187,7 @@ | ||
4 | |||
5 | echo '</table>'; | ||
6 | |||
7 | - echo '<div style="text-align: center;">'; | ||
8 | + echo '<div style="text-align: left;">'; | ||
9 | echo '<br />'; | ||
10 | // @todo cant use AJAX here, it affects file uploads. | ||
11 | 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 @@ | |||
1 | diff --git a/htdocs/login.php b/htdocs/login.php | ||
2 | index 48f9e2e..298b07d 100644 | ||
3 | --- a/htdocs/login.php | ||
4 | +++ b/htdocs/login.php | ||
5 | @@ -13,7 +13,7 @@ require './common.php'; | ||
6 | |||
7 | $user = array(); | ||
8 | $user['login'] = get_request('login'); | ||
9 | -$user['password'] = get_request('login_pass'); | ||
10 | +$user['password'] = get_request('login_pass','POST',false,null,false); | ||
11 | |||
12 | if ($user['login'] && ! strlen($user['password'])) | ||
13 | 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 @@ | |||
1 | diff -wbBur phpldapadmin-1.2.3.org/lib/TemplateRender.php phpldapadmin-1.2.3/lib/TemplateRender.php | ||
2 | --- phpldapadmin-1.2.3.org/lib/TemplateRender.php 2012-10-01 10:54:14.000000000 +0400 | ||
3 | +++ phpldapadmin-1.2.3/lib/TemplateRender.php 2018-02-02 19:06:45.674760057 +0300 | ||
4 | @@ -321,6 +321,8 @@ | ||
5 | |||
6 | $vals = array(); | ||
7 | |||
8 | + asort($picklistvalues); | ||
9 | + | ||
10 | foreach ($picklistvalues as $key => $values) { | ||
11 | $display = $args[3]; | ||
12 | |||