webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

In der Samba.cgi einige Icons ausgetauscht

Browse Source 
smbpasswd eingebunden


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@483 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
maniacikarus
2007-04-05 19:04:25 +00:00
parent 37263bc1ab
commit 60124059ba
11 changed files with 52 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
config/samba/private/secrets.tdb Executable file
View File

Binary file not shown.

1
config/samba/private/smbpasswd Executable file
View File

@@ -0,0 +1 @@
samba:1000:DF7D4C80BE72A070AAD3B435B51404EE:B3A3496D3F61D8CDA3B865A2B4B29A37:[DU ]:LCT-46151C53:

2
doc/language_issues.de
View File

@@ -235,6 +235,7 @@ WARNING: translation string unused: sectors read from disk per second
WARNING: translation string unused: sectors written to disk per second
WARNING: translation string unused: select media
WARNING: translation string unused: shared memory
WARNING: translation string unused: smbreload
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
WARNING: translation string unused: squid fix cache
@@ -315,6 +316,7 @@ WARNING: untranslated string: selecttraffic
WARNING: untranslated string: settingsc
WARNING: untranslated string: show areas
WARNING: untranslated string: show lines
WARNING: untranslated string: smbrestart
WARNING: untranslated string: sstraffic
WARNING: untranslated string: trafficblue
WARNING: untranslated string: trafficdate

4
doc/language_issues.en
View File

@@ -244,6 +244,7 @@ WARNING: translation string unused: sectors read from disk per second
WARNING: translation string unused: sectors written to disk per second
WARNING: translation string unused: shaping add options
WARNING: translation string unused: shared memory
WARNING: translation string unused: smbreload
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
WARNING: translation string unused: ssnetwork status
@@ -304,6 +305,8 @@ WARNING: untranslated string: Number of IPs for the pie chart
WARNING: untranslated string: Number of Ports for the pie chart
WARNING: untranslated string: alt proxy
WARNING: untranslated string: down
WARNING: untranslated string: firewall logs ip
WARNING: untranslated string: firewall logs port
WARNING: untranslated string: help
WARNING: untranslated string: openvpn log
WARNING: untranslated string: otherip
@@ -313,6 +316,7 @@ WARNING: untranslated string: pc add
WARNING: untranslated string: red
WARNING: untranslated string: remove x509
WARNING: untranslated string: settingsc
WARNING: untranslated string: smbrestart
WARNING: untranslated string: up
WARNING: untranslated string: urlfilter log
WARNING: untranslated string: user log

2
doc/language_missings
View File

@@ -19,6 +19,8 @@
< dns server
< download
< err bk 10 password
< firewall logs ip
< firewall logs port
< or
< password crypting key
< proxy no proxy extend

58
html/cgi-bin/samba.cgi
View File

