Completed
Pull Request — development (#738)
by Kai
05:25
created
htdocs/lib/clicompatbase.inc.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -399,7 +399,7 @@  discard block
 block discarded – undo
399 399
 /**
400 400
  * @deprecated use DBAL Conenction instead. See adminreports.php for an example implementation
401 401
  * @param $value
402
- * @return false|string
402
+ * @return string
403 403
  */
404 404
 function sql_escape($value)
405 405
 {
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
 /**
414 414
  * @deprecated use DBAL Conenction instead. See adminreports.php for an example implementation
415 415
  * @param $value
416
- * @return false|mixed|string
416
+ * @return string
417 417
  */
418 418
 function sql_escape_backtick($value)
419 419
 {
Please login to merge, or discard this patch.
htdocs/lib2/db.inc.php 2 patches
Doc Comments   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 /**
85 85
  * @deprecated use DBAL Conenction instead. See adminreports.php for an example implementation
86 86
  * @param $sql
87
- * @return resource
87
+ * @return mysqli_result
88 88
  */
89 89
 function sql($sql)
90 90
 {
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 /**
115 115
  * @deprecated use DBAL Conenction instead. See adminreports.php for an example implementation
116 116
  * @param $sql
117
- * @return resource
117
+ * @return mysqli_result
118 118
  */
119 119
 function sql_slave($sql)
120 120
 {
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
  * @deprecated use DBAL Conenction instead. See adminreports.php for an example implementation
145 145
  * @param $dblink
146 146
  * @param $sql
147
- * @return resource
147
+ * @return mysqli_result
148 148
  */
149 149
 function sql_internal($dblink, $sql)
150 150
 {
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
 /**
343 343
  * @deprecated use DBAL Conenction instead. See adminreports.php for an example implementation
344 344
  * @param string $sql
345
- * @return resource
345
+ * @return mysqli_result
346 346
  */
347 347
 function sqlf($sql)
348 348
 {
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
 /**
361 361
  * @deprecated use DBAL Conenction instead. See adminreports.php for an example implementation
362 362
  * @param string $sql
363
- * @return resource
363
+ * @return mysqli_result
364 364
  */
365 365
 function sqlf_slave($sql)
366 366
 {
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
 /**
379 379
  * @deprecated use DBAL Conenction instead. See adminreports.php for an example implementation
380 380
  * @param string $sql
381
- * @return resource
381
+ * @return mysqli_result
382 382
  */
383 383
 function sqll($sql)
384 384
 {
@@ -1228,7 +1228,7 @@  discard block
 block discarded – undo
1228 1228
 
1229 1229
 /**
1230 1230
  * @deprecated use DBAL Conenction instead. See adminreports.php for an example implementation
1231
- * @param $f
1231
+ * @param resource $f
1232 1232
  * @param resource $rs
1233 1233
  * @param $table
1234 1234
  * @param bool $truncate
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1033,7 +1033,7 @@
 block discarded – undo
1033 1033
 
1034 1034
     if ($db['dblink_slave'] !== false) {
1035 1035
         mysqli_query(
1036
-            $db['dblink_slave'].
1036
+            $db['dblink_slave'] .
1037 1037
             "SET NAMES '" . mysqli_real_escape_string($db['dblink_slave'], $opt['charset']['mysql']) . "'"
1038 1038
 
1039 1039
         );
Please login to merge, or discard this patch.
local/stat/coordstat.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
     $year = substr($cache['date_created'], 0, 4);
25 25
     if ($year >= 2005 && $year <= date('Y') && ($lat != 0 || $long != 0)) {
26 26
         $years[$year] = true;
27
-        $liste[$lat][$long]['caches'][$year] ++;
27
+        $liste[$lat][$long]['caches'][$year]++;
28 28
     }
29 29
 }
30 30
 mysqli_free_result($rs);
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
         $year = substr($cache['date'], 0, 4);
49 49
         if ($year >= 2005 && $year <= date('Y') && ($lat != 0 || $long != 0)) {
50 50
             $years[$year] = true;
51
-            $liste[$lat][$long]['logs'][$year] ++;
51
+            $liste[$lat][$long]['logs'][$year]++;
52 52
         }
53 53
     }
54 54
     mysqli_free_result($rs);
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 while ($cache = sql_fetch_assoc($rs)) {
66 66
     $lat = floor($cache['latitude'] / $grid);
67 67
     $long = floor($cache['longitude'] / $grid);
68
-    $liste[$lat][$long]['caches']['all'] ++;
68
+    $liste[$lat][$long]['caches']['all']++;
69 69
     $liste[$lat][$long]['logs']['all'] += $cache['logs'];
70 70
 }
71 71
 mysqli_free_result($rs);
Please login to merge, or discard this patch.
htdocs/lib2/sqldebugger.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
                     break;
91 91
                 }
92 92
                 $command['result'][] = $r;
93
-                $c ++;
93
+                $c++;
94 94
             }
95 95
             sql_free_result($rs);
96 96
 
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
         $bError = ($rsResult == false);
112 112
         $command['affected'] = mysqli_affected_rows($dblink);
113 113
 
114
-        $rs = mysqli_query( $dblink, 'SHOW WARNINGS');
114
+        $rs = mysqli_query($dblink, 'SHOW WARNINGS');
115 115
         while ($r = sql_fetch_assoc($rs)) {
116 116
             $command['warnings'][] = $r['Message'];
117 117
         }
Please login to merge, or discard this patch.
htdocs/editdesc.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -22,8 +22,8 @@  discard block
 block discarded – undo
22 22
         isset($_REQUEST['desclang']) &&
23 23
         !isset($_REQUEST['descid'])) {  // Ocprop
24 24
 
25
-        $cache_id = $_REQUEST['cacheid'];  // Ocprop
26
-        $desc_lang = $_REQUEST['desclang'];  // Ocprop
25
+        $cache_id = $_REQUEST['cacheid']; // Ocprop
26
+        $desc_lang = $_REQUEST['desclang']; // Ocprop
27 27
 
28 28
         $rs = sql("SELECT `id` FROM `cache_desc` WHERE `cache_id`='&1' AND `language`='&2'", $cache_id, $desc_lang);
29 29
         if (mysqli_num_rows($rs) == 1) {
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
                 //save to DB?
91 91
                 if (isset($_POST['post'])) {  // Ocprop
92 92
                     //here we read all used information from the form if submitted
93
-                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;  // Ocprop
93
+                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1; // Ocprop
94 94
 
95 95
                     // fuer alte Versionen von OCProp
96 96
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
                         $oldDescMode = $descMode;
124 124
                     }
125 125
 
126
-                    $short_desc = trim($_POST['short_desc']);  // Ocprop
126
+                    $short_desc = trim($_POST['short_desc']); // Ocprop
127 127
                     $hint = htmlspecialchars(trim($_POST['hints']), ENT_COMPAT, 'UTF-8');
128 128
                     $desclang = $_POST['desclang'];
129 129
                     $show_all_langs = isset($_POST['show_all_langs_value']) ? $_POST['show_all_langs_value'] : 0;
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
                     }
139 139
 
140 140
                     // Text from textarea
141
-                    $desc = trim($_POST['desc']);  // Ocprop
141
+                    $desc = trim($_POST['desc']); // Ocprop
142 142
 
143 143
                     // fuer alte Versionen von OCProp
144 144
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
                 tpl_set_var('desclang', htmlspecialchars($desc_lang, ENT_COMPAT, 'UTF-8'));
296 296
                 tpl_set_var('desclang_name', htmlspecialchars(db_LanguageFromShort($desc_lang), ENT_COMPAT, 'UTF-8'));
297 297
                 tpl_set_var('cachename', htmlspecialchars($desc_record['name'], ENT_COMPAT, 'UTF-8'));
298
-                tpl_set_var('reset', $reset);  // obsolete
298
+                tpl_set_var('reset', $reset); // obsolete
299 299
                 tpl_set_var('submit', $submit);
300 300
 
301 301
                 // Text / normal HTML / HTML editor
Please login to merge, or discard this patch.
htdocs/lang/de/ocstyle/varset.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
 // REQUEST-Variablen durchlaufen und an target anhaengen
48 48
 $allowed = ['cacheid', 'userid', 'logid', 'desclang', 'descid'];
49 49
 
50
-foreach($_REQUEST as $varname => $varvalue) {
50
+foreach ($_REQUEST as $varname => $varvalue) {
51 51
     if (in_array($varname, $allowed)) {
52 52
         $target .= $varname . '=' . $varvalue . '&';
53 53
     }
Please login to merge, or discard this patch.