OpencachingDeutschland / oc-server3

htdocs/lib2/logic/cachelist.class.php

Braces +2 added lines, -1 removed lines

@@ -109,7 +109,8 @@
                 $this->getUserId(),
                 $this->getId(),
                 $name
-            )) {// $this->getId() is 0 when creating a new list -> condition has no effect
+            )) {
+// $this->getId() is 0 when creating a new list -> condition has no effect
                 return ERROR_DUPLICATE_LISTNAME;
             } elseif ($visibility >= 2 && strlen($name) < 10) {
                 return ERROR_BAD_LISTNAME;

htdocs/lib2/logic/data-license.inc.php

Braces +2 added lines, -1 removed lines

@@ -27,7 +27,8 @@
     $for_cachedesc,
     $html,
     $twolines = false
-) {
+)
+{
     global $opt, $translate;
 
     $ltext = "";

htdocs/lib2/logic/cracklib.inc.php

Braces +2 added lines, -1 removed lines

@@ -75,7 +75,8 @@
 
     // $pw may not contain one of $addwords[]
     foreach ($wordlist as $v) {
-        if (mb_stripos($pw_lc, $v) !== false) {// mb_stripos needs PHP 5.2
+        if (mb_stripos($pw_lc, $v) !== false) {
+// mb_stripos needs PHP 5.2
             return false;
         }
     }

htdocs/lib2/logic/logtypes.inc.php

Braces +2 added lines, -1 removed lines

@@ -104,7 +104,8 @@
             $allowed_logtypes[] = 14;
         }  // locked, invisible
     }
