OpencachingDeutschland / oc-server3

htdocs/okapi/views/devel/comparator.inc.php

Braces +75 added lines, -74 removed lines

@@ -131,8 +131,7 @@ 
         if (is_array($this->config['updateTypes']))
         {
             $updateActions = $this->config['updateTypes'];
-        }
-        else
+        } else
         {
             $updateActions = array_map('trim', explode(',', $this->config['updateTypes']));
         }
@@ -146,15 +145,13 @@ 
                 {
                     $result[$table] = $info;
                 }
-            }
-            elseif ($info['destOrphan'])
+            } elseif ($info['destOrphan'])
             {
                 if (in_array('drop', $updateActions))
                 {
                     $result[$table] = $info;
                 }
-            }
-            elseif($info['differs'])
+            } elseif($info['differs'])
             {
                 $resultInfo = $info;
                 unset($resultInfo['differs']);
@@ -163,12 +160,10 @@ 
                     if (empty($diff['dest']) && in_array('add', $updateActions))
                     {
                         $resultInfo['differs'][] = $diff;
-                    }
-                    elseif (empty($diff['source']) && in_array('remove', $updateActions))
+                    } elseif (empty($diff['source']) && in_array('remove', $updateActions))
                     {
                         $resultInfo['differs'][] = $diff;
-                    }
-                    elseif(in_array('modify', $updateActions))
+                    } elseif(in_array('modify', $updateActions))
                     {
                         $resultInfo['differs'][] = $diff;
                     }
@@ -198,12 +193,10 @@ 
             if ($info['sourceOrphan'])
             {
                 $result['sourceOrphans'][] = $table;
-            }
-            elseif ($info['destOrphan'])
+            } elseif ($info['destOrphan'])
             {
                 $result['destOrphans'][] = $table;
-            }
-            else
+            } else
             {
                 $result['different'][] = $table;
             }
@@ -245,12 +238,10 @@ 
             if(in_array($tab, $destOrphans))
             {
                 $info['destOrphan'] = true;
-            }
-            elseif (in_array($tab, $sourceOrphans))
+            } elseif (in_array($tab, $sourceOrphans))
             {
                 $info['sourceOrphan'] = true;
-            }
-            else
+            } else
             {
                 $destSql = $this->getTabSql($this->destStruct, $tab, true);
                 $sourceSql = $this->getTabSql($this->sourceStruct, $tab, true);
@@ -259,12 +250,15 @@ 
                 {
                     trigger_error('[WARNING] error parsing definition of table "'.$tab.'" - skipped');
                     continue;
-                }
-                elseif (!empty($diffs))//not empty array
+                } elseif (!empty($diffs)) {
+                    //not empty array
                 {
                     $info['differs'] = $diffs;
                 }
-                else continue;//empty array
+                } else {
+                    continue;
+                }
+                //empty array
             }
             $result[$tab] = $info;
         }
@@ -281,10 +275,12 @@ 
         $result = array();
         if (preg_match_all('/CREATE(?:\s*TEMPORARY)?\s*TABLE\s*(?:IF NOT EXISTS\s*)?(?:`?(\w+)`?\.)?`?(\w+)`?/i', $struct, $m))
         {
-            foreach($m[2] as $match)//m[1] is a database name if any
+            foreach($m[2] as $match) {
+                //m[1] is a database name if any
             {
                 $result[] = $match;
             }
+            }
         }
         return $result;
     }
@@ -312,8 +308,7 @@ 
             if ($end === false)
             {
                 $result = substr($struct, $start);
-            }
-            else
+            } else
             {
                 $result = substr($struct, $start, $end-$start);//already without ';'
             }
@@ -390,9 +385,11 @@ 
         $result = array();
         //split with comma delimiter, not line breaks
         $sourceParts =  $this->splitTabSql($sourceSql);
-        if ($sourceParts===false)//error parsing sql
+        if ($sourceParts===false) {
+            //error parsing sql
         {
             trigger_error('[WARNING] error parsing source sql');
+        }
             return false;
         }
         $destParts = $this->splitTabSql($destSql);
