"Update Booster" fertiggestellt und getestet.

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / samba.cgi

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index d3e5b605d858dcd727e818dbb9177f99764e4fe4..375a7364129b40aea9edec6792a93ea774ce0aea 100644 (file)
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -24,7 +24,7 @@ my $message = "";
 my $errormessage = "";
 my @Logs = qx(ls /var/log/samba/);
 my $Log =$Lang::tr{'no log selected'};
-my $defaultoption= "[Share]\npath = /var/samba/share1\ncomment = Share - Public Access\nbrowseable = yes\nwriteable = yes\ncreate mask = 0777\ndirectory mask = 0777\nguest ok = yes\npublic = yes\nforce user = samba";
+my $defaultoption= "[Share]\npath = /var/ipfire/samba/share1\ncomment = Share - Public Access\nbrowseable = yes\nwriteable = yes\ncreate mask = 0777\ndirectory mask = 0777\npublic = yes\nforce user = samba";
 my $userentry = "";
 my @user = ();
 my @userline = ();
@@ -144,6 +144,7 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes')
        $sambasettings{'DOMAINMASTER'} = 'off';
        $sambasettings{'PREFERREDMASTER'} = 'off';
        $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`;
+       system("/usr/local/bin/sambactrl smbreload");
        }
 
 # smbsafeconf is directly called by the if clause
@@ -164,6 +165,7 @@ system('/usr/local/bin/sambactrl smbsharesreset');
  @shareline = split( /\:/, $shareentry );
  push(@Zeilen,$shareline[0]);push(@Shares,$shareline[1]);
  }
+ system("/usr/local/bin/sambactrl smbreload");
 }
 
 ############################################################################################################################
@@ -172,14 +174,14 @@ system('/usr/local/bin/sambactrl smbsharesreset');
 if ($sambasettings{'ACTION'} eq 'globalreset')
        {
        print <<END
+       <br />
        <table width='95%' cellspacing='0'>
-       <tr><td colspan='2'><br /></td></tr>
-       <tr><td bgcolor='${Header::table1colour}' colspan='3' align='center'><b>Globals zurück setzen?</b>
+       <tr><td bgcolor='${Header::table1colour}' colspan='3' align='center'><b>$Lang::tr{'resetglobals'}</b>
        <tr><td align='right' width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                        Yes <input type='image' alt='Yes' src='/images/edit-redo.png' />
+                                        $Lang::tr{'yes'} <input type='image' alt='$Lang::tr{'yes'}' src='/images/edit-redo.png' />
                                        <input type='hidden' name='ACTION' value='globalresetyes' /></form></td>
                        <td align='left'  width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                       <input type='image' alt='No' src='/images/dialog-error.png' /> No 
+                                       <input type='image' alt='$Lang::tr{'no'}' src='/images/dialog-error.png' /> $Lang::tr{'no'} 
                                        <input type='hidden' name='ACTION' value='cancel' /></form></td>
        </tr>
        </table>
@@ -190,14 +192,14 @@ END
 if ($sambasettings{'ACTION'} eq 'sharesreset')
        {
        print <<END
+       <br />
        <table width='95%' cellspacing='0'>
-       <tr><td colspan='2'><br /></td></tr>
-       <tr><td bgcolor='${Header::table1colour}' colspan='3' align='center'><b>Shares zurück setzen?</b>
+       <tr><td bgcolor='${Header::table1colour}' colspan='3' align='center'><b>$Lang::tr{'resetshares'}</b>
        <tr><td align='right'  width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                        Yes <input type='image' alt='Yes' src='/images/edit-redo.png' />
+                                        $Lang::tr{'yes'} <input type='image' alt='$Lang::tr{'yes'}' src='/images/edit-redo.png' />
                                        <input type='hidden' name='ACTION' value='sharesresetyes' /></form></td>
                        <td align='left'  width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                       <input type='image' alt='No' src='/images/dialog-error.png' /> No 
+                                       <input type='image' alt='$Lang::tr{'no'}' src='/images/dialog-error.png' /> $Lang::tr{'no'} 
                                        <input type='hidden' name='ACTION' value='cancel' /></form></td>
        </tr>
        </table>
@@ -240,6 +242,7 @@ system("/usr/local/bin/sambactrl smbsafeconf");
  @shareline = split( /\:/, $shareentry );
  push(@Zeilen,$shareline[0]);push(@Shares,$shareline[1]);
  }
+system("/usr/local/bin/sambactrl smbreload");
 }
 
 ############################################################################################################################
@@ -304,6 +307,7 @@ system("/usr/local/bin/sambactrl smbsafeconf");
  @shareline = split( /\:/, $shareentry );
  push(@Zeilen,$shareline[0]);push(@Shares,$shareline[1]);
  }
+system("/usr/local/bin/sambactrl smbreload");
 }
 ############################################################################################################################
 ################################################## Sambashare �dern #######################################################
@@ -362,6 +366,7 @@ system("/usr/local/bin/sambactrl smbsafeconf");
  @shareline = split( /\:/, $shareentry );
  push(@Zeilen,$shareline[0]);push(@Shares,$shareline[1]);
  }
+system("/usr/local/bin/sambactrl smbreload");
 }
 
 ############################################################################################################################
@@ -453,6 +458,7 @@ END
  {
  system('/usr/local/bin/sambactrl smbsafeconf');
  }
+system("/usr/local/bin/sambactrl smbreload");
 }
   &General::readhash("${General::swroot}/samba/settings", \%sambasettings);
   
@@ -504,6 +510,7 @@ $selected{'SECURITY'}{$sambasettings{'SECURITY'}} = "selected='selected'";
 &Header::openbox('100%', 'center', $Lang::tr{'samba'});
 print <<END
         <hr />
+        <br />
         <table width='95%' cellspacing='0'>
 END
 ;
@@ -513,7 +520,6 @@ if ( $message ne "" )
        }
 
 print <<END
-<tr><td colspan='3'><br /></td></tr>
 <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'all services'}</b></td></tr>
 </table><table width='95%' cellspacing='0'>
 END
@@ -529,18 +535,17 @@ foreach $key (sort keys %servicenames)
        }
 
 print <<END
-<tr><td colspan='3'><br /></td></tr>
-<tr><td></td><td colspan='2' align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                                                                                                                               <input type='submit' name='ACTION' value='smbstart' />
-                                                                                                                                               <input type='submit' name='ACTION' value='smbstop' />
-                                                                                                                                               <input type='submit' name='ACTION' value='smbrestart' />
-</form></td></tr>
 </table>
-
-
+<br />
+<table width='95%' cellspacing='0'>
+<tr><td align='left' width='40%' />
+<td align='center' ><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='smbstart' /><input type='image' alt='$Lang::tr{'smbstart'}' src='/images/go-up.png' /></form></td>
+<td align='center' ><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='smbstop' /><input type='image' alt='$Lang::tr{'smbstop'}' src='/images/go-down.png' /></form></td>
+<td align='center' ><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='smbrestart' /><input type='image' alt='$Lang::tr{'smbrestart'}' src='/images/view-refresh.png' /></form></td></tr>
+</table>
+<br />
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
 <table width='95%' cellspacing='0'>
-<tr><td colspan='2'><br /></td></tr>
 <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'basic options'}</b></td></tr>
 <tr><td align='left' width='40%'>$Lang::tr{'workgroup'}</td><td align='left'><input type='text' name='WORKGRP' value='$sambasettings{'WORKGRP'}' size="30" /></td></tr>
 <tr><td align='left' width='40%'>$Lang::tr{'netbios name'}</td><td align='left'><input type='text' name='NETBIOSNAME' value='$sambasettings{'NETBIOSNAME'}' size="30" /></td></tr>
@@ -632,17 +637,17 @@ END
 
 print <<END
 </table>
+<br />
 <table width='10%' cellspacing='0'>
-<tr><td colspan='3'><br /></td></tr>
 <tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                                                                <input type='hidden' name='ACTION' value=$Lang::tr{'save'} />
-                                                                                               <input type='image' alt='$Lang::tr{'save'}' src='/images/floppy.gif' /></form></td>
+                                                                                               <input type='image' alt='$Lang::tr{'save'}' src='/images/media-floppy.png' /></form></td>
 <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                                                <input type='hidden' name='ACTION' value='globalreset' />
                                                                                <input type='image' alt='$Lang::tr{'reset'}' src='/images/reload.gif' /></form></td>
 <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                                                <input type='hidden' name='ACTION' value='globalcaption' />
-                                                                               <input type='image' alt='$Lang::tr{'caption'}' src='/images/info.gif' /></form></td></tr>
+                                                                               <input type='image' alt='$Lang::tr{'caption'}' src='/images/help-browser.png' /></form></td></tr>
 </table>
 END
 ;
@@ -650,10 +655,10 @@ END
 if ($sambasettings{'ACTION'} eq 'globalcaption')
        {
        print <<END
+       <br />
        <table width='95%' cellspacing='0'>
-       <tr><td colspan='2'><br /></td></tr>
        <tr><td align='center' colspan='2'><b>$Lang::tr{'caption'}</b></td></tr>
-       <tr><td align='right' width='33%'><img src='/images/floppy.gif' /></td><td align='left'>$Lang::tr{'save settings'}</td></tr>
+       <tr><td align='right' width='33%'><img src='/images/media-floppy.png' /></td><td align='left'>$Lang::tr{'save settings'}</td></tr>
        <tr><td align='right' width='33%'><img src='/images/reload.gif' /></td><td align='left'>$Lang::tr{'restore settings'}</td></tr>
        </table>
 END
@@ -677,8 +682,8 @@ if ($sambasettings{'SECURITY'} eq 'user')
                }
        print <<END
        <hr />
+       <br />
        <table width='95%' cellspacing='0'>
-       <tr><td colspan='6'><br /></td></tr>
        <tr><td colspan='6' align='left'></td></tr>
        <tr><td bgcolor='${Header::table1colour}' colspan='7' align='left'><b>$Lang::tr{'accounting'}</b></td></tr>
        <tr><td align='left'><u>$Lang::tr{'username'}</u></td><td align='left'><u>$Lang::tr{'password'}</u></td>
@@ -691,10 +696,10 @@ END
                }
        else
                {
-               print "<td align='left'><u>Typ</u></td>";
+               print "<td align='left'><u>$Lang::tr{'type'}</u></td>";
                }
 
-       print "<td align='left'><u>$Lang::tr{'interfaces'}</u></td><td colspan='3' width='5%' align='center'><u>$Lang::tr{'options'}</u></td></tr>";
+       print "<td align='left'><u>$Lang::tr{'status'}</u></td><td colspan='3' width='5%' align='center'><u>$Lang::tr{'options'}</u></td></tr>";
        system('/usr/local/bin/sambactrl readsmbpasswd');
        open(FILE, "</var/ipfire/samba/private/smbpasswd") or die "Can't read user file: $!";
        @user = <FILE>;
@@ -732,7 +737,7 @@ END
                if ($userline[4] =~ /D/)
                        {
                        print <<END
-                       inaktiv</td>
+                       $Lang::tr{'inactive'}</td>
                        <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                        <input type='hidden' name='NAME' value='$userline[0]' />
                                        <input type='hidden' name='ACTION' value='smbuserenable' />
@@ -744,7 +749,7 @@ END
                else
                        {
                        print <<END
-                       aktiv</td>
+                       $Lang::tr{'active'}</td>
                        <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                        <input type='hidden' name='NAME' value='$userline[0]' />
                                        <input type='hidden' name='ACTION' value='smbuserdisable' />
@@ -795,8 +800,8 @@ END
                }
        print <<END
        </table>
+       <br />
        <table width='10%' cellspacing='0'>
-       <tr><td colspan='3'><br /></td></tr>
        <tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                                                                        <input type='hidden' name='ACTION' value='useradd' />
                                                                                                        <input type='image' alt='$Lang::tr{'add user'}' src='/images/user-option-add.png' /></form></td>
@@ -815,7 +820,7 @@ END
        print <<END
        <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                                                        <input type='hidden' name='ACTION' value='usercaption' />
-                                                                                       <input type='image' alt='$Lang::tr{'caption'}' src='/images/info.gif' /></form>
+                                                                                       <input type='image' alt='$Lang::tr{'caption'}' src='/images/help-browser.png' /></form>
        </td></tr>
        </table>
 END
@@ -824,8 +829,8 @@ END
        if ($sambasettings{'ACTION'} eq 'usercaption')
                {
                print <<END
+               <br />
                <table width='95%' cellspacing='0'>
-               <tr><td align='center' colspan='2'><br /></td></tr>
                <tr><td align='center' colspan='2'><b>$Lang::tr{'caption'}</b></td></tr>
                <tr><td align='right' width='33%'><img src='/images/user-option-add.png' /></td><td align='left'>$Lang::tr{'add user'}</td></tr>
                <tr><td align='right' width='33%'><img src='/images/network.png' /></td><td align='left'>$Lang::tr{'add pc'}</td></tr>
@@ -834,7 +839,7 @@ END
                <tr><td align='right' width='33%'><img src='/images/on.gif' /></td><td align='left'>$Lang::tr{'activate user'}</td></tr>
                <tr><td align='right' width='33%'><img src='/images/off.gif' /></td><td align='left'>$Lang::tr{'deactivate user'}</td></tr>
                <tr><td align='right' width='33%'><img src='/images/edit.gif' /></td><td align='left'>$Lang::tr{'change passwords'}</td></tr>
-               <tr><td align='right' width='33%'><img src='/images/floppy.gif' /></td><td align='left'>$Lang::tr{'save config'}</td></tr>
+               <tr><td align='right' width='33%'><img src='/images/media-floppy.png' /></td><td align='left'>$Lang::tr{'save config'}</td></tr>
                </table>
 END
 ;
@@ -846,14 +851,14 @@ END
                my $password = 'samba';
                print <<END
                <hr />
+               <br />
                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                <table width='95%' cellspacing='0'>
-               <tr><td colspan='2'><br /></td></tr>
                <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'change passwords'}</b></td></tr>
                <tr><td align='left'>$Lang::tr{'username'}</td><td><input type='text' name='USERNAME' value='$username' size='30' /></td></tr>
                <tr><td align='left'>$Lang::tr{'password'}</td><td><input type='password' name='PASSWORD' value='$password' size='30' /></td></tr>
                <tr><td colspan='2' align='center'><input type='hidden' name='ACTION' value='smbchangepw' />
-                                                                                                                                                               <input type='image' alt=$Lang::tr{'save'} src='/images/floppy.gif' /></td></tr>
+                                                                                                                                                               <input type='image' alt=$Lang::tr{'save'} src='/images/media-floppy.png' /></td></tr>
                </table>
                </form>
 END
@@ -870,16 +875,16 @@ END
                $password=~s/\s//g;
                print <<END
                <hr />
+               <br />
                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                <table width='95%' cellspacing='0'>
-               <tr><td colspan='2'><br /></td></tr>
                <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'add user'}</b></td></tr>
                <tr><td align='left'>$Lang::tr{'username'}</td><td><input type='text' name='USERNAME' value='$username' size='30' /></td></tr>
                <tr><td align='left'>$Lang::tr{'password'}</td><td><input type='password' name='PASSWORD' value='$password' size='30' /></td></tr>
                <tr><td align='left'>$Lang::tr{'unix group'}</td><td><input type='text' name='GROUP' value='sambauser' size='30' /></td></tr>
                <tr><td align='left'>$Lang::tr{'unix shell'}</td><td><input type='text' name='SHELL' value='/bin/false' size='30' /></td></tr>
                <tr><td colspan='2' align='center'><input type='hidden' name='ACTION' value='smbuseradd' />
-                                                                                                                                                               <input type='image' alt=$Lang::tr{'save'} src='/images/floppy.gif' /></td></tr>
+                                                                                                                                                               <input type='image' alt=$Lang::tr{'save'} src='/images/media-floppy.png' /></td></tr>
                </table>
                </form>
 END
@@ -893,15 +898,15 @@ END
                $pcname=~s/\s//g;
                print <<END
                <hr />
+               <br />
                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                <table width='95%' cellspacing='0'>
-               <tr><td colspan='2'><br /></td></tr>
                <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'pc add'}</b></td></tr>
                <tr><td align='left'>$Lang::tr{'client'}</td><td><input type='text' name='PCNAME' value='$pcname' size='30' /></td></tr>
                <tr><td align='left'>$Lang::tr{'unix group'}</td><td><input type='text' name='GROUP' value='sambawks' size='30' /></td></tr>
                <tr><td align='left'>$Lang::tr{'unix shell'}</td><td><input type='text' name='SHELL' value='/bin/false' size='30' /></td></tr>
                <tr><td colspan='2' align='center'><input type='hidden' name='ACTION' value='smbpcadd' />
-                                                                                                                                                               <input type='image' alt=$Lang::tr{'save'} src='/images/floppy.gif' /></td></tr>
+                                                                                                                                                               <input type='image' alt=$Lang::tr{'save'} src='/images/media-floppy.png' /></td></tr>
                </table>
                </form>
 END
@@ -918,8 +923,8 @@ END
 
 print <<END
 <hr />
+<br />
 <table width='95%' cellspacing='0'>
-<tr><td colspan='3'><br /></td></tr>
 <tr><td bgcolor='${Header::table1colour}' colspan='3' align='left'><b>$Lang::tr{'manage shares'}</b>
 <tr><td align='left'><u>$Lang::tr{'sharename'}</u></td><td colspan='2' width="5%" align='center'><u>$Lang::tr{'options'}</u></td></tr>
 END
@@ -937,7 +942,7 @@ foreach $shareentry (sort @Shares)
        <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                        <input type='hidden' name='NAME' value='$shareentry' />
                        <input type='hidden' name='ACTION' value='smbsharedel' />
-                       <input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' />
+                       <input type='image' alt='$Lang::tr{'delete'}' src='/images/user-trash.png' />
        </form></td></tr>
 END
 ;
@@ -945,11 +950,11 @@ END
 
 print <<END
 </table>
+<br />
 <table width='10%' cellspacing='0'>
-<tr><td colspan='3'><br /></td></tr>
 <tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                                                                <input type='hidden' name='ACTION' value='shareadd' />
-                                                                                               <input type='image' alt='$Lang::tr{'add share'}' src='/images/add.gif' />
+                                                                                               <input type='image' alt='$Lang::tr{'add share'}' src='/images/list-add.png' />
                                                                                                </form></td>
                <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                                                                <input type='hidden' name='ACTION' value='sharesreset' />
@@ -957,7 +962,7 @@ print <<END
                                                                                                </form></td>
                <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                                                                <input type='hidden' name='ACTION' value='sharecaption' />
-                                                                                               <input type='image' alt='$Lang::tr{'caption'}' src='/images/info.gif' />
+                                                                                               <input type='image' alt='$Lang::tr{'caption'}' src='/images/help-browser.png' />
                                                                                                </form></td></tr>
 </table>
 END
@@ -966,14 +971,14 @@ END
 if ($sambasettings{'ACTION'} eq 'sharecaption')
        {
        print <<END
+       <br />
        <table width='95%' cellspacing='0'>
-       <tr><td align='center' colspan='2'><br /></td></tr>
-       <tr><td align='center' colspan='2'><b>Legende:</b></td></tr>
-       <tr><td align='right' width='33%'><img src='/images/add.gif' /></td><td align='left'>$Lang::tr{'add share'}</td></tr>
+       <tr><td align='center' colspan='2'><b>$Lang::tr{'caption'}</b></td></tr>
+       <tr><td align='right' width='33%'><img src='/images/list-add.png' /></td><td align='left'>$Lang::tr{'add share'}</td></tr>
        <tr><td align='right' width='33%'><img src='/images/edit.gif' /></td><td align='left'>$Lang::tr{'edit share'}</td></tr>
-       <tr><td align='right' width='33%'><img src='/images/floppy.gif' /></td><td align='left'>$Lang::tr{'save config'}</td></tr>
+       <tr><td align='right' width='33%'><img src='/images/media-floppy.png' /></td><td align='left'>$Lang::tr{'save config'}</td></tr>
        <tr><td align='right' width='33%'><img src='/images/reload.gif' /></td><td align='left'>$Lang::tr{'reset shares'}</td></tr>
-       <tr><td align='right' width='33%'><img src='/images/delete.gif' /></td><td align='left'>$Lang::tr{'delete share'}</td></tr>
+       <tr><td align='right' width='33%'><img src='/images/user-trash.png' /></td><td align='left'>$Lang::tr{'delete share'}</td></tr>
        </table>
 END
 ;
@@ -983,20 +988,20 @@ if ($sambasettings{'ACTION'} eq 'shareadd' || $sambasettings{'ACTION'} eq 'optio
        {
        print <<END
        <hr />
+       <br />
        <table width='95%' cellspacing='0'>
-       <tr><td colspan='2'><br /></td></tr>
        <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'add share'}</b></td></tr>
        <tr><td colspan='2' align='center'></td></tr>
        <tr><td colspan='2' align='center'>$Lang::tr{'show share options'}<form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                                                                                                                                                                                                                                                        <input type='hidden' name='ACTION' value='optioncaption' />
-                                                                                                                                                                                                                                                                                       <input type='image' alt='$Lang::tr{'caption'}' src='/images/info.gif' />
+                                                                                                                                                                                                                                                                                       <input type='image' alt='$Lang::tr{'caption'}' src='/images/help-browser.png' />
                                                                                                                                                                                                                                                                                        </form></td></tr>
        <form method='post' action='$ENV{'SCRIPT_NAME'}'><tr><td colspan='2' align='center'><textarea name="SHAREOPTION" cols="50" rows="15" Wrap="off">$defaultoption</textarea></td></tr>
        </table>
+       <br />
        <table width='10%' cellspacing='0'>
-       <tr><td><br /></td></tr>
        <tr><td align='center'><input type='hidden' name='ACTION' value='smbshareadd' />
-                                                                                                       <input type='image' alt='$Lang::tr{'add share'}' src='/images/floppy.gif' /></td></tr></form>
+                                                                                                       <input type='image' alt='$Lang::tr{'add share'}' src='/images/media-floppy.png' /></td></tr></form>
        </table>
 END
 ;
@@ -1024,19 +1029,19 @@ if ($sambasettings{'ACTION'} eq 'sharechange' || $sambasettings{'ACTION'} eq 'op
                }
        print <<END
        <hr />
+       <br />
        <table width='95%' cellspacing='0'>
-       <tr><td colspan='2'><br /></td></tr>
        <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'edit share'}</b></td></tr>
        <tr><td colspan='2' align='center'></td></tr>
        <tr><td colspan='2' align='center'>$Lang::tr{'show share options'}<form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                                                                                                                                                                                                                                                        <input type='hidden' name='ACTION' value='optioncaption2' />
-                                                                                                                                                                                                                                                                                       <input type='image' alt='$Lang::tr{'caption'}' src='/images/info.gif' /></form></td></tr>
+                                                                                                                                                                                                                                                                                       <input type='image' alt='$Lang::tr{'caption'}' src='/images/help-browser.png' /></form></td></tr>
        <tr><td colspan='2' align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><textarea name="SHAREOPTION" cols="50" rows="15" Wrap="off">$shareoption</textarea></td></tr>
        </table>
+       <br />
        <table width='10%' cellspacing='0'>
-       <tr><td><br /></td></tr>
        <tr><td align='center'><input type='hidden' name='NAME' value='$sambasettings{'NAME'}' />
-                                                                                                       <input type='image' alt='$Lang::tr{'change share'}' src='/images/floppy.gif' />
+                                                                                                       <input type='image' alt='$Lang::tr{'change share'}' src='/images/media-floppy.png' />
                                                                                                        <input type='hidden' name='ACTION' value='smbsharechange' /></form></td></tr>
        </table>
 END
@@ -1046,8 +1051,8 @@ END
 if ($sambasettings{'ACTION'} eq 'optioncaption' || $sambasettings{'ACTION'} eq 'optioncaption2')
        {
        print <<END
+       <br />
        <table width='95%' cellspacing='0'>
-       <tr><td><br /></td></tr>
        <tr><td><b>$Lang::tr{'caption'}</b></td></tr>
        <tr><td><u>$Lang::tr{'options'}</u></td><td><u>$Lang::tr{'meaning'}</u> / <u>$Lang::tr{'exampel'}</u></td></tr>
        <tr><td>comment</td><td>$Lang::tr{'comment'}</td></tr>
@@ -1111,8 +1116,8 @@ END
 
 print <<END
 <hr />
+<br />
 <table width='95%' cellspacing='0'>
-<tr><td colspan='4'  align='left'><br /></td></tr>
 <tr><td bgcolor='${Header::table1colour}' colspan='3' align='left'><b>$Lang::tr{'samba status'}</b></td></tr>
 <tr><td  align='left'>$Status</td></tr>
 </table>
@@ -1134,9 +1139,9 @@ $Log=~s/\n/<br \/>/g;
 
 print <<END
 <hr />
+<br />
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
 <table width='95%' cellspacing='0'>
-<tr><td colspan='3'  align='left'><br /></td></tr>
 <tr><td bgcolor='${Header::table1colour}' colspan='3' align='left'><b>$Lang::tr{'log view'}</b></td></tr>
 <tr><td colspan='3'  align='left'><br /></td></tr>
 <tr><td  align='left'><select name='LOG' style="width: 200px">
@@ -1146,7 +1151,7 @@ foreach my $log (@Logs) {chomp $log;print"<option value='$log'>$log</option>";}
 print <<END
 
 </select></td><td  align='left'>$Lang::tr{'show last x lines'}<input type='text' name='LOGLINES' value='$LOGLINES' size="3" /></td>
-                       <td  align='left'><input type='hidden' name='ACTION' value='showlog' /><input type='image' alt='view Log' src='/images/document-open.png' /></td></tr>
+                       <td  align='left'><input type='hidden' name='ACTION' value='showlog' /><input type='image' alt='view Log' src='/images/format-justify-fill.png' /></td></tr>
 <tr><td colspan='3'  align='left'><br /></td></tr>
 <tr><td colspan='3'  align='left'><font size=2>$Log</font></td></tr>
 <tr><td colspan='3'  align='left'><br /></td></tr>