summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/services_captiveportal_filemanager.php
diff options
context:
space:
mode:
authorOrsiris de Jong <ozy@netpower.fr>2016-04-20 16:05:38 +0200
committerOrsiris de Jong <ozy@netpower.fr>2016-04-20 16:05:38 +0200
commit3f3fce19318d1677020adcac742c0bfb5e25f967 (patch)
tree57a91ec12a8cd606aac010340cfe9f23da72d69c /src/usr/local/www/services_captiveportal_filemanager.php
parent57cb8d30df7eb921192a53c4216f1f167a597a2e (diff)
downloadpfsense-3f3fce19318d1677020adcac742c0bfb5e25f967.zip
pfsense-3f3fce19318d1677020adcac742c0bfb5e25f967.tar.gz
Allow upload of favicon.ico without prefix adding
Diffstat (limited to 'src/usr/local/www/services_captiveportal_filemanager.php')
-rw-r--r--src/usr/local/www/services_captiveportal_filemanager.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/usr/local/www/services_captiveportal_filemanager.php b/src/usr/local/www/services_captiveportal_filemanager.php
index 68834a7..39a839a 100644
--- a/src/usr/local/www/services_captiveportal_filemanager.php
+++ b/src/usr/local/www/services_captiveportal_filemanager.php
@@ -115,7 +115,7 @@ if ($_POST) {
if (is_uploaded_file($_FILES['new']['tmp_name'])) {
- if (!stristr($_FILES['new']['name'], "captiveportal-")) {
+ if ((!stristr($_FILES['new']['name'], "captiveportal-")) && ($_FILES['new']['name'] != 'favicon.ico')) {
$name = "captiveportal-" . $_FILES['new']['name'];
} else {
$name = $_FILES['new']['name'];
@@ -278,6 +278,7 @@ endif;
<div class="panel-body">
<?=gettext("Any files that are uploaded here with the filename prefix of captiveportal- will " .
"be made available in the root directory of the captive portal HTTP(S) server. " .
+ "An icon file named favicon.ico may also be uploaded and will remain without prefix. " .
"They may be referenced directly from the portal page HTML code using relative paths. " .
"Example: An image uploaded with the name 'captiveportal-test.jpg' using the " .
"file manager can then be included in the portal page like this:")?><br /><br />
OpenPOWER on IntegriCloud