projects
/
mirror
/
userdir-ldap-cgi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the correct cert when connecting to the LDAP server
[mirror/userdir-ldap-cgi.git]
/
search.cgi
diff --git
a/search.cgi
b/search.cgi
index
dcab35b
..
3769538
100755
(executable)
--- a/
search.cgi
+++ b/
search.cgi
@@
-11,17
+11,17
@@
use strict vars;
use CGI;
use Util;
use URI::Escape;
use CGI;
use Util;
use URI::Escape;
-use Net::LDAP qw(
:all
);
+use Net::LDAP qw(
LDAP_SUCCESS LDAP_PROTOCOL_ERROR
);
# Global settings...
my %config = &Util::ReadConfigFile;
my $query = new CGI;
# Global settings...
my %config = &Util::ReadConfigFile;
my $query = new CGI;
-my $id =
$query->param('id'
);
+my $id =
uri_escape($query->param('id')
);
my $authtoken = $query->param('authtoken');
my $password = &Util::CheckAuthToken($authtoken);
my $authtoken = $query->param('authtoken');
my $password = &Util::CheckAuthToken($authtoken);
-my $dosearch =
$query->param('dosearch'
);
-my $searchdn =
$query->param('searchdn'
);
+my $dosearch =
uri_escape($query->param('dosearch')
);
+my $searchdn =
uri_escape($query->param('searchdn')
);
my $ldap = undef;
my $proto = ($ENV{HTTPS} ? "https" : "http");
my $ldap = undef;
my $proto = ($ENV{HTTPS} ? "https" : "http");
@@
-30,7
+30,7
@@
sub DieHandler {
$ldap->unbind if (defined($ldap));
}
$ldap->unbind if (defined($ldap));
}
-$SIG{__DIE__} = \&DieHandler;
+
#
$SIG{__DIE__} = \&DieHandler;
if (!$dosearch) {
# No action yet, send back the search form...
if (!$dosearch) {
# No action yet, send back the search form...
@@
-61,7
+61,7
@@
if (!$dosearch) {
# go through %searchdata and pull out all the search criteria the user
# specified...
# go through %searchdata and pull out all the search criteria the user
# specified...
- my $filter = "(objectclass=inetOrgPerson)";
+ my $filter = "(objectclass=inetOrgPerson)
(!(accountStatus=*))
";
foreach (keys(%searchdata)) {
if ($query->param($searchdata{$_}{formname})) {
if ($query->param($searchdata{$_}{fuzzy})) {
foreach (keys(%searchdata)) {
if ($query->param($searchdata{$_}{formname})) {
if ($query->param($searchdata{$_}{fuzzy})) {
@@
-191,7
+191,7
@@
if (!$dosearch) {
$vacation = $data->{onvacation}->[0] if ($authtoken && $id);
# OK, now generate output... (i.e. put the output into the buffer )
$vacation = $data->{onvacation}->[0] if ($authtoken && $id);
# OK, now generate output... (i.e. put the output into the buffer )
- $outsub{searchresults} .= '<table border=2 cellpadding=2 cellspacing=0 bgcolor="#DDDDDD" width="80%">';
+ $outsub{searchresults} .= '<table
class="debform"
border=2 cellpadding=2 cellspacing=0 bgcolor="#DDDDDD" width="80%">';
$outsub{searchresults} .= '<tr><th bgcolor="#44CCCC" colspan=2><font size=+1>'."$name</font> ";
$outsub{searchresults} .= "($ufdn)</th></tr>\n";
$outsub{searchresults} .= '<tr><th bgcolor="#44CCCC" colspan=2><font size=+1>'."$name</font> ";
$outsub{searchresults} .= "($ufdn)</th></tr>\n";