/[smeserver]/rpms/e-smith-base/sme7/e-smith-base-4.18.1-add2general.patch
ViewVC logotype

Diff of /rpms/e-smith-base/sme7/e-smith-base-4.18.1-add2general.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.5 by slords, Mon Apr 28 22:42:29 2008 UTC Revision 1.8 by snetram, Mon Aug 4 20:04:32 2008 UTC
# Line 245  diff -Nur -x '*.orig' -x '*.rej' e-smith Line 245  diff -Nur -x '*.orig' -x '*.rej' e-smith
245       if ( $numGroups == 0 ) {       if ( $numGroups == 0 ) {
246           print $q->Tr($q->td(           print $q->Tr($q->td(
247  -           '<p><b>' . $fm->localise("NO_GROUPS") . '</p></b>'));  -           '<p><b>' . $fm->localise("NO_GROUPS") . '</p></b>'));
248  +           '<p><b>' . $fm->localise("ACCOUNT_GROUP_NONE") . '</p></b>'));  +           '<p><b>' . $fm->localise("NO_GROUPS") . '</p></b>'));
249    
250       }       }
251       else {       else {
# Line 263  diff -Nur -x '*.orig' -x '*.rej' e-smith Line 263  diff -Nur -x '*.orig' -x '*.rej' e-smith
263          off => $self->localise('NO_ACCESS'),          off => $self->localise('NO_ACCESS'),
264       );       );
265    
266  @@ -306,14 +306,14 @@  @@ -306,8 +306,8 @@
267       return '' unless $db->get('ftp');       return '' unless $db->get('ftp');
268    
269       my %options = (       my %options = (
# Line 274  diff -Nur -x '*.orig' -x '*.rej' e-smith Line 274  diff -Nur -x '*.orig' -x '*.rej' e-smith
274          off => $self->localise('NO_ACCESS'),          off => $self->localise('NO_ACCESS'),
275       );       );
276    
      my %loginOptions = (  
 -       private => $self->localise('PASSWORD_LOGIN_PRIVATE'),  
 -       public  => $self->localise('PASSWORD_LOGIN_PUBLIC'),  
 +       private => $self->localise('PASSWORD_LOGIN_NETWORKS_ALLOW_LOCAL'),  
 +       public  => $self->localise('PASSWORD_LOGIN_NETWORKS_ALLOW_PUBLIC'),  
      );  
   
      print $q->Tr(  
277  @@ -721,7 +721,7 @@  @@ -721,7 +721,7 @@
278    
279       unless ( system( "/sbin/e-smith/signal-event", "remoteaccess-update" ) == 0 )       unless ( system( "/sbin/e-smith/signal-event", "remoteaccess-update" ) == 0 )
# Line 311  diff -Nur -x '*.orig' -x '*.rej' e-smith Line 303  diff -Nur -x '*.orig' -x '*.rej' e-smith
303       unless ($pass1 eq $pass2) {       unless ($pass1 eq $pass2) {
304           $self->{cgi}->param( -name => 'wherenext', -value => 'Password' );           $self->{cgi}->param( -name => 'wherenext', -value => 'Password' );
305  -        return "PASSWORD_VERIFY_ERROR";  -        return "PASSWORD_VERIFY_ERROR";
306  +        return "PASSWORD_NO_MATCH";  +        return "PASSWORD_VERIFY_ERROR";
307       }       }
308       return "OK";       return "OK";
309   }   }
# Line 320  diff -Nur -x '*.orig' -x '*.rej' e-smith Line 312  diff -Nur -x '*.orig' -x '*.rej' e-smith
312       unless ($pass1 eq $pass2) {       unless ($pass1 eq $pass2) {
313           $self->{cgi}->param( -name => 'wherenext', -value => 'Password' );           $self->{cgi}->param( -name => 'wherenext', -value => 'Password' );
314  -        return "SYSTEM_PASSWORD_VERIFY_ERROR";  -        return "SYSTEM_PASSWORD_VERIFY_ERROR";
315  +        return "SYSTEM_PASSWORD_NO_MATCH";  +        return "SYSTEM_PASSWORD_VERIFY_ERROR";
316       }       }
317       return "OK";       return "OK";
318   }   }
# Line 469  diff -Nur -x '*.orig' -x '*.rej' e-smith Line 461  diff -Nur -x '*.orig' -x '*.rej' e-smith
461       {       {
462          $q->param(-name => 'status_message',          $q->param(-name => 'status_message',
463  -                   -value => 'PASSWORD_CHANGE_FAILURE');  -                   -value => 'PASSWORD_CHANGE_FAILURE');
464  +                   -value => 'ERROR_PASSWORD_CHANGE');  +                   -value => 'PASSWORD_CHANGE_ERROR');
465          return;          return;
466       }       }
467       $acct->set_prop("PasswordSet", "yes");       $acct->set_prop("PasswordSet", "yes");
# Line 487  diff -Nur -x '*.orig' -x '*.rej' e-smith Line 479  diff -Nur -x '*.orig' -x '*.rej' e-smith
479          unless ($pass1 eq $pass2) {          unless ($pass1 eq $pass2) {
480                  $fm->{cgi}->param( -name => 'wherenext', -value => 'Password' );                  $fm->{cgi}->param( -name => 'wherenext', -value => 'Password' );
481  -                       return "PASSWORD_VERIFY_ERROR";  -                       return "PASSWORD_VERIFY_ERROR";
482  +                       return "PASSWORD_NO_MATCH";  +                       return "PASSWORD_VERIFY_ERROR";
483          }          }
484           return "OK";           return "OK";
485   }   }
# Line 521  diff -Nur -x '*.orig' -x '*.rej' e-smith Line 513  diff -Nur -x '*.orig' -x '*.rej' e-smith
513       </page>       </page>
514       <page name="Done" pre-event="print_status_message()">       <page name="Done" pre-event="print_status_message()">
515       </page>       </page>
516    --- e-smith-base-4.18.1/root/etc/e-smith/web/functions/remoteaccess.add2general2        2008-07-04 23:13:37.000000000 +0200
517    +++ e-smith-base-4.18.1/root/etc/e-smith/web/functions/remoteaccess     2008-07-04 23:13:37.000000000 +0200
518    @@ -132,7 +132,7 @@
519            
520             <field type="select"
521                 id="sshAccess"
522    -            options=" 'off' => 'NO_ACCESS', 'private' => 'PRIVATE', 'public' => 'PUBLIC'"
523    +            options=" 'off' => 'NO_ACCESS', 'private' => 'NETWORKS_ALLOW_LOCAL', 'public' => 'NETWORKS_ALLOW_PUBLIC'"
524                 value="get_ssh_access()">
525                 <label>LABEL_SSH</label>
526                 <description>DESC_SSH</description>

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed