Completed
Pull Request — development (#802)
by Mirco
04:41
created
htdocs/lib2/search/ftsearch.inc.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
     $str = '';
200 200
 
201 201
     ftsearch_load_ignores();
202
-    for ($i = count($astr) - 1; $i >= 0; $i --) {
202
+    for ($i = count($astr) - 1; $i >= 0; $i--) {
203 203
         // ignore?
204 204
         if (array_search(mb_strtolower($astr[$i]), $ftsearch_ignores) !== false) {
205 205
             unset($astr[$i]);
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
 
255 255
     // doppelte chars ersetzen
256 256
     $ordZ = ord('z');
257
-    for ($c = ord('a'); $c <= $ordZ; $c ++) {
257
+    for ($c = ord('a'); $c <= $ordZ; $c++) {
258 258
         $old_str = '';
259 259
         while ($old_str !== $str) {
260 260
             $old_str = $str;
Please login to merge, or discard this patch.
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -68,9 +68,9 @@  discard block
 block discarded – undo
68 68
 /**
69 69
  * str = single word
70 70
  * @param $str
71
- * @param $simple
71
+ * @param boolean $simple
72 72
  *
73
- * @return array
73
+ * @return string
74 74
  */
75 75
 function ftsearch_split(&$str, $simple)
76 76
 {
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
  * str = single word
142 142
  * @param $str
143 143
  *
144
- * @return mixed|string
144
+ * @return string
145 145
  */
146 146
 function ftsearch_text2simple($str)
147 147
 {
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
  * str = single word
172 172
  * @param $str
173 173
  *
174
- * @return mixed|string
174
+ * @return string
175 175
  */
176 176
 function ftsearch_text2sort($str)
177 177
 {
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
 /**
315 315
  * @param $text
316 316
  *
317
- * @return mixed|string
317
+ * @return string
318 318
  */
319 319
 function ftsearch_strip_html($text)
320 320
 {
Please login to merge, or discard this patch.
htdocs/src/Oc/Util/ProcessSync.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
             $pidDaemon = fgets($pidFile, 20);
62 62
             fclose($pidFile);
63 63
 
64
-            $pidDaemon = (int) $pidDaemon;
64
+            $pidDaemon = (int)$pidDaemon;
65 65
 
66 66
             // bad PID file, e.g. due to system malfunction while creating the file?
67 67
             if ($pidDaemon <= 0) {
Please login to merge, or discard this patch.
htdocs/lib2/ss_zip.class.php 2 patches
Indentation   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,8 +34,7 @@
 block discarded – undo
34 34
     public $cdir = [];
35 35
 
36 36
     /**    constructor
37
-
38
-*
37
+     *
39 38
 *@param string $zipFile if not empty must contain path to valid zip file, ss_zip will try to open and parse it.
40 39
      *               If this parameter is empty, the new empty zip archive is created. This parameter has no meaning in
41 40
      *               LIGHT verion, please upgrade to PROfessional version.
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -141,9 +141,9 @@  discard block
 block discarded – undo
141 141
         }
142 142
 
143 143
         $fnl = strlen($filename);
144
-        $fh = "\x14\x00";    // ver needed to extract
145
-        $fh .= "\x00\x00";    // gen purpose bit flag
146
-        $fh .= "\x08\x00";    // compression method
144
+        $fh = "\x14\x00"; // ver needed to extract
145
+        $fh .= "\x00\x00"; // gen purpose bit flag
146
+        $fh .= "\x08\x00"; // compression method
147 147
         $fh .= "\x00\x00\x00\x00"; // last mod time and date
148 148
         $fh .=
149 149
             pack(
@@ -170,16 +170,16 @@  discard block
 block discarded – undo
170 170
                 'va*v3V2',
171 171
                 0,
172 172
                 $fh,
173
-                0,        // file comment length
174
-                0,        // disk number start
175
-                0,        // internal file attributes
176
-                $attr,    // external file attributes - 'archive/directory' bit set
173
+                0, // file comment length
174
+                0, // disk number start
175
+                0, // internal file attributes
176
+                $attr, // external file attributes - 'archive/directory' bit set
177 177
                 $this->offset
178 178
             ) . $filename;
179 179
 
180 180
         $this->offset += 42 + $fnl + $gzsize;
181 181
         $this->cdir[] = $cdir;
182
-        $this->cnt ++;
182
+        $this->cnt++;
183 183
         $this->idx = $this->cnt - 1;
184 184
     }
185 185
 
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
                 $cdsl, // size of central dir
228 228
                 $zdsl, // offset to start of central dir
229 229
                 0
230
-            );              // .zip file comment length
230
+            ); // .zip file comment length
231 231
         return $this->zipfile;
232 232
     }
233 233
 
Please login to merge, or discard this patch.
htdocs/lib2/Net/IDNA2.php 1 patch
Spacing   +12 added lines, -14 removed lines patch added patch discarded remove patch
@@ -2322,8 +2322,7 @@  discard block
 block discarded – undo
2322 2322
         // Forcing conversion of input to UCS4 array
2323 2323
         // If one time encoding is given, use this, else the objects property
2324 2324
         switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
2325
-            case 'utf8':
2326
-                $decoded = $this->_utf8_to_ucs4($decoded);
2325
+            case 'utf8' : $decoded = $this->_utf8_to_ucs4($decoded);
2327 2326
                 break;
2328 2327
             case 'ucs4_string':
2329 2328
                 $decoded = $this->_ucs4_string_to_ucs4($decoded);
@@ -2478,8 +2477,7 @@  discard block
 block discarded – undo
2478 2477
         // The output is UTF-8 by default, other output formats need conversion here
2479 2478
         // If one time encoding is given, use this, else the objects property
2480 2479
         switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
2481
-            case 'utf8':
2482
-                return $return;
2480
+            case 'utf8' : return $return;
2483 2481
                 break;
2484 2482
             case 'ucs4_string':
2485 2483
                 return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
@@ -2714,12 +2712,12 @@  discard block
 block discarded – undo
2714 2712
                     break;
2715 2713
                 }
2716 2714
 
2717
-                $w = (int) ($w * ($this->_base - $t));
2715
+                $w = (int)($w * ($this->_base - $t));
2718 2716
             }
2719 2717
 
2720 2718
             $bias = $this->_adapt($idx - $old_idx, $deco_len + 1, $is_first);
2721 2719
             $is_first = false;
2722
-            $char += (int) ($idx / ($deco_len + 1));
2720
+            $char += (int)($idx / ($deco_len + 1));
2723 2721
             $idx %= ($deco_len + 1);
2724 2722
 
2725 2723
             if ($deco_len > 0) {
@@ -2746,14 +2744,14 @@  discard block
 block discarded – undo
2746 2744
      */
2747 2745
     private function _adapt($delta, $npoints, $is_first)
2748 2746
     {
2749
-        $delta = (int) ($is_first ? ($delta / $this->_damp) : ($delta / 2));
2750
-        $delta += (int) ($delta / $npoints);
2747
+        $delta = (int)($is_first ? ($delta / $this->_damp) : ($delta / 2));
2748
+        $delta += (int)($delta / $npoints);
2751 2749
 
2752 2750
         for ($k = 0; $delta > (($this->_base - $this->_tmin) * $this->_tmax) / 2; $k += $this->_base) {
2753
-            $delta = (int) ($delta / ($this->_base - $this->_tmin));
2751
+            $delta = (int)($delta / ($this->_base - $this->_tmin));
2754 2752
         }
2755 2753
 
2756
-        return (int) ($k + ($this->_base - $this->_tmin + 1) * $delta / ($delta + $this->_skew));
2754
+        return (int)($k + ($this->_base - $this->_tmin + 1) * $delta / ($delta + $this->_skew));
2757 2755
     }
2758 2756
 
2759 2757
     /**
@@ -2899,8 +2897,8 @@  discard block
 block discarded – undo
2899 2897
 
2900 2898
         $result = [];
2901 2899
         $T = $this->_tbase + $sindex % $this->_tcount;
2902
-        $result[] = (int) ($this->_lbase + $sindex / $this->_ncount);
2903
-        $result[] = (int) ($this->_vbase + ($sindex % $this->_ncount) / $this->_tcount);
2900
+        $result[] = (int)($this->_lbase + $sindex / $this->_ncount);
2901
+        $result[] = (int)($this->_vbase + ($sindex % $this->_ncount) / $this->_tcount);
2904 2902
 
2905 2903
         if ($T != $this->_tbase) {
2906 2904
             $result[] = $T;
@@ -3141,7 +3139,7 @@  discard block
 block discarded – undo
3141 3139
                     throw new UnexpectedValueException('This might be UTF-8, but I don\'t understand it at byte ' . $k);
3142 3140
                 }
3143 3141
                 if ('add' == $mode) {
3144
-                    $output[$out_len] = (int) $v;
3142
+                    $output[$out_len] = (int)$v;
3145 3143
                     ++$out_len;
3146 3144
                     continue;
3147 3145
                 }
@@ -3361,7 +3359,7 @@  discard block
 block discarded – undo
3361 3359
             return mb_strlen($string, '8bit');
3362 3360
         }
3363 3361
 
3364
-        return strlen((binary) $string);
3362
+        return strlen((binary)$string);
3365 3363
     }
3366 3364
 
3367 3365
     // }}}}
Please login to merge, or discard this patch.
htdocs/lib2/search/search.xml.inc.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -205,7 +205,7 @@
 block discarded – undo
205 205
 
206 206
 /**
207 207
  * @param string $str
208
- * @return mixed
208
+ * @return string
209 209
  */
210 210
 function lf2crlf($str)
211 211
 {
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.
local/maintenance/email_recovery.php 3 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.
Doc Comments   +9 added lines patch added patch discarded remove patch
@@ -81,6 +81,10 @@  discard block
 block discarded – undo
81 81
         return preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}$/', $datetime);
82 82
     }
83 83
 
84
+    /**
85
+     * @param integer $level
86
+     * @param string $text
87
+     */
84 88
     private static function message($level, $text): void
85 89
     {
86 90
         echo str_repeat(' ', 2 * $level) . $text . "\n";
@@ -93,6 +97,11 @@  discard block
 block discarded – undo
93 97
             ' AND `' . $table . '`.`' . $field . "` <= '" . sql_escape($this->toDateTime) . "'";
94 98
     }
95 99
 
100
+    /**
101
+     * @param string $table
102
+     * @param string $dateField
103
+     * @param string $description
104
+     */
96 105
     private function showObjectCount($table, $dateField, $description, $andWhere = ''): void
97 106
     {
98 107
         $objectCount = sql_value(
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.
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.