@@ -406,13 +403,17 @@ 
         foreach($sourceParts as $line)
         {
             $lineInfo = $this->processLine($line);
-            if (!$lineInfo) continue;
+            if (!$lineInfo) {
+                continue;
+            }
             $sourcePartsIndexed[$lineInfo['key']] = $lineInfo['line'];
         }
         foreach($destParts as $line)
         {
             $lineInfo = $this->processLine($line);
-            if (!$lineInfo) continue;
+            if (!$lineInfo) {
+                continue;
+            }
             $destPartsIndexed[$lineInfo['key']] = $lineInfo['line'];
         }
         $sourceKeys = array_keys($sourcePartsIndexed);
@@ -432,17 +433,16 @@ 
             if ($sourceOrphan)
             {
                 $info['source'] = $sourcePartsIndexed[$key];
-            }
-            elseif ($destOrphan)
+            } elseif ($destOrphan)
             {
                 $info['dest'] = $destPartsIndexed[$key];
-            }
-            elseif ($different)
+            } elseif ($different)
             {
                 $info['source'] = $sourcePartsIndexed[$key];
                 $info['dest'] = $destPartsIndexed[$key];
+            } else {
+                continue;
             }
-            else continue;
             $result[] = $info;
         }
         return $result;
@@ -461,20 +461,25 @@ 
         $options = $this->config;
         $result = array('key'=>'', 'line'=>'');
         $line = rtrim(trim($line), ',');
-        if (preg_match('/^(CREATE\s+TABLE)|(\) ENGINE=)/i', $line))//first or last table definition line
+        if (preg_match('/^(CREATE\s+TABLE)|(\) ENGINE=)/i', $line)) {
+            //first or last table definition line
         {
             return false;
         }
+        }
         //if (preg_match('/^(PRIMARY KEY)|(((UNIQUE )|(FULLTEXT ))?KEY `?\w+`?)/i', $line, $m))//key definition
-        if (preg_match('/^(PRIMARY\s+KEY)|(((UNIQUE\s+)|(FULLTEXT\s+))?KEY\s+`?\w+`?)/i', $line, $m))//key definition
+        if (preg_match('/^(PRIMARY\s+KEY)|(((UNIQUE\s+)|(FULLTEXT\s+))?KEY\s+`?\w+`?)/i', $line, $m)) {
+            //key definition
         {
             $key = $m[0];
         }
-        elseif (preg_match('/^`?\w+`?/i', $line, $m))//field definition
+        } elseif (preg_match('/^`?\w+`?/i', $line, $m)) {
+            //field definition
         {
-            $key = '!'.$m[0];//to make sure fields will be synchronised before the keys
+            $key = '!'.$m[0];
         }
-        else
+        //to make sure fields will be synchronised before the keys
+        } else
         {
             return false;//line has no valuable info (empty or comment)
         }
@@ -514,13 +519,16 @@ 
         }
         foreach($diff as $tab=>$info)
         {
-            if ($info['sourceOrphan'])//delete it
+            if ($info['sourceOrphan']) {
+                //delete it
             {
                 $sqls[] = 'DROP TABLE `'.$tab.'`';
             }
-            elseif ($info['destOrphan'])//create destination table in source
+            } elseif ($info['destOrphan']) {
+                //create destination table in source
             {
                 $database = '';
+            }
                 $destSql = $this->getTabSql($this->destStruct, $tab, $database);
                 if (!empty($options['ignoreIncrement']))
                 {
@@ -535,8 +543,7 @@ 
                     $destSql = preg_replace('/(CREATE(?:\s*TEMPORARY)?\s*TABLE\s*)(?:IF\sNOT\sEXISTS\s*)?(`?\w+`?)/i', '$1IF NOT EXISTS $2', $destSql);
                 }
                 $sqls[] = $destSql;
-            }
-            else
+            } else
             {
                 foreach($info['differs'] as $finfo)
                 {
@@ -546,13 +553,11 @@ 
                     {
                         $sql = $finfo['source'];
                         $action = 'drop';
-                    }
-                    elseif ($inDest && !$inSource)
+                    } elseif ($inDest && !$inSource)
                     {
                         $sql = $finfo['dest'];
                         $action = 'add';
-                    }
-                    else
+                    } else
                     {
                         $sql = $finfo['dest'];
                         $action = 'modify';
@@ -590,8 +595,7 @@ 
                     if ($type=='primary')
                     {
                         $result.= 'DROP PRIMARY KEY';
-                    }
-                    else
+                    } else
                     {
                         $result.= 'DROP INDEX `'.$name.'`';
                     }
