From b30dd803e3c33cfc9508b0516744b0bb95be4d09 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 2 Dec 2014 16:18:26 +0100 Subject: disable flash uploading by default Thanks to Kacper Szurek for reporting this --- conf/mime.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/mime.conf b/conf/mime.conf index 2a50fab10..c2e03b775 100644 --- a/conf/mime.conf +++ b/conf/mime.conf @@ -9,7 +9,6 @@ gif image/gif png image/png ico image/vnd.microsoft.icon -swf application/x-shockwave-flash mp3 audio/mpeg ogg audio/ogg wav audio/wav @@ -66,3 +65,7 @@ odt !application/vnd.oasis.opendocument.text #xml text/xml #csv text/csv +# Also flash may be able to execute arbitrary scripts in the website's +# context +#swf application/x-shockwave-flash + -- cgit v1.2.3 From 2cabdb626a8a94795a6579cdbb0f6eef0cd8dc67 Mon Sep 17 00:00:00 2001 From: Rainbow Spike Date: Wed, 10 Dec 2014 11:42:56 +1000 Subject: Update mysql.conf.php.example Fix some typos --- conf/mysql.conf.php.example | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'conf') diff --git a/conf/mysql.conf.php.example b/conf/mysql.conf.php.example index c67e77c45..8337f51b4 100644 --- a/conf/mysql.conf.php.example +++ b/conf/mysql.conf.php.example @@ -56,7 +56,7 @@ $conf['plugin']['authmysql']['TablesToLock']= array("users", "users AS u","group * of the user. If the result table is empty or contains more than one * row, access will be denied. * - * The plugin accesses the password as 'pass' so a alias might be necessary. + * The plugin accesses the password as 'pass' so an alias might be necessary. * * Following patters will be replaced: * %{user} user name @@ -107,10 +107,10 @@ $conf['plugin']['authmysql']['getGroups'] = "SELECT name as `group` /* This statement should return a table containing all user login names * that meet certain filter criteria. The filter expressions will be added * case dependend by the plugin. At the end a sort expression will be added. - * Important is that this list contains no double entries fo a user. Each + * Important is that this list contains no double entries for a user. Each * user name is only allowed once in the table. * - * The login name will be accessed as 'user' to a alias might be neseccary. + * The login name will be accessed as 'user' to an alias might be neseccary. * No patterns will be replaced in this statement but following patters * will be replaced in the filter expressions: * %{user} in FilterLogin user's login name @@ -174,7 +174,7 @@ $conf['plugin']['authmysql']['delGroup'] = "DELETE FROM groups WHERE gid='%{gid}'"; /* This statement should return the database index of a given user name. - * The plugin will access the index with the name 'id' so a alias might be + * The plugin will access the index with the name 'id' so an alias might be * necessary. * following patters will be replaced: * %{user} user name @@ -240,7 +240,7 @@ $conf['plugin']['authmysql']['delUserGroup']= "DELETE FROM usergroup AND gid='%{gid}'"; /* This statement should return the database index of a given group name. - * The plugin will access the index with the name 'id' so a alias might + * The plugin will access the index with the name 'id' so an alias might * be necessary. * * Following patters will be replaced: -- cgit v1.2.3 From 25839a4134376bdcf24d224bea967ee79ec85a40 Mon Sep 17 00:00:00 2001 From: chang-zhao Date: Thu, 12 Feb 2015 15:09:51 +0300 Subject: Update wordblock.conf wordblock.conf too restrictive #1021 - removed fetish, bi...sex & gay...sex --- conf/wordblock.conf | 3 --- 1 file changed, 3 deletions(-) (limited to 'conf') diff --git a/conf/wordblock.conf b/conf/wordblock.conf index fc939a4d4..f877f26d7 100644 --- a/conf/wordblock.conf +++ b/conf/wordblock.conf @@ -2,14 +2,11 @@ # patches welcome # https?:\/\/(\S*?)(-side-effects|top|pharm|pill|discount|discount-|deal|price|order|now|best|cheap|cheap-|online|buy|buy-|sale|sell)(\S*?)(cialis|viagra|prazolam|xanax|zanax|soma|vicodin|zenical|xenical|meridia|paxil|prozac|claritin|allegra|lexapro|wellbutrin|zoloft|retin|valium|levitra|phentermine) -gay\s*sex -bi\s*sex incest zoosex gang\s*bang facials ladyboy -fetish \btits\b \brape\b bolea\.com -- cgit v1.2.3 From fb45dc56a0cf91f2a0d7126e846580666a6755b7 Mon Sep 17 00:00:00 2001 From: Tim222 Date: Thu, 12 Feb 2015 13:56:22 +0100 Subject: Update interwiki.conf Support for the URI scheme tel: #643 --- conf/interwiki.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/interwiki.conf b/conf/interwiki.conf index d961912e5..4857e27f3 100644 --- a/conf/interwiki.conf +++ b/conf/interwiki.conf @@ -32,6 +32,6 @@ google.de http://www.google.de/search?q= go http://www.google.com/search?q={URL}&btnI=lucky user :user:{NAME} -# To support VoIP/SIP links +# To support VoIP/SIP/TEL links callto callto://{NAME} - +tel tel:{NAME} -- cgit v1.2.3 From 8b7f89f548e7fdb4a84eb98f638fe5f49529d829 Mon Sep 17 00:00:00 2001 From: chang-zhao Date: Thu, 12 Feb 2015 19:51:22 +0300 Subject: Update wordblock.conf --- conf/wordblock.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/wordblock.conf b/conf/wordblock.conf index f877f26d7..f2ff15942 100644 --- a/conf/wordblock.conf +++ b/conf/wordblock.conf @@ -2,13 +2,12 @@ # patches welcome # https?:\/\/(\S*?)(-side-effects|top|pharm|pill|discount|discount-|deal|price|order|now|best|cheap|cheap-|online|buy|buy-|sale|sell)(\S*?)(cialis|viagra|prazolam|xanax|zanax|soma|vicodin|zenical|xenical|meridia|paxil|prozac|claritin|allegra|lexapro|wellbutrin|zoloft|retin|valium|levitra|phentermine) -incest +https?:\/\/(\S*?)(bi\s*sex|gay\s*sex|fetish|incest|\brape\b) zoosex gang\s*bang facials ladyboy \btits\b -\brape\b bolea\.com 52crystal baida\.org -- cgit v1.2.3 From c9f9ddf9a8e1f6113df3844ed45bb1f6d9012f4f Mon Sep 17 00:00:00 2001 From: chang-zhao Date: Fri, 13 Feb 2015 12:56:51 +0300 Subject: Update wordblock.conf moved those keywords to http & added penis --- conf/wordblock.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/wordblock.conf b/conf/wordblock.conf index f2ff15942..3040fa08f 100644 --- a/conf/wordblock.conf +++ b/conf/wordblock.conf @@ -2,7 +2,7 @@ # patches welcome # https?:\/\/(\S*?)(-side-effects|top|pharm|pill|discount|discount-|deal|price|order|now|best|cheap|cheap-|online|buy|buy-|sale|sell)(\S*?)(cialis|viagra|prazolam|xanax|zanax|soma|vicodin|zenical|xenical|meridia|paxil|prozac|claritin|allegra|lexapro|wellbutrin|zoloft|retin|valium|levitra|phentermine) -https?:\/\/(\S*?)(bi\s*sex|gay\s*sex|fetish|incest|\brape\b) +https?:\/\/(\S*?)(bi\s*sex|gay\s*sex|fetish|incest|penis|\brape\b) zoosex gang\s*bang facials -- cgit v1.2.3 From 282d636f25b71ecb3c37012033d25fd10ba9c83e Mon Sep 17 00:00:00 2001 From: Patrick Brown Date: Thu, 16 Jul 2015 02:29:53 -0400 Subject: Change interwiki links to HTTPS --- conf/interwiki.conf | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'conf') diff --git a/conf/interwiki.conf b/conf/interwiki.conf index 4857e27f3..3bfc2ac73 100644 --- a/conf/interwiki.conf +++ b/conf/interwiki.conf @@ -8,28 +8,29 @@ # To prevent losing your added InterWiki shortcuts after an upgrade, # you should add new ones to interwiki.local.conf -wp http://en.wikipedia.org/wiki/{NAME} -wpfr http://fr.wikipedia.org/wiki/{NAME} -wpde http://de.wikipedia.org/wiki/{NAME} -wpes http://es.wikipedia.org/wiki/{NAME} -wppl http://pl.wikipedia.org/wiki/{NAME} -wpjp http://ja.wikipedia.org/wiki/{NAME} -wpmeta http://meta.wikipedia.org/wiki/{NAME} -doku http://www.dokuwiki.org/ -dokubug http://bugs.dokuwiki.org/index.php?do=details&task_id= -rfc http://tools.ietf.org/html/rfc +wp https://en.wikipedia.org/wiki/{NAME} +wpfr https://fr.wikipedia.org/wiki/{NAME} +wpde https://de.wikipedia.org/wiki/{NAME} +wpes https://es.wikipedia.org/wiki/{NAME} +wppl https://pl.wikipedia.org/wiki/{NAME} +wpjp https://ja.wikipedia.org/wiki/{NAME} +wpmeta https://meta.wikipedia.org/wiki/{NAME} +doku https://www.dokuwiki.org/ +dokubug https://bugs.dokuwiki.org/index.php?do=details&task_id= +dokugit https://github.com/splitbrain/dokuwiki/issues/ +rfc https://tools.ietf.org/html/rfc man http://man.cx/ amazon http://www.amazon.com/exec/obidos/ASIN/{URL}/splitbrain-20/ -amazon.de http://www.amazon.de/exec/obidos/ASIN/{URL}/splitbrain-21/ -amazon.uk http://www.amazon.co.uk/exec/obidos/ASIN/ +amazon.de https://www.amazon.de/exec/obidos/ASIN/{URL}/splitbrain-21/ +amazon.uk https://www.amazon.co.uk/exec/obidos/ASIN/ paypal https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business= -phpfn http://www.php.net/{NAME} +phpfn https://www.php.net/{NAME} coral http://{HOST}.{PORT}.nyud.net:8090{PATH}?{QUERY} freecache http://freecache.org/{NAME} sb http://www.splitbrain.org/go/ skype skype:{NAME} -google.de http://www.google.de/search?q= -go http://www.google.com/search?q={URL}&btnI=lucky +google.de https://www.google.de/search?q= +go https://www.google.com/search?q={URL}&btnI=lucky user :user:{NAME} # To support VoIP/SIP/TEL links -- cgit v1.2.3 From ccee93d9d1aa20ccc91f9277983d7fa2ee34f7f9 Mon Sep 17 00:00:00 2001 From: Patrick Brown Date: Thu, 16 Jul 2015 02:50:41 -0400 Subject: Unit test for interwiki URL encoding bug --- conf/interwiki.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/interwiki.conf b/conf/interwiki.conf index 3bfc2ac73..18de535f0 100644 --- a/conf/interwiki.conf +++ b/conf/interwiki.conf @@ -20,7 +20,7 @@ dokubug https://bugs.dokuwiki.org/index.php?do=details&task_id= dokugit https://github.com/splitbrain/dokuwiki/issues/ rfc https://tools.ietf.org/html/rfc man http://man.cx/ -amazon http://www.amazon.com/exec/obidos/ASIN/{URL}/splitbrain-20/ +amazon https://www.amazon.com/exec/obidos/ASIN/{URL}/splitbrain-20/ amazon.de https://www.amazon.de/exec/obidos/ASIN/{URL}/splitbrain-21/ amazon.uk https://www.amazon.co.uk/exec/obidos/ASIN/ paypal https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business= -- cgit v1.2.3 From 0cfb5a3076f8591bdbe10f9915199b3b3863dec8 Mon Sep 17 00:00:00 2001 From: Patrick Brown Date: Wed, 22 Jul 2015 22:04:09 -0400 Subject: Remove non-functioning interwiki links --- conf/interwiki.conf | 4 ---- 1 file changed, 4 deletions(-) (limited to 'conf') diff --git a/conf/interwiki.conf b/conf/interwiki.conf index 18de535f0..9305c038a 100644 --- a/conf/interwiki.conf +++ b/conf/interwiki.conf @@ -16,8 +16,6 @@ wppl https://pl.wikipedia.org/wiki/{NAME} wpjp https://ja.wikipedia.org/wiki/{NAME} wpmeta https://meta.wikipedia.org/wiki/{NAME} doku https://www.dokuwiki.org/ -dokubug https://bugs.dokuwiki.org/index.php?do=details&task_id= -dokugit https://github.com/splitbrain/dokuwiki/issues/ rfc https://tools.ietf.org/html/rfc man http://man.cx/ amazon https://www.amazon.com/exec/obidos/ASIN/{URL}/splitbrain-20/ @@ -25,8 +23,6 @@ amazon.de https://www.amazon.de/exec/obidos/ASIN/{URL}/splitbrain-21/ amazon.uk https://www.amazon.co.uk/exec/obidos/ASIN/ paypal https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business= phpfn https://www.php.net/{NAME} -coral http://{HOST}.{PORT}.nyud.net:8090{PATH}?{QUERY} -freecache http://freecache.org/{NAME} sb http://www.splitbrain.org/go/ skype skype:{NAME} google.de https://www.google.de/search?q= -- cgit v1.2.3 From b43568ad387384d9ae09bf4d7c0835ecbdc6b5b1 Mon Sep 17 00:00:00 2001 From: Patrick Brown Date: Wed, 22 Jul 2015 22:28:09 -0400 Subject: Document all options in the interwiki config --- conf/interwiki.conf | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/interwiki.conf b/conf/interwiki.conf index 9305c038a..3ddcfd810 100644 --- a/conf/interwiki.conf +++ b/conf/interwiki.conf @@ -1,8 +1,16 @@ -# Each URL may contain one of the placeholders {URL} or {NAME} +# Each URL may contain one of these placeholders # {URL} is replaced by the URL encoded representation of the wikiname # this is the right thing to do in most cases # {NAME} this is replaced by the wikiname as given in the document -# no further encoding is done +# only mandatory encoded is done, urlencoding if the link +# is an external URL, or encoding as a wikiname if it is an +# internal link (begins with a colon) +# {SCHEME} +# {HOST} +# {PORT} +# {PATH} +# {QUERY} these placeholders will be replaced with the appropriate part +# of the link when parsed as a URL # If no placeholder is defined the urlencoded name is appended to the URL # To prevent losing your added InterWiki shortcuts after an upgrade, -- cgit v1.2.3 From ac1654273a44452a833628e254ee3e172386a55e Mon Sep 17 00:00:00 2001 From: Patrick Brown Date: Thu, 23 Jul 2015 13:04:45 -0400 Subject: Remove splitbrain.org interwiki link --- conf/interwiki.conf | 1 - 1 file changed, 1 deletion(-) (limited to 'conf') diff --git a/conf/interwiki.conf b/conf/interwiki.conf index 3ddcfd810..4dc3c80ee 100644 --- a/conf/interwiki.conf +++ b/conf/interwiki.conf @@ -31,7 +31,6 @@ amazon.de https://www.amazon.de/exec/obidos/ASIN/{URL}/splitbrain-21/ amazon.uk https://www.amazon.co.uk/exec/obidos/ASIN/ paypal https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business= phpfn https://www.php.net/{NAME} -sb http://www.splitbrain.org/go/ skype skype:{NAME} google.de https://www.google.de/search?q= go https://www.google.com/search?q={URL}&btnI=lucky -- cgit v1.2.3