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 --- 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 +++ 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 @@ -0,0 +1 @@ +PERMS=0755 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 --- smeserver-tw-logonscript-1.5.old/root/home/e-smith/files/samba/netlogon/logon_script 2015-09-08 10:18:48.000000000 -0400 +++ smeserver-tw-logonscript-1.5/root/home/e-smith/files/samba/netlogon/logon_script 2021-04-18 22:02:43.480000000 -0400 @@ -79,4 +79,5 @@ print PAMCONF "\n"; close PAMCONF; close LOGON; + chmod(0755, "$netlogon_root/users/$username.bat"); close LOG; 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 --- 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 +++ smeserver-tw-logonscript-1.5/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/ibayletters.pm 2021-04-18 22:02:43.222000000 -0400 @@ -155,9 +155,11 @@ print $q->end_table,"\n"; print $q->hidden (-name => 'IbayLettersSave', -override => 1, -default => 1); - print $q->hidden (-name => 'WorkgroupSave', -override => 1, -default => 0); - print $q->submit (-name => 'sendbutton', -value => 'Save'); - print "localise('SMB_NEEDS_RESTART_PROCEED')."')\" href=\"ibayletters?WorkgroupSave=1&page=0\">".$self->localise('RELOAD_WORKGROUP_SETTINGS').""; + #now we force reload on every save, previously was default 0 and you needed to use second button + print $q->hidden (-name => 'WorkgroupSave', -override => 1, -default => 1); + print $q->submit (-name => 'sendbutton', -value => $self->localise('SAVE') ); + #print "

".$self->localise('SMB_NEEDS_RESTART_PROCEED')."

"; + #print "localise('RELOAD_WORKGROUP_SETTINGS')."\">"; return ""; } @@ -169,20 +171,19 @@ my $batchfileName = "/home/e-smith/files/samba/netlogon/custom/$group_name.bat"; my @batchfileTemp; - my $batchfileContents; + my $batchfileContents=""; my $returnValue; my $q = $self->{cgi}; - - open(BATCHFILE,"<$batchfileName") or print $self->localise('FILE_DOES_NOT_EXIT_WILL_BE_CREATED')." $batchfileName"; - while(){ - push(@batchfileTemp,$_); + if ( -f $batchfileName) { + open(BATCHFILE,"<$batchfileName") or print $self->localise('FILE_DOES_NOT_EXIT_WILL_BE_CREATED')." $batchfileName"; + while(){ + push(@batchfileTemp,$_); + } + close(BATCHFILE); + + $batchfileContents .= join ("",@batchfileTemp); } - close(BATCHFILE); - - - $batchfileContents .= join ("",@batchfileTemp); - $returnValue ='
'; @@ -199,12 +200,12 @@ sub save_info { my ($self) = @_; - if( $self->cgi->param('wherenext') eq "CustomBatchGroup"){ + if( defined $self->cgi->param('wherenext') && $self->cgi->param('wherenext') eq "CustomBatchGroup"){ $self->wherenext('CustomBatchGroup'); return; } - if( $self->cgi->param('saveBatchFile') eq "1"){ + if( defined $self->cgi->param('saveBatchFile') && $self->cgi->param('saveBatchFile') eq "1"){ my $group_name = $self->cgi->param('groupname'); @@ -232,6 +233,7 @@ open BATCHFILE,">$batchfileName"; print BATCHFILE "$batchContents"; close(BATCHFILE); + chmod(0755, "$batchfileName"); $self->success($self->localise('BATCH_FILE_SAVED_SUCCESSFULLY')." $batchfileName"); $self->wherenext('First'); return;