@@ -600,12 +604,10 @@ 
                     if ($type=='primary')
                     {
                         $result.= 'ADD PRIMARY KEY '.$fields;
-                    }
-                    elseif ($type=='')
+                    } elseif ($type=='')
                     {
                         $result.= 'ADD INDEX `'.$name.'` '.$fields;
-                    }
-                    else
+                    } else
                     {
                         $result .='ADD '.strtoupper($type).' `'.$name.'` '.$fields;//fulltext or unique
                     }
@@ -614,20 +616,17 @@ 
                     if ($type=='primary')
                     {
                         $result.='DROP PRIMARY KEY, ADD PRIMARY KEY '.$fields;
-                    }
-                    elseif ($type=='')
+                    } elseif ($type=='')
                     {
                         $result.='DROP INDEX `'.$name.'`, ADD INDEX `'.$name.'` '.$fields;
-                    }
-                    else
+                    } else
                     {
                         $result.='DROP INDEX `'.$name.'`, ADD '.strtoupper($type).' `'.$name.'` '.$fields;//fulltext or unique
                     }
                 break;
 
             }
-        }
-        else //fields operations
+        } else //fields operations
         {
             $sql = rtrim(trim($sql), ',');
             $result.= strtoupper($action);
@@ -635,8 +634,7 @@ 
             {
                 $spacePos = strpos($sql, ' ');
                 $result.= ' '.substr($sql, 0, $spacePos);
-            }
-            else
+            } else
             {
                 $result.= ' '.$sql;
             }
@@ -660,8 +658,7 @@ 
         if ($skipInBrackets)
         {
             $reg.='(\(|\))|';
-        }
-        else
+        } else
         {
             $reg.='()';
         }
@@ -686,47 +683,51 @@ 
                 continue;//here we could also simplify regexp
             }
 
-            if (!empty($m[7][0]))// ';' found
+            if (!empty($m[7][0])) {
+                // ';' found
             {
                 if (empty($stack))
                 {
                     return $m[7][1];
-                }
-                else
+            }
+                } else
                 {
                     //var_dump($stack, substr($string, $offset-strlen($m[0][0])));
                 }
             }
-            if (!empty($m[6][0]))// '(' or ')' found
+            if (!empty($m[6][0])) {
+                // '(' or ')' found
             {
                 if (empty($stack) && $m[6][0]=='(')
                 {
                     array_push($stack, $m[6][0]);
-                }
-                elseif($m[6][0]==')' && end($stack)=='(')
+            }
+                } elseif($m[6][0]==')' && end($stack)=='(')
                 {
                     array_pop($stack);
                 }
-            }
-            elseif (!empty($m[1][0]))// ' or " found
+            } elseif (!empty($m[1][0])) {
+                // ' or " found
             {
                 if (end($stack)==$m[1][0])
                 {
                     array_pop($stack);
-                }
-                else
+            }
+                } else
                 {
                     array_push($stack, $m[1][0]);
                 }
-            }
-            elseif (!empty($m[2][0])) // opening comment / *
+            } elseif (!empty($m[2][0])) {
+                // opening comment / *
             {
                 array_push($stack, $m[2][0]);
             }
-            elseif (!empty($m[4][0])) // opening comment --
+            } elseif (!empty($m[4][0])) {
+                // opening comment --
             {
                 array_push($stack, $m[4][0]);
             }
+            }
         }
         return false;
     }

htdocs/okapi/views/method_call.php

Braces +3 added lines, -2 removed lines

