Completed
Pull Request — master (#624)
by Michael
24:05
created
htdocs/modules/protector/include/precheck_functions.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -25,12 +25,12 @@  discard block
 block discarded – undo
25 25
 function protector_precheck()
26 26
 {
27 27
     // check the access is from install/index.php
28
-    if (defined('_INSTALL_CHARSET') && !is_writable(\XoopsBaseConfig::get('root-path') . '/mainfile.php')) {
28
+    if (defined('_INSTALL_CHARSET') && !is_writable(\XoopsBaseConfig::get('root-path').'/mainfile.php')) {
29 29
         die('To use installer, remove protector\'s lines from mainfile.php first.');
30 30
     }
31 31
 
32 32
     // Protector class
33
-    require_once dirname(__DIR__) . '/class/protector.php';
33
+    require_once dirname(__DIR__).'/class/protector.php';
34 34
 
35 35
     // Protector object
36 36
     $protector = Protector::getInstance();
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
     }
69 69
     $is_reliable = false;
70 70
     foreach ($reliable_ips as $reliable_ip) {
71
-        if (!empty($reliable_ip) && preg_match('/' . $reliable_ip . '/', $_SERVER['REMOTE_ADDR'])) {
71
+        if (!empty($reliable_ip) && preg_match('/'.$reliable_ip.'/', $_SERVER['REMOTE_ADDR'])) {
72 72
             $is_reliable = true;
73 73
         }
74 74
     }
Please login to merge, or discard this patch.
htdocs/modules/protector/include/precheck.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -19,10 +19,10 @@  discard block
 block discarded – undo
19 19
  * @version         $Id$
20 20
  */
21 21
 
22
-require_once __DIR__ . '/precheck_functions.php';
22
+require_once __DIR__.'/precheck_functions.php';
23 23
 
24 24
 define('PROTECTOR_PRECHECK_INCLUDED', 1);
25
-define('PROTECTOR_VERSION', file_get_contents(__DIR__ . '/version.txt'));
25
+define('PROTECTOR_VERSION', file_get_contents(__DIR__.'/version.txt'));
26 26
 
27 27
 // set $_SERVER['REQUEST_URI'] for IIS
28 28
 if (empty($_SERVER['REQUEST_URI'])) { // Not defined by IIS
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
         $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'];
32 32
     }
33 33
     if (isset($_SERVER['QUERY_STRING'])) {
34
-        $_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
34
+        $_SERVER['REQUEST_URI'] .= '?'.$_SERVER['QUERY_STRING'];
35 35
     }
36 36
 }
37 37
 
Please login to merge, or discard this patch.
htdocs/modules/protector/include/postcheck.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,10 +19,10 @@
 block discarded – undo
19 19
  * @version         $Id$
20 20
  */
21 21
 
22
-require_once __DIR__ . '/postcheck_functions.php';
22
+require_once __DIR__.'/postcheck_functions.php';
23 23
 
24 24
 if (!defined('PROTECTOR_PRECHECK_INCLUDED')) {
25
-    require __DIR__ . '/precheck.inc.php';
25
+    require __DIR__.'/precheck.inc.php';
26 26
     return;
27 27
 }
28 28
 
Please login to merge, or discard this patch.
htdocs/modules/protector/language/italian/main.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -2,10 +2,10 @@
 block discarded – undo
2 2
 //Italian translation: Defkon1 - defkon1(at)gmail(dot)com - www.xoopsitalia.org
3 3
 //Updated by Ianez - Xoops Italia Staff
4 4
 
5
-define('_MD_PROTECTOR_YOUAREBADIP','Sei registrato come BAD_IP dal sistema di protezione del sito (Protector).') ;
6
-define('_MD_PROTECTOR_FMT_JAILINFO','Il blocco scadrà alla data; %s');
7
-define('_MD_PROTECTOR_FMT_JAILTIME','j-m-Y H:i:s');
8
-define('_MD_PROTECTOR_BANDWIDTHLIMITED','Troppe connessioni al sito in questo momento. Riprova più.');
9
-define('_MD_PROTECTOR_TURNJAVASCRIPTON','Impostare JavaScript su ON') ;
10
-define('_MD_PROTECTOR_DENYBYRBL','Protector rifiuta il tuo messaggio, perch´ il tuo IP è registrato in RBL') ;
11
-define('_MD_PROTECTOR_FMT_REGISTER_MORATORIUM','Reinvia ancora il messaggio tra %s minuti. (spiacenti, procedura Anti-SPAMMING)');
5
+define('_MD_PROTECTOR_YOUAREBADIP', 'Sei registrato come BAD_IP dal sistema di protezione del sito (Protector).');
6
+define('_MD_PROTECTOR_FMT_JAILINFO', 'Il blocco scadrà alla data; %s');
7
+define('_MD_PROTECTOR_FMT_JAILTIME', 'j-m-Y H:i:s');
8
+define('_MD_PROTECTOR_BANDWIDTHLIMITED', 'Troppe connessioni al sito in questo momento. Riprova più.');
9
+define('_MD_PROTECTOR_TURNJAVASCRIPTON', 'Impostare JavaScript su ON');
10
+define('_MD_PROTECTOR_DENYBYRBL', 'Protector rifiuta il tuo messaggio, perch´ il tuo IP è registrato in RBL');
11
+define('_MD_PROTECTOR_FMT_REGISTER_MORATORIUM', 'Reinvia ancora il messaggio tra %s minuti. (spiacenti, procedura Anti-SPAMMING)');
Please login to merge, or discard this patch.
htdocs/modules/protector/language/nederlands/main.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -4,11 +4,11 @@
 block discarded – undo
4 4
 
5 5
 
6 6
 // Appended by Xoops Language Checker -GIJOE- in 2009-08-29 04:13:46
7
-define('_MD_PROTECTOR_FMT_REGISTER_MORATORIUM','Post it again %s minutes later. (for Anti-SPAMMING, sorry)');
8
-
9
-define('_MD_PROTECTOR_YOUAREBADIP','U bent geregistreerd als een Slechte IP door Protector. <br />') ;
10
-define('_MD_PROTECTOR_FMT_JAILINFO','Deze restrictie geldt tot %s') ;
11
-define('_MD_PROTECTOR_FMT_JAILTIME','Y-m-j H:i:s') ;
12
-define('_MD_PROTECTOR_BANDWIDTHLIMITED','Deze site is op moment overbezocht. Probeert u het aub later nog eens.') ;
13
-define('_MD_PROTECTOR_TURNJAVASCRIPTON','Zet JavaScript AAN') ;
14
-define('_MD_PROTECTOR_DENYBYRBL','Protector weigert uw bericht, omdat uw IP is geregistreerd in RBL, indien u het hier niet mee eens bent, neem contact op met de webmaster') ;
7
+define('_MD_PROTECTOR_FMT_REGISTER_MORATORIUM', 'Post it again %s minutes later. (for Anti-SPAMMING, sorry)');
8
+
9
+define('_MD_PROTECTOR_YOUAREBADIP', 'U bent geregistreerd als een Slechte IP door Protector. <br />');
10
+define('_MD_PROTECTOR_FMT_JAILINFO', 'Deze restrictie geldt tot %s');
11
+define('_MD_PROTECTOR_FMT_JAILTIME', 'Y-m-j H:i:s');
12
+define('_MD_PROTECTOR_BANDWIDTHLIMITED', 'Deze site is op moment overbezocht. Probeert u het aub later nog eens.');
13
+define('_MD_PROTECTOR_TURNJAVASCRIPTON', 'Zet JavaScript AAN');
14
+define('_MD_PROTECTOR_DENYBYRBL', 'Protector weigert uw bericht, omdat uw IP is geregistreerd in RBL, indien u het hier niet mee eens bent, neem contact op met de webmaster');
Please login to merge, or discard this patch.
htdocs/modules/protector/language/polish/main.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -3,13 +3,13 @@
 block discarded – undo
3 3
 
4 4
 
5 5
 // Appended by Xoops Language Checker -GIJOE- in 2009-08-29 04:13:44
6
-define('_MD_PROTECTOR_FMT_REGISTER_MORATORIUM','Post it again %s minutes later. (for Anti-SPAMMING, sorry)');
6
+define('_MD_PROTECTOR_FMT_REGISTER_MORATORIUM', 'Post it again %s minutes later. (for Anti-SPAMMING, sorry)');
7 7
 
8 8
 // Appended by Xoops Language Checker -GIJOE- in 2008-11-21 04:44:30
9
-define('_MD_PROTECTOR_FMT_JAILINFO','This restriction will be expired on %s');
10
-define('_MD_PROTECTOR_FMT_JAILTIME','Y-m-j H:i:s');
11
-define('_MD_PROTECTOR_BANDWIDTHLIMITED','This site is very crowed now. try later.');
9
+define('_MD_PROTECTOR_FMT_JAILINFO', 'This restriction will be expired on %s');
10
+define('_MD_PROTECTOR_FMT_JAILTIME', 'Y-m-j H:i:s');
11
+define('_MD_PROTECTOR_BANDWIDTHLIMITED', 'This site is very crowed now. try later.');
12 12
 
13
-define('_MD_PROTECTOR_YOUAREBADIP','Zostałeś zarejestrowany jako zbanowane IP przez Protectora.') ;
14
-define('_MD_PROTECTOR_TURNJAVASCRIPTON','Włącz obsługę JavaScript') ;
15
-define('_MD_PROTECTOR_DENYBYRBL','Protector odrzucił Twój post, ponieważ IP z którego został on wysłany znajduje się na czarnej liście') ;
13
+define('_MD_PROTECTOR_YOUAREBADIP', 'Zostałeś zarejestrowany jako zbanowane IP przez Protectora.');
14
+define('_MD_PROTECTOR_TURNJAVASCRIPTON', 'Włącz obsługę JavaScript');
15
+define('_MD_PROTECTOR_DENYBYRBL', 'Protector odrzucił Twój post, ponieważ IP z którego został on wysłany znajduje się na czarnej liście');
Please login to merge, or discard this patch.
htdocs/modules/protector/language/french/main.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -3,13 +3,13 @@
 block discarded – undo
3 3
 
4 4
 
5 5
 // Appended by Xoops Language Checker -GIJOE- in 2009-08-29 04:13:45
6
-define('_MD_PROTECTOR_FMT_REGISTER_MORATORIUM','Post it again %s minutes later. (for Anti-SPAMMING, sorry)');
6
+define('_MD_PROTECTOR_FMT_REGISTER_MORATORIUM', 'Post it again %s minutes later. (for Anti-SPAMMING, sorry)');
7 7
 
8 8
 // Appended by Xoops Language Checker -GIJOE- in 2008-11-21 04:44:31
9
-define('_MD_PROTECTOR_FMT_JAILINFO','This restriction will be expired on %s');
10
-define('_MD_PROTECTOR_FMT_JAILTIME','Y-m-j H:i:s');
11
-define('_MD_PROTECTOR_BANDWIDTHLIMITED','This site is very crowed now. try later.');
9
+define('_MD_PROTECTOR_FMT_JAILINFO', 'This restriction will be expired on %s');
10
+define('_MD_PROTECTOR_FMT_JAILTIME', 'Y-m-j H:i:s');
11
+define('_MD_PROTECTOR_BANDWIDTHLIMITED', 'This site is very crowed now. try later.');
12 12
 
13
-define('_MD_PROTECTOR_YOUAREBADIP','You are registered as BAD_IP by Protector.') ;
14
-define('_MD_PROTECTOR_TURNJAVASCRIPTON','Turn JavaScript ON') ;
15
-define('_MD_PROTECTOR_DENYBYRBL','Protector rejects your post, because your IP is registered in RBL') ;
13
+define('_MD_PROTECTOR_YOUAREBADIP', 'You are registered as BAD_IP by Protector.');
14
+define('_MD_PROTECTOR_TURNJAVASCRIPTON', 'Turn JavaScript ON');
15
+define('_MD_PROTECTOR_DENYBYRBL', 'Protector rejects your post, because your IP is registered in RBL');
Please login to merge, or discard this patch.
htdocs/modules/protector/language/portuguesebr/main.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -3,13 +3,13 @@
 block discarded – undo
3 3
 
4 4
 
5 5
 // Appended by Xoops Language Checker -GIJOE- in 2009-08-29 04:13:43
6
-define('_MD_PROTECTOR_FMT_REGISTER_MORATORIUM','Post it again %s minutes later. (for Anti-SPAMMING, sorry)');
6
+define('_MD_PROTECTOR_FMT_REGISTER_MORATORIUM', 'Post it again %s minutes later. (for Anti-SPAMMING, sorry)');
7 7
 
8 8
 // Appended by Xoops Language Checker -GIJOE- in 2008-11-21 04:44:30
9
-define('_MD_PROTECTOR_FMT_JAILINFO','This restriction will be expired on %s');
10
-define('_MD_PROTECTOR_FMT_JAILTIME','Y-m-j H:i:s');
11
-define('_MD_PROTECTOR_BANDWIDTHLIMITED','This site is very crowed now. try later.');
9
+define('_MD_PROTECTOR_FMT_JAILINFO', 'This restriction will be expired on %s');
10
+define('_MD_PROTECTOR_FMT_JAILTIME', 'Y-m-j H:i:s');
11
+define('_MD_PROTECTOR_BANDWIDTHLIMITED', 'This site is very crowed now. try later.');
12 12
 
13
-define('_MD_PROTECTOR_YOUAREBADIP','You are registered as BAD_IP by Protector.') ;
14
-define('_MD_PROTECTOR_TURNJAVASCRIPTON','Turn JavaScript ON') ;
15
-define('_MD_PROTECTOR_DENYBYRBL','Protector rejects your post, because your IP is registered in RBL') ;
13
+define('_MD_PROTECTOR_YOUAREBADIP', 'You are registered as BAD_IP by Protector.');
14
+define('_MD_PROTECTOR_TURNJAVASCRIPTON', 'Turn JavaScript ON');
15
+define('_MD_PROTECTOR_DENYBYRBL', 'Protector rejects your post, because your IP is registered in RBL');
Please login to merge, or discard this patch.
htdocs/modules/protector/language/spanish/main.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -3,13 +3,13 @@
 block discarded – undo
3 3
 
4 4
 
5 5
 // Appended by Xoops Language Checker -GIJOE- in 2009-08-29 04:13:43
6
-define('_MD_PROTECTOR_FMT_REGISTER_MORATORIUM','Post it again %s minutes later. (for Anti-SPAMMING, sorry)');
6
+define('_MD_PROTECTOR_FMT_REGISTER_MORATORIUM', 'Post it again %s minutes later. (for Anti-SPAMMING, sorry)');
7 7
 
8 8
 // Appended by Xoops Language Checker -GIJOE- in 2008-11-21 04:44:30
9
-define('_MD_PROTECTOR_FMT_JAILINFO','Esta restricción expirará en %s');
10
-define('_MD_PROTECTOR_FMT_JAILTIME','Y-m-j H:i:s');
11
-define('_MD_PROTECTOR_BANDWIDTHLIMITED','La página tiene ahora mismo demasiadas visitas, inténtelo más tarde.');
9
+define('_MD_PROTECTOR_FMT_JAILINFO', 'Esta restricción expirará en %s');
10
+define('_MD_PROTECTOR_FMT_JAILTIME', 'Y-m-j H:i:s');
11
+define('_MD_PROTECTOR_BANDWIDTHLIMITED', 'La página tiene ahora mismo demasiadas visitas, inténtelo más tarde.');
12 12
 
13
-define('_MD_PROTECTOR_YOUAREBADIP','Está registrado como BAD_IP por Protector.') ;
14
-define('_MD_PROTECTOR_TURNJAVASCRIPTON','Active el JavaScript en su navegador') ;
15
-define('_MD_PROTECTOR_DENYBYRBL','Protector rechaza su envío porque su IP está registrada en RBL') ;
13
+define('_MD_PROTECTOR_YOUAREBADIP', 'Está registrado como BAD_IP por Protector.');
14
+define('_MD_PROTECTOR_TURNJAVASCRIPTON', 'Active el JavaScript en su navegador');
15
+define('_MD_PROTECTOR_DENYBYRBL', 'Protector rechaza su envío porque su IP está registrada en RBL');
Please login to merge, or discard this patch.