OpencachingDeutschland / oc-server3

htdocs/okapi/services/oauth/authorize.php

Braces +9 added lines, -5 removed lines

@@ -21,13 +21,17 @@
     public static function call(OkapiRequest $request)
     {
         $token_key = $request->get_parameter('oauth_token');
-        if (!$token_key)
-            throw new ParamMissing("oauth_token");
+        if (!$token_key) {
+                    throw new ParamMissing("oauth_token");
+        }
         $langpref = $request->get_parameter('langpref');
         $interactivity = $request->get_parameter('interactivity');
-        if (!$interactivity) $interactivity = 'minimal';
-        if (!in_array($interactivity, array('minimal', 'confirm_user')))
-            throw new InvalidParam('interactivity', $interactivity);
+        if (!$interactivity) {
+            $interactivity = 'minimal';
+        }
+        if (!in_array($interactivity, array('minimal', 'confirm_user'))) {
+                    throw new InvalidParam('interactivity', $interactivity);
+        }
 
         # Redirect to the "apps" folder. This is done there (not here)
         # because: 1) we don't want any cookie or session-handling

htdocs/okapi/services/attrs/attribute.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
         $acode = $request->get_parameter('acode');
         if ($acode === null) throw new ParamMissing('acode');
-        if (strstr($acode,'|')) throw new InvalidParam('acode', "Only a single A-code must be supplied.");
+        if (strstr($acode, '|')) throw new InvalidParam('acode', "Only a single A-code must be supplied.");
 
         $langpref = $request->get_parameter('langpref');
         if (!$langpref) $langpref = "en";

Braces +16 added lines, -7 removed lines

@@ -29,17 +29,27 @@ 
         # Read the parameters.
 
         $acode = $request->get_parameter('acode');
-        if ($acode === null) throw new ParamMissing('acode');
-        if (strstr($acode,'|')) throw new InvalidParam('acode', "Only a single A-code must be supplied.");
+        if ($acode === null) {
+            throw new ParamMissing('acode');
+        }
+        if (strstr($acode,'|')) {
+            throw new InvalidParam('acode', "Only a single A-code must be supplied.");
+        }
 
         $langpref = $request->get_parameter('langpref');
-        if (!$langpref) $langpref = "en";
+        if (!$langpref) {
+            $langpref = "en";
+        }
 
         $fields = $request->get_parameter('fields');
-        if (!$fields) $fields = "name";
+        if (!$fields) {
+            $fields = "name";
+        }
 
         $forward_compatible = $request->get_parameter('forward_compatible');
-        if (!$forward_compatible) $forward_compatible = "true";
+        if (!$forward_compatible) {
+            $forward_compatible = "true";
+        }
 
         # Pass them all to the attributes method.
 
@@ -52,8 +62,7 @@ 
         $results = OkapiServiceRunner::call('services/attrs/attributes',
             new OkapiInternalRequest($request->consumer, $request->token, $params));
         $result = $results[$acode];
-        if ($result === null)
-        {
+        if ($result === null) {
             /* Note, this can happen only when $forward_compatible is false. */
             throw new InvalidParam('acode', "Unknown A-code.");
         }

htdocs/okapi/facade.php

Braces +6 added lines, -4 removed lines

@@ -78,8 +78,9 @@ 
         );
         $request->i_want_OkapiResponse = true;
         $request->perceive_as_http_request = true;
-        if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
-            $request->etag = $_SERVER['HTTP_IF_NONE_MATCH'];
+        if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
+                    $request->etag = $_SERVER['HTTP_IF_NONE_MATCH'];
+        }
         $response = OkapiServiceRunner::call($service_name, $request);
         $response->display();
     }
@@ -118,8 +119,9 @@ 
      */
     public static function schedule_geocache_check($cache_codes)
     {
-        if (!is_array($cache_codes))
-            $cache_codes = array($cache_codes);
+        if (!is_array($cache_codes)) {
+                    $cache_codes = array($cache_codes);
+        }
         Db::execute("
             update caches
             set okapi_syncbase = now()

htdocs/okapi/lib/oc_session.php

Braces +12 added lines, -8 removed lines

@@ -12,18 +12,22 @@
     public static function get_user_id()
     {
         static $cached_result = false;
-        if ($cached_result !== false)
-            return $cached_result;
+        if ($cached_result !== false) {
+                    return $cached_result;
+        }
 
         $cookie_name = Settings::get('OC_COOKIE_NAME');
-        if (!isset($_COOKIE[$cookie_name]))
-            return null;
+        if (!isset($_COOKIE[$cookie_name])) {
+                    return null;
+        }
         $OC_data = unserialize(base64_decode($_COOKIE[$cookie_name]));
-        if (!isset($OC_data['sessionid']))
-            return null;
+        if (!isset($OC_data['sessionid'])) {
+                    return null;
+        }
         $OC_sessionid = $OC_data['sessionid'];
-        if (!$OC_sessionid)
-            return null;
+        if (!$OC_sessionid) {
+                    return null;
+        }
 
         return Db::select_value("select user_id from sys_sessions where uuid='".Db::escape_string($OC_sessionid)."'");
     }

htdocs/okapi/views/changelog_helper.inc.php

Indentation +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
                 );
                 $context = stream_context_create($opts);
                 $changes_xml = file_get_contents(
-                     # TODO: load from OKAPI repo
+                        # TODO: load from OKAPI repo
                     'https://raw.githubusercontent.com/opencaching/okapi/master/etc/changes.xml',
                     false, $context
                 );

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
                     throw new ErrorException();
                 }
                 Cache::set($cache_key, $changes_xml, 3600);