@@ -20,9 +20,10 @@
     {
         require_once($GLOBALS['rootpath'].'okapi/service_runner.php');
 
-        if (!OkapiServiceRunner::exists($methodname))
-            throw new BadRequest("Method '$methodname' does not exist. ".
+        if (!OkapiServiceRunner::exists($methodname)) {
+                    throw new BadRequest("Method '$methodname' does not exist. ".
                 "See OKAPI docs at ".Settings::get('SITE_URL')."okapi/");
+        }
         $options = OkapiServiceRunner::options($methodname);
         $request = new OkapiHttpRequest($options);
         return OkapiServiceRunner::call($methodname, $request);

htdocs/okapi/views/tilestress.php

Braces +6 added lines, -3 removed lines

@@ -66,9 +66,12 @@
             }
 
             $tiles = array();
-            for ($xx=$x; $xx<$x+4; $xx++)
-                for ($yy=$y; $yy<$y+4; $yy++)
-                    $tiles[] = array($xx, $yy);
+            for ($xx=$x; $xx<$x+4; $xx++) {
+                            for ($yy=$y;
+            }
+            $yy<$y+4; $yy++) {
+                                    $tiles[] = array($xx, $yy);
+                }
             srand();
             shuffle($tiles);
 

htdocs/okapi/views/menu.inc.php

Braces +10 added lines, -8 removed lines

@@ -23,9 +23,10 @@ 
     public static function get_menu_html($current_path = null)
     {
         $chunks = array();
-        if (Okapi::$version_number)
-            $chunks[] = "<div class='revision'>ver. ".Okapi::$version_number.
+        if (Okapi::$version_number) {
+                    $chunks[] = "<div class='revision'>ver. ".Okapi::$version_number.
                 " (".substr(Okapi::$git_revision, 0, 7).")</div>";
+        }
         $chunks[] = "<div class='main'>";
         $chunks[] = self::link($current_path, "introduction.html", "Introduction");
         $chunks[] = self::link($current_path, "signup.html", "Sign up");
@@ -48,8 +49,9 @@ 
             $pos = strrpos($methodname, "/");
             $modulename = substr($methodname, 0, $pos);
             $method_short_name = substr($methodname, $pos + 1);
-            if (!isset($module_methods[$modulename]))
-                $module_methods[$modulename] = array();
+            if (!isset($module_methods[$modulename])) {
+                            $module_methods[$modulename] = array();
+            }
             $module_methods[$modulename][] = $method_short_name;
         }
         $modulenames = array_keys($module_methods);
@@ -59,8 +61,9 @@ 
         {
             $chunks[] = "<div class='module'>$modulename</div>";
             $chunks[] = "<div class='methods'>";
-            foreach ($module_methods[$modulename] as $method_short_name)
-                $chunks[] = self::link($current_path, "$modulename/$method_short_name.html", "$method_short_name");
+            foreach ($module_methods[$modulename] as $method_short_name) {
+                            $chunks[] = self::link($current_path, "$modulename/$method_short_name.html", "$method_short_name");
+            }
             $chunks[] = "</div>";
         }
         return implode("", $chunks);
@@ -84,8 +87,7 @@ 
                 $inst_ref['site_url'] = $site_url;
                 $inst_ref['okapi_base_url'] = $site_url . 'okapi/';
                 $inst_ref['selected'] = true;
-            }
-            else
+            } else
             {
                 $inst_ref['selected'] = false;
             }

htdocs/okapi/views/method_doc.php

Braces +1 added lines, -2 removed lines

@@ -26,8 +26,7 @@
         {
             $method = OkapiServiceRunner::call('services/apiref/method', new OkapiInternalRequest(
                 null, null, array('name' => $methodname)));
-        }
-        catch (BadRequest $e)
+        } catch (BadRequest $e)
         {
             throw new Http404();
         }

htdocs/okapi/views/apps/index.php

Braces +3 added lines, -2 removed lines

@@ -48,8 +48,9 @@
         $vars['site_name'] = Okapi::get_normalized_site_name();
         $vars['site_logo'] = Settings::get('SITE_LOGO');
         $vars['apps'] = array();
-        while ($row = Db::fetch_assoc($rs))
-            $vars['apps'][] = $row;
+        while ($row = Db::fetch_assoc($rs)) {
+                    $vars['apps'][] = $row;
+        }
         Db::free_result($rs);
 
         $response = new OkapiHttpResponse();

htdocs/okapi/views/apps/authorize.php

Braces +6 added lines, -8 removed lines

@@ -20,8 +20,9 @@ 
         $langpref = isset($_GET['langpref']) ? $_GET['langpref'] : Settings::get('SITELANG');
         $langprefs = explode("|", $langpref);
         $locales = array();
