| 1 |
diff -Nur --no-dereference smeserver-tw-logonscript-1.5.old/root/etc/e-smith/templates.metadata/home/e-smith/files/samba/netlogon/netlogon.bat smeserver-tw-logonscript-1.5/root/etc/e-smith/templates.metadata/home/e-smith/files/samba/netlogon/netlogon.bat |
| 2 |
--- smeserver-tw-logonscript-1.5.old/root/etc/e-smith/templates.metadata/home/e-smith/files/samba/netlogon/netlogon.bat 1969-12-31 19:00:00.000000000 -0500 |
| 3 |
+++ smeserver-tw-logonscript-1.5/root/etc/e-smith/templates.metadata/home/e-smith/files/samba/netlogon/netlogon.bat 2021-04-18 22:25:04.848000000 -0400 |
| 4 |
@@ -0,0 +1 @@ |
| 5 |
+PERMS=0755 |
| 6 |
diff -Nur --no-dereference smeserver-tw-logonscript-1.5.old/root/home/e-smith/files/samba/netlogon/logon_script smeserver-tw-logonscript-1.5/root/home/e-smith/files/samba/netlogon/logon_script |
| 7 |
--- smeserver-tw-logonscript-1.5.old/root/home/e-smith/files/samba/netlogon/logon_script 2015-09-08 10:18:48.000000000 -0400 |
| 8 |
+++ smeserver-tw-logonscript-1.5/root/home/e-smith/files/samba/netlogon/logon_script 2021-04-18 22:02:43.480000000 -0400 |
| 9 |
@@ -79,4 +79,5 @@ |
| 10 |
print PAMCONF "</pam_mount>\n"; |
| 11 |
close PAMCONF; |
| 12 |
close LOGON; |
| 13 |
+ chmod(0755, "$netlogon_root/users/$username.bat"); |
| 14 |
close LOG; |
| 15 |
diff -Nur --no-dereference smeserver-tw-logonscript-1.5.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/ibayletters.pm smeserver-tw-logonscript-1.5/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/ibayletters.pm |
| 16 |
--- smeserver-tw-logonscript-1.5.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/ibayletters.pm 2021-04-18 17:39:53.245000000 -0400 |
| 17 |
+++ smeserver-tw-logonscript-1.5/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/ibayletters.pm 2021-04-18 22:02:43.222000000 -0400 |
| 18 |
@@ -155,9 +155,11 @@ |
| 19 |
|
| 20 |
print $q->end_table,"\n"; |
| 21 |
print $q->hidden (-name => 'IbayLettersSave', -override => 1, -default => 1); |
| 22 |
- print $q->hidden (-name => 'WorkgroupSave', -override => 1, -default => 0); |
| 23 |
- print $q->submit (-name => 'sendbutton', -value => 'Save'); |
| 24 |
- print "<a class=\"button-like\" onClick=\"return confirm('".$self->localise('SMB_NEEDS_RESTART_PROCEED')."')\" href=\"ibayletters?WorkgroupSave=1&page=0\">".$self->localise('RELOAD_WORKGROUP_SETTINGS')."</a>"; |
| 25 |
+ #now we force reload on every save, previously was default 0 and you needed to use second button |
| 26 |
+ print $q->hidden (-name => 'WorkgroupSave', -override => 1, -default => 1); |
| 27 |
+ print $q->submit (-name => 'sendbutton', -value => $self->localise('SAVE') ); |
| 28 |
+ #print "<p>".$self->localise('SMB_NEEDS_RESTART_PROCEED')." </p>"; |
| 29 |
+ #print "<input type=\"button\" class=\"button-like\" onClick=\"document.getElementsByName('WorkgroupSave').value = 1; this.form.submit(); \" value=\"".$self->localise('RELOAD_WORKGROUP_SETTINGS')."\">"; |
| 30 |
return ""; |
| 31 |
} |
| 32 |
|
| 33 |
@@ -169,20 +171,19 @@ |
| 34 |
|
| 35 |
my $batchfileName = "/home/e-smith/files/samba/netlogon/custom/$group_name.bat"; |
| 36 |
my @batchfileTemp; |
| 37 |
- my $batchfileContents; |
| 38 |
+ my $batchfileContents=""; |
| 39 |
my $returnValue; |
| 40 |
my $q = $self->{cgi}; |
| 41 |
|
| 42 |
- |
| 43 |
- open(BATCHFILE,"<$batchfileName") or print $self->localise('FILE_DOES_NOT_EXIT_WILL_BE_CREATED')." $batchfileName"; |
| 44 |
- while(<BATCHFILE>){ |
| 45 |
- push(@batchfileTemp,$_); |
| 46 |
+ if ( -f $batchfileName) { |
| 47 |
+ open(BATCHFILE,"<$batchfileName") or print $self->localise('FILE_DOES_NOT_EXIT_WILL_BE_CREATED')." $batchfileName"; |
| 48 |
+ while(<BATCHFILE>){ |
| 49 |
+ push(@batchfileTemp,$_); |
| 50 |
+ } |
| 51 |
+ close(BATCHFILE); |
| 52 |
+ |
| 53 |
+ $batchfileContents .= join ("",@batchfileTemp); |
| 54 |
} |
| 55 |
- close(BATCHFILE); |
| 56 |
- |
| 57 |
- |
| 58 |
- $batchfileContents .= join ("",@batchfileTemp); |
| 59 |
- |
| 60 |
$returnValue ='<textarea name="batchfilecontents" rows="30" cols="60">'; |
| 61 |
$returnValue .= $batchfileContents; |
| 62 |
$returnValue .= '</textarea><br>'; |
| 63 |
@@ -199,12 +200,12 @@ |
| 64 |
sub save_info { |
| 65 |
my ($self) = @_; |
| 66 |
|
| 67 |
- if( $self->cgi->param('wherenext') eq "CustomBatchGroup"){ |
| 68 |
+ if( defined $self->cgi->param('wherenext') && $self->cgi->param('wherenext') eq "CustomBatchGroup"){ |
| 69 |
$self->wherenext('CustomBatchGroup'); |
| 70 |
return; |
| 71 |
} |
| 72 |
|
| 73 |
- if( $self->cgi->param('saveBatchFile') eq "1"){ |
| 74 |
+ if( defined $self->cgi->param('saveBatchFile') && $self->cgi->param('saveBatchFile') eq "1"){ |
| 75 |
|
| 76 |
my $group_name = $self->cgi->param('groupname'); |
| 77 |
|
| 78 |
@@ -232,6 +233,7 @@ |
| 79 |
open BATCHFILE,">$batchfileName"; |
| 80 |
print BATCHFILE "$batchContents"; |
| 81 |
close(BATCHFILE); |
| 82 |
+ chmod(0755, "$batchfileName"); |
| 83 |
$self->success($self->localise('BATCH_FILE_SAVED_SUCCESSFULLY')." $batchfileName"); |
| 84 |
$self->wherenext('First'); |
| 85 |
return; |
Parent Directory
| 
Revision Log
| 
Revision Graph