-                Cache::set($cache_backup_key, $changes_xml, 3600*24*30);
+                Cache::set($cache_backup_key, $changes_xml, 3600 * 24 * 30);
             }
             catch (Exception $e)
             {
@@ -51,7 +51,7 @@ 
 
                 $changes_xml = Cache::get($cache_backup_key);
                 if ($changes_xml) {
-                    Cache::set($cache_key, $changes_xml, 3600*12);
+                    Cache::set($cache_key, $changes_xml, 3600 * 12);
                 }
             }
         }

Braces +5 added lines, -12 removed lines

@@ -20,12 +20,10 @@ 
         $changes_xml = Cache::get($cache_key);
         $changelog = null;
 
-        if (!$changes_xml)
-        {
+        if (!$changes_xml) {
             # Download the current changelog.
 
-            try
-            {
+            try {
                 $opts = array(
                     'http' => array(
                         'method' => "GET",
@@ -44,9 +42,7 @@ 
                 }
                 Cache::set($cache_key, $changes_xml, 3600);
                 Cache::set($cache_backup_key, $changes_xml, 3600*24*30);
-            }
-            catch (Exception $e)
-            {
+            } catch (Exception $e) {
                 # GitHub failed on us. User backup list, if available.
 
                 $changes_xml = Cache::get($cache_backup_key);
@@ -64,14 +60,11 @@ 
         $this->unavailable_changes = array();
         $this->available_changes = array();
 
-        if (!$changelog)
-        {
+        if (!$changelog) {
             # We could not retreive the changelog from Github, and there was
             # no backup key or it expired. Probably we are on a developer
             # machine. The template will output some error message.
-        }
-        else
-        {
+        } else {
             $commits = array();
             $versions = array();
 

htdocs/okapi/views/method_call.php

Braces +3 added lines, -2 removed lines

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

htdocs/templates2/ocstyle/search.tpl.inc.php

Indentation +2 added lines, -2 removed lines

@@ -8,8 +8,8 @@
  ****************************************************************************/
 
     // search.php -> $tpl->error
-     $outputformat_notexist = _('The selected output format is unknown!');
-     $error_query_not_found = _('The search operation could not be executed, please reenter the search data.');
+        $outputformat_notexist = _('The selected output format is unknown!');
+        $error_query_not_found = _('The search operation could not be executed, please reenter the search data.');
     $unknown_searchoption = _('unknown search option');
     $unknown_searchtype = _('unknown search type');
 

Spacing +9 added lines, -9 removed lines

@@ -14,14 +14,14 @@ 
     $unknown_searchtype = _('unknown search type');
 
     // search.php -> search.tpl
-    $error_plz = '<tr><td colspan="3"><span class="errormsg">' . _('The postal code could not be found') . '</span></td></tr>';
-    $error_ort = '<tr><td colspan="3"><span class="errormsg">' . _('There does no city exist with this name') . '</span></td></tr>';
-    $error_locidnocoords = '<tr><td colspan="3"><span class="errormsg">' . _('There are no Koordinates available for the selected city') . '</span></td></tr>';
-    $error_noort = '<tr><td colspan="3"><span class="errormsg">' . _('The entered city is not valid.') . '</span></td></tr>';
-    $error_nowaypointfound = '<tr><td colspan="3"><span class="errormsg">' . _('There does no cache exist with this waypoint') . '</span></td></tr>';
-    $error_nocoords = '<tr><td colspan="3"><span class="errormsg">' . _('The entered coordinates are no valid.') . '</span></td></tr>';
-    $error_nofulltext = '<tr><td colspan="3"><span class="errormsg">' . _('The entered text is invalid.') . '</span></td></tr>';
-    $error_fulltexttoolong = '<tr><td colspan="3"><span class="errormsg">' . _('The entered text contains more than 50 words.') . '</span></td></tr>';
+    $error_plz = '<tr><td colspan="3"><span class="errormsg">'._('The postal code could not be found').'</span></td></tr>';
+    $error_ort = '<tr><td colspan="3"><span class="errormsg">'._('There does no city exist with this name').'</span></td></tr>';
+    $error_locidnocoords = '<tr><td colspan="3"><span class="errormsg">'._('There are no Koordinates available for the selected city').'</span></td></tr>';
+    $error_noort = '<tr><td colspan="3"><span class="errormsg">'._('The entered city is not valid.').'</span></td></tr>';
+    $error_nowaypointfound = '<tr><td colspan="3"><span class="errormsg">'._('There does no cache exist with this waypoint').'</span></td></tr>';
+    $error_nocoords = '<tr><td colspan="3"><span class="errormsg">'._('The entered coordinates are no valid.').'</span></td></tr>';
+    $error_nofulltext = '<tr><td colspan="3"><span class="errormsg">'._('The entered text is invalid.').'</span></td></tr>';
+    $error_fulltexttoolong = '<tr><td colspan="3"><span class="errormsg">'._('The entered text contains more than 50 words.').'</span></td></tr>';
 
     // search.php -> selectlocid.tpl
     $locline = '<tr><td width="50px"><p>{nr}.&nbsp;</p></td><td><p><b><a href="search.php?{urlparams}">{locationname}</a>{secondlocationname}</b></p></td></tr>
@@ -32,7 +32,7 @@ 
     $no_location_coords = _('no coordinates available');
 
     // search.html.inc.php -> search.result.caches.tpl
-    $caches_newstring = '<b class="newsymbol">&nbsp;' . _('NEW') . '&nbsp;</b>&nbsp;';
+    $caches_newstring = '<b class="newsymbol">&nbsp;'._('NEW').'&nbsp;</b>&nbsp;';
     $caches_oconlystring = '<img src="resource2/ocstyle/images/misc/is_oconly.png" alt="OConly" title="OConly" style="margin:0px; padding:0px" width="64" height="35" />';
 
     $cache_attrib_group =

htdocs/ignore.php

Switch Indentation +6 added lines, -6 removed lines

@@ -29,12 +29,12 @@
 }
 
 switch ($action) {
-    case 'addignore':
-        sql("INSERT IGNORE INTO `cache_ignore` (`cache_id`, `user_id`) VALUES ('&1', '&2')", $cache_id, $login->userid);
-        break;
-    case 'removeignore':
-        sql("DELETE FROM `cache_ignore` WHERE `cache_id`='&1' AND `user_id`='&2'", $cache_id, $login->userid);
-        break;
+        case 'addignore':
+            sql("INSERT IGNORE INTO `cache_ignore` (`cache_id`, `user_id`) VALUES ('&1', '&2')", $cache_id, $login->userid);
+            break;
+        case 'removeignore':
+            sql("DELETE FROM `cache_ignore` WHERE `cache_id`='&1' AND `user_id`='&2'", $cache_id, $login->userid);
+            break;
 }
 
 // clear cached map result, so that the change directly appears on the map

Spacing +3 added lines, -3 removed lines

@@ -5,11 +5,11 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $cache_id = isset($_GET['cacheid']) ? $_GET['cacheid'] + 0 : 0;
 $action = isset($_GET['action']) ? $_GET['action'] : '';
-$target = isset($_GET['target']) ? $_GET['target'] : 'viewcache.php?cacheid=' . $cache_id;
+$target = isset($_GET['target']) ? $_GET['target'] : 'viewcache.php?cacheid='.$cache_id;
 
 $login->verify();
 
@@ -41,7 +41,7 @@ 
 $map_result_id = sql_value(
     "SELECT `result_id`
      FROM `map2_result`
-     WHERE INSTR(sqlquery,\"`user_id`='" . sql_escape($login->userid) . "'\")
+     WHERE INSTR(sqlquery,\"`user_id`='" . sql_escape($login->userid)."'\")
      LIMIT 1",
     0
 );

htdocs/editcache.php

Braces +15 added lines, -5 removed lines

@@ -76,10 +76,12 @@ 
 if ($error == false) {
     //cacheid
     $cache_id = 0;
-    if (isset($_REQUEST['cacheid']))  // Ocprop
+    if (isset($_REQUEST['cacheid'])) {
+        // Ocprop
     {
         $cache_id = $_REQUEST['cacheid'];
     }
+    }
 
     if ($usr === false) {
         $tplname = 'login';
@@ -197,9 +199,11 @@ 
                 $way_length = isset($_POST['way_length']) ? $_POST['way_length'] : $cache_record['way_length'];
 
                 if ($status_old == 5 && $status == 5) {
-                    if (isset($_POST['publish']))  // Ocprop
+                    if (isset($_POST['publish'])) {
+                        // Ocprop
                     {
                         $publish = $_POST['publish'];
+                    }
                         if (!($publish == 'now' || $publish == 'later' || $publish == 'notnow')) {
                             // somebody messed up the POST-data, so we do not publish the cache, since he isn't published right now (status=5)
                             $publish = 'notnow';
@@ -228,12 +232,14 @@ 
                     $status = $status_old;
                 }
 
-                if ($status_old == 7) // cache is locked
+                if ($status_old == 7) {
+                    // cache is locked
                 {
                     // only admins can change status of locked caches
                     if (($bAdmin & ADMIN_USER) != ADMIN_USER) {
                         // no status change allowed for normal user
                         $status = $status_old;
+                }
                     }
                 }
 
@@ -439,11 +445,13 @@ 
                 }
 
                 //try to save to DB?
-                if (isset($_POST['submit']))  // Ocprop
+                if (isset($_POST['submit'])) {
+                    // Ocprop
                 {
                     //all validations ok?
                     if (!($hidden_date_not_ok || $lat_not_ok || $lon_not_ok || $name_not_ok || $time_not_ok || $way_length_not_ok || $size_not_ok || $activate_date_not_ok || $status_not_ok || $diff_not_ok || $attribs_not_ok || $wpgc_not_ok)) {
                         $cache_lat = $coords_lat_h + $coords_lat_min / 60;
+                }
                         if ($coords_latNS == 'S') {
                             $cache_lat = - $cache_lat;
                         }
@@ -931,9 +939,11 @@ 
                 tpl_set_var('statuschange', $status_old == 5 ? '' : mb_ereg_replace('%1', $cache_id, $status_change));
 
                 // show activation form?
-                if ($status_old == 5) // status = not yet published
+                if ($status_old == 5) {
+                    // status = not yet published
                 {
                     $tmp = $activation_form;
+                }
 
                     $tmp = mb_ereg_replace(
                         '{activate_day}',

Spacing +63 added lines, -63 removed lines

@@ -13,9 +13,9 @@ 
 use Oc\Libse\ChildWp\HandlerChildWp;
 use Oc\Libse\Coordinate\FormatterCoordinate;
 
-require_once __DIR__ . '/lib/consts.inc.php';
+require_once __DIR__.'/lib/consts.inc.php';
 $opt['gui'] = GUI_HTML;
-require_once __DIR__ . '/lib/common.inc.php';
+require_once __DIR__.'/lib/common.inc.php';
 
 function getWaypoints($cacheid)
 {
@@ -85,7 +85,7 @@ 
         $tplname = 'login';
 
         tpl_set_var('username', '');
-        tpl_set_var('target', 'editcache.php?cacheid=' . urlencode($cache_id));
+        tpl_set_var('target', 'editcache.php?cacheid='.urlencode($cache_id));
         tpl_set_var('message_start', "");
         tpl_set_var('message_end', "");
         tpl_set_var('message', $login_required);
@@ -131,7 +131,7 @@ 
             if ($cache_record['user_id'] == $usr['userid'] || $login->listingAdmin()) {
                 $tplname = 'editcache';
 
-                require $stylepath . '/editcache.inc.php';
+                require $stylepath.'/editcache.inc.php';
 
                 if ($cache_record['node'] != $oc_nodeid) {
                     tpl_errorMsg('editcache', $error_wrong_node);
@@ -139,7 +139,7 @@ 
                 }
 
                 //here we read all used information from the form if submitted, otherwise from DB
-                $cache_name = trim(isset($_POST['name']) ? $_POST['name'] : $cache_record['name']);  // Ocprop
+                $cache_name = trim(isset($_POST['name']) ? $_POST['name'] : $cache_record['name']); // Ocprop
                 $cache_type = isset($_POST['type']) ? $_POST['type'] : $cache_record['type'];
                 if (!isset($_POST['size'])) {
                     if ($cache_type == 4 || $cache_type == 5) {
@@ -153,15 +153,15 @@ 
                 $cache_hidden_day = isset($_POST['hidden_day']) ? $_POST['hidden_day'] : date(
                     'd',
                     strtotime($cache_record['date_hidden'])
-                );  // Ocprop
+                ); // Ocprop
                 $cache_hidden_month = isset($_POST['hidden_month']) ? $_POST['hidden_month'] : date(
                     'm',
                     strtotime($cache_record['date_hidden'])
-                );  // Ocprop
+                ); // Ocprop
                 $cache_hidden_year = isset($_POST['hidden_year']) ? $_POST['hidden_year'] : date(
                     'Y',
                     strtotime($cache_record['date_hidden'])
-                );  // Ocprop
+                ); // Ocprop
 
                 if (is_null($cache_record['date_activate'])) {
                     $cache_activate_day = isset($_POST['activate_day']) ? $_POST['activate_day'] : date('d');
@@ -187,11 +187,11 @@ 
                     );
                 }
 
-                $cache_difficulty = isset($_POST['difficulty']) ? $_POST['difficulty'] : $cache_record['difficulty'];  // Ocprop
-                $cache_terrain = isset($_POST['terrain']) ? $_POST['terrain'] : $cache_record['terrain'];  // Ocprop
-                $cache_country = isset($_POST['country']) ? $_POST['country'] : $cache_record['country'];  // Ocprop
+                $cache_difficulty = isset($_POST['difficulty']) ? $_POST['difficulty'] : $cache_record['difficulty']; // Ocprop
+                $cache_terrain = isset($_POST['terrain']) ? $_POST['terrain'] : $cache_record['terrain']; // Ocprop
+                $cache_country = isset($_POST['country']) ? $_POST['country'] : $cache_record['country']; // Ocprop
                 $show_all_countries = isset($_POST['show_all_countries']) ? $_POST['show_all_countries'] : 0;
-                $status = isset($_POST['status']) ? $_POST['status'] : $cache_record['status'];  // Ocprop
+                $status = isset($_POST['status']) ? $_POST['status'] : $cache_record['status']; // Ocprop
                 $status_old = $cache_record['status'];
                 $search_time = isset($_POST['search_time']) ? $_POST['search_time'] : $cache_record['search_time'];
                 $way_length = isset($_POST['way_length']) ? $_POST['way_length'] : $cache_record['way_length'];
@@ -253,7 +253,7 @@ 
 
                 $log_pw = isset($_POST['log_pw']) ? mb_substr($_POST['log_pw'], 0, 20) : $cache_record['logpw'];
                 // fix #4356: gc waypoints are frequently copy&pasted with leading spaces
-                $wp_gc = isset($_POST['wp_gc']) ? strtoupper(trim($_POST['wp_gc'])) : $cache_record['wp_gc'];  // Ocprop
+                $wp_gc = isset($_POST['wp_gc']) ? strtoupper(trim($_POST['wp_gc'])) : $cache_record['wp_gc']; // Ocprop
                 $showlists = isset($_POST['showlists']) ? 1 : $cache_record['show_cachelists'] + 0;
                 $protect_old_coords = isset($_POST['protect_old_coords']) ? 1 : $cache_record['protect_old_coords'] + 0;
 
@@ -265,12 +265,12 @@ 
 
                 if (isset($_POST['latNS'])) {
                     //get coords from post-form
-                    $coords_latNS = $_POST['latNS'];  // Ocprop
-                    $coords_lonEW = $_POST['lonEW'];  // Ocprop
-                    $coords_lat_h = $_POST['lat_h'];  // Ocprop
-                    $coords_lon_h = $_POST['lon_h'];  // Ocprop
-                    $coords_lat_min = $_POST['lat_min'];  // Ocprop
-                    $coords_lon_min = $_POST['lon_min'];  // Ocprop
+                    $coords_latNS = $_POST['latNS']; // Ocprop
+                    $coords_lonEW = $_POST['lonEW']; // Ocprop
+                    $coords_lat_h = $_POST['lat_h']; // Ocprop
+                    $coords_lon_h = $_POST['lon_h']; // Ocprop
+                    $coords_lat_min = $_POST['lat_min']; // Ocprop
+                    $coords_lon_min = $_POST['lon_min']; // Ocprop
                 } else {
                     //get coords from DB
                     $coords_lon = $cache_record['longitude'];
@@ -457,7 +457,7 @@ 
                             $activation_date = 'NULL';
                         } elseif ($publish == 'later') {
                             $status = 5;
-                            $activation_date = "'" . sql_escape(
+                            $activation_date = "'".sql_escape(
                                     date(
                                         'Y-m-d H:i:s',
                                         mktime(
@@ -469,7 +469,7 @@ 
                                             $cache_activate_year
                                         )
                                     )
-                                ) . "'";
+                                )."'";
                         } elseif ($publish == 'notnow') {
                             $status = 5;
                             $activation_date = 'NULL';
@@ -564,7 +564,7 @@ 
                                     $logtype = 13;
                                     break;
                                 default:
-                                    $logtype = 0;  // ???
+                                    $logtype = 0; // ???
                             }
                             if ($logtype > 0) {
                                 sql(
@@ -585,25 +585,25 @@ 
 
                         // update cache attributes
                         $attriblist = "999";
-                        for ($i = 0; $i < count($cache_attribs); $i ++) {
+                        for ($i = 0; $i < count($cache_attribs); $i++) {
                             if ($cache_attribs[$i] + 0 > 0) {
                                 sql(
                                     "INSERT IGNORE INTO `caches_attributes` (`cache_id`, `attrib_id`) VALUES('&1', '&2')",
                                     $cache_id,
                                     $cache_attribs[$i] + 0
                                 );
-                                $attriblist .= "," . ($cache_attribs[$i] + 0);
+                                $attriblist .= ",".($cache_attribs[$i] + 0);
                             }
                         }
 
                         sql(
-                            "DELETE FROM `caches_attributes` WHERE `cache_id`='&1' AND `attrib_id` NOT IN (" . $attriblist . ")",
+                            "DELETE FROM `caches_attributes` WHERE `cache_id`='&1' AND `attrib_id` NOT IN (".$attriblist.")",
                             // SQL injections in $attriblist prevented by adding 0 above
                             $cache_id
                         );
 
                         //call eventhandler
-                        require_once $opt['rootpath'] . 'lib/eventhandler.inc.php';
+                        require_once $opt['rootpath'].'lib/eventhandler.inc.php';
                         event_edit_cache($cache_id, $usr['userid'] + 0);
 
                         // if old status is not yet published and new status is published => notify-event
@@ -612,7 +612,7 @@ 
                         }
 
                         //display cache-page
-                        tpl_redirect('viewcache.php?cacheid=' . urlencode($cache_id));
+                        tpl_redirect('viewcache.php?cacheid='.urlencode($cache_id));
                         // Ocprop: Location:\s*$viewcacheUrl\?cacheid=([0-9]+)
                         // (s.a. tpl_redirect() in common.inc.php
                         exit;
@@ -654,15 +654,15 @@ 
 
                 while ($record = sql_fetch_assoc($rs)) {
                     $sSelected = ($record['short'] == $cache_country) ? ' selected="selected"' : '';
-                    $countriesoptions .= '<option value="' . htmlspecialchars(
+                    $countriesoptions .= '<option value="'.htmlspecialchars(
                             $record['short'],
                             ENT_COMPAT,
                             'UTF-8'
-                        ) . '"' . $sSelected . '>' . htmlspecialchars(
+                        ).'"'.$sSelected.'>'.htmlspecialchars(
                             $record['name'],
                             ENT_COMPAT,
                             'UTF-8'
-                        ) . '</option>' . "\n";
+                        ).'</option>'."\n";
                 }
                 tpl_set_var('countryoptions', $countriesoptions);
                 sql_free_result($rs);
@@ -719,7 +719,7 @@ 
                         $line = mb_ereg_replace('{name}', escape_javascript($record['name']), $line);
                         $line = mb_ereg_replace('{color}', $rAttrGroup['color'], $line);
                         $group_line .= $line;
-                        $nLineAttrCount ++;
+                        $nLineAttrCount++;
 
                         $line = $cache_attrib_js;
                         $line = mb_ereg_replace('{id}', $record['id'], $line);
@@ -776,11 +776,11 @@ 
 
                 //difficulty
                 $difficulty_options = '';
-                for ($i = 2; $i <= 10; $i ++) {
+                for ($i = 2; $i <= 10; $i++) {
                     if ($cache_difficulty == $i) {
-                        $difficulty_options .= '<option value="' . $i . '" selected="selected">' . $i / 2 . '</option>';
+                        $difficulty_options .= '<option value="'.$i.'" selected="selected">'.$i / 2.'</option>';
                     } else {
-                        $difficulty_options .= '<option value="' . $i . '">' . $i / 2 . '</option>';
+                        $difficulty_options .= '<option value="'.$i.'">'.$i / 2.'</option>';
                     }
                     $difficulty_options .= "\n";
                 }
@@ -788,11 +788,11 @@ 
 
                 //build terrain options
                 $terrain_options = '';
-                for ($i = 2; $i <= 10; $i ++) {
+                for ($i = 2; $i <= 10; $i++) {
                     if ($cache_terrain == $i) {
-                        $terrain_options .= '<option value="' . $i . '" selected="selected">' . $i / 2 . '</option>';
+                        $terrain_options .= '<option value="'.$i.'" selected="selected">'.$i / 2.'</option>';
                     } else {
-                        $terrain_options .= '<option value="' . $i . '">' . $i / 2 . '</option>';
+                        $terrain_options .= '<option value="'.$i.'">'.$i / 2.'</option>';
                     }
                     $terrain_options .= "\n";
                 }
@@ -805,16 +805,16 @@ 
                                                         FROM `cache_type`
                                              LEFT JOIN `sys_trans` ON `cache_type`.`trans_id`=`sys_trans`.`id`
                                              LEFT JOIN `sys_trans_text` ON `sys_trans`.`id`=`sys_trans_text`.`trans_id` AND
-                                                                 `sys_trans_text`.`lang`='" . sql_escape($locale) . "'
+                                                                 `sys_trans_text`.`lang`='" . sql_escape($locale)."'
                                                 ORDER BY `cache_type`.`ordinal` ASC"
                 );
                 while ($rType = sql_fetch_assoc($rsTypes)) {
                     $sSelected = ($rType['id'] == $cache_type) ? ' selected="selected"' : '';
-                    $types .= '<option value="' . $rType['id'] . '"' . $sSelected . '>' . htmlspecialchars(
+                    $types .= '<option value="'.$rType['id'].'"'.$sSelected.'>'.htmlspecialchars(
                             $rType['name'],
                             ENT_COMPAT,
                             'UTF-8'
-                        ) . '</option>';
+                        ).'</option>';
                 }
                 sql_free_result($rsTypes);
                 tpl_set_var('typeoptions', $types);
@@ -826,16 +826,16 @@ 
                                                         FROM `cache_size`
                                              LEFT JOIN `sys_trans` ON `cache_size`.`trans_id`=`sys_trans`.`id`
                                              LEFT JOIN `sys_trans_text` ON `sys_trans`.`id`=`sys_trans_text`.`trans_id` AND
-                                                                 `sys_trans_text`.`lang`='" . sql_escape($locale) . "'
+                                                                 `sys_trans_text`.`lang`='" . sql_escape($locale)."'
                                                 ORDER BY `cache_size`.`ordinal` ASC"
                 );
                 while ($rSize = sql_fetch_assoc($rsSizes)) {
                     $sSelected = ($rSize['id'] == $sel_size) ? ' selected="selected"' : '';
-                    $sizes .= '<option value="' . $rSize['id'] . '"' . $sSelected . '>' . htmlspecialchars(
+                    $sizes .= '<option value="'.$rSize['id'].'"'.$sSelected.'>'.htmlspecialchars(
                             $rSize['name'],
                             ENT_COMPAT,
                             'UTF-8'
-                        ) . '</option>';
+                        ).'</option>';
                 }
                 sql_free_result($rsSizes);
                 tpl_set_var('sizeoptions', $sizes);
@@ -846,14 +846,14 @@ 
                 $gc_com_refs = false;
                 foreach ($desclangs AS $desclang) {
                     if (count($desclangs) > 1) {
-                        $remove_url = 'removedesc.php?cacheid=' . urlencode($cache_id) . '&desclang=' . urlencode(
+                        $remove_url = 'removedesc.php?cacheid='.urlencode($cache_id).'&desclang='.urlencode(
                                 $desclang
                             );
-                        $removedesc = '&nbsp;[<a href="' . htmlspecialchars(
+                        $removedesc = '&nbsp;[<a href="'.htmlspecialchars(
                                 $remove_url,
                                 ENT_COMPAT,
                                 'UTF-8'
-                            ) . '">' . $remove . '</a>]';
+                            ).'">'.$remove.'</a>]';
                     } else {
                         $removedesc = '';
                     }
@@ -869,17 +869,17 @@ 
                     }
                     sql_free_result($resp);
 
-                    $edit_url = 'editdesc.php?cacheid=' . urlencode($cache_id) . '&desclang=' . urlencode($desclang);
+                    $edit_url = 'editdesc.php?cacheid='.urlencode($cache_id).'&desclang='.urlencode($desclang);
 
-                    $cache_descs .= '<tr><td colspan="2">' . htmlspecialchars(
+                    $cache_descs .= '<tr><td colspan="2">'.htmlspecialchars(
                             db_LanguageFromShort($desclang),
                             ENT_COMPAT,
                             'UTF-8'
-                        ) . ' [<a href="' . htmlspecialchars(
+                        ).' [<a href="'.htmlspecialchars(
                             $edit_url,
                             ENT_COMPAT,
                             'UTF-8'
-                        ) . '">' . $edit . '</a>]' . $removedesc . '</td></tr>';
+                        ).'">'.$edit.'</a>]'.$removedesc.'</td></tr>';
                 }
                 tpl_set_var('cache_descs', $cache_descs);
 
@@ -899,33 +899,33 @@ 
                                                              FROM `cache_status`
                                                   LEFT JOIN `sys_trans` ON `cache_status`.`trans_id`=`sys_trans`.`id`
                                                   LEFT JOIN `sys_trans_text` ON `sys_trans`.`id`=`sys_trans_text`.`trans_id` AND
-                                                                      `sys_trans_text`.`lang`='" . sql_escape($locale) . "'
+                                                                      `sys_trans_text`.`lang`='" . sql_escape($locale)."'
                                                           WHERE `cache_status`.`id` NOT IN (4, 5, 7) OR `cache_status`.`id`='" . sql_escape(
                             $status_old + 0
-                        ) . "'
+                        )."'
                                                      ORDER BY `cache_status`.`id` ASC"
                     );
                     while ($rStatus = sql_fetch_assoc($rsStatus)) {
                         $sSelected = ($rStatus['id'] == $status) ? ' selected="selected"' : '';
                         if ($sSelected != '' || $status_old == 5) {
-                            $statusoptions .= '<option value="' . htmlspecialchars(
+                            $statusoptions .= '<option value="'.htmlspecialchars(
                                     $rStatus['id'],
                                     ENT_COMPAT,
                                     'UTF-8'
-                                ) . '"' . $sSelected . '>' . htmlspecialchars(
+                                ).'"'.$sSelected.'>'.htmlspecialchars(
                                     $rStatus['name'],
                                     ENT_COMPAT,
                                     'UTF-8'
-                                ) . '</option>';
+                                ).'</option>';
                         }
                     }
                     sql_free_result($rsStatus);
                 } else {
-                    $statusoptions .= '<option value="7" selected="selected">' . htmlspecialchars(
+                    $statusoptions .= '<option value="7" selected="selected">'.htmlspecialchars(
                             t("Locked, invisible"),
                             ENT_COMPAT,
                             'UTF-8'
-                        ) . '</option>';
+                        ).'</option>';
                 }
                 tpl_set_var('statusoptions', $statusoptions);
                 tpl_set_var('statuschange', $status_old == 5 ? '' : mb_ereg_replace('%1', $cache_id, $status_change));
@@ -955,11 +955,11 @@ 
                     $tmp = mb_ereg_replace('{publish_notnow_checked}', ($publish == 'notnow') ? 'checked' : '', $tmp);
 
                     $activation_hours = '';
-                    for ($i = 0; $i <= 23; $i ++) {
+                    for ($i = 0; $i <= 23; $i++) {
                         if ($cache_activate_hour == $i) {
-                            $activation_hours .= '<option value="' . $i . '" selected="selected">' . $i . '</option>';
+                            $activation_hours .= '<option value="'.$i.'" selected="selected">'.$i.'</option>';
                         } else {
-                            $activation_hours .= '<option value="' . $i . '">' . $i . '</option>';
+                            $activation_hours .= '<option value="'.$i.'">'.$i.'</option>';
                         }
                         $activation_hours .= "\n";
                     }
@@ -983,7 +983,7 @@ 
                         $cache_id
                     );
 
-                    for ($i = 0; $i < mysql_num_rows($rspictures); $i ++) {
+                    for ($i = 0; $i < mysql_num_rows($rspictures); $i++) {
                         $tmpline = ($i == 0 ? $pictureline0 : $pictureline);
                         $pic_record = sql_fetch_array($rspictures);
 
@@ -1058,7 +1058,7 @@ 
                 $st_hours = floor($search_time);
                 $st_minutes = sprintf('%02.0F', ($search_time - $st_hours) * 60);
 
-                tpl_set_var('search_time', $st_hours . ':' . $st_minutes);
+                tpl_set_var('search_time', $st_hours.':'.$st_minutes);
 
                 tpl_set_var('way_length', $way_length);
                 tpl_set_var('log_pw', htmlspecialchars($log_pw, ENT_COMPAT, 'UTF-8'));
@@ -1066,7 +1066,7 @@ 
                 tpl_set_var('showlists_checked', $showlists ? 'checked="checked"' : '');
                 tpl_set_var('protectcoords_checked', $protect_old_coords ? 'checked="checked"' : '');
 
-                tpl_set_var('reset', $reset);  // obsolete
+                tpl_set_var('reset', $reset); // obsolete
                 tpl_set_var('submit', $submit);
             } else {
                 //TODO: not the owner

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

@@ -844,7 +844,7 @@
                 $desclangs = mb_split(',', $cache_record['desc_languages']);
                 $cache_descs = '';
                 $gc_com_refs = false;
-                foreach ($desclangs AS $desclang) {
+                foreach ($desclangs as $desclang) {
                     if (count($desclangs) > 1) {
                         $remove_url = 'removedesc.php?cacheid=' . urlencode($cache_id) . '&desclang=' . urlencode(
                                 $desclang