/[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.1 by snetram, Sun Apr 27 10:26:07 2008 UTC Revision 1.8 by snetram, Mon Aug 4 20:04:32 2008 UTC
# Line 242  diff -Nur -x '*.orig' -x '*.rej' e-smith Line 242  diff -Nur -x '*.orig' -x '*.rej' e-smith
242  +          . $fm->localise("GROUP_ADD")  +          . $fm->localise("GROUP_ADD")
243             . "</a></p>"));             . "</a></p>"));
244    
245  -    if ( $numGroups == 0 ) {       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 264  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 275  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 312  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 321  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 334  diff -Nur -x '*.orig' -x '*.rej' e-smith Line 325  diff -Nur -x '*.orig' -x '*.rej' e-smith
325           }           }
326       }       }
327       return '';       return '';
328    diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/reboot mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/reboot
329    --- e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/reboot  2008-03-26 17:49:00.000000000 +0100
330    +++ mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/reboot        2008-04-27 17:49:48.000000000 +0200
331    @@ -2,18 +2,10 @@
332     -->
333     <lexicon lang="en-us">
334         <entry>
335    -       <base>PERFORM</base>
336    -       <trans>Perform</trans>
337    -    </entry>
338    -    <entry>
339            <base>FORM_TITLE</base>
340            <trans>Shutdown or reboot</trans>
341         </entry>
342         <entry>
343    -       <base>SHUTDOWN</base>
344    -       <trans>Shutdown</trans>
345    -    </entry>
346    -    <entry>
347            <base>REBOOT</base>
348            <trans>Reboot</trans>
349         </entry>
350    @@ -26,10 +18,6 @@
351            <trans>Your server has initiated the reboot process.</trans>
352         </entry>
353         <entry>
354    -       <base>RECONFIGURE</base>
355    -       <trans>Reconfigure</trans>
356    -    </entry>
357    -    <entry>
358            <base>RECONFIGURE_SUCCEEDED</base>
359            <trans>Reconfiguration request initiated successfully.</trans>
360         </entry>
361    diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/panels/password/cgi-bin/userpassword mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/panels/password/cgi-bin/userpassword
362    --- e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/panels/password/cgi-bin/userpassword      2005-11-21 05:28:05.000000000 +0100
363    +++ mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/panels/password/cgi-bin/userpassword    2008-04-27 18:49:34.000000000 +0200
364    @@ -1,11 +1,6 @@
365     <lexicon lang="en-us">
366    
367         <entry>
368    -      <base>FORM_TITLE</base>
369    -      <trans>Change account password</trans>
370    -    </entry>
371    -
372    -    <entry>
373           <base>DESCRIPTION</base>
374           <trans>
375            <![CDATA[
376    @@ -22,63 +17,5 @@
377         </entry>
378    
379         <entry>
380    -      <base>ACCOUNT_NAME</base>
381    -      <trans>Your account: </trans>
382    -    </entry>
383    -
384    -    <entry>
385    -      <base>OLD_SYSTEM_PASSWORD</base>
386    -      <trans>Old password: </trans>
387    -    </entry>
388    -
389    -    <entry>
390    -      <base>NEW_SYSTEM_PASSWORD</base>
391    -      <trans>New password: </trans>
392    -    </entry>
393    -
394    -    <entry>
395    -      <base>NEW_SYSTEM_PASSWORD_VERIFY</base>
396    -      <trans>New password (verify): </trans>
397    -    </entry>
398    -
399    -    <entry>
400    -      <base>CHANGE_PASSWORD</base>
401    -      <trans>Change Password</trans>
402    -    </entry>
403    -
404    -    <entry>
405    -      <base>PASSWORD_VERIFY_ERROR</base>
406    -      <trans>The passwords you entered did not match.</trans>
407    -    </entry>
408    -
409    -    <entry>
410    -      <base>PASSWORD_CHANGE_FAILURE</base>
411    -      <trans>An error occurred while attempting to change your password.  Please make sure that the old password entered is correct.</trans>
412    -    </entry>
413    -
414    -    <entry>
415    -      <base>PASSWORD_CHANGED</base>
416    -      <trans>Your password has been successfully changed.</trans>
417    -    </entry>
418    -
419    -    <entry>
420    -      <base>TAINED_OLDPASS</base>
421    -      <trans>The old password you entered contained invalid characters.</trans>
422    -    </entry>
423    -
424    -    <entry>
425    -      <base>TAINED_PASS</base>
426    -      <trans>The password you entered contained invalid characters.</trans>
427    -    </entry>
428    -
429    -    <entry>
430    -      <base>TAINED_ACCOUNT</base>
431    -      <trans>The account name you entered contained invalid characters.</trans>
432    -    </entry>
433    -
434    -    <entry>
435    -      <base>NO_SUCH_USER</base>
436    -      <trans>The account name entered is invalid.</trans>
437    -    </entry>
438    
439     </lexicon>
440    diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/etc/e-smith/web/panels/password/cgi-bin/userpassword mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/web/panels/password/cgi-bin/userpassword
441    --- e-smith-base-4.18.1/root/etc/e-smith/web/panels/password/cgi-bin/userpassword       2005-11-21 05:28:10.000000000 +0100
442    +++ mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/web/panels/password/cgi-bin/userpassword     2008-04-27 18:51:05.000000000 +0200
443    @@ -66,13 +66,13 @@
444         my $acct;
445         unless ($acct = $accountdb->get($acctName))
446         {
447    -        $q->param(-name => 'status_message', -value => 'NO_SUCH_USER');    
448    +        $q->param(-name => 'status_message', -value => 'YOUR_ACCOUNT_INVALID');    
449            return;
450         }
451    
452         unless ($acct->prop('type') eq 'user')
453         {
454    -       $q->param(-name=>'status_message', -value=>"NO_SUCH_USER");
455    +       $q->param(-name=>'status_message', -value=>"YOUR_ACCOUNT_INVALID");
456            return;
457         }
458    
459    @@ -82,7 +82,7 @@
460                    $pass))
461         {
462            $q->param(-name => 'status_message',
463    -                   -value => 'PASSWORD_CHANGE_FAILURE');
464    +                   -value => 'PASSWORD_CHANGE_ERROR');
465            return;
466         }
467         $acct->set_prop("PasswordSet", "yes");
468    @@ -92,7 +92,7 @@
469            or die ("Error occurred while modifying password for $acctName.\n");
470         $accountdb = esmith::AccountsDB->open();
471    
472    -    $q->param(-name => 'status_message', -value => 'PASSWORD_CHANGED');    
473    +    $q->param(-name => 'status_message', -value => 'PASSWORD_CHANGE_SUCCESS');    
474         return;
475     }
476    
477    @@ -103,7 +103,7 @@
478            my $pass1 = $fm->{cgi}->param('pass');
479            unless ($pass1 eq $pass2) {
480                    $fm->{cgi}->param( -name => 'wherenext', -value => 'Password' );
481    -                       return "PASSWORD_VERIFY_ERROR";
482    +                       return "PASSWORD_VERIFY_ERROR";
483            }
484             return "OK";
485     }
486    @@ -128,23 +128,23 @@
487     }
488    
489     __DATA__
490    -<form title="FORM_TITLE" header="/etc/e-smith/web/common/userpassword_head.tmpl" footer="/etc/e-smith/web/common/foot.tmpl">
491    +<form title="ACCOUNT_PASSWORD_CHANGE" header="/etc/e-smith/web/common/userpassword_head.tmpl" footer="/etc/e-smith/web/common/foot.tmpl">
492         <page name="Password"  post-event="change_password" pre-event="turn_off_buttons()" header="/etc/e-smith/web/common/head.tmpl" footer="/etc/e-smith/web/common/foot.tmpl">
493             <description>DESCRIPTION</description>
494    
495             <field type="text" id="account" validation="nonblank" value="">
496    -            <label>ACCOUNT_NAME</label>
497    +            <label>YOUR_ACCOUNT</label>
498             </field>
499             <field type="password" id="oldPass" validation="nonblank" value="">
500    -            <label>OLD_SYSTEM_PASSWORD</label>
501    +            <label>PASSWORD_OLD</label>
502             </field>
503             <field type="password" id="pass" validation="nonblank, check_password" value="">
504    -            <label>NEW_SYSTEM_PASSWORD</label>
505    +            <label>PASSWORD_NEW</label>
506             </field>
507             <field type="password" id="passVerify" validation="password_compare" value="">
508    -            <label>NEW_SYSTEM_PASSWORD_VERIFY</label>
509    +            <label>PASSWORD_NEW_VERIFY</label>
510             </field>
511    -        <subroutine src="print_button('CHANGE_PASSWORD')" />
512    +        <subroutine src="print_button('PASSWORD_CHANGE')" />
513         </page>
514         <page name="Done" pre-event="print_status_message()">
515         </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