diff -Nur -x '*.orig' -x '*.rej' e-smith-ibays-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/ibays mezzanine_patched_e-smith-ibays-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/ibays
--- e-smith-ibays-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/ibays 2008-04-27 18:09:02.000000000 +0200
+++ mezzanine_patched_e-smith-ibays-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/ibays 2008-04-27 18:04:13.000000000 +0200
@@ -44,30 +44,12 @@
- NAME
-
- Name
-
-
-
- DESCRIPTION
-
- Description
-
-
-
NAME_LABEL
Information bay name
- DESCRIPTION_LABEL
-
- Brief description
-
-
-
USER_ACCESS
User access via file sharing or user ftp
@@ -119,10 +101,6 @@
- RESET_PASSWORD
- Reset password
-
-
ERROR_WHILE_CREATING_IBAY
An error occurred while creating the i-bay.
@@ -141,12 +119,6 @@
- DESCRIPTION_ERROR
-
- Unexpected characters in description.
-
-
-
CANT_FIND_IBAY
Can't find account for {$name} (does it exist?)
@@ -191,18 +163,6 @@
- NEW_PASSWORD
-
- New password
-
-
-
- NEW_PASSWORD_VERIFY
-
- New password (verify)
-
-
-
PASSWORD_DESC
You are about to change the password for the i-bay {$name}.
@@ -284,10 +244,6 @@
Entire Internet (password required outside local network)
- PASSWORD_VERIFY_ERROR
- The passwords you entered did not match.
-
-
INVALID_IBAY_DESCRIPTION
Error: unexpected or missing characters in i-bay description
diff -Nur -x '*.orig' -x '*.rej' e-smith-ibays-1.2.0/root/etc/e-smith/web/functions/ibays mezzanine_patched_e-smith-ibays-1.2.0/root/etc/e-smith/web/functions/ibays
--- e-smith-ibays-1.2.0/root/etc/e-smith/web/functions/ibays 2005-10-06 23:52:28.000000000 +0200
+++ mezzanine_patched_e-smith-ibays-1.2.0/root/etc/e-smith/web/functions/ibays 2008-04-27 18:06:51.000000000 +0200
@@ -129,13 +129,13 @@
- RESET_PASSWORD
+ PASSWORD_RESET
PASSWORD_DESC
-
+
-
+
diff -Nur -x '*.orig' -x '*.rej' e-smith-ibays-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/ibays.pm mezzanine_patched_e-smith-ibays-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/ibays.pm
--- e-smith-ibays-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/ibays.pm 2008-04-27 18:09:02.000000000 +0200
+++ mezzanine_patched_e-smith-ibays-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/ibays.pm 2008-04-27 18:05:18.000000000 +0200
@@ -121,7 +121,7 @@
my $description = $self->localise('DESCRIPTION');
my $modify = $self->localise('MODIFY');
my $remove = $self->localise('REMOVE');
- my $resetpw = $self->localise('RESET_PASSWORD');
+ my $resetpw = $self->localise('PASSWORD_RESET');
my $action_h = $self->localise('ACTION');
my @ibays = $accountdb->ibays();
@@ -617,7 +617,7 @@
if (system ("/sbin/e-smith/signal-event", "password-modify",
$name) == 0)
{
- $self->success("SUCCESSFULLY_RESET_PASSWORD");
+ $self->success("SUCCESSFULLY_PASSWORD_RESET");
} else {
$self->error("ERROR_WHILE_RESETTING_PASSWORD");
}
@@ -672,7 +672,7 @@
my $pass1 = $self->{cgi}->param('newPass');
unless ($pass1 eq $pass2) {
$self->{cgi}->param( -name => 'wherenext', -value => 'Password' );
- return "PASSWORD_VERIFY_ERROR";
+ return "PASSWORD_NO_MATCH";
}
return "OK";
}