phpki/contribs7/phpki-0.82-ca_admin_users.patch

diff -Nur phpki/phpki-0.82/ca/manage_certs.php phpki_mod/phpki-0.82/ca/manage_certs.php
--- phpki/phpki-0.82/ca/manage_certs.php        2011-06-29 13:07:14.000000000 +0200
+++ phpki_mod/phpki-0.82/ca/manage_certs.php    2011-06-29 13:08:22.000000000 +0200
@@ -20,12 +20,6 @@
 $show_revoked = gpvar('show_revoked');
 $show_expired = gpvar('show_expired');
 
-
-# Prevent handling certs that don't belong to user
-if ($serial && CAdb_issuer($serial) != $PHPki_user && ! in_array($PHPki_user, $PHPki_admins)) { 
-       $stage = 'goaway';
-}
-
 if ( !($show_valid.$show_revoked.$show_expired) ) {
        $show_valid   = 'V';
        $show_revoked = 'R';
@@ -366,12 +360,7 @@
 
        $x = "^[$show_valid$show_revoked$show_expired]";
 
-       if (in_array($PHPki_user, $PHPki_admins)) {
-               $x = "$x.*$search";
-       }
-       else {
-               $x = "$x.*$search.*$PHPki_user|$x.*$PHPki_user.*$search";
-       }
+       $x = "$x.*$search";
 
        $db = csort(CAdb_to_array($x), $sortfield, ($ascdec=='A'?SORT_ASC:SORT_DESC));
 
1	vip-ire	1.1	diff -Nur phpki/phpki-0.82/ca/manage_certs.php phpki_mod/phpki-0.82/ca/manage_certs.php
2			--- phpki/phpki-0.82/ca/manage_certs.php 2011-06-29 13:07:14.000000000 +0200
3			+++ phpki_mod/phpki-0.82/ca/manage_certs.php 2011-06-29 13:08:22.000000000 +0200
4			@@ -20,12 +20,6 @@
5			$show_revoked = gpvar('show_revoked');
6			$show_expired = gpvar('show_expired');
7
8			-
9			-# Prevent handling certs that don't belong to user
10			-if ($serial && CAdb_issuer($serial) != $PHPki_user && ! in_array($PHPki_user, $PHPki_admins)) {
11			- $stage = 'goaway';
12			-}
13			-
14			if ( !($show_valid.$show_revoked.$show_expired) ) {
15			$show_valid = 'V';
16			$show_revoked = 'R';
17			@@ -366,12 +360,7 @@
18
19			$x = "^[$show_valid$show_revoked$show_expired]";
20
21			- if (in_array($PHPki_user, $PHPki_admins)) {
22			- $x = "$x.*$search";
23			- }
24			- else {
25			- $x = "$x.$search.$PHPki_user\|$x.$PHPki_user.$search";
26			- }
27			+ $x = "$x.*$search";
28
29			$db = csort(CAdb_to_array($x), $sortfield, ($ascdec=='A'?SORT_ASC:SORT_DESC));
30