OpencachingDeutschland / oc-server3

htdocs/editdesc.php

Braces +14 added lines, -7 removed lines

@@ -19,9 +19,12 @@ 
     require $stylepath . '/editdesc.inc.php';
 
     // check for old-style parameters
-    if (isset($_REQUEST['cacheid']) && isset($_REQUEST['desclang']) && !isset($_REQUEST['descid']))  // Ocprop
+    if (isset($_REQUEST['cacheid']) && isset($_REQUEST['desclang']) && !isset($_REQUEST['descid'])) {
+        // Ocprop
     {
-        $cache_id = $_REQUEST['cacheid'];  // Ocprop
+        $cache_id = $_REQUEST['cacheid'];
+    }
+    // Ocprop
         $desc_lang = $_REQUEST['desclang'];  // Ocprop
 
         $rs = sql("SELECT `id` FROM `cache_desc` WHERE `cache_id`='&1' AND `language`='&2'", $cache_id, $desc_lang);
@@ -87,10 +90,13 @@ 
                 $show_all_langs = false;
 
                 //save to DB?
-                if (isset($_POST['post']))  // Ocprop
+                if (isset($_POST['post'])) {
+                    // Ocprop
                 {
                     //here we read all used information from the form if submitted
-                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;  // Ocprop
+                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;
+                }
+                // Ocprop
 
                     // fuer alte Versionen von OCProp
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -147,7 +153,8 @@ 
 
                     $desc = processEditorInput($oldDescMode, $descMode, $desc);
 
-                    if (isset($_POST['submitform']))  // Ocprop
+                    if (isset($_POST['submitform'])) {
+                        // Ocprop
                     {
                         // prüfen, ob sprache nicht schon vorhanden
                         $rs = sql(
@@ -160,6 +167,7 @@ 
                             $descid,
                             $desclang
                         );
+                    }
                         $r = sql_fetch_array($rs);
                         if ($r['count'] > 0) {
                             tpl_errorMsg('editdesc', $error_desc_exists);
@@ -224,8 +232,7 @@ 
 
                     if ($oldDescMode == 0) {
                         $desc = processEditorInput($oldDescMode, $descMode, $desc_record['desc']);
-                    }
-                    else {
+                    } else {
                         $desc = $desc_record['desc'];
                     }
                 }

htdocs/resource2/tinymce/config/log.js.php

Braces +1 added lines, -2 removed lines

@@ -1,8 +1,7 @@
 <?php
   if (isset($_REQUEST['lang'])) {
     $lang = $_REQUEST['lang'];
-  }
-  else {
+  } else {
     $lang = 'de';
   }
 ?>

htdocs/resource2/tinymce/config/desc.js.php

Braces +2 added lines, -4 removed lines

@@ -1,14 +1,12 @@
 <?php
   if (isset($_REQUEST['cacheid'])) {
     $cacheID = $_REQUEST['cacheid'];
-  }
-  else {
+  } else {
     $cacheID = 0;
   }
   if (isset($_REQUEST['lang'])) {
     $lang = $_REQUEST['lang'];
-  }
-  else {
+  } else {
     $lang = 'de';
   }
 ?>

htdocs/resource2/tinymce/config/user.js.php

Braces +6 added lines, -5 removed lines

@@ -1,9 +1,10 @@
 <?php
-  if (isset($_REQUEST['lang']))
-    $lang = $_REQUEST['lang'];
-  else
-    $lang = 'de';
-?>
+  if (isset($_REQUEST['lang'])) {
+      $lang = $_REQUEST['lang'];
+  } else {
+      $lang = 'de';
+  }
+  ?>
 
 tinyMCE_GZ.init({
     plugins : 'advhr,contextmenu,emotions,insertdatetime,paste,table',

htdocs/mailto.php

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
 $text = isset($_REQUEST['text']) ? $_REQUEST['text'] : '';
 if (isset($_REQUEST['emailaddress'])) {
     $bEmailaddress = ($_REQUEST['emailaddress'] == 1);
-}
-else {
+} else {
     $own_user = new user($login->userid);
     $bEmailaddress = $own_user->getUsermailSendAddress();
 }

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/lib2/db.inc.php

Braces +3 added lines, -2 removed lines

@@ -894,8 +894,9 @@
     }
 
     if ($db['dblink_slave'] !== false) {
-        if (mysql_select_db($opt['db']['placeholder']['db'], $db['dblink_slave']) == false)
-            sql_error();
+        if (mysql_select_db($opt['db']['placeholder']['db'], $db['dblink_slave']) == false) {
+                    sql_error();
+        }
 
         mysql_query("SET NAMES '" . mysql_real_escape_string($opt['charset']['mysql'], $db['dblink_slave']) . "'", $db['dblink_slave']);
 

htdocs/okapi/services/replicate/changelog.php

Braces +9 added lines, -4 removed lines

@@ -29,13 +29,18 @@
         require_once('replicate_common.inc.php');
 
         $since = $request->get_parameter('since');
-        if ($since === null) throw new ParamMissing('since');
-        if ((int)$since != $since) throw new InvalidParam('since');
+        if ($since === null) {
+            throw new ParamMissing('since');
+        }
+        if ((int)$since != $since) {
+            throw new InvalidParam('since');
+        }
 
         # Let's check the $since parameter.
 
-        if (!ReplicateCommon::check_since_param($since))
-            throw new BadRequest("The 'since' parameter is too old. You must update your database more frequently.");
+        if (!ReplicateCommon::check_since_param($since)) {
+                    throw new BadRequest("The 'since' parameter is too old. You must update your database more frequently.");
+        }
 
         # Select a best chunk for the given $since, get the chunk from the database (or cache).