-        foreach (Locales::$languages as $lang => $attrs)
-            $locales[$attrs['locale']] = $attrs;
+        foreach (Locales::$languages as $lang => $attrs) {
+                    $locales[$attrs['locale']] = $attrs;
+        }
 
         # Current implementation of the "interactivity" parameter is: If developer
         # wants to "confirm_user", then just log out the current user before we
@@ -96,8 +97,7 @@ 
                     # that's exactly the relogin that we want.
 
                     $login_page .= 'action=logout&';
-                }
-                else
+                } else
                 {
                     # OCPL uses REAL MAGIC for session handling. I don't get ANY of it.
                     # The logout.php DOES NOT support the "target" parameter, so we
@@ -158,8 +158,7 @@ 
                         );
                     ");
                     $authorized = true;
-                }
-                else
+                } else
                 {
                     # User denied access. Nothing sensible to do now. Will try to report
                     # back to the Consumer application with an error.
@@ -175,8 +174,7 @@ 
                         return new OkapiRedirectResponse(Settings::get('SITE_URL')."index.php");
                     }
                 }
-            }
-            else
+            } else
             {
                 # Not yet authorized. Display an authorization request.
                 $vars = array(

htdocs/okapi/views/signup.php

Braces +15 added lines, -15 removed lines

@@ -26,21 +26,21 @@
             $email = isset($_REQUEST['email']) ? $_REQUEST['email'] : "";
             $accepted_terms = isset($_REQUEST['terms']) ? $_REQUEST['terms'] : "";
             $ok = false;
-            if (!$appname)
-                $notice = "Please provide a valid application name.";
-            elseif (mb_strlen($appname) > 100)
-                $notice = "Application name should be less than 100 characters long.";
-            elseif (mb_strlen($appurl) > 250)
-                $notice = "Application URL should be less than 250 characters long.";
-            elseif ($appurl && (substr($appurl, 0, 7) != "http://") && (substr($appurl, 0, 8) != "https://"))
-                $notice = "Application homepage URL should start with http(s)://. (Note: this URL is OPTIONAL and it is NOT for OAuth callback.)";
-            elseif (!$email)
-                $notice = "Please provide a valid email address.";
-            elseif (mb_strlen($email) > 70)
-                $notice = "Email address should be less than 70 characters long.";
-            elseif (!$accepted_terms)
-                $notice = "You have to read and accept OKAPI Terms of Use.";
-            else
+            if (!$appname) {
+                            $notice = "Please provide a valid application name.";
+            } elseif (mb_strlen($appname) > 100) {
+                            $notice = "Application name should be less than 100 characters long.";
+            } elseif (mb_strlen($appurl) > 250) {
+                            $notice = "Application URL should be less than 250 characters long.";
+            } elseif ($appurl && (substr($appurl, 0, 7) != "http://") && (substr($appurl, 0, 8) != "https://")) {
+                            $notice = "Application homepage URL should start with http(s)://. (Note: this URL is OPTIONAL and it is NOT for OAuth callback.)";
+            } elseif (!$email) {
+                            $notice = "Please provide a valid email address.";
+            } elseif (mb_strlen($email) > 70) {
+                            $notice = "Email address should be less than 70 characters long.";
+            } elseif (!$accepted_terms) {
+                            $notice = "You have to read and accept OKAPI Terms of Use.";
+            } else
             {
                 $ok = true;
                 Okapi::register_new_consumer($appname, $appurl, $email);

htdocs/log.php

Braces +5 added lines, -2 removed lines

@@ -24,8 +24,9 @@ 
 
 // check login
 $login->verify();
-if ($login->userid == 0)
+if ($login->userid == 0) {
     $tpl->redirect_login();
+}
 
 // get cache_id if not given
 $cacheId = 0;
@@ -216,7 +217,8 @@ 
     $validate['duplicateLog'] = true;
 
     // all checks done, no error => log
-    if (isset($_POST['submitform']) && $loggable)  // Ocprop
+    if (isset($_POST['submitform']) && $loggable) {
+        // Ocprop
     {
         /*
          * check if time is logged
@@ -226,6 +228,7 @@ 
         $logTimeSecond = ($logTimeHour . $logTimeMinute != ""
                 && $logTimeHour == 0
                 && $logTimeMinute == 0) + 0;
+    }
 
         // make time values database ready
         $logDate = date(