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

Merge remote-tracking branch 'origin/next' into thirteen

Browse Source
This commit is contained in:
Arne Fitzenreiter
2012-10-26 09:58:49 +02:00
parent d8ce16fa66 03207e65b1
commit ecd0ac08a5
3 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
html/cgi-bin/credits.cgi
View File

@@ -39,16 +39,11 @@ require "${General::swroot}/header.pl";
print <<END
<p>$Lang::tr{'donation-text'}</p>
<div align="center">
<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
<input type="hidden" name="cmd" value="_s-xclick">
<input type="hidden" name="hosted_button_id" value="HHBTSN9QRWPAY">
<input type="image" src="$Lang::tr{'donation-link'}" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
<img alt="" border="0" src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif" width="1" height="1">
</form>
</div>
<br />
<div align="center">
<a href="http://www.ipfire.org/donate">$Lang::tr{'donation'}</a>
</div>
<br>
END
;
&Header::closebox();
@@ -73,8 +68,6 @@ Christian Schmidt
(<a href='mailto:christian.schmidt\@ipfire.org'>christian.schmidt\@ipfire.org</a>) - Vice Project Leader <br />
Stefan Schantl
(<a href='mailto:stefan.schantl\@ipfire.org'>stefan.schantl\@ipfire.org</a>)<br />
Jan Paul T&uuml;cking
(<a href='mailto:jan.tuecking\@ipfire.org'>jan.tuecking\@ipfire.org</a>)<br />
Heiner Schmeling
(<a href='mailto:heiner.schmeling\@ipfire.org'>heiner.schmeling\@ipfire.org</a>)<br />
Ronald Wiesinger
@@ -94,12 +87,10 @@ Peter Pfeiffer
(<a href='mailto:peter.pfeifer\@ipfire.org'>peter.pfeifer\@ipfire.org</a>)<br />
Peter Sch&auml;lchli
(<a href='mailto:peter.schaelchli\@ipfire.org'>peter.schaelchli\@ipfire.org</a>)<br />
Jan Paul T&uuml;cking
(<a href='mailto:jan.tuecking\@ipfire.org'>jan.tuecking\@ipfire.org</a>)<br />
</p>
<p>Some parts of the distribution are left ajar on third-party software, that is licensed under the GPL, too.<br />
There are: Advanced Proxy with URL-Filter and Update-Accelerator, ZERINA, Connection Scheduler, Hddtemp and Wake-on-LAN.<br />
Distributed by Marco Sondermann, Ufuk Altinkaynak, Thomas Eichstaedt and Olaf Westrik.</p>
<p>
This product includes GeoLite data created by MaxMind, available from <a href='http://www.maxmind.com/' target="_blank">http://www.maxmind.com/</a>.
</p>
END

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

@@ -1362,7 +1362,7 @@ sub printlegendicons
<td><img src='/images/updbooster/updxl-globe.gif' alt='$Lang::tr{'updxlrtr last checkup'}' /></td>
<td class='base'>$Lang::tr{'updxlrtr last checkup'}</td>
<td class='base'>&nbsp;</td>
<td><img src='/images/updbooster/delete.gif' alt='$Lang::tr{'updxlrtr remove file'}' /></td>
<td><img src='/images/delete.gif' alt='$Lang::tr{'updxlrtr remove file'}' /></td>
<td class='base'>$Lang::tr{'updxlrtr remove file'}</td>
<td class='base'>&nbsp;</td>
<td class='base'>&nbsp;</td>

4
src/pakfire/lib/functions.sh
View File

@@ -24,13 +24,13 @@
extract_files() {
echo "Extracting files..."
tar xvf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C /
tar xavf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C /
echo "...Finished."
}
extract_backup_includes() {
echo "Extracting backup includes..."
tar xvf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / \
tar xavf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / \
var/ipfire/backup/addons/includes
echo "...Finished."
}