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

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

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