diff options
| author | Orsiris de Jong <ozy@netpower.fr> | 2016-04-20 16:05:38 +0200 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2016-04-20 10:12:31 -0400 |
| commit | c045e352ef609853f1f4e34ad4f144ffbb3f3218 (patch) | |
| tree | 093199f173a624f491b1d6f86a2a2f5488451332 /src/usr/local/www/services_captiveportal_filemanager.php | |
| parent | 23a6f29b1ce58874b7463db9cc68f7e303254d02 (diff) | |
| download | pfsense-c045e352ef609853f1f4e34ad4f144ffbb3f3218.zip pfsense-c045e352ef609853f1f4e34ad4f144ffbb3f3218.tar.gz | |
Allow upload of favicon.ico without prefix adding
(cherry picked from commit 3f3fce19318d1677020adcac742c0bfb5e25f967)
Diffstat (limited to 'src/usr/local/www/services_captiveportal_filemanager.php')
| -rw-r--r-- | src/usr/local/www/services_captiveportal_filemanager.php | 3 |
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 /> |
