OpencachingDeutschland / oc-server3

htdocs/translate.php

Switch Indentation +100 added lines, -100 removed lines

@@ -86,69 +86,69 @@ 
 }
 
 switch ($action) {
-    case 'selectlang':
-        break;
+        case 'selectlang':
+            break;
 
-    case 'verify':
-        verify();
-        break;
+        case 'verify':
+            verify();
+            break;
 
-    case 'resetids':
-        resetIds();
-        break;
+        case 'resetids':
+            resetIds();
+            break;
 
-    case 'clearcache':
-        clearCache();
-        break;
+        case 'clearcache':
+            clearCache();
+            break;
 
-    case 'export':
-        export();
-        break;
+        case 'export':
+            export();
+            break;
 
-    case 'xmlexport':
-        xmlexport();
-        break;
+        case 'xmlexport':
+            xmlexport();
+            break;
 
-    case 'xmlimport':
-        break;
+        case 'xmlimport':
+            break;
 
-    case 'xmlimport2':
-        xmlimport2();
-        break;
+        case 'xmlimport2':
+            xmlimport2();
+            break;
 
-    case 'xmlimport3':
-        xmlimport3();
-        break;
+        case 'xmlimport3':
+            xmlimport3();
+            break;
 
-    case 'textexportnew':
-        textexport($translang, false);
-        break;
+        case 'textexportnew':
+            textexport($translang, false);
+            break;
 
-    case 'textexportall':
-        textexport($translang, true);
-        break;
+        case 'textexportall':
+            textexport($translang, true);
+            break;
 
-    case 'textimport':
-        break;
+        case 'textimport':
+            break;
 
-    case 'textimport2':
-        textimport($translang);
-        break;
+        case 'textimport2':
+            textimport($translang);
+            break;
 
-    case 'edit':
-        if (!$access->mayTranslate($translang)) {
-            $tpl->error(ERROR_NO_ACCESS);
-        }
-        edit();
-        break;
+        case 'edit':
+            if (!$access->mayTranslate($translang)) {
+                $tpl->error(ERROR_NO_ACCESS);
+            }
+            edit();
+            break;
 
-    case 'copy_en':
-        copy_english_texts();
-        break;
+        case 'copy_en':
+            copy_english_texts();
+            break;
 
-    case 'listfaults':
-        $trans = sql(
-            "SELECT
+        case 'listfaults':
+            $trans = sql(
+                "SELECT
                 `sys_trans`.`id`,
                 `sys_trans`.`text`
              FROM `sys_trans`
@@ -156,14 +156,14 @@ 
                 ON `sys_trans`.`id`=`sys_trans_ref`.`trans_id`
              WHERE ISNULL(`sys_trans_ref`.`trans_id`)
              ORDER BY `sys_trans`.`id` DESC"
-        );
-        $tpl->assign_rs('trans', $trans);
-        sql_free_result($trans);
-        break;
+            );
+            $tpl->assign_rs('trans', $trans);
+            sql_free_result($trans);
+            break;
 
-    case 'listall':
-        $trans = sql(
-            "SELECT
+        case 'listall':
+            $trans = sql(
+                "SELECT
                 `sys_trans`.`id`,
                 `sys_trans`.`text`,
                 `sys_trans_text`.`text` AS `trans`
@@ -172,48 +172,48 @@ 
                 ON `sys_trans`.`id`=`sys_trans_text`.`trans_id`
                 AND `sys_trans_text`.`lang`='&1'
              ORDER BY `sys_trans`.`id` DESC",
-            $translang
-        );
-        $tpl->assign_rs('trans', $trans);
-        sql_free_result($trans);
-        break;
+                $translang
+            );
+            $tpl->assign_rs('trans', $trans);
+            sql_free_result($trans);
+            break;
 
-    case 'remove':
-        if (!$access->mayTranslate($translang)) {
-            $tpl->error(ERROR_NO_ACCESS);
-        }
-        remove();
-        break;
-
-    case 'scan':
-        scan();
-        break;
-
-    case 'scanstart':
-        scanStart();
-        break;
-
-    case 'scanfile':
-        $filename = isset($_REQUEST['filename']) ? $_REQUEST['filename'] : '';
-        scanFile($filename);
-        exit;
-
-    case 'quicknone':
-        $cookie->un_set('translate_mode');
-        break;
-
-    case 'quicknew':
-        $cookie->set('translate_mode', 'new');
-        break;
-
-    case 'quickall':
-        $cookie->set('translate_mode', 'all');
-        break;
-
-    default:
-        $action = 'listnew';
-        $trans = sql(
-            "SELECT DISTINCT
+        case 'remove':
+            if (!$access->mayTranslate($translang)) {
+                $tpl->error(ERROR_NO_ACCESS);
+            }
+            remove();
+            break;
+
+        case 'scan':
+            scan();
+            break;
+
+        case 'scanstart':
+            scanStart();
+            break;
+
+        case 'scanfile':
+            $filename = isset($_REQUEST['filename']) ? $_REQUEST['filename'] : '';
+            scanFile($filename);
+            exit;
+
+        case 'quicknone':
+            $cookie->un_set('translate_mode');
+            break;
+
+        case 'quicknew':
+            $cookie->set('translate_mode', 'new');
+            break;
+
+        case 'quickall':
+            $cookie->set('translate_mode', 'all');
+            break;
+
+        default:
+            $action = 'listnew';
+            $trans = sql(
+                "SELECT DISTINCT
                 `sys_trans`.`id`,
                 `sys_trans`.`text`
              FROM `sys_trans`
@@ -224,10 +224,10 @@ 
                 ON `sys_trans`.`id`=`sys_trans_ref`.`trans_id`
              WHERE ISNULL(`sys_trans_text`.`trans_id`) OR `sys_trans_text`.`text`=''
              ORDER BY `sys_trans`.`id` DESC",
-            $translang
-        );
-        $tpl->assign_rs('trans', $trans);
-        sql_free_result($trans);
+                $translang
+            );
+            $tpl->assign_rs('trans', $trans);
+            sql_free_result($trans);
 }
 
 $languages = [];

