OpencachingDeutschland / oc-server3

htdocs/okapi/services/caches/map/replicate_listener.inc.php

Unused Use Statements +1 added lines, -11 removed lines

@@ -2,21 +2,11 @@
 
 namespace okapi\services\caches\map;
 
-use Exception;
-use okapi\Okapi;
-use okapi\Settings;
-use okapi\Cache;
 use okapi\Db;
-use okapi\OkapiRequest;
-use okapi\OkapiHttpResponse;
-use okapi\ParamMissing;
 use okapi\InvalidParam;
-use okapi\BadRequest;
-use okapi\DoesNotExist;
-use okapi\OkapiInternalRequest;
 use okapi\OkapiInternalConsumer;
+use okapi\OkapiInternalRequest;
 use okapi\OkapiServiceRunner;
-
 use okapi\services\caches\map\TileTree;
 
 require_once 'tiletree.inc.php';

Spacing +6 added lines, -6 removed lines

@@ -145,8 +145,8 @@ 
 
         $z21x = $row[1];
         $z21y = $row[2];
-        $ex = $z21x >> 8;  # initially, z21x / <tile width>
-        $ey = $z21y >> 8;  # initially, z21y / <tile height>
+        $ex = $z21x >> 8; # initially, z21x / <tile width>
+        $ey = $z21y >> 8; # initially, z21y / <tile height>
         for ($zoom = 21; $zoom >= 0; $zoom--, $ex >>= 1, $ey >>= 1)
         {
             # ($ex, $ey) points to the "exact match" tile. We need to determine
@@ -154,9 +154,9 @@ 
             # go with the simple approach and check all 1+8 bordering tiles.
 
             $tiles_in_this_region = array();
-            for ($x=$ex-1; $x<=$ex+1; $x++)
-                for ($y=$ey-1; $y<=$ey+1; $y++)
-                    if (($x >= 0) && ($x < 1<<$zoom) && ($y >= 0) && ($y < 1<<$zoom))
+            for ($x = $ex - 1; $x <= $ex + 1; $x++)
+                for ($y = $ey - 1; $y <= $ey + 1; $y++)
+                    if (($x >= 0) && ($x < 1 << $zoom) && ($y >= 0) && ($y < 1 << $zoom))
                         $tiles_in_this_region[] = array($x, $y);
 
             foreach ($tiles_in_this_region as $coords)
@@ -164,7 +164,7 @@ 
                 list($x, $y) = $coords;
 
                 $scale = 8 + 21 - $zoom;
-                $margin = 1 << ($scale - 3);  # 32px of current $zoom level, measured in z21 pixels.
+                $margin = 1 << ($scale - 3); # 32px of current $zoom level, measured in z21 pixels.
 
                 $left_z21x = ($x << $scale) - $margin;
                 $right_z21x = (($x + 1) << $scale) + $margin;

Braces +35 added lines, -37 removed lines

@@ -29,14 +29,13 @@ 
         # changelog. The format of $changelog is described in the replicate module
         # (NOT the entire response, just the "changelog" key).
 
-        foreach ($changelog as $c)
-        {
-            if ($c['object_type'] == 'geocache')
-            {
-                if ($c['change_type'] == 'replace')
-                    self::handle_geocache_replace($c);
-                else
-                    self::handle_geocache_delete($c);
+        foreach ($changelog as $c) {
+            if ($c['object_type'] == 'geocache') {
+                if ($c['change_type'] == 'replace') {
+                                    self::handle_geocache_replace($c);
+                } else {
+                                    self::handle_geocache_delete($c);
+                }
             }
         }
     }
@@ -90,25 +89,21 @@ 
         # Compute the new row for okapi_tile_caches. Compare with the old one.
 
         $theirs = TileTree::generate_short_row($cache);
-        if (!$ours)
-        {
+        if (!$ours) {
             # Aaah, a new geocache! How nice... ;)
 
             self::add_geocache_to_cached_tiles($theirs);
-        }
-        elseif (($ours[1] != $theirs[1]) || ($ours[2] != $theirs[2]))  # z21x & z21y fields
+        } elseif (($ours[1] != $theirs[1]) || ($ours[2] != $theirs[2])) {
+            # z21x & z21y fields
         {
             # Location changed.
 
             self::remove_geocache_from_cached_tiles($ours[0]);
-            self::add_geocache_to_cached_tiles($theirs);
         }
-        elseif ($ours != $theirs)
-        {
+            self::add_geocache_to_cached_tiles($theirs);
+        } elseif ($ours != $theirs) {
             self::update_geocache_attributes_in_cached_tiles($theirs);
-        }
-        else
-        {
+        } else {
             # No need to update anything. This is very common (i.e. when the
             # cache was simply found, not actually changed). Replicate module generates
             # many updates which do not influence our cache.
@@ -147,20 +142,21 @@ 
         $z21y = $row[2];
         $ex = $z21x >> 8;  # initially, z21x / <tile width>
         $ey = $z21y >> 8;  # initially, z21y / <tile height>
-        for ($zoom = 21; $zoom >= 0; $zoom--, $ex >>= 1, $ey >>= 1)
-        {
+        for ($zoom = 21; $zoom >= 0; $zoom--, $ex >>= 1, $ey >>= 1) {
             # ($ex, $ey) points to the "exact match" tile. We need to determine
             # tile-range to check for "just outside the border" tiles. We will
             # go with the simple approach and check all 1+8 bordering tiles.
 
             $tiles_in_this_region = array();
-            for ($x=$ex-1; $x<=$ex+1; $x++)
-                for ($y=$ey-1; $y<=$ey+1; $y++)
-                    if (($x >= 0) && ($x < 1<<$zoom) && ($y >= 0) && ($y < 1<<$zoom))
+            for ($x=$ex-1; $x<=$ex+1; $x++) {
+                            for ($y=$ey-1;
+            }
+            $y<=$ey+1; $y++) {
+                                    if (($x >= 0) && ($x < 1<<$zoom) && ($y >= 0) && ($y < 1<<$zoom))
                         $tiles_in_this_region[] = array($x, $y);
+                }
 
-            foreach ($tiles_in_this_region as $coords)
-            {
+            foreach ($tiles_in_this_region as $coords) {
                 list($x, $y) = $coords;
 
                 $scale = 8 + 21 - $zoom;
@@ -171,14 +167,18 @@ 
                 $top_z21y = ($y << $scale) - $margin;
                 $bottom_z21y = (($y + 1) << $scale) + $margin;
 
-                if ($z21x < $left_z21x)
-                    continue;
-                if ($z21x > $right_z21x)
-                    continue;
-                if ($z21y < $top_z21y)
-                    continue;
-                if ($z21y > $bottom_z21y)
-                    continue;
+                if ($z21x < $left_z21x) {
+                                    continue;
+                }
+                if ($z21x > $right_z21x) {
+                                    continue;
+                }
+                if ($z21y < $top_z21y) {
+                                    continue;
+                }
+                if ($z21y > $bottom_z21y) {
+                                    continue;
+                }
 
                 # We found a match. Store it for later.
 
@@ -191,8 +191,7 @@ 
         # only the cached ones.
 
         $alternatives_escaped = array();
-        foreach ($tiles_to_update as $coords)
-        {
+        foreach ($tiles_to_update as $coords) {
             list($z, $x, $y) = $coords;
             $alternatives_escaped[] = "(
                 z = '".Db::escape_string($z)."'
@@ -200,8 +199,7 @@ 
                 and y = '".Db::escape_string($y)."'
             )";
         }
-        if (count($alternatives_escaped) > 0)
-        {
+        if (count($alternatives_escaped) > 0) {
             Db::execute("
                 replace into okapi_tile_caches (
                     z, x, y, cache_id, z21x, z21y, status, type, rating, flags, name_crc

htdocs/okapi/services/caches/search/searching.inc.php

Unused Use Statements +5 added lines, -5 removed lines

@@ -2,15 +2,15 @@
 
 namespace okapi\services\caches\search;
 
-use okapi\Okapi;
+use Exception;
+use okapi\BadRequest;
 use okapi\Db;
+use okapi\InvalidParam;
+use okapi\Okapi;
 use okapi\OkapiInternalRequest;
-use okapi\OkapiServiceRunner;
 use okapi\OkapiRequest;
-use okapi\InvalidParam;
-use okapi\BadRequest;
+use okapi\OkapiServiceRunner;
 use okapi\Settings;
-use Exception;
 
 class SearchAssistant
 {

Spacing +1 added lines, -1 removed lines

@@ -682,7 +682,7 @@
         # To avoid join errors, put each of the $where_conds in extra paranthesis.
 
         $tmp = array();
-        foreach($where_conds as $cond)
+        foreach ($where_conds as $cond)
             $tmp[] = "(".$cond.")";
         $where_conds = $tmp;
         unset($tmp);

Braces +191 added lines, -211 removed lines

@@ -95,8 +95,7 @@ 
         # At the beginning we have to set up some "magic e$Xpressions".
         # We will use them to make our query run on both OCPL and OCDE databases.
 
-        if (Settings::get('OC_BRANCH') == 'oc.pl')
-        {
+        if (Settings::get('OC_BRANCH') == 'oc.pl') {
             # OCPL's 'caches' table contains some fields which OCDE's does not
             # (topratings, founds, notfounds, last_found, votes, score). If
             # we're being run on OCPL installation, we will simply use them.
@@ -107,9 +106,7 @@ 
             $X_LAST_FOUND = 'caches.last_found';
             $X_VOTES = 'caches.votes';
             $X_SCORE = 'caches.score';
-        }
-        else
-        {
+        } else {
             # OCDE holds this data in a separate table. Additionally, OCDE
             # does not provide a rating system (votes and score fields).
             # If we're being run on OCDE database, we will include this
@@ -131,55 +128,44 @@ 
         # type
         #
 
-        if ($tmp = $this->request->get_parameter('type'))
-        {
+        if ($tmp = $this->request->get_parameter('type')) {
             $operator = "in";
-            if ($tmp[0] == '-')
-            {
+            if ($tmp[0] == '-') {
                 $tmp = substr($tmp, 1);
                 $operator = "not in";
             }
             $types = array();
-            foreach (explode("|", $tmp) as $name)
-            {
-                try
-                {
+            foreach (explode("|", $tmp) as $name) {
+                try {
                     $id = Okapi::cache_type_name2id($name);
                     $types[] = $id;
-                }
-                catch (Exception $e)
-                {
+                } catch (Exception $e) {
                     throw new InvalidParam('type', "'$name' is not a valid cache type.");
                 }
             }
-            if (count($types) > 0)
-                $where_conds[] = "caches.type $operator ('".implode("','", array_map('\okapi\Db::escape_string', $types))."')";
-            else if ($operator == "in")
-                $where_conds[] = "false";
+            if (count($types) > 0) {
+                            $where_conds[] = "caches.type $operator ('".implode("','", array_map('\okapi\Db::escape_string', $types))."')";
+            } else if ($operator == "in") {
+                            $where_conds[] = "false";
+            }
         }
 
         #
         # size2
         #
 
-        if ($tmp = $this->request->get_parameter('size2'))
-        {
+        if ($tmp = $this->request->get_parameter('size2')) {
             $operator = "in";
-            if ($tmp[0] == '-')
-            {
+            if ($tmp[0] == '-') {
                 $tmp = substr($tmp, 1);
                 $operator = "not in";
             }
             $types = array();
-            foreach (explode("|", $tmp) as $name)
-            {
-                try
-                {
+            foreach (explode("|", $tmp) as $name) {
+                try {
                     $id = Okapi::cache_size2_to_sizeid($name);
                     $types[] = $id;
-                }
-                catch (Exception $e)
-                {
+                } catch (Exception $e) {
                     throw new InvalidParam('size2', "'$name' is not a valid cache size.");
                 }
             }
@@ -191,16 +177,14 @@ 
         #
 
         $tmp = $this->request->get_parameter('status');
-        if ($tmp == null) $tmp = "Available";
+        if ($tmp == null) {
+            $tmp = "Available";
+        }
         $codes = array();
-        foreach (explode("|", $tmp) as $name)
-        {
-            try
-            {
+        foreach (explode("|", $tmp) as $name) {
+            try {
                 $codes[] = Okapi::cache_status_name2id($name);
-            }
-            catch (Exception $e)
-            {
+            } catch (Exception $e) {
                 throw new InvalidParam('status', "'$name' is not a valid cache status.");
             }
         }
@@ -210,26 +194,23 @@ 
         # owner_uuid
         #
 
-        if ($tmp = $this->request->get_parameter('owner_uuid'))
-        {
+        if ($tmp = $this->request->get_parameter('owner_uuid')) {
             $operator = "in";
-            if ($tmp[0] == '-')
-            {
+            if ($tmp[0] == '-') {
                 $tmp = substr($tmp, 1);
                 $operator = "not in";
             }
-            try
-            {
+            try {
                 $users = OkapiServiceRunner::call("services/users/users", new OkapiInternalRequest(
                     $this->request->consumer, null, array('user_uuids' => $tmp, 'fields' => 'internal_id')));
-            }
-            catch (InvalidParam $e) # invalid uuid
+            } catch (InvalidParam $e) # invalid uuid
             {
                 throw new InvalidParam('owner_uuid', $e->whats_wrong_about_it);
             }
             $user_ids = array();
-            foreach ($users as $user)
-                $user_ids[] = $user['internal_id'];
+            foreach ($users as $user) {
+                            $user_ids[] = $user['internal_id'];
+            }
             $where_conds[] = "caches.user_id $operator ('".implode("','", array_map('\okapi\Db::escape_string', $user_ids))."')";
         }
 
@@ -237,27 +218,26 @@ 
         # terrain, difficulty, size, rating - these are similar, we'll do them in a loop
         #
 
-        foreach (array('terrain', 'difficulty', 'size', 'rating') as $param_name)
-        {
-            if ($tmp = $this->request->get_parameter($param_name))
-            {
-                if (!preg_match("/^[1-5]-[1-5](\|X)?$/", $tmp))
-                    throw new InvalidParam($param_name, "'$tmp'");
+        foreach (array('terrain', 'difficulty', 'size', 'rating') as $param_name) {
+            if ($tmp = $this->request->get_parameter($param_name)) {
+                if (!preg_match("/^[1-5]-[1-5](\|X)?$/", $tmp)) {
+                                    throw new InvalidParam($param_name, "'$tmp'");
+                }
                 list($min, $max) = explode("-", $tmp);
-                if (strpos($max, "|X") !== false)
-                {
+                if (strpos($max, "|X") !== false) {
                     $max = $max[0];
                     $allow_null = true;
                 } else {
                     $allow_null = false;
                 }
-                if ($min > $max)
-                    throw new InvalidParam($param_name, "'$tmp'");
-                switch ($param_name)
-                {
+                if ($min > $max) {
+                                    throw new InvalidParam($param_name, "'$tmp'");
+                }
+                switch ($param_name) {
                     case 'terrain':
-                        if ($allow_null)
-                            throw new InvalidParam($param_name, "The '|X' suffix is not allowed here.");
+                        if ($allow_null) {
+                                                    throw new InvalidParam($param_name, "The '|X' suffix is not allowed here.");
+                        }
                         if (($min == 1) && ($max == 5)) {
                             /* no extra condition necessary */
                         } else {
@@ -265,8 +245,9 @@ 
                         }
                         break;
                     case 'difficulty':
-                        if ($allow_null)
-                            throw new InvalidParam($param_name, "The '|X' suffix is not allowed here.");
+                        if ($allow_null) {
+                                                    throw new InvalidParam($param_name, "The '|X' suffix is not allowed here.");
+                        }
                         if (($min == 1) && ($max == 5)) {
                             /* no extra condition necessary */
                         } else {
@@ -288,8 +269,7 @@ 
                         }
                         break;
                     case 'rating':
-                        if (Settings::get('OC_BRANCH') == 'oc.pl')
-                        {
+                        if (Settings::get('OC_BRANCH') == 'oc.pl') {
                             if (($min == 1) && ($max == 5) && $allow_null) {
                                 /* no extra condition necessary */
                             } else {
@@ -299,9 +279,7 @@ 
                                 $where_conds[] = "($X_SCORE >= $min and $X_SCORE < $max and $X_VOTES >= 3)".
                                     ($allow_null ? " or ($X_VOTES < 3)" : "");
                             }
-                        }
-                        else
-                        {
+                        } else {
                             # OCDE does not support rating. We will ignore this parameter.
                         }
                         break;
@@ -313,22 +291,23 @@ 
         # min_rcmds
         #
 
-        if ($tmp = $this->request->get_parameter('min_rcmds'))
-        {
-            if ($tmp[strlen($tmp) - 1] == '%')
-            {
+        if ($tmp = $this->request->get_parameter('min_rcmds')) {
+            if ($tmp[strlen($tmp) - 1] == '%') {
                 $tmp = substr($tmp, 0, strlen($tmp) - 1);
-                if (!is_numeric($tmp))
-                    throw new InvalidParam('min_rcmds', "'$tmp'");
+                if (!is_numeric($tmp)) {
+                                    throw new InvalidParam('min_rcmds', "'$tmp'");
+                }
                 $tmp = intval($tmp);
-                if ($tmp > 100 || $tmp < 0)
-                    throw new InvalidParam('min_rcmds', "'$tmp'");
+                if ($tmp > 100 || $tmp < 0) {
+                                    throw new InvalidParam('min_rcmds', "'$tmp'");
+                }
                 $tmp = floatval($tmp) / 100.0;
                 $where_conds[] = "$X_TOPRATINGS >= $X_FOUNDS * '".Db::escape_string($tmp)."'";
                 $where_conds[] = "$X_FOUNDS > 0";
             }
-            if (!is_numeric($tmp))
-                throw new InvalidParam('min_rcmds', "'$tmp'");
+            if (!is_numeric($tmp)) {
+                            throw new InvalidParam('min_rcmds', "'$tmp'");
+            }
             $where_conds[] = "$X_TOPRATINGS >= '".Db::escape_string($tmp)."'";
         }
 
@@ -336,10 +315,10 @@ 
         # min_founds
         #
 
-        if ($tmp = $this->request->get_parameter('min_founds'))
-        {
-            if (!is_numeric($tmp))
-                throw new InvalidParam('min_founds', "'$tmp'");
+        if ($tmp = $this->request->get_parameter('min_founds')) {
+            if (!is_numeric($tmp)) {
+                            throw new InvalidParam('min_founds', "'$tmp'");
+            }
             $where_conds[] = "$X_FOUNDS >= '".Db::escape_string($tmp)."'";
         }
 
@@ -348,10 +327,10 @@ 
         # may be '0' for FTF hunts
         #
 
-        if (!is_null($tmp = $this->request->get_parameter('max_founds')))
-        {
-            if (!is_numeric($tmp))
-                throw new InvalidParam('max_founds', "'$tmp'");
+        if (!is_null($tmp = $this->request->get_parameter('max_founds'))) {
+            if (!is_numeric($tmp)) {
+                            throw new InvalidParam('max_founds', "'$tmp'");
+            }
             $where_conds[] = "$X_FOUNDS <= '".Db::escape_string($tmp)."'";
         }
 
@@ -359,27 +338,27 @@ 
         # modified_since
         #
 
-        if ($tmp = $this->request->get_parameter('modified_since'))
-        {
+        if ($tmp = $this->request->get_parameter('modified_since')) {
             $timestamp = strtotime($tmp);
-            if ($timestamp)
-                $where_conds[] = "unix_timestamp(caches.last_modified) > '".Db::escape_string($timestamp)."'";
-            else
-                throw new InvalidParam('modified_since', "'$tmp' is not in a valid format or is not a valid date.");
+            if ($timestamp) {
+                            $where_conds[] = "unix_timestamp(caches.last_modified) > '".Db::escape_string($timestamp)."'";
+            } else {
+                            throw new InvalidParam('modified_since', "'$tmp' is not in a valid format or is not a valid date.");
+            }
         }
 
         #
         # found_status
         #
 
-        if ($tmp = $this->request->get_parameter('found_status'))
-        {
-            if ($this->request->token == null)
-                throw new InvalidParam('found_status', "Might be used only for requests signed with an Access Token.");
-            if (!in_array($tmp, array('found_only', 'notfound_only', 'either')))
-                throw new InvalidParam('found_status', "'$tmp'");
-            if ($tmp != 'either')
-            {
+        if ($tmp = $this->request->get_parameter('found_status')) {
+            if ($this->request->token == null) {
+                            throw new InvalidParam('found_status', "Might be used only for requests signed with an Access Token.");
+            }
+            if (!in_array($tmp, array('found_only', 'notfound_only', 'either'))) {
+                            throw new InvalidParam('found_status', "'$tmp'");
+            }
+            if ($tmp != 'either') {
                 $found_cache_ids = self::get_found_cache_ids(array($this->request->token->user_id));
                 $operator = ($tmp == 'found_only') ? "in" : "not in";
                 $where_conds[] = "caches.cache_id $operator ('".implode("','", array_map('\okapi\Db::escape_string', $found_cache_ids))."')";
@@ -390,12 +369,12 @@ 
         # found_by
         #
 
-        if ($tmp = $this->request->get_parameter('found_by'))
-        {
+        if ($tmp = $this->request->get_parameter('found_by')) {
             try {
                 $users = OkapiServiceRunner::call("services/users/users", new OkapiInternalRequest(
                     $this->request->consumer, null, array('user_uuids' => $tmp, 'fields' => 'internal_id')));
-            } catch (InvalidParam $e) { # invalid uuid
+            } catch (InvalidParam $e) {
+# invalid uuid
                 throw new InvalidParam('found_by', $e->whats_wrong_about_it);
             }
             $internal_user_ids = array_map(create_function('$user', 'return $user["internal_id"];'), $users);
@@ -407,12 +386,12 @@ 
         # not_found_by
         #
 
-        if ($tmp = $this->request->get_parameter('not_found_by'))
-        {
+        if ($tmp = $this->request->get_parameter('not_found_by')) {
             try {
                 $users = OkapiServiceRunner::call("services/users/users", new OkapiInternalRequest(
                     $this->request->consumer, null, array('user_uuids' => $tmp, 'fields' => 'internal_id')));
-            } catch (InvalidParam $e) { # invalid uuid
+            } catch (InvalidParam $e) {
+# invalid uuid
                 throw new InvalidParam('not_found_by', $e->whats_wrong_about_it);
             }
             $internal_user_ids = array_map(create_function('$user', 'return $user["internal_id"];'), $users);
@@ -424,21 +403,20 @@ 
         # watched_only
         #
 
-        if ($tmp = $this->request->get_parameter('watched_only'))
-        {
-            if ($this->request->token == null)
-                throw new InvalidParam('watched_only', "Might be used only for requests signed with an Access Token.");
-            if (!in_array($tmp, array('true', 'false')))
-                throw new InvalidParam('watched_only', "'$tmp'");
-            if ($tmp == 'true')
-            {
+        if ($tmp = $this->request->get_parameter('watched_only')) {
+            if ($this->request->token == null) {
+                            throw new InvalidParam('watched_only', "Might be used only for requests signed with an Access Token.");
+            }
+            if (!in_array($tmp, array('true', 'false'))) {
+                            throw new InvalidParam('watched_only', "'$tmp'");
+            }
+            if ($tmp == 'true') {
                 $watched_cache_ids = Db::select_column("
                     select cache_id
                     from cache_watches
                     where user_id = '".Db::escape_string($this->request->token->user_id)."'
                 ");
-                if (Settings::get('OC_BRANCH') == 'oc.de')
-                {
+                if (Settings::get('OC_BRANCH') == 'oc.de') {
                     $watched_cache_ids = array_merge($watched_cache_ids, Db::select_column("
                         select cache_id
                         from cache_list_items cli, cache_list_watches clw
@@ -455,33 +433,35 @@ 
         #
 
         $ignored_status = 'either';
-        if ($tmp = $this->request->get_parameter('exclude_ignored'))
-        {
-            if ($this->request->token == null)
-                throw new InvalidParam('exclude_ignored', "Might be used only for requests signed with an Access Token.");
-            if ($tmp == 'true')
-                $ignored_status = 'notignored_only';
-            elseif ($tmp != 'false')
-                throw new InvalidParam('exclude_ignored', "'$tmp'");
-        }
-        if ($tmp = $this->request->get_parameter('ignored_status'))
-        {
-            if ($this->request->token == null)
-                throw new InvalidParam('ignored_status', "Might be used only for requests signed with an Access Token.");
-            if (!in_array($tmp, array('ignored_only', 'notignored_only', 'either')))
-                throw new InvalidParam('ignored_status', "'$tmp'");
+        if ($tmp = $this->request->get_parameter('exclude_ignored')) {
+            if ($this->request->token == null) {
+                            throw new InvalidParam('exclude_ignored', "Might be used only for requests signed with an Access Token.");
+            }
+            if ($tmp == 'true') {
+                            $ignored_status = 'notignored_only';
+            } elseif ($tmp != 'false') {
+                            throw new InvalidParam('exclude_ignored', "'$tmp'");
+            }
+        }
+        if ($tmp = $this->request->get_parameter('ignored_status')) {
+            if ($this->request->token == null) {
+                            throw new InvalidParam('ignored_status', "Might be used only for requests signed with an Access Token.");
+            }
+            if (!in_array($tmp, array('ignored_only', 'notignored_only', 'either'))) {
+                            throw new InvalidParam('ignored_status', "'$tmp'");
+            }
             if ($tmp != 'either') {
-                if ($tmp == 'ignored_only' && $ignored_status == 'notignored_only')
-                    $ignored_status = 'none';
-                else
-                    $ignored_status = $tmp;
+                if ($tmp == 'ignored_only' && $ignored_status == 'notignored_only') {
+                                    $ignored_status = 'none';
+                } else {
+                                    $ignored_status = $tmp;
+                }
                 }
         }
 
-        if ($ignored_status == 'none')
-            $where_conds[] = 'false';
-        elseif ($ignored_status != 'either')
-        {
+        if ($ignored_status == 'none') {
+                    $where_conds[] = 'false';
+        } elseif ($ignored_status != 'either') {
             $ignored_cache_ids = Db::select_column("
                 select cache_id
                 from cache_ignore
@@ -495,27 +475,29 @@ 
         # exclude_my_own
         #
 
-        if ($tmp = $this->request->get_parameter('exclude_my_own'))
-        {
-            if ($this->request->token == null)
-                throw new InvalidParam('exclude_my_own', "Might be used only for requests signed with an Access Token.");
-            if (!in_array($tmp, array('true', 'false')))
-                throw new InvalidParam('exclude_my_own', "'$tmp'");
-            if ($tmp == 'true')
-                $where_conds[] = "caches.user_id != '".Db::escape_string($this->request->token->user_id)."'";
+        if ($tmp = $this->request->get_parameter('exclude_my_own')) {
+            if ($this->request->token == null) {
+                            throw new InvalidParam('exclude_my_own', "Might be used only for requests signed with an Access Token.");
+            }
+            if (!in_array($tmp, array('true', 'false'))) {
+                            throw new InvalidParam('exclude_my_own', "'$tmp'");
+            }
+            if ($tmp == 'true') {
+                            $where_conds[] = "caches.user_id != '".Db::escape_string($this->request->token->user_id)."'";
+            }
         }
 
         #
         # name
         #
 
-        if ($tmp = $this->request->get_parameter('name'))
-        {
+        if ($tmp = $this->request->get_parameter('name')) {
             # WRTODO: Make this more user-friendly. See:
             # https://github.com/opencaching/okapi/issues/121
 
-            if (strlen($tmp) > 100)
-                throw new InvalidParam('name', "Maximum length of 'name' parameter is 100 characters");
+            if (strlen($tmp) > 100) {
+                            throw new InvalidParam('name', "Maximum length of 'name' parameter is 100 characters");
+            }
             $tmp = str_replace("*", "%", str_replace("%", "%%", $tmp));
             $where_conds[] = "caches.name LIKE '".Db::escape_string($tmp)."'";
         }
@@ -524,12 +506,11 @@ 
         # with_trackables_only
         #
 
-        if ($tmp = $this->request->get_parameter('with_trackables_only'))
-        {
-            if (!in_array($tmp, array('true', 'false'), 1))
-                throw new InvalidParam('with_trackables_only', "'$tmp'");
-            if ($tmp == 'true')
-            {
+        if ($tmp = $this->request->get_parameter('with_trackables_only')) {
+            if (!in_array($tmp, array('true', 'false'), 1)) {
+                            throw new InvalidParam('with_trackables_only', "'$tmp'");
+            }
+            if ($tmp == 'true') {
                 $where_conds[] = "
                     caches.wp_oc in (
                         select distinct wp
@@ -543,12 +524,11 @@ 
         # ftf_hunter
         #
 
-        if ($tmp = $this->request->get_parameter('ftf_hunter'))
-        {
-            if (!in_array($tmp, array('true', 'false'), 1))
-                throw new InvalidParam('ftf_hunter', "'$tmp'");
-            if ($tmp == 'true')
-            {
+        if ($tmp = $this->request->get_parameter('ftf_hunter')) {
+            if (!in_array($tmp, array('true', 'false'), 1)) {
+                            throw new InvalidParam('ftf_hunter', "'$tmp'");
+            }
+            if ($tmp == 'true') {
                 $where_conds[] = "$X_FOUNDS = 0";
             }
         }
@@ -558,8 +538,7 @@ 
         #
 
         $join_powertrails = false;
-        if ($tmp = $this->request->get_parameter('powertrail_only'))
-        {
+        if ($tmp = $this->request->get_parameter('powertrail_only')) {
             if ($tmp === 'true') {
                 $join_powertrails = true;
             } elseif ($tmp === 'false') {
@@ -594,8 +573,7 @@ 
         # set_and
         #
 
-        if ($tmp = $this->request->get_parameter('set_and'))
-        {
+        if ($tmp = $this->request->get_parameter('set_and')) {
             # Check if the set exists.
 
             $exists = Db::select_value("
@@ -603,8 +581,9 @@ 
                 from okapi_search_sets
                 where id = '".Db::escape_string($tmp)."'
             ");
-            if (!$exists)
-                throw new InvalidParam('set_and', "Couldn't find a set by given ID.");
+            if (!$exists) {
+                            throw new InvalidParam('set_and', "Couldn't find a set by given ID.");
+            }
             $extra_tables[] = "okapi_search_results osr_and";
             $where_conds[] = "osr_and.cache_id = caches.cache_id";
             $where_conds[] = "osr_and.set_id = '".Db::escape_string($tmp)."'";
@@ -615,34 +594,43 @@ 
         #
 
         $limit = $this->request->get_parameter('limit');
-        if ($limit == null) $limit = "100";
-        if (!is_numeric($limit))
-            throw new InvalidParam('limit', "'$limit'");
-        if ($limit < 1 || (($limit > 500) && (!$this->request->skip_limits)))
-            throw new InvalidParam(
+        if ($limit == null) {
+            $limit = "100";
+        }
+        if (!is_numeric($limit)) {
+                    throw new InvalidParam('limit', "'$limit'");
+        }
+        if ($limit < 1 || (($limit > 500) && (!$this->request->skip_limits))) {
+                    throw new InvalidParam(
                 'limit',
                 $this->request->skip_limits
                     ? "Cannot be lower than 1."
                     : "Has to be between 1 and 500."
             );
+        }
 
         #
         # offset
         #
 
         $offset = $this->request->get_parameter('offset');
-        if ($offset == null) $offset = "0";
-        if (!is_numeric($offset))
-            throw new InvalidParam('offset', "'$offset'");
-        if (($offset + $limit > 500) && (!$this->request->skip_limits))
-            throw new BadRequest("The sum of offset and limit may not exceed 500.");
-        if ($offset < 0 || (($offset > 499) && (!$this->request->skip_limits)))
-            throw new InvalidParam(
+        if ($offset == null) {
+            $offset = "0";
+        }
+        if (!is_numeric($offset)) {
+                    throw new InvalidParam('offset', "'$offset'");
+        }
+        if (($offset + $limit > 500) && (!$this->request->skip_limits)) {
+                    throw new BadRequest("The sum of offset and limit may not exceed 500.");
+        }
+        if ($offset < 0 || (($offset > 499) && (!$this->request->skip_limits))) {
+                    throw new InvalidParam(
                 'offset',
                 $this->request->skip_limits
                     ? "Cannot be lower than 0."
                     : "Has to be between 0 and 499."
             );
+        }
 
         #
         # order_by
@@ -650,21 +638,18 @@ 
 
         $order_clauses = array();
         $order_by = $this->request->get_parameter('order_by');
-        if ($order_by != null)
-        {
+        if ($order_by != null) {
             $order_by = explode('|', $order_by);
-            foreach ($order_by as $field)
-            {
+            foreach ($order_by as $field) {
                 $dir = 'asc';
-                if ($field[0] == '-')
-                {
+                if ($field[0] == '-') {
                     $dir = 'desc';
                     $field = substr($field, 1);
+                } elseif ($field[0] == '+') {
+                                    $field = substr($field, 1);
                 }
-                elseif ($field[0] == '+')
-                    $field = substr($field, 1); # ignore leading "+"
-                switch ($field)
-                {
+                # ignore leading "+"
+                switch ($field) {
                     case 'code': $cl = "caches.wp_oc"; break;
                     case 'name': $cl = "caches.name"; break;
                     case 'founds': $cl = "$X_FOUNDS"; break;
@@ -682,8 +667,9 @@ 
         # To avoid join errors, put each of the $where_conds in extra paranthesis.
 
         $tmp = array();
-        foreach($where_conds as $cond)
-            $tmp[] = "(".$cond.")";
+        foreach($where_conds as $cond) {
+                    $tmp[] = "(".$cond.")";
+        }
         $where_conds = $tmp;
         unset($tmp);
 
@@ -697,8 +683,7 @@ 
             'extra_joins' => $extra_joins,
         );
 
-        if ($this->search_params === NULL)
-        {
+        if ($this->search_params === NULL) {
             $this->search_params = $ret_array;
         } else {
             $this->search_params = array_merge_recursive($this->search_params, $ret_array);
@@ -738,8 +723,7 @@ 
             limit ".($this->search_params['offset']).", ".($this->search_params['limit'] + 1).";
         ");
 
-        if (count($cache_codes) > $this->search_params['limit'])
-        {
+        if (count($cache_codes) > $this->search_params['limit']) {
             $more = true;
             array_pop($cache_codes); # get rid of the one above the limit
         } else {
@@ -767,18 +751,17 @@ 
     public function prepare_location_search_params()
     {
         $location_source = $this->request->get_parameter('location_source');
-        if (!$location_source)
-            $location_source = 'default-coords';
+        if (!$location_source) {
+                    $location_source = 'default-coords';
+        }
 
         # Make sure location_source has prefix alt_wpt:
-        if ($location_source != 'default-coords' && strncmp($location_source, 'alt_wpt:', 8) != 0)
-        {
+        if ($location_source != 'default-coords' && strncmp($location_source, 'alt_wpt:', 8) != 0) {
             throw new InvalidParam('location_source', '\''.$location_source.'\'');
         }
 
         # Make sure we have sufficient authorization
-        if ($location_source == 'alt_wpt:user-coords' && $this->request->token == null)
-        {
+        if ($location_source == 'alt_wpt:user-coords' && $this->request->token == null) {
             throw new BadRequest("Level 3 Authentication is required to access 'alt_wpt:user-coords'.");
         }
 
@@ -787,14 +770,12 @@ 
             $location_source = 'default-coords';
         }
 
-        if ($location_source == 'default-coords')
-        {
+        if ($location_source == 'default-coords') {
             $this->longitude_expr = 'caches.longitude';
             $this->latitude_expr = 'caches.latitude';
         } else {
             $extra_joins = null;
-            if (Settings::get('OC_BRANCH') == 'oc.pl')
-            {
+            if (Settings::get('OC_BRANCH') == 'oc.pl') {
                 $this->longitude_expr = 'ifnull(cache_mod_cords.longitude, caches.longitude)';
                 $this->latitude_expr = 'ifnull(cache_mod_cords.latitude, caches.latitude)';
                 $extra_joins = array("
@@ -818,8 +799,7 @@ 
             $location_extra_sql = array(
                 'extra_joins' => $extra_joins
             );
-            if ($this->search_params === NULL)
-            {
+            if ($this->search_params === NULL) {
                 $this->search_params = $location_extra_sql;
             } else {
                 $this->search_params = array_merge_recursive($this->search_params, $location_extra_sql);

Upper-Lower-Casing +6 added lines, -6 removed lines

@@ -26,10 +26,10 @@ 
     public  function __construct(OkapiRequest $request)
     {
         $this->request = $request;
-        $this->longitude_expr = NULL;
-        $this->latitude_expr = NULL;
-        $this->location_extra_sql = NULL;
-        $this->search_params = NULL;
+        $this->longitude_expr = null;
+        $this->latitude_expr = null;
+        $this->location_extra_sql = null;
+        $this->search_params = null;
     }
 
     /**
@@ -697,7 +697,7 @@ 
             'extra_joins' => $extra_joins,
         );
 
-        if ($this->search_params === NULL)
+        if ($this->search_params === null)
         {
             $this->search_params = $ret_array;
         } else {
@@ -818,7 +818,7 @@ 
             $location_extra_sql = array(
                 'extra_joins' => $extra_joins
             );
-            if ($this->search_params === NULL)
+            if ($this->search_params === null)
             {
                 $this->search_params = $location_extra_sql;
             } else {

htdocs/okapi/services/logs/images/delete.php

Unused Use Statements +1 added lines, -2 removed lines

@@ -2,9 +2,8 @@
 
 namespace okapi\services\logs\images\delete;
 
-use Exception;
-use okapi\Okapi;
 use okapi\Db;
+use okapi\Okapi;
 use okapi\OkapiRequest;
 use okapi\Settings;
 use okapi\services\logs\images\LogImagesCommon;

Braces +2 added lines, -5 removed lines

@@ -41,12 +41,9 @@
         # OCDE sequence numbers may have gaps. So we do not need to adjust
         # any numbers after deleting from table 'pictures'.
 
-        if (Settings::get('OC_BRANCH') == 'oc.de')
-        {
+        if (Settings::get('OC_BRANCH') == 'oc.de') {
             # OCDE does all the housekeeping by triggers
-        }
-        else
-        {
+        } else {
             Db::execute("
                 INSERT INTO removed_objects (
                     localID, uuid, type, removed_date, node

htdocs/okapi/services/users/users.php

Unused Use Statements +3 added lines, -4 removed lines

@@ -3,13 +3,12 @@
 namespace okapi\services\users\users;
 
 use Exception;
-use okapi\Okapi;
-use okapi\Settings;
 use okapi\Db;
+use okapi\InvalidParam;
+use okapi\Okapi;
 use okapi\OkapiRequest;
 use okapi\ParamMissing;
-use okapi\InvalidParam;
-use okapi\services\caches\search\SearchAssistant;
+use okapi\Settings;
 
 class WebService
 {

Spacing +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
 
             while ($row = Db::fetch_assoc($rs))
             {
-                $extras[$row['user_id']] = array();;
+                $extras[$row['user_id']] = array(); ;
                 $extra_ref = &$extras[$row['user_id']];
                 $extra_ref['caches_found'] = 0 + $row['founds_count'];
                 $extra_ref['caches_notfound'] = 0 + $row['notfounds_count'];

Braces +34 added lines, -36 removed lines

@@ -28,18 +28,23 @@ 
     public static function call(OkapiRequest $request)
     {
         $user_uuids = $request->get_parameter('user_uuids');
-        if (!$user_uuids) throw new ParamMissing('user_uuids');
+        if (!$user_uuids) {
+            throw new ParamMissing('user_uuids');
+        }
         $user_uuids = explode("|", $user_uuids);
-        if (count($user_uuids) > 500)
-            throw new InvalidParam('user_uuids', "Maximum allowed number of referenced users ".
+        if (count($user_uuids) > 500) {
+                    throw new InvalidParam('user_uuids', "Maximum allowed number of referenced users ".
                 "is 500. You provided ".count($user_uuids)." user IDs.");
+        }
         $fields = $request->get_parameter('fields');
-        if (!$fields)
-            throw new ParamMissing('fields');
+        if (!$fields) {
+                    throw new ParamMissing('fields');
+        }
         $fields = explode("|", $fields);
-        foreach ($fields as $field)
-            if (!in_array($field, self::$valid_field_names))
+        foreach ($fields as $field) {
+                    if (!in_array($field, self::$valid_field_names))
                 throw new InvalidParam('fields', "'$field' is not a valid field code.");
+        }
         $rs = Db::query("
             select user_id, uuid, username, admin, latitude, longitude, date_created
             from user
@@ -48,15 +53,12 @@ 
         $results = array();
         $id2uuid = array();
         $uuid2id = array();
-        while ($row = Db::fetch_assoc($rs))
-        {
+        while ($row = Db::fetch_assoc($rs)) {
             $id2uuid[$row['user_id']] = $row['uuid'];
             $uuid2id[$row['uuid']] = $row['user_id'];
             $entry = array();
-            foreach ($fields as $field)
-            {
-                switch ($field)
-                {
+            foreach ($fields as $field) {
+                switch ($field) {
                     case 'uuid': $entry['uuid'] = $row['uuid']; break;
                     case 'username': $entry['username'] = $row['username']; break;
                     case 'profile_url': $entry['profile_url'] = Settings::get('SITE_URL')."viewprofile.php?userid=".$row['user_id']; break;
@@ -99,15 +101,13 @@ 
         # caches_found, caches_notfound, caches_hidden
 
         if (in_array('caches_found', $fields) || in_array('caches_notfound', $fields) || in_array('caches_hidden', $fields)
-            || in_array('rcmds_given', $fields))
-        {
+            || in_array('rcmds_given', $fields)) {
             # We will load all these stats together. Then we may remove these which
             # the user doesn't need.
 
             $extras = array();
 
-            if (Settings::get('OC_BRANCH') == 'oc.pl')
-            {
+            if (Settings::get('OC_BRANCH') == 'oc.pl') {
                 # OCPL stores user stats in 'user' table.
 
                 $rs = Db::query("
@@ -115,9 +115,7 @@ 
                     from user
                     where user_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($id2uuid)))."')
                 ");
-            }
-            else
-            {
+            } else {
                 # OCDE stores user stats in 'stat_user' table.
 
                 $rs = Db::query("
@@ -134,8 +132,7 @@ 
                 ");
             }
 
-            while ($row = Db::fetch_assoc($rs))
-            {
+            while ($row = Db::fetch_assoc($rs)) {
                 $extras[$row['user_id']] = array();;
                 $extra_ref = &$extras[$row['user_id']];
                 $extra_ref['caches_found'] = 0 + $row['founds_count'];
@@ -144,8 +141,7 @@ 
             }
             Db::free_result($rs);
 
-            if (in_array('rcmds_given', $fields))
-            {
+            if (in_array('rcmds_given', $fields)) {
                 $rs = Db::query("
                     select user_id, count(*) as rcmds_given
                     from cache_rating
@@ -153,30 +149,32 @@ 
                     group by user_id
                 ");
                 $rcmds_counts = array();
-                while ($row = Db::fetch_assoc($rs))
-                    $rcmds_counts[$row['user_id']] = $row['rcmds_given'];
-                foreach ($extras as $user_id => &$extra_ref)
-                {
+                while ($row = Db::fetch_assoc($rs)) {
+                                    $rcmds_counts[$row['user_id']] = $row['rcmds_given'];
+                }
+                foreach ($extras as $user_id => &$extra_ref) {
                     $extra_ref['rcmds_given'] = isset($rcmds_counts[$user_id]) ? 0 + $rcmds_counts[$user_id] : 0;
                 }
             }
 
             # "Apply" only those fields which the consumer wanted.
 
-            foreach (array('caches_found', 'caches_notfound', 'caches_hidden', 'rcmds_given') as $field)
-            {
-                if (!in_array($field, $fields))
-                    continue;
-                foreach ($results as $uuid => &$result_ref)
-                    $result_ref[$field] = $extras[$uuid2id[$uuid]][$field];
+            foreach (array('caches_found', 'caches_notfound', 'caches_hidden', 'rcmds_given') as $field) {
+                if (!in_array($field, $fields)) {
+                                    continue;
+                }
+                foreach ($results as $uuid => &$result_ref) {
+                                    $result_ref[$field] = $extras[$uuid2id[$uuid]][$field];
+                }
             }
         }
 
         # Check which user IDs were not found and mark them with null.
 
-        foreach ($user_uuids as $user_uuid)
-            if (!isset($results[$user_uuid]))
+        foreach ($user_uuids as $user_uuid) {
+                    if (!isset($results[$user_uuid]))
                 $results[$user_uuid] = null;
+        }
 
         return Okapi::formatted_response($request, $results);
     }

htdocs/okapi/views/apps/authorize.php

Unused Use Statements +3 added lines, -5 removed lines

@@ -2,15 +2,13 @@
 
 namespace okapi\views\apps\authorize;
 
-use Exception;
-use okapi\Okapi;
 use okapi\Db;
+use okapi\Locales;
+use okapi\OCSession;
+use okapi\Okapi;
 use okapi\OkapiHttpResponse;
-use okapi\OkapiHttpRequest;
 use okapi\OkapiRedirectResponse;
 use okapi\Settings;
-use okapi\Locales;
-use okapi\OCSession;
 
 class View
 {

Spacing +4 added lines, -4 removed lines

@@ -111,10 +111,10 @@ 
                         foreach ($cookies as $cookie) {
                             $parts = explode('=', $cookie);
                             $name = trim($parts[0]);
-                            setcookie($name, '', time()-1000);
-                            setcookie($name, '', time()-1000, '/');
+                            setcookie($name, '', time() - 1000);
+                            setcookie($name, '', time() - 1000, '/');
                             foreach (self::getPossibleCookieDomains() as $domain) {
-                                setcookie($name, '', time()-1000, '/', $domain);
+                                setcookie($name, '', time() - 1000, '/', $domain);
                             }
                         }
                     }
@@ -123,7 +123,7 @@ 
                 }
             }
 
-            $after_login = "okapi/apps/authorize?oauth_token=$token_key".(($langpref != Settings::get('SITELANG'))?"&langpref=".$langpref:"");
+            $after_login = "okapi/apps/authorize?oauth_token=$token_key".(($langpref != Settings::get('SITELANG')) ? "&langpref=".$langpref : "");
             $login_url = Settings::get('SITE_URL').$login_page."target=".urlencode($after_login)
                 ."&langpref=".$langpref;
             return new OkapiRedirectResponse($login_url);

Braces +13 added lines, -25 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
@@ -48,8 +49,7 @@ 
 
         $callback_concat_char = (strpos($token['callback'], '?') === false) ? "?" : "&";
 
-        if (!$token)
-        {
+        if (!$token) {
             # Probably Request Token has expired. This will be usually viewed
             # by the user, who knows nothing on tokens and OAuth. Let's be nice then!
 
@@ -79,26 +79,21 @@ 
 
         # Ensure a user is logged in (or force re-login).
 
-        if ($force_relogin || ($OC_user_id == null))
-        {
+        if ($force_relogin || ($OC_user_id == null)) {
             # TODO: confirm_user should first ask the user if he's "the proper one",
             # and then offer to sign in as a different user.
 
             $login_page = 'login.php?';
 
-            if ($OC_user_id !== null)
-            {
-                if (Settings::get('OC_BRANCH') == 'oc.de')
-                {
+            if ($OC_user_id !== null) {
+                if (Settings::get('OC_BRANCH') == 'oc.de') {
                     # OCDE login.php?action=logout&target=... will NOT logout and
                     # then redirect to the target, but it will log out, prompt for
                     # login and then redirect to the target after logging in -
                     # 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
                     # can't just call it. The only thing that comes to mind is...
@@ -141,15 +136,12 @@ 
                 and consumer_key = '".Db::escape_string($token['consumer_key'])."'
         ", 0);
 
-        if (!$authorized)
-        {
-            if (isset($_POST['authorization_result']))
-            {
+        if (!$authorized) {
+            if (isset($_POST['authorization_result'])) {
                 # Not yet authorized, but user have just submitted the authorization form.
                 # WRTODO: CSRF protection
 
-                if ($_POST['authorization_result'] == 'granted')
-                {
+                if ($_POST['authorization_result'] == 'granted') {
                     Db::execute("
                         insert ignore into okapi_authorizations (consumer_key, user_id)
                         values (
@@ -158,9 +150,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,9 +165,7 @@ 
                         return new OkapiRedirectResponse(Settings::get('SITE_URL')."index.php");
                     }
                 }
-            }
-            else
-            {
+            } else {
                 # Not yet authorized. Display an authorization request.
                 $vars = array(
                     'okapi_base_url' => Settings::get('SITE_URL')."okapi/",

htdocs/okapi/views/devel/dbstruct.php

Unused Use Statements +4 added lines, -11 removed lines

@@ -3,19 +3,12 @@
 namespace okapi\views\devel\dbstruct;
 
 use Exception;
-use okapi\Okapi;
-use okapi\Settings;
-use okapi\Cache;
-use okapi\Db;
-use okapi\OkapiRequest;
-use okapi\OkapiRedirectResponse;
+use okapi\BadRequest;
 use okapi\OkapiHttpResponse;
-use okapi\ParamMissing;
-use okapi\InvalidParam;
-use okapi\OkapiServiceRunner;
-use okapi\OkapiInternalRequest;
 use okapi\OkapiInternalConsumer;
-use okapi\BadRequest;
+use okapi\OkapiInternalRequest;
+use okapi\OkapiServiceRunner;
+use okapi\Settings;
 
 class View
 {

Spacing +2 added lines, -2 removed lines

@@ -39,12 +39,12 @@
 
         ini_set('memory_limit', '16M');
         $shell_arguments = "mysqldump --no-data -h$dbserver -u$user -p$password $dbname";
-        if (!strpos($shell_arguments,"--no-data"))
+        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)
+        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.

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;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
         $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)
+        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.

htdocs/okapi/views/tilestress.php

Unused Use Statements +4 added lines, -14 removed lines

@@ -3,22 +3,12 @@
 namespace okapi\views\tilestress;
 
 use Exception;
-
-use okapi\Okapi;
-use okapi\Cache;
 use okapi\Db;
-use okapi\OkapiRequest;
-use okapi\OkapiRedirectResponse;
-use okapi\OkapiHttpResponse;
-use okapi\ParamMissing;
-use okapi\InvalidParam;
-use okapi\OkapiServiceRunner;
-use okapi\OkapiInternalRequest;
-use okapi\OkapiInternalConsumer;
-use okapi\OkapiInternalAccessToken;
-use okapi\Settings;
-use okapi\OkapiLock;
 use okapi\OkapiExceptionHandler;
+use okapi\OkapiInternalAccessToken;
+use okapi\OkapiInternalConsumer;
+use okapi\OkapiInternalRequest;
+use okapi\OkapiServiceRunner;
 
 require_once($GLOBALS['rootpath']."okapi/service_runner.php");
 

Spacing +2 added lines, -2 removed lines

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

Braces +8 added lines, -7 removed lines

@@ -42,8 +42,7 @@ 
         $user_id = $_GET['u'];
         self::out("Yo. I'm $user_id.\n\n");
 
-        while (true)
-        {
+        while (true) {
             srand(floor(time() / 10));
             $mode2 = rand(0, 9) <= 7;
             if ($mode2) {
@@ -66,14 +65,16 @@ 
             }
 
             $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);
 
-            foreach ($tiles as $tile)
-            {
+            foreach ($tiles as $tile) {
                 list($x, $y) = $tile;
                 self::out("Loading ".str_pad("($z, $x, $y)... ", 30));
                 $time_started = microtime(true);

htdocs/src/Oc/Libse/ChildWp/ControllerChildWp.php

Doc Comments +6 added lines

@@ -35,6 +35,9 @@ 
         $this->init(0, 0);
     }
 
+    /**
+     * @param boolean $request
+     */
     private function initRequest($request)
     {
         if ($request) {
@@ -44,6 +47,9 @@ 
         return new RequestHttp();
     }
 
+    /**
+     * @param boolean $translator
+     */
     private function initTranslator($translator)
     {
         if ($translator) {

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 use Oc\Libse\Validator\AlwaysValidValidator;
 use Oc\Libse\Validator\ArrayValidator;
 
-require_once __DIR__ . '/../../../../lib2/error.inc.php';
+require_once __DIR__.'/../../../../lib2/error.inc.php';
 
 abstract class PresenterChildWp
 {

htdocs/adminuser.php

Spacing +4 added lines, -4 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'adminuser';
 $tpl->menuitem = MNU_ADMIN_USER;
@@ -51,7 +51,7 @@ 
     // send a new confirmation
     $user->sendRegistrationCode();
 
-    $tpl->redirect('adminuser.php?action=searchuser&msg=sendcodecommit&username=' . urlencode($user->getUsername()));
+    $tpl->redirect('adminuser.php?action=searchuser&msg=sendcodecommit&username='.urlencode($user->getUsername()));
 }
 
 function formAction()
@@ -97,8 +97,8 @@ 
         $user->addEmailProblem($datalicense);
     }
 
-    $tpl->redirect('adminuser.php?action=searchuser&username=' . urlencode($username) .
-        '&success=' . ($disduelicense + $disable));
+    $tpl->redirect('adminuser.php?action=searchuser&username='.urlencode($username).
+        '&success='.($disduelicense + $disable));
 }
 
 function searchUser()