Completed
Branch master (84f4f1)
by Thomas
23:30
created
htdocs/src/Oc/Session/SessionDataCookie.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
     }
64 64
 
65 65
     /**
66
-     * @param $name
66
+     * @param string $name
67 67
      * @param null $default
68 68
      *
69 69
      * @return mixed|null
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
     }
75 75
 
76 76
     /**
77
-     * @param $name
77
+     * @param string $name
78 78
      *
79 79
      * @return bool
80 80
      */
Please login to merge, or discard this patch.
htdocs/src/Oc/Session/SessionDataNative.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
                     // TODO fix the following if statement, seems corrupted
51 51
                     if (strtolower(
52 52
                             substr(
53
-                                'http' + strstr($_SERVER['REFERER'], '://'),
53
+                                'http' +strstr($_SERVER['REFERER'], '://'),
54 54
                                 0,
55 55
                                 strlen($opt['page']['absolute_http_url'])
56 56
                             )
Please login to merge, or discard this patch.
htdocs/src/Oc/Cache/WebCache.php 2 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -44,8 +44,8 @@  discard block
 block discarded – undo
44 44
     }
45 45
 
46 46
     /**
47
-     * @param $relBaseDir
48
-     * @param $ext
47
+     * @param string $relBaseDir
48
+     * @param string $ext
49 49
      */
50 50
     private function unlinkFiles($relBaseDir, $ext)
51 51
     {
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
     }
145 145
 
146 146
     /**
147
-     * @param $sTemplate
147
+     * @param string $sTemplate
148 148
      */
149 149
     private function preCompileTemplate($sTemplate)
150 150
     {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@
 block discarded – undo
80 80
                 \set_php_locale();
81 81
 
82 82
                 if ($this->translate->t('INTERNAL_LANG', 'all', 'OcSmarty.class.php', '') !== $sLanguage) {
83
-                    echo 'setlocale() failed to set language to ' . $sLanguage ."\n";
83
+                    echo 'setlocale() failed to set language to ' . $sLanguage . "\n";
84 84
                     die("Is the translation of INTERNAL_LANG correct?\n");
85 85
                 }
86 86
 
Please login to merge, or discard this patch.
htdocs/config2/settings-sample-vagrant.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 $opt['session']['mode'] = SAVE_COOKIE;
64 64
 $opt['session']['cookiename'] = 'ocvagrant'; // only with SAVE_COOKIE
65 65
 $opt['session']['path'] = '/';
66
-$opt['session']['domain'] = 'local.team-opencaching.de';    // may be overwritten by $opt['domain'][...]['cookiedomain']
66
+$opt['session']['domain'] = 'local.team-opencaching.de'; // may be overwritten by $opt['domain'][...]['cookiedomain']
67 67
 
68 68
 /* If the Referer was sent by the client and the substring was not found,
69 69
  * the embedded session id will be marked as invalid.
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
  * Take caution on caching issues (!)
222 222
  */
223 223
 
224
-$opt['map']['towns']['enable'] = true;  // for releasing v14
224
+$opt['map']['towns']['enable'] = true; // for releasing v14
225 225
 
226 226
 define('MNU_INFO', 1015);
227 227
 define('MNU_TEAMBLOG', 1016);
Please login to merge, or discard this patch.
htdocs/lib2/util.inc.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
  * @param $filename
285 285
  * @param $maxLength
286 286
  *
287
- * @return bool|string
287
+ * @return false|string
288 288
  */
289 289
 function read_file($filename, $maxLength = 4096)
290 290
 {
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
453 453
  *
454 454
  * @param $n
455 455
  *
456
- * @return mixed|string
456
+ * @return string
457 457
  */
458 458
 function number1000($n)
459 459
 {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -241,7 +241,7 @@
 block discarded – undo
241 241
     while ($nCurPos < mb_strlen($str)) {
242 242
         $nNextSep = mb_strlen($str);
243 243
         $sepLength = mb_strlen($sep);
244
-        for ($nSepPos = 0; $nSepPos < $sepLength; $nSepPos ++) {
244
+        for ($nSepPos = 0; $nSepPos < $sepLength; $nSepPos++) {
245 245
             $nThisPos = mb_strpos($str, mb_substr($sep, $nSepPos, 1), $nCurPos);
246 246
             if ($nThisPos !== false && $nNextSep > $nThisPos) {
247 247
                 $nNextSep = $nThisPos;
Please login to merge, or discard this patch.
htdocs/lib2/logic/picture.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -464,9 +464,9 @@
 block discarded – undo
464 464
                 return false;
465 465
             } else {
466 466
                 // restore picture file
467
-                $this->setUrl($original_url);     // set the url, so that we can
467
+                $this->setUrl($original_url); // set the url, so that we can
468 468
                 $filename = $this->getFilename(); // .. retrieve the file path+name
469
-                $this->setFilenames($filename);   // now set url(s) from the new uuid
469
+                $this->setFilenames($filename); // now set url(s) from the new uuid
470 470
                 try {
471 471
                     rename($this->deletedFilename($filename), $this->getFilename());
472 472
                 } catch (Exception $e) {
Please login to merge, or discard this patch.
local/ocxml11client/xml2array.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -14,14 +14,14 @@
 block discarded – undo
14 14
 
15 15
     public function push_pos(&$pos)
16 16
     {
17
-        $this->stack[count($this->stack)] =& $pos;
18
-        $this->stack_ref =& $pos;
17
+        $this->stack[count($this->stack)] = & $pos;
18
+        $this->stack_ref = & $pos;
19 19
     }
20 20
 
21 21
     public function pop_pos()
22 22
     {
23 23
         unset($this->stack[count($this->stack) - 1]);
24
-        $this->stack_ref =& $this->stack[count($this->stack) - 1];
24
+        $this->stack_ref = & $this->stack[count($this->stack) - 1];
25 25
     }
26 26
 
27 27
     /**
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 (mysql_num_rows($rs) == 1) {
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
                 //save to DB?
90 90
                 if (isset($_POST['post'])) {  // Ocprop
91 91
                     //here we read all used information from the form if submitted
92
-                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;  // Ocprop
92
+                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1; // Ocprop
93 93
 
94 94
                     // fuer alte Versionen von OCProp
95 95
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
                         $oldDescMode = $descMode;
123 123
                     }
124 124
 
125
-                    $short_desc = $_POST['short_desc'];  // Ocprop
125
+                    $short_desc = $_POST['short_desc']; // Ocprop
126 126
                     $hint = htmlspecialchars($_POST['hints'], ENT_COMPAT, 'UTF-8');
127 127
                     $desclang = $_POST['desclang'];
128 128
                     $show_all_langs = isset($_POST['show_all_langs_value']) ? $_POST['show_all_langs_value'] : 0;
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
                     }
138 138
 
139 139
                     // Text from textarea
140
-                    $desc = $_POST['desc'];  // Ocprop
140
+                    $desc = $_POST['desc']; // Ocprop
141 141
 
142 142
                     // fuer alte Versionen von OCProp
143 143
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
296 296
                 tpl_set_var('desclang', htmlspecialchars($desc_lang, ENT_COMPAT, 'UTF-8'));
297 297
                 tpl_set_var('desclang_name', htmlspecialchars(db_LanguageFromShort($desc_lang), ENT_COMPAT, 'UTF-8'));
298 298
                 tpl_set_var('cachename', htmlspecialchars($desc_record['name'], ENT_COMPAT, 'UTF-8'));
299
-                tpl_set_var('reset', $reset);  // obsolete
299
+                tpl_set_var('reset', $reset); // obsolete
300 300
                 tpl_set_var('submit', $submit);
301 301
 
302 302
                 // Text / normal HTML / HTML editor
Please login to merge, or discard this patch.
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.