htdocs/lib2/Net/IDNA2.php

Switch Indentation +79 added lines, -79 removed lines

@@ -2273,38 +2273,38 @@ 
 
         foreach ($option as $k => $v) {
             switch ($k) {
-            case 'encoding':
-                switch ($v) {
-                case 'utf8':
-                case 'ucs4_string':
-                case 'ucs4_array':
-                    $this->_api_encoding = $v;
-                    break;
+                case 'encoding':
+                    switch ($v) {
+                        case 'utf8':
+                        case 'ucs4_string':
+                        case 'ucs4_array':
+                            $this->_api_encoding = $v;
+                            break;
 
-                default:
-                    throw new InvalidArgumentException('Set Parameter: Unknown parameter '.$v.' for option '.$k);
-                }
+                        default:
+                            throw new InvalidArgumentException('Set Parameter: Unknown parameter '.$v.' for option '.$k);
+                    }
 
                 break;
 
-            case 'overlong':
-                $this->_allow_overlong = ($v) ? true : false;
-                break;
+                case 'overlong':
+                    $this->_allow_overlong = ($v) ? true : false;
+                    break;
 
-            case 'strict':
-                $this->_strict_mode = ($v) ? true : false;
-                break;
+                case 'strict':
+                    $this->_strict_mode = ($v) ? true : false;
+                    break;
 
-            case 'version':
-                if (in_array($v, array('2003', '2008'))) {
-                    $this->_version = $v;
-                } else {
-                    throw new InvalidArgumentException('Set Parameter: Invalid parameter '.$v.' for option '.$k);
-                }
-                break;
+                case 'version':
+                    if (in_array($v, array('2003', '2008'))) {
+                        $this->_version = $v;
+                    } else {
+                        throw new InvalidArgumentException('Set Parameter: Invalid parameter '.$v.' for option '.$k);
+                    }
+                    break;
 
-            default:
-                return false;
+                default:
+                    return false;
             }
         }
 
@@ -2328,15 +2328,15 @@ 
         // Forcing conversion of input to UCS4 array
         // If one time encoding is given, use this, else the objects property
         switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
