summaryrefslogtreecommitdiff
path: root/php/includes/settings.inc.php
diff options
context:
space:
mode:
authorAustin <austi_gillm935@ahapps.anoka.k12.mn.us>2016-06-21 15:29:43 +0200
committerGitHub <noreply@github.com>2016-06-21 15:29:43 +0200
commit0d7028c01d85405fe441bdc0cc7448bb59a9cf19 (patch)
tree0a3046f1b01c5c3a85a0f4144134237600791a4c /php/includes/settings.inc.php
parent342c0128119367392072760ef14a1a5f4443e905 (diff)
parente01670d1bb7204051e076069f50fd68d55e8c92c (diff)
Merge pull request #18 from akpu1/patch-1
Have FILTER_MODE determine whether FILTER_MIME is white/blacklist
Diffstat (limited to 'php/includes/settings.inc.php')
-rw-r--r--php/includes/settings.inc.php12
1 files changed, 5 insertions, 7 deletions
diff --git a/php/includes/settings.inc.php b/php/includes/settings.inc.php
index 19a3987..6e70569 100644
--- a/php/includes/settings.inc.php
+++ b/php/includes/settings.inc.php
@@ -90,17 +90,15 @@ define('ID_CHARSET', 'abcdefghijklmnopqrstuvwxyz');
/**
- * Blocked mime types
- * @param string[] $FILTER_MIME blocked mime types
+ * Filtered mime types
+ * @param string[] $FILTER_MIME allowed/blocked mime types
*/
$FILTER_MIME = array("");
-
/**
- * Whitelisted mime types
- * @param string[] $WHITELIST_MIME_MIME allowed mime types
+ * Filter mode: whitelist (true) or blacklist (false)
+ * @param bool $FILTER_MODE mime type filter mode
*/
-$WHITELIST_MIME = array("");
-
+$FILTER_MODE = false;
/**
* Double dot file extensions
*