Completed
Pull Request — development (#663)
by Nick
07:42
created
htdocs/lib2/db.inc.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1256,7 +1256,7 @@
 block discarded – undo
1256 1256
 }
1257 1257
 
1258 1258
 /**
1259
- * @param $f
1259
+ * @param resource $f
1260 1260
  * @param resource $rs
1261 1261
  * @param $table
1262 1262
  * @param bool $truncate
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@
 block discarded – undo
86 86
 
87 87
 $db['debug'] = (($opt['debug'] & DEBUG_SQLDEBUGGER) == DEBUG_SQLDEBUGGER);
88 88
 if ($db['debug'] === true) {
89
-  require_once __DIR__ . '/sqldebugger.class.php';
89
+    require_once __DIR__ . '/sqldebugger.class.php';
90 90
 }
91 91
 
92 92
 
Please login to merge, or discard this patch.
htdocs/lib2/imagebmp.inc.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -577,7 +577,7 @@
 block discarded – undo
577 577
 }
578 578
 
579 579
 /**
580
- * @param $d
580
+ * @param integer $d
581 581
  * @param integer $n
582 582
  *
583 583
  * @return string
Please login to merge, or discard this patch.
local/maintenance/email_recovery.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -300,7 +300,7 @@
 block discarded – undo
300 300
         while ($r = sql_fetch_assoc($rs)) {
301 301
             $user = new user($r['user_id']);
302 302
             $user->sendRegistrationCode();
303
-            ++ $n;
303
+            ++$n;
304 304
         }
305 305
         sql_free_result($rs);
306 306
         self::message(0, $n . ' users have been re-sent the activation code');
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@
 block discarded – undo
100 100
             'SELECT COUNT(*)
101 101
              FROM `' . $table . '`
102 102
              WHERE ' . $this->getDateCondition($table, $dateField) .
103
-                       ($andWhere ? ' AND (' . $andWhere . ')' : ''),
103
+                        ($andWhere ? ' AND (' . $andWhere . ')' : ''),
104 104
             0
105 105
         );
106 106
         self::message(1, $objectCount . ' ' . $description);
Please login to merge, or discard this patch.
htdocs/lib2/common.inc.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
 
12 12
 require_once __DIR__ . '/../vendor/autoload.php';
13 13
 
14
-$opt['rootpath'] = __DIR__ .'/../';
14
+$opt['rootpath'] = __DIR__ . '/../';
15 15
 
16 16
 function __autoload($class_name)
17 17
 {
Please login to merge, or discard this patch.
Doc Comments   +13 added lines patch added patch discarded remove patch
@@ -31,6 +31,11 @@  discard block
 block discarded – undo
31 31
 }
32 32
 
33 33
 if (!function_exists('bindtextdomain')) {
34
+
35
+    /**
36
+     * @param string $domain
37
+     * @param string $directory
38
+     */
34 39
     function bindtextdomain($domain, $directory)
35 40
     {
36 41
         // dummy function for travis
@@ -38,6 +43,10 @@  discard block
 block discarded – undo
38 43
 }
39 44
 
40 45
 if (!function_exists('textdomain')) {
46
+
47
+    /**
48
+     * @param string $domain
49
+     */
41 50
     function textdomain($domain)
42 51
     {
43 52
         // dummy function for travis
@@ -45,6 +54,10 @@  discard block
 block discarded – undo
45 54
 }
46 55
 
47 56
 if (!function_exists('gettext')) {
57
+
58
+    /**
59
+     * @param string $message
60
+     */
48 61
     function gettext($message)
49 62
     {
50 63
         // dummy function for travis
Please login to merge, or discard this patch.
htdocs/lib/common.inc.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -802,6 +802,9 @@
 block discarded – undo
802 802
     return '';
803 803
 }
804 804
 
805
+/**
806
+ * @return string
807
+ */
805 808
 function get_logtype_name($logtype, $language)
806 809
 {
807 810
     return sqlValue(
Please login to merge, or discard this patch.
local/mailing/mailing.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
 
40 40
 foreach ($sendTo as $receiver) {
41 41
     $receiver = trim($receiver);
42
-    echo ++ $n . "/$total: $receiver";
42
+    echo ++$n . "/$total: $receiver";
43 43
     mail(
44 44
         $receiver,
45 45
         $subject,
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/lib/settings-dist.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -142,7 +142,7 @@
 block discarded – undo
142 142
 
143 143
 /* default locale
144 144
  */
145
-$opt['template']['default']['locale'] = 'DE';   // can be overwritten by $opt['domain'][<domain>]['locale']
145
+$opt['template']['default']['locale'] = 'DE'; // can be overwritten by $opt['domain'][<domain>]['locale']
146 146
 
147 147
 // include all locale settings
148 148
 require_once __DIR__ . '/../config2/locale.inc.php';
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.