@@ -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");
}
############################################################################################################################
@@ -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 <20>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);
@@ -529,14 +535,14 @@ 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>
<table width='95%' cellspacing='0'>
<tr><td colspan='4'><br /></td></tr>
<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>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='95%' cellspacing='0'>
@@ -636,13 +642,13 @@ print <<END
<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
;
@@ -653,7 +659,7 @@ if ($sambasettings{'ACTION'} eq 'globalcaption')
<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
@@ -815,7 +821,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
@@ -834,7 +840,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
;
@@ -853,7 +859,7 @@ END
<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
@@ -879,7 +885,7 @@ END
<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
@@ -901,7 +907,7 @@ END
<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
@@ -937,7 +943,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
;
@@ -949,7 +955,7 @@ print <<END
<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 +963,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
@@ -969,11 +975,11 @@ if ($sambasettings{'ACTION'} eq 'sharecaption')
<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='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
;
@@ -989,14 +995,14 @@ if ($sambasettings{'ACTION'} eq 'shareadd' || $sambasettings{'ACTION'} eq 'optio
<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>
<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
;
@@ -1030,13 +1036,13 @@ if ($sambasettings{'ACTION'} eq 'sharechange' || $sambasettings{'ACTION'} eq 'op
<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>
<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
@@ -1146,7 +1152,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>

82
html/html/images/Makefile.am
View File

@@ -1,82 +0,0 @@
size = 16x16
context = actions
iconsdir = $(themedir)/$(size)/$(context)
icons_DATA = \
address-book-new.png \
appointment-new.png \
bookmark-new.png \
contact-new.png \
document-new.png \
document-open.png \
document-print.png \
document-print-preview.png \
document-properties.png \
document-save.png \
document-save-as.png \
edit-clear.png \
edit-copy.png \
edit-cut.png \
edit-delete.png \
edit-find.png \
edit-find-replace.png \
edit-paste.png \
edit-redo.png \
edit-select-all.png \
edit-undo.png \
folder-new.png \
format-indent-less.png \
format-indent-more.png \
format-justify-center.png \
format-justify-fill.png \
format-justify-left.png \
format-justify-right.png \
format-text-bold.png \
format-text-italic.png \
format-text-strikethrough.png \
format-text-underline.png \
go-bottom.png \
go-down.png \
go-first.png \
go-home.png \
go-jump.png \
go-last.png \
go-next.png \
go-previous.png \
go-top.png \
go-up.png \
list-add.png \
list-remove.png \
mail-forward.png \
mail-message-new.png \
mail-mark-junk.png \
mail-mark-not-junk.png \
mail-reply-all.png \
mail-reply-sender.png \
mail-send-receive.png \
media-eject.png \
media-playback-pause.png \
media-playback-start.png \
media-playback-stop.png \
media-record.png \
media-seek-backward.png \
media-seek-forward.png \
media-skip-backward.png \
media-skip-forward.png \
process-stop.png \
system-lock-screen.png \
system-log-out.png \
system-search.png \
system-shutdown.png \
tab-new.png \
view-fullscreen.png \
view-refresh.png \
window-new.png
EXTRA_DIST = \
$(icons_DATA)
install-data-local: install-iconsDATA
(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))

3
langs/de/cgi-bin/de.pl
View File

@@ -1192,6 +1192,9 @@
'shutting down' => 'Fahre herunter',
'shutting down ipfire' => 'Fahre IPFire herunter',
'size' => 'Größe',
'smbreload' => 'Samba Dienste durchstarten',
'smbstart' => 'Samba Dienste starten',
'smbstop' => 'Samba Dienste beenden',
'snort hits' => 'Gesamtanzahl der aktivierten Intrusion-Regeln für',
'sort ascending' => 'Sortiere aufsteigend',
'sort descending' => 'Sortiere absteigend',

5
langs/en/cgi-bin/en.pl
View File

@@ -637,8 +637,6 @@
'firewall log' => 'Firewall log',
'firewall log viewer' => 'Firewall Log Viewer',
'firewall logs' => 'Firewall Logs',
'firewall logs ip' => 'Firewall Log Graphs (IP)',
'firewall logs port' => 'Firewall Log Graphs (Port)',
'firmware' => 'Firmware',
'firmware upload' => 'Upload Firmware/Drivers',
'fixed ip lease added' => 'Fixed IP lease added',
@@ -1207,6 +1205,9 @@
'shutting down' => 'Shutting down',
'shutting down ipfire' => 'Shutting down IPFire',
'size' => 'Size',
'smbreload' => 'Samba Dienste durchstarten',
'smbstart' => 'Samba Dienste starten',
'smbstop' => 'Samba Dienste beenden',
'snort hits' => 'Total of number of Intrusion rules activated for',
'sort ascending' => 'Sort Ascending',
'sort descending' => 'Sort Descending',

4
lfs/samba
View File

@@ -107,5 +107,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cp -vfp /var/ipfire/samba/default.settings /var/ipfire/samba/settings
cp -vfp /var/ipfire/samba/default.shares /var/ipfire/samba/shares
cp -vfp /var/ipfire/samba/default.printer /var/ipfire/samba/printer
cat /var/ipfire/samba/global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf
useradd -c 'Samba User' -s /bin/false
groupadd sambauser
groupadd sambawks
@rm -rf $(DIR_APP)
@$(POSTBUILD)

11
src/misc-progs/sambactrl.c
View File

@@ -77,34 +77,30 @@ int main(int argc, char *argv[])
if (strcmp(argv[1], "smbstop")==0)
{
safe_system("/etc/rc.d/init.d/samba stop");
printf(command);
return 0;
}
if (strcmp(argv[1], "smbstart")==0)
{
safe_system("/etc/rc.d/init.d/samba start");
printf(command);
return 0;
}
if (strcmp(argv[1], "smbrestart")==0)
{
safe_system("/etc/rc.d/init.d/samba restart");
printf(command);
return 0;
}
if (strcmp(argv[1], "smbreload")==0)
{
safe_system("/etc/rc.d/init.d/samba reload");
printf(command);
return 0;
}
if (strcmp(argv[1], "smbstatus")==0)
{
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/smbstatus");
snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbstatus");
safe_system(command);
return 0;
}
@@ -115,10 +111,8 @@ int main(int argc, char *argv[])
safe_system(command);
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/useradd -c 'Samba User' -m -g %s -p %s -s %s %s", argv[4], argv[3], argv[5], argv[2]);
safe_system(command);
printf(command);
snprintf(command, BUFFER_SIZE-1, "/usr/bin/printf '%s\n%s\n' | /usr/bin/smbpasswd -as %s", argv[3], argv[3], argv[2]);
safe_system(command);
printf(command);
return 0;
}
@@ -128,10 +122,8 @@ int main(int argc, char *argv[])
safe_system(command);
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/useradd -c 'Samba Workstation' -g %s -s %s %s", argv[3], argv[4], argv[2]);
safe_system(command);
printf(command);
snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -a -m %s", argv[2]);
safe_system(command);
printf(command);
return 0;
}
@@ -139,7 +131,6 @@ int main(int argc, char *argv[])
{
snprintf(command, BUFFER_SIZE-1, "/usr/bin/printf '%s\n%s\n' | /usr/bin/smbpasswd -as %s", argv[3], argv[3], argv[2]);
safe_system(command);
printf(command);
return 0;
}