OpencachingDeutschland / oc-server3

htdocs/okapi/views/apps/revoke_access.php

Braces +1 added lines, -2 removed lines

@@ -22,8 +22,7 @@
 
         # Ensure a user is logged in.
 
-        if ($OC_user_id == null)
-        {
+        if ($OC_user_id == null) {
             $after_login = "okapi/apps/"; # it is correct, if you're wondering
             $login_url = Settings::get('SITE_URL')."login.php?target=".urlencode($after_login);
             return new OkapiRedirectResponse($login_url);

htdocs/okapi/views/apps/index.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
         if ($OC_user_id == null)
         {
-            $after_login = "okapi/apps/".(($langpref != Settings::get('SITELANG'))?"?langpref=".$langpref:"");
+            $after_login = "okapi/apps/".(($langpref != Settings::get('SITELANG')) ? "?langpref=".$langpref : "");
             $login_url = Settings::get('SITE_URL')."login.php?target=".urlencode($after_login);
             return new OkapiRedirectResponse($login_url);
         }

Braces +4 added lines, -4 removed lines

@@ -23,8 +23,7 @@ 
         require_once($GLOBALS['rootpath']."okapi/lib/oc_session.php");
         $OC_user_id = OCSession::get_user_id();
 
-        if ($OC_user_id == null)
-        {
+        if ($OC_user_id == null) {
             $after_login = "okapi/apps/".(($langpref != Settings::get('SITELANG'))?"?langpref=".$langpref:"");
             $login_url = Settings::get('SITE_URL')."login.php?target=".urlencode($after_login);
             return new OkapiRedirectResponse($login_url);
@@ -48,8 +47,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/authorized.php

Braces +1 added lines, -2 removed lines

@@ -33,8 +33,7 @@
                 and t.consumer_key = c.`key`
         ");
 
-        if (!$token)
-        {
+        if (!$token) {
             # Probably Request Token has expired or it was already used. We'll
             # just redirect to the Opencaching main page.
             return new OkapiRedirectResponse(Settings::get('SITE_URL'));

htdocs/okapi/views/menu.inc.php

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
             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['okapi_base_url'] = $site_url.'okapi/';
                 $inst_ref['selected'] = true;
             }
             else

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

Spacing +2 added lines, -2 removed lines

@@ -19,8 +19,8 @@
         $query_extensions = array('exif', 'gd', 'imagick');
         $ok = array_intersect($query_extensions, $loaded_extensions);
         $missing = array_diff($query_extensions, $loaded_extensions);
-        $body .= "Loaded PHP extensions: " . ($ok ? implode(', ', $ok) : "-none-") . "\n";
-        $body .= "Missing PHP extensions: " . ($missing ? implode(', ', $missing) : "-none-") . "\n";
+        $body .= "Loaded PHP extensions: ".($ok ? implode(', ', $ok) : "-none-")."\n";
+        $body .= "Missing PHP extensions: ".($missing ? implode(', ', $missing) : "-none-")."\n";
 
         $response = new OkapiHttpResponse();
         $response->content_type = "text/plain; charset=utf-8";

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

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
         ob_start();
 
         $start = isset($_GET['start']) ? $_GET['start'] : date(
-            "Y-m-d 00:00:00", time() - 7*86400);
+            "Y-m-d 00:00:00", time() - 7 * 86400);
         $end = isset($_GET['end']) ? $_GET['end'] : date("Y-m-d 23:59:59");
 
         print "From: $start\n";

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/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!";