-        case 'utf8':
-            $decoded = $this->_utf8_to_ucs4($decoded);
-            break;
-        case 'ucs4_string':
-            $decoded = $this->_ucs4_string_to_ucs4($decoded);
-        case 'ucs4_array': // No break; before this line. Catch case, but do nothing
-            break;
-        default:
-            throw new InvalidArgumentException('Unsupported input format');
+            case 'utf8':
+                $decoded = $this->_utf8_to_ucs4($decoded);
+                break;
+            case 'ucs4_string':
+                $decoded = $this->_ucs4_string_to_ucs4($decoded);
+            case 'ucs4_array': // No break; before this line. Catch case, but do nothing
+                break;
+            default:
+                throw new InvalidArgumentException('Unsupported input format');
         }
 
         // No input, no output, what else did you expect?
@@ -2350,35 +2350,35 @@ 
         foreach ($decoded as $k => $v) {
             // Make sure to use just the plain dot
             switch($v) {
-            case 0x3002:
-            case 0xFF0E:
-            case 0xFF61:
-                $decoded[$k] = 0x2E;
-                // It's right, no break here
-                // The codepoints above have to be converted to dots anyway
-
-            // Stumbling across an anchoring character
-            case 0x2E:
-            case 0x2F:
-            case 0x3A:
-            case 0x3F:
-            case 0x40:
-                // Neither email addresses nor URLs allowed in strict mode
-                if ($this->_strict_mode) {
-                    throw new InvalidArgumentException('Neither email addresses nor URLs are allowed in strict mode.');
-                }
-                // Skip first char
-                if ($k) {
-                    $encoded = '';
-                    $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin)));
-                    if ($encoded) {
-                        $output .= $encoded;
-                    } else {
-                        $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                case 0x3002:
+                case 0xFF0E:
+                case 0xFF61:
+                    $decoded[$k] = 0x2E;
+                    // It's right, no break here
+                    // The codepoints above have to be converted to dots anyway
+
+                // Stumbling across an anchoring character
+                case 0x2E:
+                case 0x2F:
+                case 0x3A:
+                case 0x3F:
+                case 0x40:
+                    // Neither email addresses nor URLs allowed in strict mode
+                    if ($this->_strict_mode) {
+                        throw new InvalidArgumentException('Neither email addresses nor URLs are allowed in strict mode.');
                     }
-                    $output .= chr($decoded[$k]);
-                }
-                $last_begin = $k + 1;
+                    // Skip first char
+                    if ($k) {
+                        $encoded = '';
+                        $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                        if ($encoded) {
+                            $output .= $encoded;
+                        } else {
+                            $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                        }
+                        $output .= chr($decoded[$k]);
+                    }
+                    $last_begin = $k + 1;
             }
         }
         // Catch the rest of the string
@@ -2416,12 +2416,12 @@ 
         // Optionally set
         if ($one_time_encoding) {
             switch ($one_time_encoding) {
-            case 'utf8':
-            case 'ucs4_string':
-            case 'ucs4_array':
-                break;
-            default:
-                throw new InvalidArgumentException('Unknown encoding '.$one_time_encoding);
+                case 'utf8':
+                case 'ucs4_string':
+                case 'ucs4_array':
+                    break;
+                default:
+                    throw new InvalidArgumentException('Unknown encoding '.$one_time_encoding);
             }
         }
         // Make sure to drop any newline characters around
@@ -2473,17 +2473,17 @@ 
         // The output is UTF-8 by default, other output formats need conversion here
         // If one time encoding is given, use this, else the objects property
         switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
-        case 'utf8':
-            return $return;
-            break;
-        case 'ucs4_string':
-            return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
-            break;
-        case 'ucs4_array':
-            return $this->_utf8_to_ucs4($return);
-            break;
-        default:
-            throw new InvalidArgumentException('Unsupported output format');
+            case 'utf8':
+                return $return;
+                break;
+            case 'ucs4_string':
+                return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
+                break;
+            case 'ucs4_array':
+                return $this->_utf8_to_ucs4($return);
+                break;
+            default:
+                throw new InvalidArgumentException('Unsupported output format');
         }
     }
 

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/ignore.php

