projects
/
mirror
/
userdir-ldap-cgi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
178de61
)
Added support for the Jabber ID
author
joey
<>
Thu, 18 Nov 2004 18:17:00 +0000
(18:17 +0000)
committer
joey
<>
Thu, 18 Nov 2004 18:17:00 +0000
(18:17 +0000)
search.cgi
patch
|
blob
|
history
update.cgi
patch
|
blob
|
history
diff --git
a/search.cgi
b/search.cgi
index
01a8541
..
ffbc654
100755
(executable)
--- a/
search.cgi
+++ b/
search.cgi
@@
-1,6
+1,6
@@
#!/usr/bin/perl
#!/usr/bin/perl
-# $Id: search.cgi,v 1.1
0 2004/11/18 14:33:32
joey Exp $
+# $Id: search.cgi,v 1.1
1 2004/11/18 19:17:00
joey Exp $
# (c) 1999 Randolph Chung. Licensed under the GPL. <tausq@debian.org>
# (c) 2004 Martin Schulze. Licensed under the GPL. <joey@debian.org>
# (c) 1999 Randolph Chung. Licensed under the GPL. <tausq@debian.org>
# (c) 2004 Martin Schulze. Licensed under the GPL. <joey@debian.org>
@@
-117,7
+117,8
@@
if (!$dosearch) {
$data = $entries->{$dn};
# These are local variables.. i have enough global vars as it is... <sigh>
$data = $entries->{$dn};
# These are local variables.. i have enough global vars as it is... <sigh>
- my ($ufdn, $login, $name, $icquin, $email, $fingerprint, $address, $latlong, $vacation, $created, $modified, $lastseen) = undef;
+ my ($ufdn, $login, $name, $icquin, $jabberjid, $email, $fingerprint,
+ $address, $latlong, $vacation, $created, $modified, $lastseen) = undef;
$ufdn = $dn; # Net::LDAP does not have a dn2ufn function, but this is close enough :)
$ufdn = $dn; # Net::LDAP does not have a dn2ufn function, but this is close enough :)
@@
-181,6
+182,7
@@
if (!$dosearch) {
$outsub{searchresults} .= FormatEntry($dataspecref->{uid}, $login);
$outsub{searchresults} .= FormatEntry($dataspecref->{ircnick}, $data->{ircnick}->[0]);
$outsub{searchresults} .= FormatEntry($dataspecref->{uid}, $login);
$outsub{searchresults} .= FormatEntry($dataspecref->{ircnick}, $data->{ircnick}->[0]);
+ $outsub{searchresults} .= FormatEntry($dataspecref->{jabberjid}, $data->{jabberjid}->[0]);
$outsub{searchresults} .= FormatEntry($dataspecref->{loginshell}, $data->{loginshell}->[0]);
$outsub{searchresults} .= FormatEntry($dataspecref->{fingerprint}, $fingerprint);
if ($icquin) {
$outsub{searchresults} .= FormatEntry($dataspecref->{loginshell}, $data->{loginshell}->[0]);
$outsub{searchresults} .= FormatEntry($dataspecref->{fingerprint}, $fingerprint);
if ($icquin) {
diff --git
a/update.cgi
b/update.cgi
index
2fae80d
..
a8e7ba0
100755
(executable)
--- a/
update.cgi
+++ b/
update.cgi
@@
-1,6
+1,6
@@
#!/usr/bin/perl
#!/usr/bin/perl
-# $Id: update.cgi,v 1.1
0 2004/11/18 14:33:54
joey Exp $
+# $Id: update.cgi,v 1.1
1 2004/11/18 19:17:00
joey Exp $
# (c) 1999 Randolph Chung. Licensed under the GPL. <tausq@debian.org>
use lib '.';
# (c) 1999 Randolph Chung. Licensed under the GPL. <tausq@debian.org>
use lib '.';
@@
-133,6
+133,7
@@
if (!($query->param('doupdate'))) {
&Util::LDAPUpdate($ldap, $editdn, 'privateSub', $query->param('privatesub'));
&Util::LDAPUpdate($ldap, $editdn, 'ircNick', $query->param('ircnick'));
&Util::LDAPUpdate($ldap, $editdn, 'icqUin', $query->param('icquin'));
&Util::LDAPUpdate($ldap, $editdn, 'privateSub', $query->param('privatesub'));
&Util::LDAPUpdate($ldap, $editdn, 'ircNick', $query->param('ircnick'));
&Util::LDAPUpdate($ldap, $editdn, 'icqUin', $query->param('icquin'));
+ &Util::LDAPUpdate($ldap, $editdn, 'jabberJID', $query->param('jabberjid'));
&Util::LDAPUpdate($ldap, $editdn, 'labeledURI', $query->param('labeleduri'));
&Util::LDAPUpdate($ldap, $editdn, 'onVacation', $query->param('onvacation'));
&Util::LDAPUpdate($ldap, $editdn, 'labeledURI', $query->param('labeleduri'));
&Util::LDAPUpdate($ldap, $editdn, 'onVacation', $query->param('onvacation'));