Call the error function on failure, instead of trying to create our own error page

diff --git a/useradmin/images/smallicon.gif b/useradmin/images/smallicon.gif
index e69de29..00ebb9d 100644 (file)
Binary files a/useradmin/images/smallicon.gif and b/useradmin/images/smallicon.gif differ

diff --git a/useradmin/user-lib.pl b/useradmin/user-lib.pl
index 79f24eb..baa142c 100644 (file)
--- a/useradmin/user-lib.pl
+++ b/useradmin/user-lib.pl
@@ -1758,6 +1758,7 @@ elsif ($config{'md5'} == 1 && !$config{'skip_md5'}) {
        # Up to system
        $format = &use_md5() if (defined(&use_md5));
        }
+
 if ($no_encrypt_password) {
        # Some operating systems don't do any encryption!
        return $pass;
@@ -1766,13 +1767,9 @@ elsif ($format == 1) {
        # MD5 encryption is selected .. use it if possible
        local $err = &check_md5();
        if ($err) {
-               &ui_print_header(undef, $text{'error'}, "");
-               print &text('usave_edigestmd5',
+               &error(&text('usave_edigestmd5',
                    "/config.cgi?$module_name",
-                   "/cpan/download.cgi?source=3&cpan=$err", $err),
-                   "<p>\n";
-               &ui_print_footer("", $text{'index_return'});
-               exit;
+                   "/cpan/download.cgi?source=3&cpan=$err", $err));
                }
        return &encrypt_md5($pass, $salt);
        }
@@ -1780,13 +1777,9 @@ elsif ($format == 2) {
        # Blowfish is selected .. use it if possible
        local $err = &check_blowfish();
        if ($err) {
-               &ui_print_header(undef, $text{'error'}, "");
-               print &text('usave_edigestblowfish',
+               &error(&text('usave_edigestblowfish',
                    "/config.cgi?$module_name",
-                   "/cpan/download.cgi?source=3&cpan=$err", $err),
-                   "<p>\n";
-               &ui_print_footer("", $text{'index_return'});
-               exit;
+                   "/cpan/download.cgi?source=3&cpan=$err", $err));
                }
        return &encrypt_blowfish($pass, $salt);
        }