michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-09-19 20:10:38 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Nicer error messages

Browse Source
This commit is contained in:
Jamie Cameron
2007-11-19 01:00:51 +00:00
parent 253a195dc4
commit 3e11acb476
9 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ldap-server/add.cgi
View File

@@ -27,7 +27,7 @@ $dn .= ", $in{'base'}" if ($in{'base'});
# Check for a clash
$rv = $ldap->search(base => $dn,
filter => '(objectClass=*)',
score => 'base');
scope => 'base');
if ($rv && !$rv->code) {
($clash) = $rv->all_entries;
$clash && &error(&text('oadd_eclash', "<tt>$dn</tt>"));

6
ldap-server/add_browser.cgi
View File

@@ -10,9 +10,9 @@ ref($ldap) || &error($ldap);
# Get the base object
$rv = $ldap->search(base => $in{'base'},
filter => '(objectClass=*)',
score => 'base');
scope => 'base');
if (!$rv || $rv->code) {
&error($rv ? $rv->code : "Unknown error");
&error(&ldap_error($rv));
}
($bo) = $rv->all_entries;
$bo || &error(&text('save_ebase', "<tt>$in{'base'}</tt>"));
@@ -25,7 +25,7 @@ $rv = $ldap->modify($bo->dn(),
if (!$rv || $rv->code) {
&error(&text('add_emodify', "<tt>".$bo->dn()."</tt>",
"<tt>$in{'add'}</tt>",
$rv ? $rv->code : "Unknown error"));
&ldap_error($rv)));
}
# Return to object

2
ldap-server/add_form.cgi
View File

@@ -10,7 +10,7 @@ if ($in{'clone'}) {
# Get original object
$rv = $ldap->search(base => $in{'base'},
filter => '(objectClass=*)',
score => 'base');
scope => 'base');
if (!$rv || $rv->code) {
&error(&text('oadd_eget', "<tt>$in{'base'}</tt>",
&ldap_error($rv)));

6
ldap-server/delete_browser.cgi
View File

@@ -12,9 +12,9 @@ ref($ldap) || &error($ldap);
# Get the base object
$rv = $ldap->search(base => $in{'base'},
filter => '(objectClass=*)',
score => 'base');
scope => 'base');
if (!$rv || $rv->code) {
&error($rv ? $rv->code : "Unknown error");
&error(&ldap_error($rv));
}
($bo) = $rv->all_entries;
$bo || &error(&text('save_ebase', "<tt>$in{'base'}</tt>"));
@@ -24,7 +24,7 @@ $rv = $ldap->modify($bo->dn(),
delete => \@d);
if (!$rv || $rv->code) {
&error(&text('delete_emodify', "<tt>".$bo->dn()."</tt>", scalar(@d),
$rv ? $rv->code : "Unknown error"));
&ldap_error($rv)));
}
# Return to object

2
ldap-server/edit_browser.cgi
View File

@@ -164,7 +164,7 @@ else {
print &ui_tabs_start_tab("browser", "attrs");
$rv2 = $ldap->search(base => $base,
filter => '(objectClass=*)',
score => 'base');
scope => 'base');
($bo) = $rv2->all_entries;
@attrs = sort { lc($a) cmp lc($b) } $bo->attributes();
if (@attrs) {

6
ldap-server/ldap-server-lib.pl
View File

@@ -74,7 +74,7 @@ foreach $ssl (@ssls) {
}
else {
return &text('connect_essl', "<tt>$server</tt>",
$@ ? %@ : $mesg ? $mesg->code : "Unknown error");
$@ ? %@ : &ldap_error($mesg));
}
}
}
@@ -84,7 +84,7 @@ $ldap || return "This can't happen!";
local $mesg = $ldap->bind(dn => $user, password => $pass);
if (!$mesg || $mesg->code) {
return &text('connect_elogin', "<tt>$server</tt>", "<tt>$user</tt>",
$mesg ? $mesg->error : "Unknown error");
&ldap_error($mesg));
}
$connect_ldap_db = $ldap;
@@ -296,7 +296,7 @@ if (!$rv) {
return $text{'euknown'};
}
elsif ($rv->code) {
return "".$rv->code;
return $rv->error || "Code ".$rv->code;
}
else {
return undef;

2
ldap-server/rename_browser.cgi
View File

@@ -10,7 +10,7 @@ ref($ldap) || &error($ldap);
# Get the object
$rv = $ldap->search(base => $in{'old'},
filter => '(objectClass=*)',
score => 'base');
scope => 'base');
if (!$rv || $rv->code) {
&error(&ldap_error($rv));
}

6
ldap-server/save_browser.cgi
View File

@@ -10,9 +10,9 @@ ref($ldap) || &error($ldap);
# Get the base object
$rv = $ldap->search(base => $in{'base'},
filter => '(objectClass=*)',
score => 'base');
scope => 'base');
if (!$rv || $rv->code) {
&error($rv ? $rv->code : "Unknown error");
&error(&ldap_error($rv));
}
($bo) = $rv->all_entries;
$bo || &error(&text('save_ebase', "<tt>$in{'base'}</tt>"));
@@ -26,7 +26,7 @@ $rv = $ldap->modify($bo->dn(),
if (!$rv || $rv->code) {
&error(&text('save_emodify', "<tt>".$bo->dn()."</tt>",
"<tt>$in{'edit'}</tt>",
$rv ? $rv->code : "Unknown error"));
&ldap_error($rv)));
}
# Return to object

2
ldap-server/sdelete_browser.cgi
View File

@@ -13,7 +13,7 @@ ref($ldap) || &error($ldap);
foreach $d (@d) {
$rv = $ldap->search(base => $d,
filter => '(objectClass=*)',
score => 'base');
scope => 'base');
if (!$rv || $rv->code) {
&error(&ldap_error($rv));
}