Completed
Pull Request — master (#312)
by
unknown
26:01 queued 18:06
created
local/ocxml11client/index.php 2 patches
Doc Comments   +8 added lines patch added patch discarded remove patch
@@ -1281,11 +1281,19 @@
 block discarded – undo
1281 1281
     }
1282 1282
 }
1283 1283
 
1284
+/**
1285
+ * @param string $recordtype
1286
+ * @param string $info
1287
+ */
1284 1288
 function importError($recordtype, $uuid, $r, $info)
1285 1289
 {
1286 1290
     echo 'error: ' . $recordtype . ' (' . $uuid . '): ' . $info . "\n";
1287 1291
 }
1288 1292
 
1293
+/**
1294
+ * @param string $recordtype
1295
+ * @param string $info
1296
+ */
1289 1297
 function importWarn($recordtype, $uuid, $r, $info)
1290 1298
 {
1291 1299
     echo 'warn: ' . $recordtype . ' (' . $uuid . '): ' . $info . "\n";
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
     $nFileNr = 0;
68 68
     $rs = sql('SELECT `id`, `url` FROM `pictures` WHERE `local`=0');
69 69
     while ($r = sql_fetch_array($rs)) {
70
-        $nFileNr ++;
70
+        $nFileNr++;
71 71
         $fileparts = mb_split('/', $r['url']);
72 72
         $filename = $fileparts[count($fileparts) - 1];
73 73
 
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
             exit;
238 238
         }
239 239
 
240
-        for ($i = 1; $i <= $filescount; $i ++) {
240
+        for ($i = 1; $i <= $filescount; $i++) {
241 241
             echo "Download Paket: " . $i . ' von ' . $filescount . "\n";
242 242
 
243 243
             $fileurl = $opt['url_getsession'];
@@ -411,11 +411,11 @@  discard block
 block discarded – undo
411 411
                             if ($sSubElement != '') {
412 412
                                 // vorheriges element zuerst schlißen
413 413
                                 $sSubElement = '';
414
-                                $nRecursionLevel --;
414
+                                $nRecursionLevel--;
415 415
                             }
416 416
 
417 417
                             $sSubElement = mb_strtoupper($xmlReader->name);
418
-                            $nRecursionLevel ++;
418
+                            $nRecursionLevel++;
419 419
 
420 420
                             // attribute auslesen
421 421
                             if ($xmlReader->moveToFirstAttribute()) {
@@ -432,7 +432,7 @@  discard block
 block discarded – undo
432 432
                         } else {
433 433
                             if ($xmlReader->nodeType == XMLReader::END_ELEMENT) {
434 434
                                 $sSubElement = '';
435
-                                $nRecursionLevel --;
435
+                                $nRecursionLevel--;
436 436
                             }
437 437
                         }
438 438
                     }
Please login to merge, or discard this patch.
local/ocxml11client/xml2array.inc.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -26,6 +26,9 @@
 block discarded – undo
26 26
         $this->stack_ref =& $this->stack[count($this->stack) - 1];
27 27
     }
28 28
 
29
+    /**
30
+     * @param false|string $strInputXML
31
+     */
29 32
     public function parse($strInputXML)
30 33
     {
31 34
 
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -16,14 +16,14 @@
 block discarded – undo
16 16
 
17 17
     public function push_pos(&$pos)
18 18
     {
19
-        $this->stack[count($this->stack)] =& $pos;
20
-        $this->stack_ref =& $pos;
19
+        $this->stack[count($this->stack)] = & $pos;
20
+        $this->stack_ref = & $pos;
21 21
     }
22 22
 
23 23
     public function pop_pos()
24 24
     {
25 25
         unset($this->stack[count($this->stack) - 1]);
26
-        $this->stack_ref =& $this->stack[count($this->stack) - 1];
26
+        $this->stack_ref = & $this->stack[count($this->stack) - 1];
27 27
     }
28 28
 
29 29
     public function parse($strInputXML)
Please login to merge, or discard this patch.
sql/static-data/pwlist.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
     while (!feof($pwf)) {
19 19
         $pw = fgets($pwf);
20 20
         sql("INSERT IGNORE INTO `pw_dict` (`pw`) VALUES ('&1')", trim($pw));
21
-        ++ $n;
21
+        ++$n;
22 22
     }
23 23
     fclose($pwf);
24 24
 
Please login to merge, or discard this patch.
htdocs/editdesc.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -21,8 +21,8 @@  discard block
 block discarded – undo
21 21
     // check for old-style parameters
22 22
     if (isset($_REQUEST['cacheid']) && isset($_REQUEST['desclang']) && !isset($_REQUEST['descid']))  // Ocprop
23 23
     {
24
-        $cache_id = $_REQUEST['cacheid'];  // Ocprop
25
-        $desc_lang = $_REQUEST['desclang'];  // Ocprop
24
+        $cache_id = $_REQUEST['cacheid']; // Ocprop
25
+        $desc_lang = $_REQUEST['desclang']; // Ocprop
26 26
 
27 27
         $rs = sql("SELECT `id` FROM `cache_desc` WHERE `cache_id`='&1' AND `language`='&2'", $cache_id, $desc_lang);
28 28
         if (mysql_num_rows($rs) == 1) {
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
                 if (isset($_POST['post']))  // Ocprop
91 91
                 {
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 = $_POST['short_desc'];  // Ocprop
126
+                    $short_desc = $_POST['short_desc']; // Ocprop
127 127
                     $hint = htmlspecialchars($_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 = $_POST['desc'];  // Ocprop
141
+                    $desc = $_POST['desc']; // Ocprop
142 142
 
143 143
                     // fuer alte Versionen von OCProp
144 144
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
                 tpl_set_var('desclang', htmlspecialchars($desc_lang, ENT_COMPAT, 'UTF-8'));
298 298
                 tpl_set_var('desclang_name', htmlspecialchars(db_LanguageFromShort($desc_lang), ENT_COMPAT, 'UTF-8'));
299 299
                 tpl_set_var('cachename', htmlspecialchars($desc_record['name'], ENT_COMPAT, 'UTF-8'));
300
-                tpl_set_var('reset', $reset);  // obsolete
300
+                tpl_set_var('reset', $reset); // obsolete
301 301
                 tpl_set_var('submit', $submit);
302 302
 
303 303
                 // Text / normal HTML / HTML editor
Please login to merge, or discard this patch.
Braces   +14 added lines, -7 removed lines patch added patch discarded remove patch
@@ -19,9 +19,12 @@  discard block
 block discarded – undo
19 19
     require $stylepath . '/editdesc.inc.php';
20 20
 
21 21
     // check for old-style parameters
22
-    if (isset($_REQUEST['cacheid']) && isset($_REQUEST['desclang']) && !isset($_REQUEST['descid']))  // Ocprop
22
+    if (isset($_REQUEST['cacheid']) && isset($_REQUEST['desclang']) && !isset($_REQUEST['descid'])) {
23
+        // Ocprop
23 24
     {
24
-        $cache_id = $_REQUEST['cacheid'];  // Ocprop
25
+        $cache_id = $_REQUEST['cacheid'];
26
+    }
27
+    // Ocprop
25 28
         $desc_lang = $_REQUEST['desclang'];  // Ocprop
26 29
 
27 30
         $rs = sql("SELECT `id` FROM `cache_desc` WHERE `cache_id`='&1' AND `language`='&2'", $cache_id, $desc_lang);
@@ -87,10 +90,13 @@  discard block
 block discarded – undo
87 90
                 $show_all_langs = false;
88 91
 
89 92
                 //save to DB?
90
-                if (isset($_POST['post']))  // Ocprop
93
+                if (isset($_POST['post'])) {
94
+                    // Ocprop
91 95
                 {
92 96
                     //here we read all used information from the form if submitted
93
-                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;  // Ocprop
97
+                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;
98
+                }
99
+                // Ocprop
94 100
 
95 101
                     // fuer alte Versionen von OCProp
96 102
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -147,7 +153,8 @@  discard block
 block discarded – undo
147 153
 
148 154
                     $desc = processEditorInput($oldDescMode, $descMode, $desc);
149 155
 
150
-                    if (isset($_POST['submitform']))  // Ocprop
156
+                    if (isset($_POST['submitform'])) {
157
+                        // Ocprop
151 158
                     {
152 159
                         // prüfen, ob sprache nicht schon vorhanden
153 160
                         $rs = sql(
@@ -160,6 +167,7 @@  discard block
 block discarded – undo
160 167
                             $descid,
161 168
                             $desclang
162 169
                         );
170
+                    }
163 171
                         $r = sql_fetch_array($rs);
164 172
                         if ($r['count'] > 0) {
165 173
                             tpl_errorMsg('editdesc', $error_desc_exists);
@@ -224,8 +232,7 @@  discard block
 block discarded – undo
224 232
 
225 233
                     if ($oldDescMode == 0) {
226 234
                         $desc = processEditorInput($oldDescMode, $descMode, $desc_record['desc']);
227
-                    }
228
-                    else {
235
+                    } else {
229 236
                         $desc = $desc_record['desc'];
230 237
                     }
231 238
                 }
Please login to merge, or discard this patch.
htdocs/src/Oc/Libse/Validator/RealValidator.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
 
23 23
     protected function getMinValue()
24 24
     {
25
-        return - 1e38;
25
+        return -1e38;
26 26
     }
27 27
 
28 28
     protected function getMaxValue()
Please login to merge, or discard this patch.
htdocs/src/Oc/Libse/Validator/IntegerValidator.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,6 +35,6 @@
 block discarded – undo
35 35
 
36 36
     protected function getValue($value)
37 37
     {
38
-        return (int) $value;
38
+        return (int)$value;
39 39
     }
40 40
 }
Please login to merge, or discard this patch.
htdocs/src/Oc/Console/Command/CodeSnifferCommand.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
     protected function execute(InputInterface $input, OutputInterface $output)
35 35
     {
36 36
         $command = $input->getOption(self::OPTION_FIX) ? 'phpcbf' : 'phpcs';
37
-        $cmd = 'vendor/bin/'.($command).' --standard=PSR2 -p -n --colors src/';
37
+        $cmd = 'vendor/bin/' . ($command) . ' --standard=PSR2 -p -n --colors src/';
38 38
 
39 39
         if ($input->getOption(self::OPTION_DRY_RUN)) {
40 40
             $output->writeln($cmd);
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
         }
44 44
 
45 45
         $process = new Process($cmd, $this->rootPath, null, null, 9600);
46
-        $process->run(function ($type, $buffer) {
46
+        $process->run(function($type, $buffer) {
47 47
             echo $buffer;
48 48
         });
49 49
 
Please login to merge, or discard this patch.
htdocs/src/Oc/SmartyPlugins/block.t.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
     $tr = [];
25 25
     $p = 0;
26 26
 
27
-    for ($i = 1; $i < func_num_args(); $i ++) {
27
+    for ($i = 1; $i < func_num_args(); $i++) {
28 28
         $arg = func_get_arg($i);
29 29
 
30 30
         if (is_array($arg)) {
Please login to merge, or discard this patch.
htdocs/src/Oc/SmartyPlugins/block.nocache.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
         if (!isset($counter[$name])) {
33 33
             $counter[$name] = 0;
34 34
         }
35
-        $counter[$name] ++;
35
+        $counter[$name]++;
36 36
 
37 37
         if ($smarty->_cache_including) {
38 38
             $param = isset($smarty->_cache_info['cached_vars'][$name][$counter[$name]]) ? $smarty->_cache_info['cached_vars'][$name][$counter[$name]] : [];
Please login to merge, or discard this patch.