-    if ($cache_type == 6) { // event
+    if ($cache_type == 6) {
+// event
         $allowed_logtypes[] = 8;   // will attend
         $allowed_logtypes[] = 7;   // attended
     } else {

htdocs/lib2/Net/IDNA2.php

Braces +36 added lines, -16 removed lines

@@ -2340,7 +2340,9 @@ 
         }
 
         // No input, no output, what else did you expect?
-        if (empty($decoded)) return '';
+        if (empty($decoded)) {
+            return '';
+        }
 
         // Anchors for iteration
         $last_begin = 0;
@@ -2429,7 +2431,8 @@ 
 
         // Negotiate input and try to determine, wether it is a plain string,
         // an email address or something like a complete URL
-        if (strpos($input, '@')) { // Maybe it is an email address
+        if (strpos($input, '@')) {
+// Maybe it is an email address
             // No no in strict mode
             if ($this->_strict_mode) {
                 throw new InvalidArgumentException('Only simple domain name parts can be handled in strict mode');
@@ -2438,10 +2441,13 @@ 
             $arr = explode('.', $input);
             foreach ($arr as $k => $v) {
                 $conv = $this->_decode($v);
-                if ($conv) $arr[$k] = $conv;
+                if ($conv) {
+                    $arr[$k] = $conv;
+                }
             }
             $return = $email_pref . '@' . join('.', $arr);
-        } elseif (preg_match('![:\./]!', $input)) { // Or a complete domain name (with or without paths / parameters)
+        } elseif (preg_match('![:\./]!', $input)) {
+// Or a complete domain name (with or without paths / parameters)
             // No no in strict mode
             if ($this->_strict_mode) {
                 throw new InvalidArgumentException('Only simple domain name parts can be handled in strict mode');
@@ -2452,22 +2458,28 @@ 
                 $arr = explode('.', $parsed['host']);
                 foreach ($arr as $k => $v) {
                     $conv = $this->_decode($v);
-                    if ($conv) $arr[$k] = $conv;
+                    if ($conv) {
+                        $arr[$k] = $conv;
+                    }
                 }
                 $parsed['host'] = join('.', $arr);
                 if (isset($parsed['scheme'])) {
                     $parsed['scheme'] .= (strtolower($parsed['scheme']) == 'mailto') ? ':' : '://';
                 }
                 $return = $this->_unparse_url($parsed);
-            } else { // parse_url seems to have failed, try without it
+            } else {
+// parse_url seems to have failed, try without it
                 $arr = explode('.', $input);
                 foreach ($arr as $k => $v) {
                     $conv = $this->_decode($v);
-                    if ($conv) $arr[$k] = $conv;
+                    if ($conv) {
+                        $arr[$k] = $conv;
+                    }
                 }
                 $return = join('.', $arr);
             }
-        } else { // Otherwise we consider it being a pure domain name string
+        } else {
+// Otherwise we consider it being a pure domain name string
             $return = $this->_decode($input);
         }
         // The output is UTF-8 by default, other output formats need conversion here
@@ -3115,7 +3127,8 @@ 
         for ($k = 0; $k < $inp_len; ++$k) {
             $v = ord($input{$k}); // Extract byte from input string
 
-            if ($v < 128) { // We found an ASCII char - put into stirng as is
+            if ($v < 128) {
+// We found an ASCII char - put into stirng as is
                 $output[$out_len] = $v;
                 ++$out_len;
                 if ('add' == $mode) {
@@ -3123,23 +3136,29 @@ 
                 }
                 continue;
             }
-            if ('next' == $mode) { // Try to find the next start byte; determine the width of the Unicode char
+            if ('next' == $mode) {
+// Try to find the next start byte; determine the width of the Unicode char
                 $start_byte = $v;
                 $mode = 'add';
                 $test = 'range';
-                if ($v >> 5 == 6) { // &110xxxxx 10xxxxx
+                if ($v >> 5 == 6) {
+// &110xxxxx 10xxxxx
                     $next_byte = 0; // Tells, how many times subsequent bitmasks must rotate 6bits to the left
                     $v = ($v - 192) << 6;
-                } elseif ($v >> 4 == 14) { // &1110xxxx 10xxxxxx 10xxxxxx
+                } elseif ($v >> 4 == 14) {
+// &1110xxxx 10xxxxxx 10xxxxxx
                     $next_byte = 1;
                     $v = ($v - 224) << 12;
-                } elseif ($v >> 3 == 30) { // &11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+                } elseif ($v >> 3 == 30) {
+// &11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
                     $next_byte = 2;
                     $v = ($v - 240) << 18;
-                } elseif ($v >> 2 == 62) { // &111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
+                } elseif ($v >> 2 == 62) {
+// &111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
                     $next_byte = 3;
                     $v = ($v - 248) << 24;
-                } elseif ($v >> 1 == 126) { // &1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
+                } elseif ($v >> 1 == 126) {
+// &1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
                     $next_byte = 4;
                     $v = ($v - 252) << 30;
                 } else {
@@ -3158,7 +3177,8 @@ 
                         throw new OutOfRangeException('Bogus UTF-8 character detected (out of legal range) at byte '.$k);
                     }
                 }
-                if ($v >> 6 == 2) { // Bit mask must be 10xxxxxx
+                if ($v >> 6 == 2) {
+// Bit mask must be 10xxxxxx
                     $v = ($v - 128) << ($next_byte * 6);
                     $output[($out_len - 1)] += $v;
                     --$next_byte;

htdocs/newdesc.php

Braces +4 added lines, -2 removed lines

@@ -51,7 +51,8 @@ 
                 $desc = isset($_POST['desc']) ? $_POST['desc'] : '';  // Ocprop
 
                 // read descMode; if not set, initialize from user profile
-                if (isset($_POST['descMode'])) {  // Ocprop
+                if (isset($_POST['descMode'])) {
+// Ocprop
                     $descMode = $_POST['descMode'] + 0;
                     if (($descMode < 1) || ($descMode > 3)) {
                         $descMode = 3;
@@ -89,7 +90,8 @@ 
                 $desc_lang_exists = false;
 
                 //save to db?
-                if (isset($_POST['submitform']) && $sel_lang != '0') {  // Ocprop
+                if (isset($_POST['submitform']) && $sel_lang != '0') {
+// Ocprop
                     //check if the entered language already exists
                     $desc_rs = sql(
                         "SELECT `id`

htdocs/adoptcache.php

Braces +2 added lines, -1 removed lines

@@ -61,7 +61,8 @@
     } else {
         showAdoptScreen($cacheid, $submit);
     }
-} else { // if ($action == 'listbyuser')
+} else {
+// if ($action == 'listbyuser')
     $tpl->assign('action', 'listbyuser');
     listRequestsByUserId();
 }

local/devel/style-cleanup.php

Braces +2 added lines, -1 removed lines

@@ -117,7 +117,8 @@
                             ++ $this->lines_modified;
                         }
                     }
-                    if (preg_match('/\<\?\s/', $line)) {   # relies on \n at EOL
+                    if (preg_match('/\<\?\s/', $line)) {
+# relies on \n at EOL
                         self::warn('short open tag in line ' . $n . ' of ' . $display_filepath);
                     }
                     ++ $n;

htdocs/xml/ocxml11.php

Braces +2 added lines, -1 removed lines

@@ -27,7 +27,8 @@
     $for_cachedesc,
     $html,
     $twolines = false
-) {
+)
+{
     global $opt, $translate;
 
     $ltext = "";