OpencachingDeutschland / oc-server3

htdocs/okapi/views/menu.inc.php

Braces +14 added lines, -17 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");
@@ -43,24 +44,24 @@ 
         # We'll break them up into modules, for readability.
 
         $module_methods = array();
-        foreach ($methodnames as $methodname)
-        {
+        foreach ($methodnames as $methodname) {
             $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);
         sort($modulenames);
 
-        foreach ($modulenames as $modulename)
-        {
+        foreach ($modulenames as $modulename) {
             $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);
@@ -72,21 +73,17 @@ 
             new OkapiInternalRequest(new OkapiInternalConsumer(), null, array()));
         $site_url = Settings::get('SITE_URL');
 
-        foreach ($installations as &$inst_ref)
-        {
+        foreach ($installations as &$inst_ref) {
             # $inst_ref['site_url'] and $site_url can have different protocols
             # (http / https). We compare only the domain parts and use
             # $site_url (which has the current request's protocol) for the menu
             # so that the menu works properly.
 
-            if (self::domains_are_equal($inst_ref['site_url'], $site_url))
-            {
+            if (self::domains_are_equal($inst_ref['site_url'], $site_url)) {
                 $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/devel/comparator.inc.php

Braces +133 added lines, -214 removed lines

@@ -87,8 +87,7 @@ 
     */
     function setConfig($config=array())
     {
-        if (is_array($config))
-        {
+        if (is_array($config)) {
             $this->config = array_merge($this->config, $config);
         }
     }
@@ -105,18 +104,15 @@ 
     {
         $result = $asString?'':array();
         $compRes = $this->compare($source, $dest);
-        if (empty($compRes))
-        {
+        if (empty($compRes)) {
             return $result;
         }
         $compRes = $this->filterDiffs($compRes);
-        if (empty($compRes))
-        {
+        if (empty($compRes)) {
             return $result;
         }
         $result = $this->getDiffSql($compRes);
-        if ($asString)
-        {
+        if ($asString) {
             $result = implode(";\r\n", $result).';';
         }
         return $result;
@@ -128,53 +124,35 @@ 
     function filterDiffs($compRes)
     {
         $result = array();
-        if (is_array($this->config['updateTypes']))
-        {
+        if (is_array($this->config['updateTypes'])) {
             $updateActions = $this->config['updateTypes'];
-        }
-        else
-        {
+        } else {
             $updateActions = array_map('trim', explode(',', $this->config['updateTypes']));
         }
         $allowedActions = array('create', 'drop', 'add', 'remove', 'modify');
         $updateActions = array_intersect($updateActions, $allowedActions);
-        foreach($compRes as $table=>$info)
-        {
-            if ($info['sourceOrphan'])
-            {
-                if (in_array('create', $updateActions))
-                {
+        foreach($compRes as $table=>$info) {
+            if ($info['sourceOrphan']) {
+                if (in_array('create', $updateActions)) {
                     $result[$table] = $info;
                 }
-            }
-            elseif ($info['destOrphan'])
-            {
-                if (in_array('drop', $updateActions))
-                {
+            } elseif ($info['destOrphan']) {
+                if (in_array('drop', $updateActions)) {
                     $result[$table] = $info;
                 }
-            }
-            elseif($info['differs'])
-            {
+            } elseif($info['differs']) {
                 $resultInfo = $info;
                 unset($resultInfo['differs']);
-                foreach ($info['differs'] as $diff)
-                {
-                    if (empty($diff['dest']) && in_array('add', $updateActions))
-                    {
+                foreach ($info['differs'] as $diff) {
+                    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;
                     }
                 }
-                if (!empty($resultInfo['differs']))
-                {
+                if (!empty($resultInfo['differs'])) {
                     $result[$table] = $resultInfo;
                 }
             }
@@ -188,23 +166,16 @@ 
     */
     function getDiffInfo($compRes)
     {
-        if (!is_array($compRes))
-        {
+        if (!is_array($compRes)) {
             return false;
         }
         $result = array('sourceOrphans'=>array(), 'destOrphans'=>array(), 'different'=>array());
-        foreach($compRes as $table=>$info)
-        {
-            if ($info['sourceOrphan'])
-            {
+        foreach($compRes as $table=>$info) {
+            if ($info['sourceOrphan']) {
                 $result['sourceOrphans'][] = $table;
-            }
-            elseif ($info['destOrphan'])
-            {
+            } elseif ($info['destOrphan']) {
                 $result['destOrphans'][] = $table;
-            }
-            else
-            {
+            } else {
                 $result['different'][] = $table;
             }
         }
@@ -239,32 +210,28 @@ 
         $sourceOrphans = array_diff($sourceTabNames, $common);
         $all = array_unique(array_merge($destTabNames, $sourceTabNames));
         sort($all);
-        foreach ($all as $tab)
-        {
+        foreach ($all as $tab) {
             $info = array('destOrphan'=>false, 'sourceOrphan'=>false, 'differs'=>false);
-            if(in_array($tab, $destOrphans))
-            {
+            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);
                 $diffs = $this->compareSql($sourceSql, $destSql);
-                if ($diffs===false)
-                {
+                if ($diffs===false) {
                     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;
         }
@@ -279,12 +246,13 @@ 
     function getTableList($struct)
     {
         $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
+        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
             {
                 $result[] = $match;
             }
+            }
         }
         return $result;
     }
@@ -302,25 +270,20 @@ 
         $result = '';
         /* create table should be single line in this case*/
         //1 - part before database, 2-database name, 3 - part after database
-        if (preg_match('/(CREATE(?:\s*TEMPORARY)?\s*TABLE\s*(?:IF NOT EXISTS\s*)?)(?:`?(\w+)`?\.)?(`?('.$tab.')`?(\W|$))/i', $struct, $m, PREG_OFFSET_CAPTURE))
-        {
+        if (preg_match('/(CREATE(?:\s*TEMPORARY)?\s*TABLE\s*(?:IF NOT EXISTS\s*)?)(?:`?(\w+)`?\.)?(`?('.$tab.')`?(\W|$))/i', $struct, $m, PREG_OFFSET_CAPTURE)) {
             $tableDef = $m[0][0];
             $start = $m[0][1];
             $database = $m[2][0];
             $offset = $start+strlen($m[0][0]);
             $end = $this->getDelimPos($struct, $offset);
-            if ($end === false)
-            {
+            if ($end === false) {
                 $result = substr($struct, $start);
-            }
-            else
-            {
+            } else {
                 $result = substr($struct, $start, $end-$start);//already without ';'
             }
         }
         $result = trim($result);
-        if ($database && $removeDatabase)
-        {
+        if ($database && $removeDatabase) {
             $result = str_replace($tableDef, $m[1][0].$m[3][0], $result);
         }
         return $result;
@@ -335,8 +298,7 @@ 
         $result = array();
         //find opening bracket, get the prefix along with it
         $openBracketPos = $this->getDelimPos($sql, 0, '(');
-        if ($openBracketPos===false)
-        {
+        if ($openBracketPos===false) {
             trigger_error('[WARNING] can not find opening bracket in table definition');
             return false;
         }
@@ -344,19 +306,16 @@ 
         $result[] = trim($prefix);
         $body = substr($sql, strlen($prefix));//fields, indexes and part after closing bracket
         //split by commas, get part by part
-        while(($commaPos = $this->getDelimPos($body, 0, ',', true))!==false)
-        {
+        while(($commaPos = $this->getDelimPos($body, 0, ',', true))!==false) {
             $part = trim(substr($body, 0, $commaPos+1));//read another part and shorten $body
-            if ($part)
-            {
+            if ($part) {
                 $result[] = $part;
             }
             $body = substr($body, $commaPos+1);
         }
         //here we have last field (or index) definition + part after closing bracket (ENGINE, ect)
         $closeBracketPos = $this->getDelimRpos($body, 0, ')');
-        if ($closeBracketPos===false)
-        {
+        if ($closeBracketPos===false) {
             trigger_error('[WARNING] can not find closing bracket in table definition');
             return false;
         }
@@ -366,8 +325,7 @@ 
         //get the suffix part along with the closing bracket
         $suffix = substr($body, $closeBracketPos);
         $suffix = trim($suffix);
-        if ($suffix)
-        {
+        if ($suffix) {
             $result[] = $suffix;
         }
         return $result;
@@ -390,29 +348,32 @@ 
         $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);
-        if ($destParts===false)
-        {
+        if ($destParts===false) {
             trigger_error('[WARNING] error parsing destination sql');
             return false;
         }
         $sourcePartsIndexed = array();
         $destPartsIndexed = array();
-        foreach($sourceParts as $line)
-        {
+        foreach($sourceParts as $line) {
             $lineInfo = $this->processLine($line);
-            if (!$lineInfo) continue;
+            if (!$lineInfo) {
+                continue;
+            }
             $sourcePartsIndexed[$lineInfo['key']] = $lineInfo['line'];
         }
-        foreach($destParts as $line)
-        {
+        foreach($destParts as $line) {
             $lineInfo = $this->processLine($line);
-            if (!$lineInfo) continue;
+            if (!$lineInfo) {
+                continue;
+            }
             $destPartsIndexed[$lineInfo['key']] = $lineInfo['line'];
         }
         $sourceKeys = array_keys($sourcePartsIndexed);
@@ -420,8 +381,7 @@ 
         $all = array_unique(array_merge($sourceKeys, $destKeys));
         sort($all);//fields first, then indexes - because fields are prefixed with '!'
 
-        foreach ($all as $key)
-        {
+        foreach ($all as $key) {
             $info = array('source'=>'', 'dest'=>'');
             $inSource= in_array($key, $sourceKeys);
             $inDest= in_array($key, $destKeys);
@@ -429,20 +389,16 @@ 
             $destOrphan = $inDest && !$inSource;
             $different =  $inSource && $inDest &&
             strcasecmp($this->normalizeString($destPartsIndexed[$key]), $this->normalizeString($sourcePartsIndexed[$key]));
-            if ($sourceOrphan)
-            {
+            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,34 +417,35 @@ 
         $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)
         }
         //$key = str_replace('`', '', $key);
-        if (!empty($options['varcharDefaultIgnore']))
-        {
+        if (!empty($options['varcharDefaultIgnore'])) {
             $line = preg_replace("/(var)?char\(([0-9]+)\)\s+NOT\s+NULL\s+default\s+''/i", '$1char($2) NOT NULL', $line);
         }
-        if (!empty($options['intDefaultIgnore']))
-        {
+        if (!empty($options['intDefaultIgnore'])) {
             $line = preg_replace("/((?:big)|(?:tiny))?int\(([0-9]+)\)\s+NOT\s+NULL\s+default\s+'0'/i", '$1int($2) NOT NULL', $line);
         }
-        if (!empty($options['ignoreIncrement']))
-        {
+        if (!empty($options['ignoreIncrement'])) {
             $line = preg_replace("/ AUTO_INCREMENT=[0-9]+/i", '', $line);
         }
         $result['key'] = $this->normalizeString($key);
@@ -508,52 +465,42 @@ 
     {
         $options = $this->config;
         $sqls = array();
-        if (!is_array($diff) || empty($diff))
-        {
+        if (!is_array($diff) || empty($diff)) {
             return $sqls;
         }
-        foreach($diff as $tab=>$info)
-        {
-            if ($info['sourceOrphan'])//delete it
+        foreach($diff as $tab=>$info) {
+            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']))
-                {
+                if (!empty($options['ignoreIncrement'])) {
                     $destSql = preg_replace("/\s*AUTO_INCREMENT=[0-9]+/i", '', $destSql);
                 }
-                if (!empty($options['ingoreIfNotExists']))
-                {
+                if (!empty($options['ingoreIfNotExists'])) {
                     $destSql = preg_replace("/IF NOT EXISTS\s*/i", '', $destSql);
                 }
-                if (!empty($options['forceIfNotExists']))
-                {
+                if (!empty($options['forceIfNotExists'])) {
                     $destSql = preg_replace('/(CREATE(?:\s*TEMPORARY)?\s*TABLE\s*)(?:IF\sNOT\sEXISTS\s*)?(`?\w+`?)/i', '$1IF NOT EXISTS $2', $destSql);
                 }
                 $sqls[] = $destSql;
-            }
-            else
-            {
-                foreach($info['differs'] as $finfo)
-                {
+            } else {
+                foreach($info['differs'] as $finfo) {
                     $inDest = !empty($finfo['dest']);
                     $inSource = !empty($finfo['source']);
-                    if ($inSource && !$inDest)
-                    {
+                    if ($inSource && !$inDest) {
                         $sql = $finfo['source'];
                         $action = 'drop';
-                    }
-                    elseif ($inDest && !$inSource)
-                    {
+                    } elseif ($inDest && !$inSource) {
                         $sql = $finfo['dest'];
                         $action = 'add';
-                    }
-                    else
-                    {
+                    } else {
                         $sql = $finfo['dest'];
                         $action = 'modify';
                     }
@@ -579,65 +526,47 @@ 
         $action = strtolower($action);
         $keyField = '`?\w`?(?:\(\d+\))?';//matches `name`(10)
         $keyFieldList = '(?:'.$keyField.'(?:,\s?)?)+';//matches `name`(10),`desc`(255)
-        if (preg_match('/((?:PRIMARY )|(?:UNIQUE )|(?:FULLTEXT ))?KEY `?(\w+)?`?\s(\('.$keyFieldList.'\))/i', $sql, $m))
-        {   //key and index operations
+        if (preg_match('/((?:PRIMARY )|(?:UNIQUE )|(?:FULLTEXT ))?KEY `?(\w+)?`?\s(\('.$keyFieldList.'\))/i', $sql, $m)) {
+//key and index operations
             $type = strtolower(trim($m[1]));
             $name = trim($m[2]);
             $fields = trim($m[3]);
-            switch($action)
-            {
+            switch($action) {
                 case 'drop':
-                    if ($type=='primary')
-                    {
+                    if ($type=='primary') {
                         $result.= 'DROP PRIMARY KEY';
-                    }
-                    else
-                    {
+                    } else {
                         $result.= 'DROP INDEX `'.$name.'`';
                     }
                 break;
                 case 'add':
-                    if ($type=='primary')
-                    {
+                    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
                     }
                 break;
                 case 'modify':
-                    if ($type=='primary')
-                    {
+                    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);
-            if ($action=='drop')
-            {
+            if ($action=='drop') {
                 $spacePos = strpos($sql, ' ');
                 $result.= ' '.substr($sql, 0, $spacePos);
-            }
-            else
-            {
+            } else {
                 $result.= ' '.$sql;
             }
         }
@@ -657,76 +586,69 @@ 
         $rbs = '\\\\';  //reg - escaped backslash
         $regPrefix = "(?<!$rbs)(?:$rbs{2})*";
         $reg = $regPrefix.'("|\')|(/\\*)|(\\*/)|(-- )|(\r\n|\r|\n)|';
-        if ($skipInBrackets)
-        {
+        if ($skipInBrackets) {
             $reg.='(\(|\))|';
-        }
-        else
-        {
+        } else {
             $reg.='()';
         }
         $reg .= '('.preg_quote($delim).')';
-        while (preg_match('%'.$reg.'%', $string, $m, PREG_OFFSET_CAPTURE, $offset))
-        {
+        while (preg_match('%'.$reg.'%', $string, $m, PREG_OFFSET_CAPTURE, $offset)) {
             $offset = $m[0][1]+strlen($m[0][0]);
-            if (end($stack)=='/*')
-            {
-                if (!empty($m[3][0]))
-                {
+            if (end($stack)=='/*') {
+                if (!empty($m[3][0])) {
                     array_pop($stack);
                 }
                 continue;//here we could also simplify regexp
             }
-            if (end($stack)=='-- ')
-            {
-                if (!empty($m[5][0]))
-                {
+            if (end($stack)=='-- ') {
+                if (!empty($m[5][0])) {
                     array_pop($stack);
                 }
                 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;
     }
@@ -738,15 +660,12 @@ 
     function getDelimRpos($string, $offset=0, $delim=';', $skipInBrackets=false)
     {
         $pos = $this->getDelimPos($string, $offset, $delim, $skipInBrackets);
-        if ($pos===false)
-        {
+        if ($pos===false) {
             return false;
         }
-        do
-        {
+        do {
             $newPos=$this->getDelimPos($string, $pos+1, $delim, $skipInBrackets);
-            if ($newPos !== false)
-            {
+            if ($newPos !== false) {
                 $pos = $newPos;
             }
         }

htdocs/okapi/views/devel/dbstruct.php

Braces +25 added lines, -31 removed lines

@@ -39,13 +39,16 @@ 
 
         ini_set('memory_limit', '16M');
         $shell_arguments = "mysqldump --no-data -h$dbserver -u$user -p$password $dbname";
-        if (!strpos($shell_arguments,"--no-data"))
-            throw new Exception("wrong database dump arguments");
+        if (!strpos($shell_arguments,"--no-data")) {
+                    throw new Exception("wrong database dump arguments");
+        }
         $struct = shell_exec($shell_arguments);
-        if (strlen($struct) > 1000000)
-            throw new Exception("something went terribly wrong while dumping table structures");
-        if (stripos($struct,"dumping data") !== FALSE)
-            throw new Exception("something went terribly wrong while dumping table structures");
+        if (strlen($struct) > 1000000) {
+                    throw new Exception("something went terribly wrong while dumping table structures");
+        }
+        if (stripos($struct,"dumping data") !== FALSE) {
+                    throw new Exception("something went terribly wrong while dumping table structures");
+        }
 
         # Remove the "AUTO_INCREMENT=..." values. They break the diffs.
 
@@ -65,12 +68,10 @@ 
 
         $response = new OkapiHttpResponse();
         $response->content_type = "text/plain; charset=utf-8";
-        if (isset($_GET['compare_to']))
-        {
+        if (isset($_GET['compare_to'])) {
             self::requireSafe($_GET['compare_to']);
             $scheme = parse_url($_GET['compare_to'], PHP_URL_SCHEME);
-            if (in_array($scheme, array('http', 'https')))
-            {
+            if (in_array($scheme, array('http', 'https'))) {
                 try {
                     $alternate_struct = @file_get_contents($_GET['compare_to']);
                 } catch (Exception $e) {
@@ -84,16 +85,13 @@ 
                     "-- better to use manual diff instead.\n\n";
                 require_once("comparator.inc.php");
                 $updater = new \dbStructUpdater();
-                if (isset($_GET['reverse']) && ($_GET['reverse'] == 'true'))
-                {
+                if (isset($_GET['reverse']) && ($_GET['reverse'] == 'true')) {
                     $response->body .=
                         "-- REVERSE MODE. The following will alter [2], so that it has the structure of [1].\n".
                         "-- 1. ".Settings::get('SITE_URL')."okapi/devel/dbstruct (".md5($struct).")\n".
                         "-- 2. ".$_GET['compare_to']." (".md5($alternate_struct).")\n\n";
                     $alters = $updater->getUpdates($alternate_struct, $struct);
-                }
-                else
-                {
+                } else {
                     $response->body .=
                         "-- The following will alter [1], so that it has the structure of [2].\n".
                         "-- 1. ".Settings::get('SITE_URL')."okapi/devel/dbstruct (".md5($struct).")\n".
@@ -101,31 +99,27 @@ 
                     $alters = $updater->getUpdates($struct, $alternate_struct);
                 }
                 # Add semicolons
-                foreach ($alters as &$alter_ref)
-                    $alter_ref .= ";";
+                foreach ($alters as &$alter_ref) {
+                                    $alter_ref .= ";";
+                }
                 # Comment out all differences containing "okapi_". These should be executed
                 # by OKAPI update scripts.
-                foreach ($alters as &$alter_ref)
-                {
-                    if (strpos($alter_ref, "okapi_") !== false)
-                    {
+                foreach ($alters as &$alter_ref) {
+                    if (strpos($alter_ref, "okapi_") !== false) {
                         $lines = explode("\n", $alter_ref);
                         $alter_ref = "-- Probably you should NOT execute this one. Use okapi/update instead.\n-- {{{\n--   ".
                             implode("\n--   ", $lines)."\n-- }}}";
                     }
                 }
-                if (count($alters) > 0)
-                    $response->body .= implode("\n", $alters)."\n";
-                else
-                    $response->body .= "-- No differences found\n";
-            }
-            else
-            {
+                if (count($alters) > 0) {
+                                    $response->body .= implode("\n", $alters)."\n";
+                } else {
+                                    $response->body .= "-- No differences found\n";
+                }
+            } else {
                 $response->body = "HTTP(S) only!";
             }
-        }
-        else
-        {
+        } else {
             $response->body = $struct;
         }
         return $response;

htdocs/okapi/views/devel/attrlist.php

Braces +32 added lines, -43 removed lines

@@ -26,33 +26,37 @@ 
         ob_start();
 
         print "Cache Types:\n\n";
-        foreach (self::get_all_cachetypes() as $id => $name)
-            print "$id: $name\n";
+        foreach (self::get_all_cachetypes() as $id => $name) {
+                    print "$id: $name\n";
+        }
 
         print "\nLog Types:\n\n";
-        foreach (self::get_all_logtypes() as $id => $name)
-            print "$id: $name\n";
+        foreach (self::get_all_logtypes() as $id => $name) {
+                    print "$id: $name\n";
+        }
 
         print "\nAttributes:\n\n";
         require_once($GLOBALS['rootpath'].'okapi/services/attrs/attr_helper.inc.php');
         $internal2acode = AttrHelper::get_internal_id_to_acode_mapping();
         $dict = self::get_all_attribute_names();
-        foreach ($dict as $internal_id => $langs)
-        {
+        foreach ($dict as $internal_id => $langs) {
             print $internal_id.": ";
             $langkeys = array_keys($langs);
             sort($langkeys);
-            if (in_array('en', $langkeys))
-                print strtoupper($langs['en']);
-            else
-                print ">>>> ENGLISH NAME UNSET! <<<<";
-            if (isset($internal2acode[$internal_id]))
-                print " - ".$internal2acode[$internal_id];
-            else
-                print " - >>>> MISSING A-CODE MAPPING <<<<";
+            if (in_array('en', $langkeys)) {
+                            print strtoupper($langs['en']);
+            } else {
+                            print ">>>> ENGLISH NAME UNSET! <<<<";
+            }
+            if (isset($internal2acode[$internal_id])) {
+                            print " - ".$internal2acode[$internal_id];
+            } else {
+                            print " - >>>> MISSING A-CODE MAPPING <<<<";
+            }
             print "\n";
-            foreach ($langkeys as $langkey)
-                print "        $langkey: ".$langs[$langkey]."\n";
+            foreach ($langkeys as $langkey) {
+                            print "        $langkey: ".$langs[$langkey]."\n";
+            }
         }
 
         print "\nAttribute notices:\n\n";
@@ -60,30 +64,24 @@ 
         print "(the last one ( ) can be safely ignored)\n\n";
 
         $attrdict = AttrHelper::get_attrdict();
-        foreach ($dict as $internal_id => $langs)
-        {
-            if (!isset($internal2acode[$internal_id]))
-            {
+        foreach ($dict as $internal_id => $langs) {
+            if (!isset($internal2acode[$internal_id])) {
                 print "(!) Attribute ".$internal_id." is not mapped to any A-code.\n";
                 continue;
             }
             $acode = $internal2acode[$internal_id];
             $attr = $attrdict[$acode];
-            foreach ($langs as $lang => $value)
-            {
-                if ($lang == 'en')
-                {
+            foreach ($langs as $lang => $value) {
+                if ($lang == 'en') {
                     continue;
                 }
-                if (!isset($attr['names'][$lang]))
-                {
+                if (!isset($attr['names'][$lang])) {
                     print "(-) Attribute $acode is missing a name in the '$lang' language.\n";
                     print "    Local name: $value\n";
                     print "    OKAPI name: >> none <<\n";
                     continue;
                 }
-                if ($attr['names'][$lang] !== $value)
-                {
+                if ($attr['names'][$lang] !== $value) {
                     print "( ) Attribute $acode has a different name in the '$lang' language\n";
                     print "    Local name: $value\n";
                     print "    OKAPI name: ".$attr['names'][$lang]."\n";
@@ -103,16 +101,13 @@ 
      */
     private static function get_all_attribute_names()
     {
-        if (Settings::get('OC_BRANCH') == 'oc.pl')
-        {
+        if (Settings::get('OC_BRANCH') == 'oc.pl') {
             # OCPL branch uses cache_attrib table to store attribute names. It has
             # different structure than the OCDE cache_attrib table. OCPL does not
             # have translation tables.
 
             $rs = Db::query("select id, language, text_long from cache_attrib order by id");
-        }
-        else
-        {
+        } else {
             # OCDE branch uses translation tables. Let's make a select which will
             # produce results compatible with the one above.
 
@@ -141,14 +136,11 @@ 
      */
     private static function get_all_cachetypes()
     {
-        if (Settings::get('OC_BRANCH') == 'oc.pl')
-        {
+        if (Settings::get('OC_BRANCH') == 'oc.pl') {
             # OCPL branch does not store cache types in many languages (just two).
 
             $rs = Db::query("select id, en from cache_type order by id");
-        }
-        else
-        {
+        } else {
             # OCDE branch uses translation tables.
 
             $rs = Db::query("
@@ -176,14 +168,11 @@ 
      */
     private static function get_all_logtypes()
     {
-        if (Settings::get('OC_BRANCH') == 'oc.pl')
-        {
+        if (Settings::get('OC_BRANCH') == 'oc.pl') {
             # OCPL branch does not store cache types in many languages (just two).
 
             $rs = Db::query("select id, en from log_types order by id");
-        }
-        else
-        {
+        } else {
             # OCDE branch uses translation tables.
 
             $rs = Db::query("

htdocs/okapi/views/devel/tilereport.php

Braces +6 added lines, -13 removed lines

@@ -57,21 +57,16 @@ 
         $calls = array('A' => 0, 'B' => 0, 'C' => 0, 'D' => 0);
         $runtime = array('A' => 0.0, 'B' => 0.0, 'C' => 0.0, 'D' => 0.0);
 
-        while (list($name, $c, $r) = Db::fetch_row($rs))
-        {
-            if ($name == 'services/caches/map/tile')
-            {
+        while (list($name, $c, $r) = Db::fetch_row($rs)) {
+            if ($name == 'services/caches/map/tile') {
                 $total_calls = $c;
                 $total_runtime = $r;
-            }
-            elseif (strpos($name, 'extra/caches/map/tile/checkpoint') === 0)
-            {
+            } elseif (strpos($name, 'extra/caches/map/tile/checkpoint') === 0) {
                 $calls[$name[32]] = $c;
                 $runtime[$name[32]] = $r;
             }
         }
-        if ($total_calls != $calls['A'])
-        {
+        if ($total_calls != $calls['A']) {
             print "Partial results. Only ".$calls['A']." out of $total_calls are covered.\n";
             print "All other will count as \"unaccounted for\".\n\n";
             $total_calls = $calls['A'];
@@ -82,8 +77,7 @@ 
 
         $perc = function($a, $b) { return ($b > 0) ? sprintf("%.1f", 100 * $a / $b)."%" : "(?)"; };
         $avg = function($a, $b) { return ($b > 0) ? sprintf("%.4f", $a / $b)."s" : "(?)"; };
-        $get_stats = function() use (&$calls_left, &$runtime_left, &$total_calls, &$total_runtime, &$perc)
-        {
+        $get_stats = function() use (&$calls_left, &$runtime_left, &$total_calls, &$total_runtime, &$perc) {
             return (
                 str_pad($perc($calls_left, $total_calls), 6, " ", STR_PAD_LEFT).
                 str_pad($perc($runtime_left, $total_runtime), 7, " ", STR_PAD_LEFT)
@@ -151,8 +145,7 @@ 
             where score is not null
             group by floor(log2(score))
         ");
-        while (list($log2, $count, $size) = Db::fetch_row($rs))
-        {
+        while (list($log2, $count, $size) = Db::fetch_row($rs)) {
             print $count." elements ($size bytes) with score between ".pow(2, $log2)." and ".pow(2, $log2 + 1).".\n";
         }
 

htdocs/okapi/views/devel/cronreport.php

Braces +28 added lines, -24 removed lines

@@ -28,47 +28,51 @@
 
         require_once($GLOBALS['rootpath']."okapi/cronjobs.php");
         $schedule = Cache::get("cron_schedule");
-        if ($schedule == null)
-            $schedule = array();
+        if ($schedule == null) {
+                    $schedule = array();
+        }
         print "Nearest event: ";
-        if (Okapi::get_var('cron_nearest_event'))
-            print "in ".(Okapi::get_var('cron_nearest_event') - time())." seconds.\n\n";
-        else
-            print "NOT SET\n\n";
+        if (Okapi::get_var('cron_nearest_event')) {
+                    print "in ".(Okapi::get_var('cron_nearest_event') - time())." seconds.\n\n";
+        } else {
+                    print "NOT SET\n\n";
+        }
         $cronjobs = CronJobController::get_enabled_cronjobs();
         usort($cronjobs, function($a, $b) {
             $cmp = function($a, $b) { return ($a < $b) ? -1 : (($a > $b) ? 1 : 0); };
             $by_type = $cmp($a->get_type(), $b->get_type());
-            if ($by_type != 0)
-                return $by_type;
+            if ($by_type != 0) {
+                            return $by_type;
+            }
             return $cmp($a->get_name(), $b->get_name());
         });
         print str_pad("TYPE", 11)."  ".str_pad("NAME", 40)."  SCHEDULE\n";
         print str_pad("----", 11)."  ".str_pad("----", 40)."  --------\n";
-        foreach ($cronjobs as $cronjob)
-        {
+        foreach ($cronjobs as $cronjob) {
             $type = $cronjob->get_type();
             $name = $cronjob->get_name();
             print str_pad($type, 11)."  ".str_pad($name, 40)."  ";
-            if (!isset($schedule[$name]))
-                print "NOT YET SCHEDULED\n";
-            elseif ($schedule[$name] <= time())
-                print "DELAYED: should be run ".(time() - $schedule[$name])." seconds ago\n";
-            else
-                print "scheduled to run in ".str_pad($schedule[$name] - time(), 6, " ", STR_PAD_LEFT)." seconds\n";
+            if (!isset($schedule[$name])) {
+                            print "NOT YET SCHEDULED\n";
+            } elseif ($schedule[$name] <= time()) {
+                            print "DELAYED: should be run ".(time() - $schedule[$name])." seconds ago\n";
+            } else {
+                            print "scheduled to run in ".str_pad($schedule[$name] - time(), 6, " ", STR_PAD_LEFT)." seconds\n";
+            }
         }
         print "\n";
         print "Crontab last ping: ";
-        if (Cache::get('crontab_last_ping'))
-            print (time() - Cache::get('crontab_last_ping'))." seconds ago";
-        else
-            print "NEVER";
+        if (Cache::get('crontab_last_ping')) {
+                    print (time() - Cache::get('crontab_last_ping'))." seconds ago";
+        } else {
+                    print "NEVER";
+        }
         print " (crontab_check_counter: ".Cache::get('crontab_check_counter').").\n";
         print "clog_revisions_daily: ";
-        if (Cache::get('clog_revisions_daily'))
-        {
-            foreach (Cache::get('clog_revisions_daily') as $time => $rev)
-                print "$rev ";
+        if (Cache::get('clog_revisions_daily')) {
+            foreach (Cache::get('clog_revisions_daily') as $time => $rev) {
+                            print "$rev ";
+            }
             print "\n";
         } else {
             print "NULL\n";

htdocs/okapi/views/update.php

Braces +217 added lines, -121 removed lines

@@ -25,14 +25,12 @@ 
 {
     public static function get_current_version()
     {
-        try
-        {
+        try {
             return Okapi::get_var('db_version', 0) + 0;
-        }
-        catch (Exception $e)
-        {
-            if (strpos($e->getMessage(), "okapi_vars' doesn't exist") !== false)
-                return 0;
+        } catch (Exception $e) {
+            if (strpos($e->getMessage(), "okapi_vars' doesn't exist") !== false) {
+                            return 0;
+            }
             throw $e;
         }
     }
@@ -40,13 +38,12 @@ 
     public static function get_max_version()
     {
         $max_db_version = 0;
-        foreach (get_class_methods(__CLASS__) as $name)
-        {
-            if (strpos($name, "ver") === 0)
-            {
+        foreach (get_class_methods(__CLASS__) as $name) {
+            if (strpos($name, "ver") === 0) {
                 $ver = substr($name, 3) + 0;
-                if ($ver > $max_db_version)
-                    $max_db_version = $ver;
+                if ($ver > $max_db_version) {
+                                    $max_db_version = $ver;
+                }
             }
         }
         return $max_db_version;
@@ -67,13 +64,10 @@ 
         $lock = OkapiLock::get('db-update');
         $lock->acquire();
 
-        try
-        {
+        try {
             self::_call();
             $lock->release();
-        }
-        catch (Exception $e)
-        {
+        } catch (Exception $e) {
             # Error occured. Make sure the lock is released and rethrow.
 
             $lock->release();
@@ -91,16 +85,12 @@ 
         $current_ver = self::get_current_version();
         $max_ver = self::get_max_version();
         self::out("Current OKAPI database version: $current_ver\n");
-        if ($current_ver == 0 && ((!isset($_GET['install'])) || ($_GET['install'] != 'true')))
-        {
+        if ($current_ver == 0 && ((!isset($_GET['install'])) || ($_GET['install'] != 'true'))) {
             self::out("Current OKAPI settings are:\n\n".Settings::describe_settings()."\n\n".
                 "Make sure they are correct, then append '?install=true' to your query.");
-            try
-            {
+            try {
                 Db::select_value("select 1 from caches limit 1");
-            }
-            catch (Exception $e)
-            {
+            } catch (Exception $e) {
                 self::out(
                     "\n\n".
                     "IMPORTANT: If you're trying to install OKAPI on an empty database then\n".
@@ -110,19 +100,14 @@ 
                 );
             }
             return;
-        }
-        elseif ($max_ver == $current_ver)
-        {
+        } elseif ($max_ver == $current_ver) {
             self::out("It is up-to-date.\n\n");
-        }
-        elseif ($max_ver < $current_ver)
-            throw new Exception();
-        else
-        {
+        } elseif ($max_ver < $current_ver) {
+                    throw new Exception();
+        } else {
             self::out("Updating to version $max_ver... PLEASE WAIT\n\n");
 
-            while ($current_ver < $max_ver)
-            {
+            while ($current_ver < $max_ver) {
                 $version_to_apply = $current_ver + 1;
                 self::out("Applying mutation #$version_to_apply...");
                 try {
@@ -280,29 +265,73 @@ 
         ");
     }
 
-    private static function ver9() { Db::execute("alter table okapi_consumers modify column `key` varchar(20) not null"); }
-    private static function ver10() { Db::execute("alter table okapi_consumers modify column secret varchar(40) not null"); }
-    private static function ver11() { Db::execute("alter table okapi_tokens modify column `key` varchar(20) not null"); }
-    private static function ver12() { Db::execute("alter table okapi_tokens modify column secret varchar(40) not null"); }
-    private static function ver13() { Db::execute("alter table okapi_tokens modify column consumer_key varchar(20) not null"); }
-    private static function ver14() { Db::execute("alter table okapi_tokens modify column verifier varchar(10) default null"); }
-    private static function ver15() { Db::execute("alter table okapi_authorizations modify column consumer_key varchar(20) not null"); }
-    private static function ver16() { Db::execute("alter table okapi_nonces modify column consumer_key varchar(20) not null"); }
-    private static function ver17() { Db::execute("alter table okapi_nonces modify column `key` varchar(255) not null"); }
-    private static function ver18() { Db::execute("alter table okapi_cache_logs modify column consumer_key varchar(20) not null"); }
-    private static function ver19() { Db::execute("alter table okapi_vars modify column `var` varchar(32) not null"); }
-
-    private static function ver20() { Db::execute("alter table okapi_consumers modify column `key` varchar(20) collate utf8_bin not null"); }
-    private static function ver21() { Db::execute("alter table okapi_consumers modify column secret varchar(40) collate utf8_bin not null"); }
-    private static function ver22() { Db::execute("alter table okapi_tokens modify column `key` varchar(20) collate utf8_bin not null"); }
-    private static function ver23() { Db::execute("alter table okapi_tokens modify column secret varchar(40) collate utf8_bin not null"); }
-    private static function ver24() { Db::execute("alter table okapi_tokens modify column consumer_key varchar(20) collate utf8_bin not null"); }
-    private static function ver25() { Db::execute("alter table okapi_tokens modify column verifier varchar(10) collate utf8_bin default null"); }
-    private static function ver26() { Db::execute("alter table okapi_authorizations modify column consumer_key varchar(20) collate utf8_bin not null"); }
-    private static function ver27() { Db::execute("alter table okapi_nonces modify column consumer_key varchar(20) collate utf8_bin not null"); }
-    private static function ver28() { Db::execute("alter table okapi_nonces modify column `key` varchar(255) collate utf8_bin not null"); }
-    private static function ver29() { Db::execute("alter table okapi_cache_logs modify column consumer_key varchar(20) collate utf8_bin not null"); }
-    private static function ver30() { Db::execute("alter table okapi_vars modify column `var` varchar(32) collate utf8_bin not null"); }
+    private static function ver9()
+    {
+Db::execute("alter table okapi_consumers modify column `key` varchar(20) not null"); }
+    private static function ver10()
+    {
+Db::execute("alter table okapi_consumers modify column secret varchar(40) not null"); }
+    private static function ver11()
+    {
+Db::execute("alter table okapi_tokens modify column `key` varchar(20) not null"); }
+    private static function ver12()
+    {
+Db::execute("alter table okapi_tokens modify column secret varchar(40) not null"); }
+    private static function ver13()
+    {
+Db::execute("alter table okapi_tokens modify column consumer_key varchar(20) not null"); }
+    private static function ver14()
+    {
+Db::execute("alter table okapi_tokens modify column verifier varchar(10) default null"); }
+    private static function ver15()
+    {
+Db::execute("alter table okapi_authorizations modify column consumer_key varchar(20) not null"); }
+    private static function ver16()
+    {
+Db::execute("alter table okapi_nonces modify column consumer_key varchar(20) not null"); }
+    private static function ver17()
+    {
+Db::execute("alter table okapi_nonces modify column `key` varchar(255) not null"); }
+    private static function ver18()
+    {
+Db::execute("alter table okapi_cache_logs modify column consumer_key varchar(20) not null"); }
+    private static function ver19()
+    {
+Db::execute("alter table okapi_vars modify column `var` varchar(32) not null"); }
+
+    private static function ver20()
+    {
+Db::execute("alter table okapi_consumers modify column `key` varchar(20) collate utf8_bin not null"); }
+    private static function ver21()
+    {
+Db::execute("alter table okapi_consumers modify column secret varchar(40) collate utf8_bin not null"); }
+    private static function ver22()
+    {
+Db::execute("alter table okapi_tokens modify column `key` varchar(20) collate utf8_bin not null"); }
+    private static function ver23()
+    {
+Db::execute("alter table okapi_tokens modify column secret varchar(40) collate utf8_bin not null"); }
+    private static function ver24()
+    {
+Db::execute("alter table okapi_tokens modify column consumer_key varchar(20) collate utf8_bin not null"); }
+    private static function ver25()
+    {
+Db::execute("alter table okapi_tokens modify column verifier varchar(10) collate utf8_bin default null"); }
+    private static function ver26()
+    {
+Db::execute("alter table okapi_authorizations modify column consumer_key varchar(20) collate utf8_bin not null"); }
+    private static function ver27()
+    {
+Db::execute("alter table okapi_nonces modify column consumer_key varchar(20) collate utf8_bin not null"); }
+    private static function ver28()
+    {
+Db::execute("alter table okapi_nonces modify column `key` varchar(255) collate utf8_bin not null"); }
+    private static function ver29()
+    {
+Db::execute("alter table okapi_cache_logs modify column consumer_key varchar(20) collate utf8_bin not null"); }
+    private static function ver30()
+    {
+Db::execute("alter table okapi_vars modify column `var` varchar(32) collate utf8_bin not null"); }
 
     private static function ver31()
     {
@@ -337,12 +366,9 @@ 
 
     private static function ver33()
     {
-        try
-        {
+        try {
             Db::execute("alter table cache_logs add key `uuid` (`uuid`)");
-        }
-        catch (Exception $e)
-        {
+        } catch (Exception $e) {
             // key exists
         }
     }
@@ -373,11 +399,21 @@ 
         );
     }
 
-    private static function ver36() { Db::execute("alter table okapi_cache modify column `key` varchar(64) not null"); }
-    private static function ver37() { Db::execute("delete from okapi_vars where var='last_clog_update'"); }
-    private static function ver38() { Db::execute("alter table okapi_clog modify column data mediumblob"); }
-    private static function ver39() { Db::execute("delete from okapi_clog"); }
-    private static function ver40() { Db::execute("alter table okapi_cache modify column value mediumblob"); }
+    private static function ver36()
+    {
+Db::execute("alter table okapi_cache modify column `key` varchar(64) not null"); }
+    private static function ver37()
+    {
+Db::execute("delete from okapi_vars where var='last_clog_update'"); }
+    private static function ver38()
+    {
+Db::execute("alter table okapi_clog modify column data mediumblob"); }
+    private static function ver39()
+    {
+Db::execute("delete from okapi_clog"); }
+    private static function ver40()
+    {
+Db::execute("alter table okapi_cache modify column value mediumblob"); }
 
     private static function ver41()
     {
@@ -389,7 +425,9 @@ 
         Cache::delete('cron_schedule');
     }
 
-    private static function ver42() { Db::execute("delete from okapi_cache where length(value) = 65535"); }
+    private static function ver42()
+    {
+Db::execute("delete from okapi_cache where length(value) = 65535"); }
 
     private static function ver43()
     {
@@ -408,9 +446,15 @@ 
         Okapi::mail_from_okapi($emails, "A change in the 'replicate' module.", ob_get_clean());
     }
 
-    private static function ver44() { Db::execute("alter table caches add column okapi_syncbase timestamp not null after last_modified;"); }
-    private static function ver45() { Db::execute("update caches set okapi_syncbase=last_modified;"); }
-    private static function ver46() { /* no longer necessary */ }
+    private static function ver44()
+    {
+Db::execute("alter table caches add column okapi_syncbase timestamp not null after last_modified;"); }
+    private static function ver45()
+    {
+Db::execute("update caches set okapi_syncbase=last_modified;"); }
+    private static function ver46()
+    {
+/* no longer necessary */ }
 
     private static function ver47()
     {
@@ -451,8 +495,12 @@ 
         print "on this procedure, please submit them to our issue tracker.\n\n";
     }
 
-    private static function ver49() { Db::execute("alter table caches add key okapi_syncbase (okapi_syncbase);"); }
-    private static function ver50() { /* no longer necessary */ }
+    private static function ver49()
+    {
+Db::execute("alter table caches add key okapi_syncbase (okapi_syncbase);"); }
+    private static function ver50()
+    {
+/* no longer necessary */ }
 
     private static function ver51()
     {
@@ -468,13 +516,16 @@ 
         # It doesn't do that anymore. Instead, it adds a separate column for itself (okapi_syncbase).
     }
 
-    private static function ver53() { Db::execute("alter table cache_logs add column okapi_syncbase timestamp not null after last_modified;"); }
-    private static function ver54() { Db::execute("update cache_logs set okapi_syncbase=last_modified;"); }
+    private static function ver53()
+    {
+Db::execute("alter table cache_logs add column okapi_syncbase timestamp not null after last_modified;"); }
+    private static function ver54()
+    {
+Db::execute("update cache_logs set okapi_syncbase=last_modified;"); }
 
     private static function ver55()
     {
-        if (Settings::get('OC_BRANCH') == 'oc.pl')
-        {
+        if (Settings::get('OC_BRANCH') == 'oc.pl') {
             # OCPL does not have cache_logs_archived table.
             return;
         }
@@ -483,8 +534,7 @@ 
 
     private static function ver56()
     {
-        if (Settings::get('OC_BRANCH') == 'oc.pl')
-        {
+        if (Settings::get('OC_BRANCH') == 'oc.pl') {
             # OCPL does not have cache_logs_archived table.
             return;
         }
@@ -544,13 +594,11 @@ 
         #
         $row = Db::select_row("show create table cache_logs");
         $stmt = $row["Create Table"];
-        if (strpos($stmt, "timestamp NOT NULL DEFAULT '0000-00-00 00:00:00'") > 0)
-        {
+        if (strpos($stmt, "timestamp NOT NULL DEFAULT '0000-00-00 00:00:00'") > 0) {
             Db::execute("alter table cache_logs modify column last_modified datetime not null;");
             Db::execute("alter table cache_logs modify column okapi_syncbase timestamp not null;");
             Db::execute("update cache_logs set okapi_syncbase=now() where okapi_syncbase='0000-00-00 00:00:00';");
-            if (Settings::get('OC_BRANCH') == 'oc.de')
-            {
+            if (Settings::get('OC_BRANCH') == 'oc.de') {
                 Db::execute("alter table cache_logs_archived modify column last_modified datetime not null;");
                 Db::execute("alter table cache_logs_archived modify column okapi_syncbase timestamp not null;");
                 Db::execute("update cache_logs_archived set okapi_syncbase=now() where okapi_syncbase='0000-00-00 00:00:00';");
@@ -558,12 +606,13 @@ 
         }
     }
 
-    private static function ver61() { Db::execute("alter table cache_logs add key okapi_syncbase (okapi_syncbase);"); }
+    private static function ver61()
+    {
+Db::execute("alter table cache_logs add key okapi_syncbase (okapi_syncbase);"); }
 
     private static function ver62()
     {
-        if (Settings::get('OC_BRANCH') == 'oc.pl')
-        {
+        if (Settings::get('OC_BRANCH') == 'oc.pl') {
             # OCPL does not have cache_logs_archived table.
             return;
         }
@@ -602,20 +651,28 @@ 
         ");
     }
 
-    private static function ver65() { Db::execute("alter table okapi_tile_status engine=innodb;"); }
-    private static function ver66() { Db::execute("alter table okapi_tile_caches engine=innodb;"); }
+    private static function ver65()
+    {
+Db::execute("alter table okapi_tile_status engine=innodb;"); }
+    private static function ver66()
+    {
+Db::execute("alter table okapi_tile_caches engine=innodb;"); }
 
     private static function ver67()
     {
         # Remove unused locks (these might have been created in previous versions of OKAPI).
 
-        for ($z=0; $z<=2; $z++)
-            for ($x=0; $x<(1<<$z); $x++)
-                for ($y=0; $y<(1<<$z); $y++)
-                {
+        for ($z=0; $z<=2; $z++) {
+                    for ($x=0;
+        }
+        $x<(1<<$z); $x++) {
+                            for ($y=0;
+            }
+            $y<(1<<$z); $y++) {
                     $lockname = "tile-computation-$z-$x-$y";
-                    if (OkapiLock::exists($lockname))
-                        OkapiLock::get($lockname)->remove();
+                    if (OkapiLock::exists($lockname)) {
+                                            OkapiLock::get($lockname)->remove();
+                    }
                 }
     }
 
@@ -623,13 +680,12 @@ 
     {
         # Once again, remove unused locks.
 
-        for ($z=0; $z<=21; $z++)
-        {
-            foreach (array("", "-0", "-1") as $suffix)
-            {
+        for ($z=0; $z<=21; $z++) {
+            foreach (array("", "-0", "-1") as $suffix) {
                 $lockname = "tile-$z$suffix";
-                if (OkapiLock::exists($lockname))
-                    OkapiLock::get($lockname)->remove();
+                if (OkapiLock::exists($lockname)) {
+                                    OkapiLock::get($lockname)->remove();
+                }
             }
         }
     }
@@ -652,12 +708,24 @@ 
         ");
     }
 
-    private static function ver71() { Db::execute("alter table okapi_cache add column score float(4,2) default null after `key`"); }
-    private static function ver72() { Db::execute("alter table okapi_cache change column expires expires datetime after score"); }
-    private static function ver73() { Db::execute("update okapi_cache set score=1, expires=date_add(now(), interval 360 day) where `key` like 'tile/%'"); }
-    private static function ver74() { Db::execute("update okapi_cache set score=1, expires=date_add(now(), interval 360 day) where `key` like 'tilecaption/%'"); }
-    private static function ver75() { Db::execute("alter table okapi_cache modify column score float default null"); }
-    private static function ver76() { Db::execute("update okapi_cache set expires=date_add(now(), interval 100 year) where `key` like 'clog#geocache#%'"); }
+    private static function ver71()
+    {
+Db::execute("alter table okapi_cache add column score float(4,2) default null after `key`"); }
+    private static function ver72()
+    {
+Db::execute("alter table okapi_cache change column expires expires datetime after score"); }
+    private static function ver73()
+    {
+Db::execute("update okapi_cache set score=1, expires=date_add(now(), interval 360 day) where `key` like 'tile/%'"); }
+    private static function ver74()
+    {
+Db::execute("update okapi_cache set score=1, expires=date_add(now(), interval 360 day) where `key` like 'tilecaption/%'"); }
+    private static function ver75()
+    {
+Db::execute("alter table okapi_cache modify column score float default null"); }
+    private static function ver76()
+    {
+Db::execute("update okapi_cache set expires=date_add(now(), interval 100 year) where `key` like 'clog#geocache#%'"); }
 
     private static function ver77()
     {
@@ -682,16 +750,36 @@ 
         ");
     }
 
-    private static function ver79() { Db::execute("alter table okapi_search_results engine=MyISAM"); }
-    private static function ver80() { Db::execute("alter table okapi_search_sets add column date_created datetime not null"); }
-    private static function ver81() { Db::execute("alter table okapi_search_sets add column expires datetime not null"); }
-    private static function ver82() { CronJobController::reset_job_schedule("FulldumpGeneratorJob"); }
-    private static function ver83() { Db::execute("alter table okapi_stats_temp engine=InnoDB"); }
-    private static function ver84() { Db::execute("truncate okapi_nonces;"); }
-    private static function ver85() { Db::execute("alter table okapi_nonces drop primary key;"); }
-    private static function ver86() { Db::execute("alter table okapi_nonces change column `key` nonce_hash varchar(32) character set utf8 collate utf8_bin not null;"); }
-    private static function ver87() { Db::execute("alter table okapi_nonces add primary key (consumer_key, nonce_hash);"); }
-    private static function ver88() { Db::execute("alter table okapi_consumers add column admin tinyint not null default 0;"); }
+    private static function ver79()
+    {
+Db::execute("alter table okapi_search_results engine=MyISAM"); }
+    private static function ver80()
+    {
+Db::execute("alter table okapi_search_sets add column date_created datetime not null"); }
+    private static function ver81()
+    {
+Db::execute("alter table okapi_search_sets add column expires datetime not null"); }
+    private static function ver82()
+    {
+CronJobController::reset_job_schedule("FulldumpGeneratorJob"); }
+    private static function ver83()
+    {
+Db::execute("alter table okapi_stats_temp engine=InnoDB"); }
+    private static function ver84()
+    {
+Db::execute("truncate okapi_nonces;"); }
+    private static function ver85()
+    {
+Db::execute("alter table okapi_nonces drop primary key;"); }
+    private static function ver86()
+    {
+Db::execute("alter table okapi_nonces change column `key` nonce_hash varchar(32) character set utf8 collate utf8_bin not null;"); }
+    private static function ver87()
+    {
+Db::execute("alter table okapi_nonces add primary key (consumer_key, nonce_hash);"); }
+    private static function ver88()
+    {
+Db::execute("alter table okapi_consumers add column admin tinyint not null default 0;"); }
 
     private static function ver89()
     {
@@ -706,10 +794,18 @@ 
         ReplicateCommon::verify_clog_consistency(true, $new_geocache_fields);
     }
 
-    private static function ver90() { Db::execute("alter table okapi_consumers change column admin bflags tinyint not null default 0;"); }
-    private static function ver91() { Db::execute("delete from okapi_tile_status"); }
-    private static function ver92() { Db::execute("delete from okapi_tile_caches"); }
-    private static function ver93() { Db::execute("alter table okapi_tile_caches add column name_crc int(10) unsigned not null default 0;"); }
+    private static function ver90()
+    {
+Db::execute("alter table okapi_consumers change column admin bflags tinyint not null default 0;"); }
+    private static function ver91()
+    {
+Db::execute("delete from okapi_tile_status"); }
+    private static function ver92()
+    {
+Db::execute("delete from okapi_tile_caches"); }
+    private static function ver93()
+    {
+Db::execute("alter table okapi_tile_caches add column name_crc int(10) unsigned not null default 0;"); }
 
     private static function ver94()
     {

htdocs/okapi/views/signup.php

Braces +16 added lines, -18 removed lines

@@ -18,30 +18,28 @@
 {
     public static function call()
     {
-        if (isset($_REQUEST['posted']))
-        {
+        if (isset($_REQUEST['posted'])) {
             $appname = isset($_REQUEST['appname']) ? $_REQUEST['appname'] : "";
             $appname = trim($appname);
             $appurl = isset($_REQUEST['appurl']) ? $_REQUEST['appurl'] : "";
             $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);
                 $notice = "Consumer Key generated successfully.\nCheck your email!";

htdocs/okapi/views/method_doc.php

Braces +2 added lines, -5 removed lines

@@ -22,13 +22,10 @@
         require_once($GLOBALS['rootpath'].'okapi/service_runner.php');
         require_once($GLOBALS['rootpath'].'okapi/views/menu.inc.php');
 
-        try
-        {
+        try {
             $method = OkapiServiceRunner::call('services/apiref/method', new OkapiInternalRequest(
                 null, null, array('name' => $methodname)));
-        }
-        catch (BadRequest $e)
-        {
+        } catch (BadRequest $e) {
             throw new Http404();
         }
         $vars = array(