OpencachingDeutschland / oc-server3

htdocs/lib/settings-sample-dev.inc.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
 // database names
 $dbname = 'opencaching';
-$tmpdbname = 'octmp';   // empty db with CREATE and DROP privileges
+$tmpdbname = 'octmp'; // empty db with CREATE and DROP privileges
 
 // common developer system settings
 require 'settings-dev.inc.php';

htdocs/doc/sql/stored-proc/maintain.php

Indentation +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 #!/usr/bin/php -q
 <?php
- /***************************************************************************
+    /***************************************************************************
  *  For license information see doc/license.txt
  *
  *  Unicode Reminder メモ

Spacing +8 added lines, -8 removed lines

@@ -8,8 +8,8 @@ 
  *  Load current stored procs and triggers into database.
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../../';
-require $opt['rootpath'] . 'lib2/cli.inc.php';
+$opt['rootpath'] = __DIR__.'/../../../';
+require $opt['rootpath'].'lib2/cli.inc.php';
 
 if ($opt['db']['maintenance_user'] == '') {
     die("ERROR: \$opt['db']['maintenance_user'] is not set in config2/settings.inc.php\n");
@@ -18,10 +18,10 @@ 
 // retrieve DB password
 if ($opt['db']['maintenance_password'] == '') {
     if (in_array('--flush', $argv)) {
-        echo "\nenter DB " . $opt['db']['maintenance_user'] . " password:\n";
+        echo "\nenter DB ".$opt['db']['maintenance_user']." password:\n";
         flush();
     } else {
-        echo 'enter DB ' . $opt['db']['maintenance_user'] . ' password: ';
+        echo 'enter DB '.$opt['db']['maintenance_user'].' password: ';
     }
 
     $fh = fopen('php://stdin', 'r');
@@ -44,13 +44,13 @@ 
 // include the requested maintain version file
 $dbsv = in_array('--dbsv', $argv);
 if ($dbsv) {
-    $versionfile = 'maintain-' . $argv[$dbsv + 1] . '.inc.php';
-    if (!file_exists(__DIR__ . '/' . $versionfile)) {
-        die($versionfile . " not found\n");
+    $versionfile = 'maintain-'.$argv[$dbsv + 1].'.inc.php';
+    if (!file_exists(__DIR__.'/'.$versionfile)) {
+        die($versionfile." not found\n");
     } else {
         require $versionfile;
     }
-    @unlink($opt['rootpath'] . 'cache2/dbsv-running');
+    @unlink($opt['rootpath'].'cache2/dbsv-running');
 } else {
     require 'maintain-current.inc.php';
 }

htdocs/coordinates.php

Braces +2 added lines, -1 removed lines

@@ -88,8 +88,9 @@
     $tpl->assign('coordW3W2', $coord->getW3W($w3w_langs[1]));
     $lang2_name = sql_value("SELECT `name` FROM `languages` WHERE `short`='&1'", '', $w3w_langs[1]);
     $tpl->assign('W3Wlang2', $translate->t($lang2_name, '', '', 0));
-} else
+} else {
     $tpl->assign('coordW3W2', false);
+}
 
 // wp gesetzt?
 $wp = isset($_REQUEST['wp']) ? $_REQUEST['wp'] : '';

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'coordinates';
 $tpl->popup = true;

htdocs/lib2/logic/getNew.class.php

Doc Comments +6 added lines, -3 removed lines

@@ -19,6 +19,9 @@ 
         return $this->userCountry;
     }
 
+    /**
+     * @param string $userCountry
+     */
     public function set_userCountry($userCountry)
     {
         $this->userCountry = $userCountry;
@@ -98,7 +101,7 @@ 
      *
      * @param array $args numeric array containing the parameter for "sql_slave"
      *
-     * @return object mysql result used by smarty assign_rs
+     * @return resource mysql result used by smarty assign_rs
      */
     private function cacheRs($args = null)
     {
@@ -150,7 +153,7 @@ 
      *
      * @param array $args numeric array containing the parameter for "sql_slave"
      *
-     * @return object mysql result used by smarty assign_rs
+     * @return resource mysql result used by smarty assign_rs
      */
     private function eventRs($args = null)
     {
@@ -221,7 +224,7 @@ 
      *
      * @param array $args numeric array containing the parameter for "sql_slave"
      *
-     * @return object mysql result used by smarty assign_rs
+     * @return resource mysql result used by smarty assign_rs
      */
     private function ratingRs($args = null)
     {

Spacing +4 added lines, -4 removed lines

@@ -51,11 +51,11 @@ 
     public function rsForSmarty($type, $args = null)
     {
         // check type
-        if (method_exists($this, strtolower($type) . 'Rs')) {
+        if (method_exists($this, strtolower($type).'Rs')) {
             return call_user_func(
                 [
                     $this,
-                    $type . 'Rs'
+                    $type.'Rs'
                 ],
                 $args
             );
@@ -78,11 +78,11 @@ 
     public function feedForSmarty($type, $items = null, $url = null, $timeout = null, $includetext = null)
     {
         // check type
-        if (method_exists($this, strtolower($type) . 'Feed')) {
+        if (method_exists($this, strtolower($type).'Feed')) {
             return call_user_func(
                 [
                     $this,
-                    $type . 'Feed'
+                    $type.'Feed'
                 ],
                 $items,
                 $url,

htdocs/lib2/search/search.txt.inc.php

Doc Comments +3 added lines

@@ -203,6 +203,9 @@
     return $str;
 }
 
+/**
+ * @param string $str
+ */
 function lf2crlf($str)
 {
     return str_replace("\r\r\n", "\r\n", str_replace("\n", "\r\n", $str));

Spacing +4 added lines, -4 removed lines

@@ -116,10 +116,10 @@ 
 
         if ($r['html'] == 0) {
             $thisline = mb_ereg_replace('{htmlwarn}', '', $thisline);
-            $thisline = mb_ereg_replace('{desc}', decodeEntities(strip_tags($r['desc'])) . $license, $thisline);
+            $thisline = mb_ereg_replace('{desc}', decodeEntities(strip_tags($r['desc'])).$license, $thisline);
         } else {
             $thisline = mb_ereg_replace('{htmlwarn}', " ($converted_from_html)", $thisline);
-            $thisline = mb_ereg_replace('{desc}', html2txt($r['desc']) . $license, $thisline);
+            $thisline = mb_ereg_replace('{desc}', html2txt($r['desc']).$license, $thisline);
         }
 
         $thisline = mb_ereg_replace('{type}', $r['type'], $thisline);
@@ -197,7 +197,7 @@ 
                 $thislog = mb_ereg_replace('{text}', html2txt($rLog['text']), $thislog);
             }
 
-            $logentries .= $thislog . "\n";
+            $logentries .= $thislog."\n";
         }
         $thisline = mb_ereg_replace('{logs}', $logentries, $thisline);
 
@@ -205,7 +205,7 @@ 
         if (!$bUseZip) {
             echo $thisline;
         } else {
-            $phpzip->add_data($r['waypoint'] . '.txt', $thisline);
+            $phpzip->add_data($r['waypoint'].'.txt', $thisline);
         }
     }
     mysql_free_result($rs);

htdocs/okapi/services/caches/formatters/garmin.php

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

@@ -3,19 +3,14 @@
 namespace okapi\services\caches\formatters\garmin;
 
 
-use okapi\Okapi;
 use okapi\Cache;
-use okapi\Settings;
-use okapi\OkapiRequest;
-use okapi\OkapiHttpResponse;
+use okapi\InvalidParam;
 use okapi\OkapiInternalRequest;
+use okapi\OkapiRequest;
 use okapi\OkapiServiceRunner;
 use okapi\OkapiZIPHttpResponse;
-use okapi\BadRequest;
 use okapi\ParamMissing;
-use okapi\InvalidParam;
-use okapi\OkapiAccessToken;
-use okapi\services\caches\search\SearchAssistant;
+use okapi\Settings;
 
 use \Exception;
 use \clsTbsZip;

Spacing +4 added lines, -4 removed lines

@@ -60,14 +60,14 @@ 
         # also include image references (actual images will be added as separate files later)
         # and personal data (if the method was invoked using Level 3 Authentication).
 
-        switch($format) {
+        switch ($format) {
             case 'gpx' :
-                $data_filename = "Garmin/GPX/opencaching".time().rand(100000,999999).".gpx";
+                $data_filename = "Garmin/GPX/opencaching".time().rand(100000, 999999).".gpx";
                 $data_method = 'services/caches/formatters/gpx';
                 $data_use_compression = true;
                 break;
             case 'ggz' :
-                $data_filename = "Garmin/GGZ/opencaching".time().rand(100000,999999).".ggz";
+                $data_filename = "Garmin/GGZ/opencaching".time().rand(100000, 999999).".ggz";
                 $data_method = 'services/caches/formatters/ggz';
                 $data_use_compression = false;
                 break;
@@ -126,7 +126,7 @@ 
                         }
                     }
                     if (!$tmp)
-                        continue;  # unsupported file extension
+                        continue; # unsupported file extension
 
                     if ($img['is_spoiler']) {
                         $zippath = $dir."/Spoilers/".$img['unique_caption'].".jpg";

Braces +49 added lines, -45 removed lines

@@ -32,22 +32,32 @@ 
     public static function call(OkapiRequest $request)
     {
         $cache_codes = $request->get_parameter('cache_codes');
-        if ($cache_codes === null) throw new ParamMissing('cache_codes');
+        if ($cache_codes === null) {
+            throw new ParamMissing('cache_codes');
+        }
 
         # Issue 106 requires us to allow empty list of cache codes to be passed into this method.
         # All of the queries below have to be ready for $cache_codes to be empty!
 
         $langpref = $request->get_parameter('langpref');
-        if (!$langpref) $langpref = "en";
+        if (!$langpref) {
+            $langpref = "en";
+        }
         $langpref .= "|".Settings::get('SITELANG');
         $images = $request->get_parameter('images');
-        if (!$images) $images = "all";
-        if (!in_array($images, array("none", "all", "spoilers", "nonspoilers")))
-            throw new InvalidParam('images');
+        if (!$images) {
+            $images = "all";
+        }
+        if (!in_array($images, array("none", "all", "spoilers", "nonspoilers"))) {
+                    throw new InvalidParam('images');
+        }
         $format = $request->get_parameter('caches_format');
-        if (!$format) $format = "gpx";
-        if (!in_array($format, array("gpx", "ggz")))
-            throw new InvalidParam('caches_format');
+        if (!$format) {
+            $format = "gpx";
+        }
+        if (!in_array($format, array("gpx", "ggz"))) {
+                    throw new InvalidParam('caches_format');
+        }
 
         $location_source = $request->get_parameter('location_source');
         $location_change_prefix = $request->get_parameter('location_change_prefix');
@@ -97,36 +107,37 @@ 
         $caches = OkapiServiceRunner::call('services/caches/geocaches', new OkapiInternalRequest(
             $request->consumer, $request->token, array('cache_codes' => $cache_codes,
             'langpref' => $langpref, 'fields' => "images")));
-        if (count($caches) > 50)
-            throw new InvalidParam('cache_codes', "The maximum number of caches allowed to be downloaded with this method is 50.");
-        if ($images != 'none')
-        {
+        if (count($caches) > 50) {
+                    throw new InvalidParam('cache_codes', "The maximum number of caches allowed to be downloaded with this method is 50.");
+        }
+        if ($images != 'none') {
             $supported_extensions = array('jpg', 'jpeg', 'gif', 'png', 'bmp');
-            foreach ($caches as $cache_code => $dict)
-            {
+            foreach ($caches as $cache_code => $dict) {
                 $imgs = $dict['images'];
-                if (count($imgs) == 0)
-                    continue;
+                if (count($imgs) == 0) {
+                                    continue;
+                }
                 $dir = "Garmin/GeocachePhotos/".$cache_code[strlen($cache_code) - 1];
                 $dir .= "/".$cache_code[strlen($cache_code) - 2];
                 $dir .= "/".$cache_code;
-                foreach ($imgs as $no => $img)
-                {
-                    if ($images == 'spoilers' && (!$img['is_spoiler']))
-                        continue;
-                    if ($images == 'nonspoilers' && $img['is_spoiler'])
-                        continue;
+                foreach ($imgs as $no => $img) {
+                    if ($images == 'spoilers' && (!$img['is_spoiler'])) {
+                                            continue;
+                    }
+                    if ($images == 'nonspoilers' && $img['is_spoiler']) {
+                                            continue;
+                    }
                     $tmp = false;
-                    foreach ($supported_extensions as $ext)
-                    {
-                        if (strtolower(substr($img['url'], strlen($img['url']) - strlen($ext) - 1)) != ".".$ext)
-                        {
+                    foreach ($supported_extensions as $ext) {
+                        if (strtolower(substr($img['url'], strlen($img['url']) - strlen($ext) - 1)) != ".".$ext) {
                             $tmp = true;
                             continue;
                         }
                     }
-                    if (!$tmp)
-                        continue;  # unsupported file extension
+                    if (!$tmp) {
+                                            continue;
+                    }
+                    # unsupported file extension
 
                     if ($img['is_spoiler']) {
                         $zippath = $dir."/Spoilers/".$img['unique_caption'].".jpg";
@@ -142,34 +153,25 @@ 
                     # be accessed locally. But all the files have 'local' set to 1 anyway.
 
                     $syspath = Settings::get('IMAGES_DIR')."/".$img['uuid'].".jpg";
-                    if (file_exists($syspath))
-                    {
+                    if (file_exists($syspath)) {
                         $response->zip->FileAdd($zippath, $syspath, clsTbsZip::TBSZIP_FILE, false);
-                    }
-                    else
-                    {
+                    } else {
                         # If file exists, but does not end with ".jpg", we will create
                         # JPEG version of it and store it in the cache.
 
                         $cache_key = "jpg#".$img['uuid'];
                         $jpeg_contents = Cache::get($cache_key);
-                        if ($jpeg_contents === null)
-                        {
-                            foreach ($supported_extensions as $ext)
-                            {
+                        if ($jpeg_contents === null) {
+                            foreach ($supported_extensions as $ext) {
                                 $syspath_other = Settings::get('IMAGES_DIR')."/".$img['uuid'].".".$ext;
-                                if (file_exists($syspath_other))
-                                {
-                                    try
-                                    {
+                                if (file_exists($syspath_other)) {
+                                    try {
                                         $image = imagecreatefromstring(file_get_contents($syspath_other));
                                         ob_start();
                                         imagejpeg($image);
                                         $jpeg_contents = ob_get_clean();
                                         imagedestroy($image);
-                                    }
-                                    catch (Exception $e)
-                                    {
+                                    } catch (Exception $e) {
                                         # GD couldn't parse the file. We will skip it, and cache
                                         # the "false" value as the contents. This way, we won't
                                         # attempt to parse it during the next 24 hours.
@@ -181,8 +183,10 @@ 
                                 }
                             }
                         }
-                        if ($jpeg_contents)  # This can be "null" *or* "false"!
+                        if ($jpeg_contents) {
+                            # This can be "null" *or* "false"!
                             $response->zip->FileAdd($zippath, $jpeg_contents, clsTbsZip::TBSZIP_STRING, false);
+                        }
                     }
                 }
             }

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