Completed
Pull Request — development (#546)
by Nick
06:41
created
htdocs/log.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -49,8 +49,8 @@  discard block
 block discarded – undo
49 49
          FROM field_note
50 50
          WHERE `id` = &1
51 51
            AND `user_id` = &2',
52
-        (int) $_GET['fieldnoteid'],
53
-        (int) $user->getUserId()
52
+        (int)$_GET['fieldnoteid'],
53
+        (int)$user->getUserId()
54 54
     );
55 55
     $fieldNote = sql_fetch_assoc($rs);
56 56
     if (!empty($fieldNote)) {
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
     // get log text editor mode (from form or from userprofile)
175 175
     // 1 = text; 2 = HTML; 3 = tinyMCE
176 176
     if (isset($_POST['descMode'])) {
177
-        $descMode = $_POST['descMode'] + 0;  // Ocprop: 2
177
+        $descMode = $_POST['descMode'] + 0; // Ocprop: 2
178 178
         if (($descMode < 1) || ($descMode > 3)) {
179 179
             $descMode = 3;
180 180
         }
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
335 335
             if (isset($_REQUEST['fieldnoteid']) && $_REQUEST['fieldnoteid']) {
336 336
                 sql(
337 337
                     'DELETE FROM field_note WHERE `id` = &1 AND `user_id` = &2',
338
-                    (int) $_REQUEST['fieldnoteid'],
338
+                    (int)$_REQUEST['fieldnoteid'],
339 339
                     $user->getUserId()
340 340
                 );
341 341
 
Please login to merge, or discard this patch.
htdocs/translate.php 1 patch
Switch Indentation   +100 added lines, -100 removed lines patch added patch discarded remove patch
@@ -86,83 +86,83 @@  discard block
 block discarded – undo
86 86
 }
87 87
 
88 88
 switch ($action) {
89
-    case 'selectlang':
90
-        break;
89
+        case 'selectlang':
90
+            break;
91 91
 
92
-    case 'verify':
93
-        verify();
94
-        break;
92
+        case 'verify':
93
+            verify();
94
+            break;
95 95
 
96
-    case 'resetids':
97
-        resetIds();
98
-        break;
96
+        case 'resetids':
97
+            resetIds();
98
+            break;
99 99
 
100
-    case 'clearcache':
101
-        clearCache();
102
-        break;
100
+        case 'clearcache':
101
+            clearCache();
102
+            break;
103 103
 
104
-    case 'export':
105
-        export();
106
-        break;
104
+        case 'export':
105
+            export();
106
+            break;
107 107
 
108
-    case 'xmlexport':
109
-        xmlexport();
110
-        break;
108
+        case 'xmlexport':
109
+            xmlexport();
110
+            break;
111 111
 
112
-    case 'xmlimport':
113
-        break;
112
+        case 'xmlimport':
113
+            break;
114 114
 
115
-    case 'xmlimport2':
116
-        xmlimport2();
117
-        break;
115
+        case 'xmlimport2':
116
+            xmlimport2();
117
+            break;
118 118
 
119
-    case 'xmlimport3':
120
-        xmlimport3();
121
-        break;
119
+        case 'xmlimport3':
120
+            xmlimport3();
121
+            break;
122 122
 
123
-    case 'textexportnew':
124
-        textexport($translang, false);
125
-        break;
123
+        case 'textexportnew':
124
+            textexport($translang, false);
125
+            break;
126 126
 
127
-    case 'textexportall':
128
-        textexport($translang, true);
129
-        break;
127
+        case 'textexportall':
128
+            textexport($translang, true);
129
+            break;
130 130
 
131
-    case 'textimport':
132
-        break;
131
+        case 'textimport':
132
+            break;
133 133
 
134
-    case 'textimport2':
135
-        textimport($translang);
136
-        break;
134
+        case 'textimport2':
135
+            textimport($translang);
136
+            break;
137 137
 
138
-    case 'edit':
139
-        if (!$access->mayTranslate($translang)) {
140
-            $tpl->error(ERROR_NO_ACCESS);
141
-        }
142
-        edit();
143
-        break;
138
+        case 'edit':
139
+            if (!$access->mayTranslate($translang)) {
140
+                $tpl->error(ERROR_NO_ACCESS);
141
+            }
142
+            edit();
143
+            break;
144 144
 
145
-    case 'copy_en':
146
-        copy_english_texts();
147
-        break;
145
+        case 'copy_en':
146
+            copy_english_texts();
147
+            break;
148 148
 
149
-    case 'listfaults':
150
-        $trans = sql(
151
-            'SELECT `sys_trans`.`id`,
149
+        case 'listfaults':
150
+            $trans = sql(
151
+                'SELECT `sys_trans`.`id`,
152 152
                     `sys_trans`.`text`
153 153
              FROM `sys_trans`
154 154
              LEFT JOIN `sys_trans_ref`
155 155
                 ON `sys_trans`.`id`=`sys_trans_ref`.`trans_id`
156 156
              WHERE ISNULL(`sys_trans_ref`.`trans_id`)
157 157
              ORDER BY `sys_trans`.`id` DESC'
158
-        );
159
-        $tpl->assign_rs('trans', $trans);
160
-        sql_free_result($trans);
161
-        break;
158
+            );
159
+            $tpl->assign_rs('trans', $trans);
160
+            sql_free_result($trans);
161
+            break;
162 162
 
163
-    case 'listall':
164
-        $trans = sql(
165
-            "SELECT `sys_trans`.`id`,
163
+        case 'listall':
164
+            $trans = sql(
165
+                "SELECT `sys_trans`.`id`,
166 166
                     `sys_trans`.`text`,
167 167
                     `sys_trans_text`.`text` AS `trans`
168 168
              FROM `sys_trans`
@@ -170,48 +170,48 @@  discard block
 block discarded – undo
170 170
                ON `sys_trans`.`id`=`sys_trans_text`.`trans_id`
171 171
                AND `sys_trans_text`.`lang`='&1'
172 172
              ORDER BY `sys_trans`.`id` DESC",
173
-            $translang
174
-        );
175
-        $tpl->assign_rs('trans', $trans);
176
-        sql_free_result($trans);
177
-        break;
173
+                $translang
174
+            );
175
+            $tpl->assign_rs('trans', $trans);
176
+            sql_free_result($trans);
177
+            break;
178 178
 
179
-    case 'remove':
180
-        if (!$access->mayTranslate($translang)) {
181
-            $tpl->error(ERROR_NO_ACCESS);
182
-        }
183
-        remove();
184
-        break;
185
-
186
-    case 'scan':
187
-        scan();
188
-        break;
189
-
190
-    case 'scanstart':
191
-        scanStart();
192
-        break;
193
-
194
-    case 'scanfile':
195
-        $filename = isset($_REQUEST['filename']) ? $_REQUEST['filename'] : '';
196
-        scanFile($filename);
197
-        exit;
198
-
199
-    case 'quicknone':
200
-        $cookie->un_set('translate_mode');
201
-        break;
202
-
203
-    case 'quicknew':
204
-        $cookie->set('translate_mode', 'new');
205
-        break;
206
-
207
-    case 'quickall':
208
-        $cookie->set('translate_mode', 'all');
209
-        break;
210
-
211
-    default:
212
-        $action = 'listnew';
213
-        $trans = sql(
214
-            "SELECT DISTINCT `sys_trans`.`id`,
179
+        case 'remove':
180
+            if (!$access->mayTranslate($translang)) {
181
+                $tpl->error(ERROR_NO_ACCESS);
182
+            }
183
+            remove();
184
+            break;
185
+
186
+        case 'scan':
187
+            scan();
188
+            break;
189
+
190
+        case 'scanstart':
191
+            scanStart();
192
+            break;
193
+
194
+        case 'scanfile':
195
+            $filename = isset($_REQUEST['filename']) ? $_REQUEST['filename'] : '';
196
+            scanFile($filename);
197
+            exit;
198
+
199
+        case 'quicknone':
200
+            $cookie->un_set('translate_mode');
201
+            break;
202
+
203
+        case 'quicknew':
204
+            $cookie->set('translate_mode', 'new');
205
+            break;
206
+
207
+        case 'quickall':
208
+            $cookie->set('translate_mode', 'all');
209
+            break;
210
+
211
+        default:
212
+            $action = 'listnew';
213
+            $trans = sql(
214
+                "SELECT DISTINCT `sys_trans`.`id`,
215 215
                              `sys_trans`.`text`
216 216
              FROM `sys_trans`
217 217
              LEFT JOIN `sys_trans_text`
@@ -222,10 +222,10 @@  discard block
 block discarded – undo
222 222
              WHERE ISNULL(`sys_trans_text`.`trans_id`)
223 223
                OR `sys_trans_text`.`text`=''
224 224
              ORDER BY `sys_trans`.`id` DESC",
225
-            $translang
226
-        );
227
-        $tpl->assign_rs('trans', $trans);
228
-        sql_free_result($trans);
225
+                $translang
226
+            );
227
+            $tpl->assign_rs('trans', $trans);
228
+            sql_free_result($trans);
229 229
 }
230 230
 
231 231
 $languages = [];
Please login to merge, or discard this patch.
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.