Passed
Pull Request — development (#682)
by Thomas
06:58
created
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.
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.
local/maintenance/email_recovery.php 1 patch
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.
htdocs/lib2/common.inc.php 1 patch
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.
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.
htdocs/config2/settings-dev.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
 );
80 80
 
81 81
 $opt['page']['develsystem'] = true;
82
-$opt['page']['max_logins_per_hour'] = 1000;    // for development ...
82
+$opt['page']['max_logins_per_hour'] = 1000; // for development ...
83 83
 
84 84
 $opt['mail']['from'] = 'root';
85 85
 $opt['mail']['subject'] = '[local.team-opencaching.de] ';
Please login to merge, or discard this patch.