Passed
Pull Request — master (#329)
by Mirko
08:13
created
htdocs/lib/settings-sample-dev.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
 
19 19
 // database names
20 20
 $dbname = 'opencaching';
21
-$tmpdbname = 'octmp';   // empty db with CREATE and DROP privileges
21
+$tmpdbname = 'octmp'; // empty db with CREATE and DROP privileges
22 22
 
23 23
 // common developer system settings
24 24
 require 'settings-dev.inc.php';
Please login to merge, or discard this patch.
htdocs/newcachesrest.php 1 patch
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,8 +14,7 @@
 block discarded – undo
14 14
 $tpl->caching = true;
15 15
 $tpl->cache_lifetime = 3600;
16 16
 
17
-$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] :
18
-    (isset($_REQUEST['country']) ? $_REQUEST['country'] : $opt['page']['main_country']);
17
+$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] : (isset($_REQUEST['country']) ? $_REQUEST['country'] : $opt['page']['main_country']);
19 18
 
20 19
 if (!$tpl->is_cached()) {
21 20
     $newCaches = array();
Please login to merge, or discard this patch.
htdocs/picture.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -75,11 +75,11 @@
 block discarded – undo
75 75
     if (isset($_REQUEST['ok'])) { // Ocprop
76 76
         $bError = false;
77 77
 
78
-        $picture->setSpoiler(isset($_REQUEST['spoiler']) && $_REQUEST['spoiler'] == '1');  // Ocprop
79
-        $picture->setDisplay((isset($_REQUEST['notdisplay']) && $_REQUEST['notdisplay'] == '1') == false);  // Ocprop
78
+        $picture->setSpoiler(isset($_REQUEST['spoiler']) && $_REQUEST['spoiler'] == '1'); // Ocprop
79
+        $picture->setDisplay((isset($_REQUEST['notdisplay']) && $_REQUEST['notdisplay'] == '1') == false); // Ocprop
80 80
         $picture->setMapPreview(isset($_REQUEST['mappreview']) && $_REQUEST['mappreview'] == '1');
81 81
 
82
-        $title = isset($_REQUEST['title']) ? $_REQUEST['title'] : '';  // Ocprop
82
+        $title = isset($_REQUEST['title']) ? $_REQUEST['title'] : ''; // Ocprop
83 83
         if ($title == '' || ($picture->getObjectType() == OBJECT_CACHELOG && trim($title) == '')) {
84 84
             $tpl->assign('errortitle', true);
85 85
             $bError = true;
Please login to merge, or discard this patch.
htdocs/query.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@
 block discarded – undo
72 72
     if ($submit == true) {
73 73
         $options = sql_value("SELECT `options` FROM `queries` WHERE `id`='&1'", false, $queryid);
74 74
         if (!$options) {
75
-            $tpl->error(ERROR_UNKNOWN);   // query does not exist
75
+            $tpl->error(ERROR_UNKNOWN); // query does not exist
76 76
         } elseif ($sortby || $sortorder || $creationdate) {
77 77
             $oa = unserialize($options);
78 78
             if ($sortby) {
Please login to merge, or discard this patch.
local/devel/find_bad_encodings.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
 
42 42
 function test_encoding($path)
43 43
 {
44
-    static $ur_exclude = [  // no unicode reminder needed
44
+    static $ur_exclude = [// no unicode reminder needed
45 45
         'lang/de/ocstyle/search1/search.result.caches',
46 46
         'lib2/b2evo-captcha',
47 47
         'lib2/HTMLPurifier',
Please login to merge, or discard this patch.
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -39,6 +39,9 @@
 block discarded – undo
39 39
 }
40 40
 
41 41
 
42
+/**
43
+ * @param string $path
44
+ */
42 45
 function testforbom($path)
43 46
 {
44 47
     $filestart = file_get_contents($path, false, null, 0, 2);
Please login to merge, or discard this patch.
local/maintenance/email_recovery.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@
 block discarded – undo
101 101
             "SELECT COUNT(*)
102 102
              FROM `" . $table . "`
103 103
              WHERE " . $this->getDateCondition($table, $dateField) .
104
-                       ($andWhere ? ' AND (' . $andWhere . ')' : ''),
104
+                        ($andWhere ? ' AND (' . $andWhere . ')' : ''),
105 105
             0
106 106
         );
107 107
         self::message(1, $objectCount . ' ' . $description);
Please login to merge, or discard this patch.
local/ocxml11client/settings-dist.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 
28 28
 // Sessions verwenden?
29 29
 $opt['session'] = 1;
30
-$opt['zip'] = 'gzip';                // 0; zip; bzip2; gzip
30
+$opt['zip'] = 'gzip'; // 0; zip; bzip2; gzip
31 31
 
32 32
 // Gebietsauswahl nach Land
33 33
 $opt['bycountry'] = 0;
Please login to merge, or discard this patch.
htdocs/lib2/search/search.txt.inc.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -203,6 +203,9 @@
 block discarded – undo
203 203
     return $str;
204 204
 }
205 205
 
206
+/**
207
+ * @param string $str
208
+ */
206 209
 function lf2crlf($str)
207 210
 {
208 211
     return str_replace("\r\r\n", "\r\n", str_replace("\n", "\r\n", $str));
Please login to merge, or discard this patch.
htdocs/src/Oc/Libse/ChildWp/ControllerChildWp.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -35,6 +35,9 @@  discard block
 block discarded – undo
35 35
         $this->init(0, 0);
36 36
     }
37 37
 
38
+    /**
39
+     * @param boolean $request
40
+     */
38 41
     private function initRequest($request)
39 42
     {
40 43
         if ($request) {
@@ -44,6 +47,9 @@  discard block
 block discarded – undo
44 47
         return new RequestHttp();
45 48
     }
46 49
 
50
+    /**
51
+     * @param boolean $translator
52
+     */
47 53
     private function initTranslator($translator)
48 54
     {
49 55
         if ($translator) {
Please login to merge, or discard this patch.