/[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.2 by snetram, Sun Apr 27 15:57:59 2008 UTC Revision 1.6 by snetram, Fri Jul 4 21:59:38 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("ACCOUNT_GROUP_NONE") . '</p></b>'));
# Line 367  diff -Nur -x '*.orig' -x '*.rej' e-smith Line 366  diff -Nur -x '*.orig' -x '*.rej' e-smith
366          <base>RECONFIGURE_SUCCEEDED</base>          <base>RECONFIGURE_SUCCEEDED</base>
367          <trans>Reconfiguration request initiated successfully.</trans>          <trans>Reconfiguration request initiated successfully.</trans>
368       </entry>       </entry>
369    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
370    --- 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
371    +++ 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
372    @@ -1,11 +1,6 @@
373     <lexicon lang="en-us">
374    
375         <entry>
376    -      <base>FORM_TITLE</base>
377    -      <trans>Change account password</trans>
378    -    </entry>
379    -
380    -    <entry>
381           <base>DESCRIPTION</base>
382           <trans>
383            <![CDATA[
384    @@ -22,63 +17,5 @@
385         </entry>
386    
387         <entry>
388    -      <base>ACCOUNT_NAME</base>
389    -      <trans>Your account: </trans>
390    -    </entry>
391    -
392    -    <entry>
393    -      <base>OLD_SYSTEM_PASSWORD</base>
394    -      <trans>Old password: </trans>
395    -    </entry>
396    -
397    -    <entry>
398    -      <base>NEW_SYSTEM_PASSWORD</base>
399    -      <trans>New password: </trans>
400    -    </entry>
401    -
402    -    <entry>
403    -      <base>NEW_SYSTEM_PASSWORD_VERIFY</base>
404    -      <trans>New password (verify): </trans>
405    -    </entry>
406    -
407    -    <entry>
408    -      <base>CHANGE_PASSWORD</base>
409    -      <trans>Change Password</trans>
410    -    </entry>
411    -
412    -    <entry>
413    -      <base>PASSWORD_VERIFY_ERROR</base>
414    -      <trans>The passwords you entered did not match.</trans>
415    -    </entry>
416    -
417    -    <entry>
418    -      <base>PASSWORD_CHANGE_FAILURE</base>
419    -      <trans>An error occurred while attempting to change your password.  Please make sure that the old password entered is correct.</trans>
420    -    </entry>
421    -
422    -    <entry>
423    -      <base>PASSWORD_CHANGED</base>
424    -      <trans>Your password has been successfully changed.</trans>
425    -    </entry>
426    -
427    -    <entry>
428    -      <base>TAINED_OLDPASS</base>
429    -      <trans>The old password you entered contained invalid characters.</trans>
430    -    </entry>
431    -
432    -    <entry>
433    -      <base>TAINED_PASS</base>
434    -      <trans>The password you entered contained invalid characters.</trans>
435    -    </entry>
436    -
437    -    <entry>
438    -      <base>TAINED_ACCOUNT</base>
439    -      <trans>The account name you entered contained invalid characters.</trans>
440    -    </entry>
441    -
442    -    <entry>
443    -      <base>NO_SUCH_USER</base>
444    -      <trans>The account name entered is invalid.</trans>
445    -    </entry>
446    
447     </lexicon>
448    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
449    --- e-smith-base-4.18.1/root/etc/e-smith/web/panels/password/cgi-bin/userpassword       2005-11-21 05:28:10.000000000 +0100
450    +++ 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
451    @@ -66,13 +66,13 @@
452         my $acct;
453         unless ($acct = $accountdb->get($acctName))
454         {
455    -        $q->param(-name => 'status_message', -value => 'NO_SUCH_USER');    
456    +        $q->param(-name => 'status_message', -value => 'YOUR_ACCOUNT_INVALID');    
457            return;
458         }
459    
460         unless ($acct->prop('type') eq 'user')
461         {
462    -       $q->param(-name=>'status_message', -value=>"NO_SUCH_USER");
463    +       $q->param(-name=>'status_message', -value=>"YOUR_ACCOUNT_INVALID");
464            return;
465         }
466    
467    @@ -82,7 +82,7 @@
468                    $pass))
469         {
470            $q->param(-name => 'status_message',
471    -                   -value => 'PASSWORD_CHANGE_FAILURE');
472    +                   -value => 'ERROR_PASSWORD_CHANGE');
473            return;
474         }
475         $acct->set_prop("PasswordSet", "yes");
476    @@ -92,7 +92,7 @@
477            or die ("Error occurred while modifying password for $acctName.\n");
478         $accountdb = esmith::AccountsDB->open();
479    
480    -    $q->param(-name => 'status_message', -value => 'PASSWORD_CHANGED');    
481    +    $q->param(-name => 'status_message', -value => 'PASSWORD_CHANGE_SUCCESS');    
482         return;
483     }
484    
485    @@ -103,7 +103,7 @@
486            my $pass1 = $fm->{cgi}->param('pass');
487            unless ($pass1 eq $pass2) {
488                    $fm->{cgi}->param( -name => 'wherenext', -value => 'Password' );
489    -                       return "PASSWORD_VERIFY_ERROR";
490    +                       return "PASSWORD_NO_MATCH";
491            }
492             return "OK";
493     }
494    @@ -128,23 +128,23 @@
495     }
496    
497     __DATA__
498    -<form title="FORM_TITLE" header="/etc/e-smith/web/common/userpassword_head.tmpl" footer="/etc/e-smith/web/common/foot.tmpl">
499    +<form title="ACCOUNT_PASSWORD_CHANGE" header="/etc/e-smith/web/common/userpassword_head.tmpl" footer="/etc/e-smith/web/common/foot.tmpl">
500         <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">
501             <description>DESCRIPTION</description>
502    
503             <field type="text" id="account" validation="nonblank" value="">
504    -            <label>ACCOUNT_NAME</label>
505    +            <label>YOUR_ACCOUNT</label>
506             </field>
507             <field type="password" id="oldPass" validation="nonblank" value="">
508    -            <label>OLD_SYSTEM_PASSWORD</label>
509    +            <label>PASSWORD_OLD</label>
510             </field>
511             <field type="password" id="pass" validation="nonblank, check_password" value="">
512    -            <label>NEW_SYSTEM_PASSWORD</label>
513    +            <label>PASSWORD_NEW</label>
514             </field>
515             <field type="password" id="passVerify" validation="password_compare" value="">
516    -            <label>NEW_SYSTEM_PASSWORD_VERIFY</label>
517    +            <label>PASSWORD_NEW_VERIFY</label>
518             </field>
519    -        <subroutine src="print_button('CHANGE_PASSWORD')" />
520    +        <subroutine src="print_button('PASSWORD_CHANGE')" />
521         </page>
522         <page name="Done" pre-event="print_status_message()">
523         </page>
524    --- e-smith-base-4.18.1/root/etc/e-smith/web/functions/remoteaccess.add2general2        2008-07-04 23:13:37.000000000 +0200
525    +++ e-smith-base-4.18.1/root/etc/e-smith/web/functions/remoteaccess     2008-07-04 23:13:37.000000000 +0200
526    @@ -132,7 +132,7 @@
527            
528             <field type="select"
529                 id="sshAccess"
530    -            options=" 'off' => 'NO_ACCESS', 'private' => 'PRIVATE', 'public' => 'PUBLIC'"
531    +            options=" 'off' => 'NO_ACCESS', 'private' => 'NETWORKS_ALLOW_LOCAL', 'public' => 'NETWORKS_ALLOW_PUBLIC'"
532                 value="get_ssh_access()">
533                 <label>LABEL_SSH</label>
534                 <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