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

Merge branch 'master' into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2017-09-24 15:45:04 +02:00
parent 1b0ff72dad 2083519a64
commit d62fd7553d
5 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/114/filelists/php Symbolic link
View File

@@ -0,0 +1 @@
../../../common/php

4
lfs/wio
View File

@@ -15,7 +15,7 @@ THISAPP = wio-$(VER)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = wio
PAK_VER = 2
PAK_VER = 3
###############################################################################
# Top-level Rules
@@ -58,7 +58,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m 644 $(DIR_APP)/wio/images/* /srv/web/ipfire/html/images/wio/
install -v -m 655 $(DIR_APP)/wio/lang/wio.de.pl /var/ipfire/addon-lang/
install -v -m 655 $(DIR_APP)/wio/lang/wio.en.pl /var/ipfire/addon-lang/
install -v -m 655 $(DIR_APP)/wio/EX-wio.menu /var/ipfire/menu.d/
install -v -m 644 $(DIR_APP)/wio/EX-wio.menu /var/ipfire/menu.d/
install -v -m 644 $(DIR_APP)/wio/config/backup/includes/wio /var/ipfire/backup/addons/includes/wio
@rm -rf $(DIR_APP)

1
src/paks/wio/install.sh
View File

@@ -30,6 +30,7 @@ chown -R nobody.nobody /var/log/rrd/wio
chown -R nobody.nobody /var/log/wio
chown root.nobody /usr/local/bin/wioscan
chown root.nobody /usr/local/bin/wiohelper
chown nobody.nobody /var/ipfire/menu.d/EX-wio.menu
chmod 4750 /usr/local/bin/wioscan
chmod 4750 /usr/local/bin/wiohelper

25
src/wio/wio.cgi
View File

@@ -21,7 +21,7 @@
# #
###############################################################################
#
# id: wio.cgi, v1.3.1 2017/07/11 21:31:16 sfeddersen
# id: wio.cgi, v1.3.2 2017/08/27 14:11:16 sfeddersen
#
# This wio.cgi is based on the Code from the IPCop WIO Addon
# and is extremly adapted to work with IPFire.
@@ -917,7 +917,10 @@ print"
<td align='left'><select size='1' name='CRON' size='5'>
";
for ($i=5; $i<=60; $i+=5) { printf("<option %s>%02s</option>\n",$selected{'CRON'}{$i},$i); }
for ($i=5; $i<=60; $i+=5) {
$_ = sprintf("%02s",$i);
print "<option $selected{'CRON'}{$_}>$_</option>\n";
}
print"
</select>&nbsp;$Lang::tr{'wio min'}</td>
@@ -929,7 +932,10 @@ print"
<td align='left'><select size='1' name='TIMEOUT' size='5'>
";
for ($i=1; $i<=15; $i++) { printf("<option %s>%02s</option>\n",$selected{'TIMEOUT'}{$i},$i); }
for ($i=1; $i<=15; $i++) {
$_ = sprintf("%02s",$i);
print "<option $selected{'TIMEOUT'}{$_}>$_</option>\n";
}
print"
</select>&nbsp;$Lang::tr{'wio sec'}</td>
@@ -980,7 +986,10 @@ print"
<td align='left'><select size='1' name='OVPNCRON' size='5'>
";
for ($i=1; $i<=15; $i++) { printf("<option %s>%02s</option>\n",$selected{'OVPNCRON'}{$i},$i); }
for ($i=1; $i<=15; $i++) {
$_ = sprintf("%02s",$i);
print "<option $selected{'OVPNCRON'}{$_}>$_</option>\n";
}
print"
</select>&nbsp;$Lang::tr{'wio min'}</td>
@@ -1947,7 +1956,13 @@ print"
<table border='0' width='100%' bordercolor='$Header::bordercolour' cellspacing='0' cellpadding='0' style='border-collapse: collapse'>
<tr bgcolor='$color{'color22'}'>
<td colspan='2' align='right'></td>
<td width='10%' align='right'><form method='post' action='/cgi-bin/logs.cgi/log.dat' enctype='multipart/form-data'><input type='hidden' name='SECTION' value='wio' /><input type='submit' name='SUBMIT' value='$Lang::tr{'system logs'}' /></form></td>
";
if ( $wiosettings{'LOGGING'} eq 'on' ) {
print"<td width='10%' align='right'><form method='post' action='/cgi-bin/logs.cgi/log.dat' enctype='multipart/form-data'><input type='hidden' name='SECTION' value='wio' /><input type='submit' name='SUBMIT' value='$Lang::tr{'system logs'}' /></form></td>";
}
print"
<td width='10%' align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}' enctype='multipart/form-data'><input type='hidden' name='ACTION' value='$Lang::tr{'edit'}1' /><input type='submit' name='SUBMIT' value='$Lang::tr{'wio_edit_set'}' /></form></td>
</tr>
</table>

2
src/wio/wiographs.cgi
View File

@@ -21,7 +21,7 @@
# #
###############################################################################
#
# id: wiographs.cgi, v1.3.1 2017/07/11 21:31:16 sfeddersen
# id: wiographs.cgi, v1.3.2 2017/08/27 14:11:16 sfeddersen
#
# This wiographs.cgi is based on the Code from the IPCop WIO Addon
# and is extremly adapted to work with IPFire.