Switch Indentation +6 added lines, -6 removed lines

@@ -29,12 +29,12 @@
 }
 
 switch ($action) {
-    case 'addignore':
-        sql("INSERT IGNORE INTO `cache_ignore` (`cache_id`, `user_id`) VALUES ('&1', '&2')", $cache_id, $login->userid);
-        break;
-    case 'removeignore':
-        sql("DELETE FROM `cache_ignore` WHERE `cache_id`='&1' AND `user_id`='&2'", $cache_id, $login->userid);
-        break;
+        case 'addignore':
+            sql("INSERT IGNORE INTO `cache_ignore` (`cache_id`, `user_id`) VALUES ('&1', '&2')", $cache_id, $login->userid);
+            break;
+        case 'removeignore':
+            sql("DELETE FROM `cache_ignore` WHERE `cache_id`='&1' AND `user_id`='&2'", $cache_id, $login->userid);
+            break;
 }
 
 // clear cached map result, so that the change directly appears on the map

htdocs/search.php

Braces +24 added lines, -12 removed lines

@@ -84,7 +84,8 @@ 
 $called_by_search = isset($_REQUEST['calledbysearch']) ? $_REQUEST['calledbysearch'] <> 0 : true;
 $called_by_profile_query = false;
 
-if (isset($_REQUEST['queryid']) || isset($_REQUEST['showresult'])) {  // Ocprop: showresult, queryid
+if (isset($_REQUEST['queryid']) || isset($_REQUEST['showresult'])) {
+// Ocprop: showresult, queryid
     $bCookieQueryid = false;
     $queryid = isset($_REQUEST['queryid']) ? $_REQUEST['queryid'] : 0;
     if ($queryid &&
@@ -208,7 +209,8 @@ 
             sql_free_result($rs_name);
         }
     }
-} else {  // $queryid == 0
+} else {
+// $queryid == 0
     // build search options from GET/POST parameters or default values
 
     // hack
@@ -287,12 +289,14 @@ 
         if (!isset($_REQUEST['utf8'])) {
             $options['cachename'] = iconv("ISO-8859-1", "UTF-8", $options['cachename']);
         }
-    } elseif (isset($_REQUEST['searchbyowner'])) { // Ocprop
+    } elseif (isset($_REQUEST['searchbyowner'])) {
+// Ocprop
         $options['searchtype'] = 'byowner';
 
         $options['ownerid'] = isset($_REQUEST['ownerid']) ? $_REQUEST['ownerid'] : 0;
         $options['owner'] = isset($_REQUEST['owner']) ? stripslashes($_REQUEST['owner']) : '';
-    } elseif (isset($_REQUEST['searchbyfinder'])) { // Ocprop
+    } elseif (isset($_REQUEST['searchbyfinder'])) {
+// Ocprop
         $options['searchtype'] = 'byfinder';
 
         $options['finderid'] = isset($_REQUEST['finderid']) ? $_REQUEST['finderid'] : 0;
@@ -437,7 +441,8 @@ 
 $bRememberQuery = isset($_REQUEST['skipqueryid']) ? !$_REQUEST['skipqueryid'] : true;
 // This is used by the map, which implements its own query-caching.
 if ($bRememberQuery) {
-    if ($queryid == 0 && $options['showresult'] != 0) { // 'showresult' = "execute query"
+    if ($queryid == 0 && $options['showresult'] != 0) {
+// 'showresult' = "execute query"
         sql(
             "INSERT INTO `queries` (`user_id`, `options`, `last_queried`) VALUES (0, '&1', NOW())",
             serialize($options)
@@ -854,7 +859,8 @@ 
                 outputSearchForm($options);
                 exit;
             }
-        } elseif ($options['searchtype'] == 'bydistance') { // Ocprop
+        } elseif ($options['searchtype'] == 'bydistance') {
+// Ocprop
             //check the entered data
             if (isset($options['lat']) && isset($options['lon'])) {
                 $lat = $options['lat'] + 0;
@@ -924,7 +930,8 @@ 
             $sql_innerjoin[] = '`cache_logs` ON `caches`.`cache_id`=`cache_logs`.`cache_id`';
             $sql_where[] = '`cache_logs`.`user_id`=\'' . sql_escape($finder_id) . '\'';
 
-            if ($options['logtype'] != '0') { // 0 = all types
+            if ($options['logtype'] != '0') {
+// 0 = all types
                 $ids = explode(',', $options['logtype']);
                 $idNumbers = '0';
                 foreach ($ids as $id) {
@@ -1405,7 +1412,8 @@ 
     }
 
     $count = $caches_per_page;
-    if (isset($_REQUEST['count'])) { // Ocprop
+    if (isset($_REQUEST['count'])) {
+// Ocprop
         $count = floor($_REQUEST['count'] + 0);
     }
     if ($count == 'max') {
@@ -1525,7 +1533,8 @@ 
     } else {
         exit;
     }
-} else { // $options['showresult'] == 0
+} else {
+// $options['showresult'] == 0
     //=============================================================
     //  F5. present search options form to the user
     //=============================================================
@@ -1597,7 +1606,8 @@ 
 
     if (isset($options['sort'])) {
         $bBynameChecked = ($options['sort'] == 'byname');
-    } else { // Ocprop
+    } else {
+// Ocprop
         $bBynameChecked = (!$login->logged_in());
     }
     $tpl->assign('byname_checked', $bBynameChecked);
@@ -1759,7 +1769,8 @@ 
     }
     if ($options['searchtype'] == 'bydistance') {
         $dByDistanceChecked = ($options['searchtype'] == 'bydistance');
-    } else { // Ocprop
+    } else {
+// Ocprop
         $dByDistanceChecked = false;
     }
     $tpl->assign('dbydistance_checked', $dByDistanceChecked);
@@ -1800,7 +1811,8 @@ 
     );
     if ($options['searchtype'] == 'bywaypoint') {
         $dByWaypointChecked = ($options['searchtype'] == 'bywaypoint');
-    } else { // Ocprop
+    } else {
+// Ocprop
         $dByWaypointChecked = false;
     }
     $tpl->assign('dbywaypoint_checked', $dByWaypointChecked);

htdocs/editlog.php

Braces +4 added lines, -2 removed lines

@@ -24,7 +24,8 @@ 
 if ($error == false) {
     //logid
     $log_id = 0;
-    if (isset($_REQUEST['logid'])) { // Ocprop
+    if (isset($_REQUEST['logid'])) {
+// Ocprop
         $log_id = $_REQUEST['logid'];
     }
 
@@ -273,7 +274,8 @@ 
                 }
 
                 //store?
-                if ($date_ok && $logtype_ok && $pw_ok && isset($_POST['submitform'])) { // Ocprop
+                if ($date_ok && $logtype_ok && $pw_ok && isset($_POST['submitform'])) {
+// Ocprop
                     // 00:00:01 = "00:00 was logged"
                     // 00:00:00 = "no time was logged"
                     if ("$log_time_hour$log_time_minute" != "" &&

htdocs/lang/de/ocstyle/lib/menu.php

Braces +2 added lines, -1 removed lines

@@ -423,7 +423,8 @@
 {
     global $menu;
 
-    if ($mainmenuindex >= 0) { // is -1 e.g. when calling newcache.php as logged-off-user (-> login.tpl.php)
+    if ($mainmenuindex >= 0) {
+// is -1 e.g. when calling newcache.php as logged-off-user (-> login.tpl.php)
         echo htmlspecialchars(t($menu[$mainmenuindex]['menustring']), ENT_COMPAT, 'UTF-8');
 
         if (isset($menu[$mainmenuindex]['submenu']) && ($menu[$mainmenuindex]['siteid'] != $pageid)) {

htdocs/picture.php

Braces +10 added lines, -5 removed lines

@@ -34,10 +34,12 @@ 
 
 $uuid = isset($_REQUEST['uuid']) ? $_REQUEST['uuid'] : 0;
 
-if ($action == 'add') { // Ocprop
+if ($action == 'add') {
+// Ocprop
     $picture = new picture();
 
-    if (isset($_REQUEST['cacheuuid'])) {  // Ocprop
+    if (isset($_REQUEST['cacheuuid'])) {
+// Ocprop
         $cache = cache::fromUUID($_REQUEST['cacheuuid']);
         if ($cache === null) {
             $tpl->error(ERROR_CACHE_NOT_EXISTS);
@@ -51,7 +53,8 @@ 
         $picture->setObjectType(OBJECT_CACHE);
 
         $cache = null;
-    } elseif (isset($_REQUEST['loguuid'])) {// Ocprop
+    } elseif (isset($_REQUEST['loguuid'])) {
+// Ocprop
         $cachelog = cachelog::fromUUID($_REQUEST['loguuid']);
         if ($cachelog === null) {
             $tpl->error(ERROR_CACHELOG_NOT_EXISTS);
@@ -72,7 +75,8 @@ 
     }
 
     // uploaded file ok?
-    if (isset($_REQUEST['ok'])) { // Ocprop
+    if (isset($_REQUEST['ok'])) {
+// Ocprop
         $bError = false;
 
         $picture->setSpoiler(isset($_REQUEST['spoiler']) && $_REQUEST['spoiler'] == '1');  // Ocprop
@@ -92,7 +96,8 @@ 
             $tpl->redirect($picture->getPageLink());
         }
 
-        if (!isset($_FILES['file'])) { // Ocprop
+        if (!isset($_FILES['file'])) {
+// Ocprop
             $tpl->assign('errorfile', ERROR_UPLOAD_ERR_NO_FILE);
             $bError = true;
         } elseif ($_FILES['file']['error'] == UPLOAD_ERR_NO_FILE) {

htdocs/restorecaches.php

Braces +10 added lines, -5 removed lines

@@ -757,7 +757,8 @@ 
                 $cacheid,
                 $rdate
             );
-            if ($r = sql_fetch_assoc($rs)) { // should always be true ...
+            if ($r = sql_fetch_assoc($rs)) {
+// should always be true ...
                 if (!$simulate) {
                     sql(
                         "UPDATE `caches` SET `latitude`='&1', `longitude`='&2' WHERE `cache_id`='&3'",
@@ -790,7 +791,8 @@ 
                 $cacheid,
                 $rdate
             );
-            if ($r = sql_fetch_assoc($rs)) { // should always be true ...
+            if ($r = sql_fetch_assoc($rs)) {
+// should always be true ...
                 if (!$simulate) {
                     sql(
                         "UPDATE `caches` SET `country`='&1'  WHERE `cache_id`='&2'",
@@ -827,7 +829,8 @@ 
             'wp_nc' => 'waypoints'
         ];
 
-        if ($r = sql_fetch_assoc($rs)) {// can be false
+        if ($r = sql_fetch_assoc($rs)) {
+// can be false
             $setfields = "";
             foreach ($fields as $field => $ropt) {
                 if (in_array($ropt, $roptions) && $r[$field] != $cache[$field]) {
@@ -896,13 +899,15 @@ 
 
             while ($r = sql_fetch_assoc($rs)) {
                 if (!$simulate) {
-                    if ($r['desc'] === null) { // was newly created -> delete
+                    if ($r['desc'] === null) {
+// was newly created -> delete
                         sql(
                             "DELETE FROM `cache_desc` WHERE `cache_id`='&1' AND `language`='&2'",
                             $cacheid,
                             $r['language']
                         );
-                    } else {// id, uuid, date_created and last_modified are set automatically
+                    } else {
+// id, uuid, date_created and last_modified are set automatically
                         sql(
                             "INSERT INTO `cache_desc`
                             (`node`, `cache_id`, `language`, `desc`, `desc_html`, `desc_htmledit`, `hint`, `short_desc`)

htdocs/util2/gns/gns_import.php

Braces +2 added lines, -1 removed lines

@@ -44,7 +44,8 @@
     $file = fopen($filename, "r");
     $cnt = 0;
     while ($line = fgets($file, 4096)) {
-        if ($cnt ++ == 0) {// skip first line
+        if ($cnt ++ == 0) {
+// skip first line
             continue;
         }