webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 11:13:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

Browse Source
This commit is contained in:
Christian Schmidt
2010-12-06 18:47:29 +01:00
parent ac93c5d0aa 27f2be1853
commit 3a13d0270d
51 changed files with 166 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
html/cgi-bin/index.cgi
View File

@@ -39,6 +39,7 @@ my $warnmessage = '';
my $refresh = "";
my $ipaddr='';
&Header::showhttpheaders();
$cgiparams{'ACTION'} = '';
@@ -57,6 +58,14 @@ my %mainsettings = ();
my $connstate = &Header::connectionstatus();
# check if reboot is necessary
my $reboot = 0;
if (`find /var/run/need_reboot 2>/dev/null`) {
$reboot = 1;
}
if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'} || $cgiparams{'ACTION'} eq $Lang::tr{'reboot'}) {
$refresh = "<meta http-equiv='refresh' content='300;'>";
} elsif ($connstate =~ /$Lang::tr{'connecting'}/ || /$Lang::tr{'connection closed'}/ ){
@@ -128,8 +137,13 @@ my $dialButtonDisabled = "disabled='disabled'";
&Header::openpage($Lang::tr{'main page'}, 1, $refresh);
&Header::openbigbox('', 'center');
&Header::openbox('100%', 'center', &Header::cleanhtml(`/bin/uname -n`,"y"));
# licence agreement
if ($cgiparams{'ACTION'} eq $Lang::tr{'yes'} && $cgiparams{'gpl_accepted'} eq '1') {
system('touch /var/ipfire/main/gpl_accepted')
}
if (`find /var/ipfire/main/gpl_accepted 2>/dev/null`) {
&Header::openbox('100%', 'center', &Header::cleanhtml(`/bin/uname -n`,"y"));
if ( ( $pppsettings{'VALID'} eq 'yes' && $modemsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ )) {
@@ -428,6 +442,7 @@ foreach my $file (@files) {
}
}
if ($warnmessage) {
print "<tr><td align='center' bgcolor=$Header::colourred colspan='3'><font color='white'>$warnmessage</font></table>";
}
@@ -437,8 +452,10 @@ END
;
&Pakfire::dblist("upgrade", "notice");
print <<END;
END
if ($reboot == 1) {
print "<br /><br /><font color='red'>$Lang::tr{'needreboot'}!</font>";
}
} else {
my $message='';
if ($death) {
@@ -462,5 +479,37 @@ END
}
&Header::closebox();
}
else {
&Header::openbox('100%', 'left', $Lang::tr{'gpl license agreement'});
print <<END;
$Lang::tr{'gpl please read carefully the general public license and accept it below'}.
<br /><br />
END
;
if (`find /usr/share/doc/licenses/GPLv3 2>/dev/null`) {
print '<textarea rows=\'25\' cols=\'75\' readonly=\'true\'>';
print `cat /usr/share/doc/licenses/GPLv3`;
print '</textarea>';
}
else {
print '<br /><a href=\'http://www.gnu.org/licenses/gpl-3.0.txt\' target=\'_blank\'>GNU GENERAL PUBLIC LICENSE</a><br />';
}
print <<END;
<p>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='checkbox' name='gpl_accepted' value='1'/> $Lang::tr{'gpl i accept these terms and conditions'}.
<br/ >
<input type='submit' name='ACTION' value=$Lang::tr{'yes'} />
</form>
</p>
<a href='http://www.gnu.org/licenses/translations.html' target='_blank'>$Lang::tr{'gpl unofficial translation of the general public license v3'}</a>
END
&Header::closebox();
}
&Header::closebigbox();
&Header::closepage();

20
html/cgi-bin/pakfire.cgi Normal file → Executable file
View File

@@ -57,6 +57,12 @@ sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' cont
&Header::openpage($Lang::tr{'pakfire configuration'}, 1);
&Header::openbigbox('100%', 'left', '', $errormessage);
# check if reboot is necessary
my $reboot = 0;
if (`find /var/run/need_reboot 2>/dev/null`) {
$reboot = 1;
}
if ($pakfiresettings{'ACTION'} eq 'install'){
$pakfiresettings{'INSPAKS'} =~ s/\|/\ /g;
if ("$pakfiresettings{'FORCE'}" eq "on") {
@@ -229,13 +235,19 @@ my $packages_update_age = &General::age("/opt/pakfire/db/lists/packages_list.db"
print <<END;
<table width='95%' cellpadding='5' >
END
if ($reboot == 1) {
print "<tr><td align='center' colspan='2'><font color='red'>$Lang::tr{'needreboot'}!</font></td></tr>";
print "<tr><td colspan='2'>&nbsp;</font></td></tr>"
}
print <<END;
<tr><td width="50%" bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire system state'}:</b>
<td width="50%">
<tr><td align="center">$Lang::tr{'pakfire core update level'}: $core_release<hr />
$Lang::tr{'pakfire last update'} $core_update_age ago<br />
$Lang::tr{'pakfire last serverlist update'} $server_update_age ago<br />
$Lang::tr{'pakfire last core list update'} $corelist_update_age ago<br />
$Lang::tr{'pakfire last package update'} $packages_update_age ago
$Lang::tr{'pakfire last update'} $core_update_age $Lang::tr{'pakfire ago'}<br />
$Lang::tr{'pakfire last serverlist update'} $server_update_age $Lang::tr{'pakfire ago'}<br />
$Lang::tr{'pakfire last core list update'} $corelist_update_age $Lang::tr{'pakfire ago'}<br />
$Lang::tr{'pakfire last package update'} $packages_update_age $Lang::tr{'pakfire ago'}
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='ACTION' value='update' />
<input type='submit' value='$Lang::tr{'calamaris refresh list'}' /><br />

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

@@ -77,7 +77,7 @@ my %servicenames = ('SMB Daemon' => 'smbd','NetBIOS Nameserver' => 'nmbd');
$sambasettings{'WORKGRP'} = 'homeip.net';
$sambasettings{'NETBIOSNAME'} = 'IPFire';
$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.7';
$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.9';
$sambasettings{'INTERFACES'} = '';
$sambasettings{'SECURITY'} = 'share';
$sambasettings{'OSLEVEL'} = '33';