OpencachingDeutschland / oc-server3

htdocs/newcache.php

Spacing +60 added lines, -60 removed lines

@@ -9,10 +9,10 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-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__ . '/lib2/edithelper.inc.php';
+require_once __DIR__.'/lib/common.inc.php';
+require_once __DIR__.'/lib2/edithelper.inc.php';
 
 $no_tpl_build = false;
 
@@ -33,10 +33,10 @@ 
 
         //set here the template to process
         $tplname = 'newcache';
-        require_once $stylepath . '/' . $tplname . '.inc.php';
+        require_once $stylepath.'/'.$tplname.'.inc.php';
 
         //set template replacements
-        tpl_set_var('reset', $reset);  // obsolete
+        tpl_set_var('reset', $reset); // obsolete
         tpl_set_var('submit', $submit);
         tpl_set_var('general_message', '');
         tpl_set_var('hidden_since_message', '');
@@ -53,7 +53,7 @@ 
         tpl_set_var('diff_message', '');
         tpl_set_var('safari_message', '');
 
-        $sel_type = isset($_POST['type']) ? $_POST['type'] : 0;  // Ocprop
+        $sel_type = isset($_POST['type']) ? $_POST['type'] : 0; // Ocprop
         if (!isset($_POST['size'])) {
             if ($sel_type == 4 || $sel_type == 5) {
                 $sel_size = 7;
@@ -61,15 +61,15 @@ 
                 $sel_size = - 1;
             }
         } else {
-            $sel_size = isset($_POST['size']) ? $_POST['size'] : - 1;  // Ocprop
+            $sel_size = isset($_POST['size']) ? $_POST['size'] : - 1; // Ocprop
         }
         $sel_lang = isset($_POST['desc_lang']) ? $_POST['desc_lang'] : $default_lang;
-        $sel_country = isset($_POST['country']) ? $_POST['country'] : getUserCountry();  // Ocprop
+        $sel_country = isset($_POST['country']) ? $_POST['country'] : getUserCountry(); // Ocprop
         $show_all_countries = isset($_POST['show_all_countries']) ? $_POST['show_all_countries'] : 0;
         $show_all_langs = isset($_POST['show_all_langs']) ? $_POST['show_all_langs'] : 0;
 
         //coords
-        $lonEW = isset($_POST['lonEW']) ? $_POST['lonEW'] : $default_EW;  // Ocprop
+        $lonEW = isset($_POST['lonEW']) ? $_POST['lonEW'] : $default_EW; // Ocprop
         if ($lonEW == 'E') {
             tpl_set_var('lonEsel', ' selected="selected"');
             tpl_set_var('lonWsel', '');
@@ -77,13 +77,13 @@ 
             tpl_set_var('lonEsel', '');
             tpl_set_var('lonWsel', ' selected="selected"');
         }
-        $lon_h = isset($_POST['lon_h']) ? $_POST['lon_h'] : '0';  // Ocprop
+        $lon_h = isset($_POST['lon_h']) ? $_POST['lon_h'] : '0'; // Ocprop
         tpl_set_var('lon_h', htmlspecialchars($lon_h, ENT_COMPAT, 'UTF-8'));
 
-        $lon_min = isset($_POST['lon_min']) ? $_POST['lon_min'] : '00.000';  // Ocprop
+        $lon_min = isset($_POST['lon_min']) ? $_POST['lon_min'] : '00.000'; // Ocprop
         tpl_set_var('lon_min', htmlspecialchars($lon_min, ENT_COMPAT, 'UTF-8'));
 
-        $latNS = isset($_POST['latNS']) ? $_POST['latNS'] : $default_NS;  // Ocprop
+        $latNS = isset($_POST['latNS']) ? $_POST['latNS'] : $default_NS; // Ocprop
         if ($latNS == 'N') {
             tpl_set_var('latNsel', ' selected="selected"');
             tpl_set_var('latSsel', '');
@@ -91,14 +91,14 @@ 
             tpl_set_var('latNsel', '');
             tpl_set_var('latSsel', ' selected="selected"');
         }
-        $lat_h = isset($_POST['lat_h']) ? $_POST['lat_h'] : '0';  // Ocprop
+        $lat_h = isset($_POST['lat_h']) ? $_POST['lat_h'] : '0'; // Ocprop
         tpl_set_var('lat_h', htmlspecialchars($lat_h, ENT_COMPAT, 'UTF-8'));
 
-        $lat_min = isset($_POST['lat_min']) ? $_POST['lat_min'] : '00.000';  // Ocprop
+        $lat_min = isset($_POST['lat_min']) ? $_POST['lat_min'] : '00.000'; // Ocprop
         tpl_set_var('lat_min', htmlspecialchars($lat_min, ENT_COMPAT, 'UTF-8'));
 
         //name
-        $name = isset($_POST['name']) ? trim($_POST['name']) : '';  // Ocprop
+        $name = isset($_POST['name']) ? trim($_POST['name']) : ''; // Ocprop
         tpl_set_var('name', htmlspecialchars($name, ENT_COMPAT, 'UTF-8'));
 
         //shortdesc
@@ -120,7 +120,7 @@ 
                 $oldDescMode = $descMode;
             }
         } else {
-            if (sqlValue("SELECT `no_htmledit_flag` FROM `user` WHERE `user_id`='" . sql_escape($usr['userid']) . "'", 1) == 1) {
+            if (sqlValue("SELECT `no_htmledit_flag` FROM `user` WHERE `user_id`='".sql_escape($usr['userid'])."'", 1) == 1) {
                 $descMode = 1;
             } else {
                 $descMode = 3;
@@ -130,7 +130,7 @@ 
 
         // fuer alte Versionen von OCProp
         if (isset($_POST['submit']) && !isset($_POST['version2'])) {
-            $descMode = (isset($_POST['desc_html']) && ($_POST['desc_html'] == 1)) ? 2 : 1;  // Ocprop
+            $descMode = (isset($_POST['desc_html']) && ($_POST['desc_html'] == 1)) ? 2 : 1; // Ocprop
             $_POST['submitform'] = $_POST['submit'];
 
             $short_desc = iconv("ISO-8859-1", "UTF-8", $short_desc);
@@ -152,13 +152,13 @@ 
 
         tpl_set_var('desc', htmlspecialchars($desc, ENT_COMPAT, 'UTF-8'));
 
-        $headers = tpl_get_var('htmlheaders') . "\n";
+        $headers = tpl_get_var('htmlheaders')."\n";
         if ($descMode == 3) {
             // TinyMCE
-            $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/tiny_mce_gzip.js"></script>' . "\n";
-            $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/config/desc.js.php?cacheid=0&lang=' . strtolower($locale) . '"></script>' . "\n";
+            $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/tiny_mce_gzip.js"></script>'."\n";
+            $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/config/desc.js.php?cacheid=0&lang='.strtolower($locale).'"></script>'."\n";
         }
-        $headers .= '<script language="javascript" type="text/javascript" src="' . editorJsPath() . '"></script>' . "\n";
+        $headers .= '<script language="javascript" type="text/javascript" src="'.editorJsPath().'"></script>'."\n";
         tpl_set_var('htmlheaders', $headers);
 
         //effort
@@ -182,7 +182,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);
 
 
@@ -196,7 +196,7 @@ 
         }
 
         //tos
-        $tos = isset($_POST['TOS']) ? 1 : 0;  // Ocprop
+        $tos = isset($_POST['TOS']) ? 1 : 0; // Ocprop
         if ($tos == 1) {
             tpl_set_var('toschecked', ' checked="checked"');
         } else {
@@ -204,9 +204,9 @@ 
         }
 
         //hidden_since
-        $hidden_day = isset($_POST['hidden_day']) ? $_POST['hidden_day'] : date('d');  // Ocprop
-        $hidden_month = isset($_POST['hidden_month']) ? $_POST['hidden_month'] : date('m');  // Ocprop
-        $hidden_year = isset($_POST['hidden_year']) ? $_POST['hidden_year'] : date('Y');  // Ocprop
+        $hidden_day = isset($_POST['hidden_day']) ? $_POST['hidden_day'] : date('d'); // Ocprop
+        $hidden_month = isset($_POST['hidden_month']) ? $_POST['hidden_month'] : date('m'); // Ocprop
+        $hidden_year = isset($_POST['hidden_year']) ? $_POST['hidden_year'] : date('Y'); // Ocprop
         tpl_set_var('hidden_day', htmlspecialchars($hidden_day, ENT_COMPAT, 'UTF-8'));
         tpl_set_var('hidden_month', htmlspecialchars($hidden_month, ENT_COMPAT, 'UTF-8'));
         tpl_set_var('hidden_year', htmlspecialchars($hidden_year, ENT_COMPAT, 'UTF-8'));
@@ -223,7 +223,7 @@ 
         tpl_set_var('publish_later_checked', '');
         tpl_set_var('publish_notnow_checked', '');
 
-        $publish = isset($_POST['publish']) ? $_POST['publish'] : 'now2';  // Ocprop
+        $publish = isset($_POST['publish']) ? $_POST['publish'] : 'now2'; // Ocprop
         if ($publish == 'now2') {
             tpl_set_var('publish_now_checked', 'checked');
         } elseif ($publish == 'later') {
@@ -237,11 +237,11 @@ 
         // fill activate hours
         $activate_hour = isset($_POST['activate_hour']) ? $_POST['activate_hour'] + 0 : date('H') + 0;
         $activation_hours = '';
-        for ($i = 0; $i <= 23; $i ++) {
+        for ($i = 0; $i <= 23; $i++) {
             if ($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";
         }
@@ -253,30 +253,30 @@ 
 
         // gc- and nc-waypoints
         // fix #4356: gc waypoints are frequently copy&pasted with leading spaces
-        $wp_gc = isset($_POST['wp_gc']) ? strtoupper(trim($_POST['wp_gc'])) : '';  // Ocprop
+        $wp_gc = isset($_POST['wp_gc']) ? strtoupper(trim($_POST['wp_gc'])) : ''; // Ocprop
         tpl_set_var('wp_gc', htmlspecialchars($wp_gc, ENT_COMPAT, 'UTF-8'));
 
         //difficulty
-        $difficulty = isset($_POST['difficulty']) ? $_POST['difficulty'] : 1;  // Ocprop
-        $difficulty_options = '<option value="1">' . $sel_message . '</option>';
-        for ($i = 2; $i <= 10; $i ++) {
+        $difficulty = isset($_POST['difficulty']) ? $_POST['difficulty'] : 1; // Ocprop
+        $difficulty_options = '<option value="1">'.$sel_message.'</option>';
+        for ($i = 2; $i <= 10; $i++) {
             if ($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";
         }
         tpl_set_var('difficulty_options', $difficulty_options);
 
         //terrain
-        $terrain = isset($_POST['terrain']) ? $_POST['terrain'] : 1;  // Ocprop
-        $terrain_options = '<option value="1">' . $sel_message . '</option>';
-        for ($i = 2; $i <= 10; $i ++) {
+        $terrain = isset($_POST['terrain']) ? $_POST['terrain'] : 1; // Ocprop
+        $terrain_options = '<option value="1">'.$sel_message.'</option>';
+        for ($i = 2; $i <= 10; $i++) {
             if ($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";
         }
@@ -284,34 +284,34 @@ 
 
         //sizeoptions
         $sSelected = ($sel_size == - 1) ? ' selected="selected"' : '';
-        $sizes = '<option value="-1"' . $sSelected . '>' . htmlspecialchars(t('Please select!'), ENT_COMPAT, 'UTF-8') . '</option>';
+        $sizes = '<option value="-1"'.$sSelected.'>'.htmlspecialchars(t('Please select!'), ENT_COMPAT, 'UTF-8').'</option>';
         $rsSizes = sql(
             "SELECT `cache_size`.`id`, IFNULL(`sys_trans_text`.`text`, `cache_size`.`name`) AS `name`
                   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($rSize['name'], ENT_COMPAT, 'UTF-8') . '</option>';
+            $sizes .= '<option value="'.$rSize['id'].'"'.$sSelected.'>'.htmlspecialchars($rSize['name'], ENT_COMPAT, 'UTF-8').'</option>';
         }
         sql_free_result($rsSizes);
         tpl_set_var('sizeoptions', $sizes);
 
         //typeoptions
         $sSelected = ($sel_type == - 1) ? ' selected="selected"' : '';
-        $types = '<option value="-1"' . $sSelected . '>' . htmlspecialchars(t('Please select!'), ENT_COMPAT, 'UTF-8') . '</option>';
+        $types = '<option value="-1"'.$sSelected.'>'.htmlspecialchars(t('Please select!'), ENT_COMPAT, 'UTF-8').'</option>';
         $rsTypes = sql("SELECT `cache_type`.`id`, IFNULL(`sys_trans_text`.`text`, `cache_type`.`en`) AS `name`
                               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'] == $sel_type) ? ' selected="selected"' : '';
-            $types .= '<option value="' . $rType['id'] . '"' . $sSelected . '>' . htmlspecialchars($rType['name'], ENT_COMPAT, 'UTF-8') . '</option>';
+            $types .= '<option value="'.$rType['id'].'"'.$sSelected.'>'.htmlspecialchars($rType['name'], ENT_COMPAT, 'UTF-8').'</option>';
         }
         sql_free_result($rsTypes);
         tpl_set_var('typeoptions', $types);
@@ -342,7 +342,7 @@ 
             tpl_set_var('show_all_langs', '0');
             tpl_set_var(
                 'show_all_langs_submit',
-                '<input type="submit" name="show_all_langs_submit" value="' . $show_all . '"/>'
+                '<input type="submit" name="show_all_langs_submit" value="'.$show_all.'"/>'
             );
 
             $rs = sql(
@@ -376,7 +376,7 @@ 
 
         while ($record = sql_fetch_assoc($rs)) {
             $sSelected = ($record['short'] == $sel_lang) ? ' selected="selected"' : '';
-            $langsoptions .= '<option value="' . htmlspecialchars($record['short'], ENT_COMPAT, 'UTF-8') . '"' . $sSelected . '>' . htmlspecialchars($record['name'], ENT_COMPAT, 'UTF-8') . '</option>' . "\n";
+            $langsoptions .= '<option value="'.htmlspecialchars($record['short'], ENT_COMPAT, 'UTF-8').'"'.$sSelected.'>'.htmlspecialchars($record['name'], ENT_COMPAT, 'UTF-8').'</option>'."\n";
         }
 
         tpl_set_var('langoptions', $langsoptions);
@@ -399,7 +399,7 @@ 
 
         if ($show_all_countries == 0) {
             tpl_set_var('show_all_countries', '0');
-            tpl_set_var('show_all_countries_submit', '<input type="submit" id="showallcountries" class="formbutton" name="show_all_countries_submit" value="' . $show_all . '" onclick="submitbutton(\'showallcountries\')" />');
+            tpl_set_var('show_all_countries_submit', '<input type="submit" id="showallcountries" class="formbutton" name="show_all_countries_submit" value="'.$show_all.'" onclick="submitbutton(\'showallcountries\')" />');
 
             $rs = sql(
                 "SELECT `countries`.`short`, IFNULL(`sys_trans_text`.`text`, `countries`.`name`) AS `name`
@@ -434,7 +434,7 @@ 
         // build the "country" dropdown list, preselect $sel_country
         while ($record = sql_fetch_array($rs)) {
             $sSelected = ($record['short'] == $sel_country) ? ' selected="selected"' : '';
-            $countriesoptions .= '<option value="' . htmlspecialchars($record['short'], ENT_COMPAT, 'UTF-8') . '"' . $sSelected . '>' . htmlspecialchars($record['name'], ENT_COMPAT, 'UTF-8') . '</option>' . "\n";
+            $countriesoptions .= '<option value="'.htmlspecialchars($record['short'], ENT_COMPAT, 'UTF-8').'"'.$sSelected.'>'.htmlspecialchars($record['name'], ENT_COMPAT, 'UTF-8').'</option>'."\n";
         }
         sql_free_result($rs);
 
@@ -488,7 +488,7 @@ 
                 LEFT JOIN `sys_trans_text` AS `ttdesc`
                     ON `tdesc`.`id`=`ttdesc`.`trans_id`
                     AND `ttdesc`.`lang`='&1'
-                WHERE `cache_attrib`.`group_id`=" . ($rAttrGroup['id'] + 0) . "
+                WHERE `cache_attrib`.`group_id`=" . ($rAttrGroup['id'] + 0)."
                 AND NOT IFNULL(`cache_attrib`.`hidden`, 0)=1
                 AND `cache_attrib`.`selectable`!=0
                 ORDER BY `cache_attrib`.`group_id`, `cache_attrib`.`id`",
@@ -508,7 +508,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);
@@ -673,8 +673,8 @@ 
                         "SELECT MIN(wp_oc)
                          FROM `caches`
                          WHERE `status`=1
-                         AND ROUND(`longitude`,6)=ROUND('" . sql_escape($longitude) . "',6)
-                         AND ROUND(`latitude`,6)=ROUND('" . sql_escape($latitude) . "',6)",
+                         AND ROUND(`longitude`,6)=ROUND('" . sql_escape($longitude)."',6)
+                         AND ROUND(`latitude`,6)=ROUND('" . sql_escape($latitude)."',6)",
                         null
                     );
                 if ($duplicate_wpoc) {
@@ -813,7 +813,7 @@ 
                 } elseif ($publish == 'later') {
                     $sel_status = 5;
                     $activation_date =
-                        "'" . date(
+                        "'".date(
                             'Y-m-d H:i:s',
                             mktime(
                                 $activate_hour,
@@ -823,7 +823,7 @@ 
                                 $activate_day,
                                 $activate_year
                             )
-                        ) . "'";
+                        )."'";
                 } elseif ($publish == 'notnow') {
                     $sel_status = 5;
                     $activation_date = 'NULL';
@@ -903,7 +903,7 @@ 
                 );
 
                 // insert cache-attributes
-                for ($i = 0; $i < count($cache_attribs); $i ++) {
+                for ($i = 0; $i < count($cache_attribs); $i++) {
                     if (($cache_attribs[$i] + 0) > 0) {
                         sql(
                             "INSERT INTO `caches_attributes` (`cache_id`, `attrib_id`) VALUES ('&1', '&2')",
@@ -916,14 +916,14 @@ 
                 // only if cache is published NOW or activate_date is in the past
                 if ($publish == 'now2' || ($publish == 'later' && mktime($activate_hour, 0, 0, $activate_month, $activate_day, $activate_year) <= $today)) {
                     //do event handling
-                    include_once(__DIR__ . '/lib/eventhandler.inc.php');
+                    include_once(__DIR__.'/lib/eventhandler.inc.php');
 
                     event_notify_new_cache($cache_id + 0);
                     event_new_cache($usr['userid'] + 0);
                 }
 
                 // redirection
-                tpl_redirect('viewcache.php?cacheid=' . urlencode($cache_id));
+                tpl_redirect('viewcache.php?cacheid='.urlencode($cache_id));
             } else {
                 tpl_set_var('general_message', $error_general);
             }

Braces +4 added lines, -2 removed lines

@@ -106,7 +106,8 @@ 
         tpl_set_var('short_desc', htmlspecialchars($short_desc, ENT_COMPAT, 'UTF-8'));
 
         // descMode auslesen, falls nicht gesetzt aus dem Profil laden
-        if (isset($_POST['descMode'])) {// Ocprop
+        if (isset($_POST['descMode'])) {
+// Ocprop
             $descMode = $_POST['descMode'] + 0;
             if (($descMode < 1) || ($descMode > 3)) {
                 $descMode = 3;
@@ -569,7 +570,8 @@ 
 
         tpl_set_var('firstcache_note', mb_ereg_replace('%1', $opt['page']['sitename'], $firstcache_note));
 
-        if (isset($_POST['submitform'])) {  // Ocprop
+        if (isset($_POST['submitform'])) {
+// Ocprop
             // check the entered data
 
             // check coordinates

htdocs/editcache.php

Spacing +55 added lines, -55 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)
 {
@@ -84,7 +84,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);
@@ -130,7 +130,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);
@@ -138,7 +138,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) {
@@ -152,15 +152,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');
@@ -186,11 +186,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'];
@@ -250,7 +250,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;
 
@@ -262,12 +262,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 @@ 
                         } elseif ($publish == 'later') {
                             $status = 5;
                             $activation_date =
-                                "'" . sql_escape(
+                                "'".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;
@@ -657,9 +657,9 @@ 
                     $countriesoptions .=
                         '<option value="'
                         . htmlspecialchars($record['short'], ENT_COMPAT, 'UTF-8')
-                        . '"' . $sSelected . '>'
+                        . '"'.$sSelected.'>'
                         . htmlspecialchars($record['name'], ENT_COMPAT, 'UTF-8')
-                        . '</option>' . "\n";
+                        . '</option>'."\n";
                 }
                 tpl_set_var('countryoptions', $countriesoptions);
                 sql_free_result($rs);
@@ -716,7 +716,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);
@@ -773,11 +773,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";
                 }
@@ -785,11 +785,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";
                 }
@@ -802,13 +802,13 @@ 
                                                         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 . '>'
+                        '<option value="'.$rType['id'].'"'.$sSelected.'>'
                         . htmlspecialchars($rType['name'], ENT_COMPAT, 'UTF-8')
                         . '</option>';
                 }
@@ -822,13 +822,13 @@ 
                                                         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 . '>'
+                        '<option value="'.$rSize['id'].'"'.$sSelected.'>'
                         . htmlspecialchars($rSize['name'], ENT_COMPAT, 'UTF-8')
                         . '</option>';
                 }
@@ -842,12 +842,12 @@ 
                 foreach ($desclangs as $desclang) {
                     if (count($desclangs) > 1) {
                         $remove_url =
-                            'removedesc.php?cacheid=' . urlencode($cache_id)
-                            . '&desclang=' . urlencode($desclang);
+                            'removedesc.php?cacheid='.urlencode($cache_id)
+                            . '&desclang='.urlencode($desclang);
                         $removedesc =
                             '&nbsp;[<a href="'
                             . htmlspecialchars($remove_url, ENT_COMPAT, 'UTF-8')
-                            . '">' . $remove . '</a>]';
+                            . '">'.$remove.'</a>]';
                     } else {
                         $removedesc = '';
                     }
@@ -863,13 +863,13 @@ 
                     }
                     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(db_LanguageFromShort($desclang), ENT_COMPAT, 'UTF-8')
-                        . ' [<a href="' . htmlspecialchars($edit_url, ENT_COMPAT, 'UTF-8')
-                        . '">' . $edit . '</a>]' . $removedesc . '</td></tr>';
+                        . ' [<a href="'.htmlspecialchars($edit_url, ENT_COMPAT, 'UTF-8')
+                        . '">'.$edit.'</a>]'.$removedesc.'</td></tr>';
                 }
                 tpl_set_var('cache_descs', $cache_descs);
 
@@ -889,10 +889,10 @@ 
                                                              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)) {
@@ -901,7 +901,7 @@ 
                             $statusoptions .=
                                 '<option value="'
                                 . htmlspecialchars($rStatus['id'], ENT_COMPAT, 'UTF-8')
-                                . '"' . $sSelected . '>'
+                                . '"'.$sSelected.'>'
                                 . htmlspecialchars($rStatus['name'], ENT_COMPAT, 'UTF-8')
                                 . '</option>';
                         }
@@ -940,11 +940,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";
                     }
@@ -968,7 +968,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);
 
@@ -1043,7 +1043,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'));
@@ -1051,7 +1051,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

Braces +10 added lines, -5 removed lines

@@ -76,7 +76,8 @@ 
 if ($error == false) {
     //cacheid
     $cache_id = 0;
-    if (isset($_REQUEST['cacheid'])) {  // Ocprop
+    if (isset($_REQUEST['cacheid'])) {
+// Ocprop
         $cache_id = $_REQUEST['cacheid'];
     }
 
@@ -196,7 +197,8 @@ 
                 $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)
@@ -226,7 +228,8 @@ 
                     $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
@@ -434,7 +437,8 @@ 
                 }
 
                 //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 ||
@@ -917,7 +921,8 @@ 
                 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(

htdocs/config2/settings-dist-common.inc.php

Spacing +19 added lines, -19 removed lines

@@ -15,11 +15,11 @@ 
  *   bin/dbsv-update.php will then migrate the tables' charset.
  */
 $opt['charset']['iconv'] = 'UTF-8'; // 'ISO-8859-1'; // use iconv compatible charset-name
-$opt['charset']['mysql'] = 'utf8';     // use mysql compatible charset-name
+$opt['charset']['mysql'] = 'utf8'; // use mysql compatible charset-name
 
 // handling of SQL and PHP errors
 $opt['db']['error']['display'] = false;
-$opt['db']['error']['mail'] = 'root';  // set '' to disable
+$opt['db']['error']['mail'] = 'root'; // set '' to disable
 
 // page title
 $opt['page']['title'] = 'OPENCACHING';
@@ -57,7 +57,7 @@ 
  * Additionally, the cookie domain (different vor lib1 and lib2) can be overwritten.
  * See examples for overriding in settings-sample.inc.php.
  */
-$opt['page']['meta']['keywords'] = 'Geocaching, Geocache, Cache, Schatzsuche, GPS, kostenlos, GPX, Koordinaten, Hobby, Natur';  // 5-10 keywords are recommended
+$opt['page']['meta']['keywords'] = 'Geocaching, Geocache, Cache, Schatzsuche, GPS, kostenlos, GPX, Koordinaten, Hobby, Natur'; // 5-10 keywords are recommended
 // see http://forum.opencaching.de/index.php?topic=3065.0
 // and http://forum.opencaching.de/index.php?topic=3065.0 regarding description
 $opt['page']['meta']['description'] = 'Opencaching.de ist das freie Portal für Geocaching, ein Schatzsuche-Spiel. Mittels GPS-Koordinaten sind Behälter oder Objekte zu finden.';
@@ -98,12 +98,12 @@ 
 // see also setting in lib/settings.inc.php!
 $opt['logic']['admin']['team_comments_only_for_reports'] = true;
 $opt['logic']['admin']['enable_listing_admins'] = false;
-$opt['logic']['admin']['listingadmin_notification'] = '';  // Email address(es), comma separated
+$opt['logic']['admin']['listingadmin_notification'] = ''; // Email address(es), comma separated
 
 /*
  * html purifier
  */
-$opt['html_purifier']['cache_path'] = dirname(__FILE__) . '/../cache2/html_purifier/';
+$opt['html_purifier']['cache_path'] = dirname(__FILE__).'/../cache2/html_purifier/';
 
 /*
  * CMS links for external pages
@@ -178,9 +178,9 @@ 
         $primary_httpsdefault = $opt['page']['https']['is_default'];
     }
     if ($primary_httpsdefault) {
-        $opt['page']['default_primary_url'] = 'https' . strstr($primary_site_url, '://');
+        $opt['page']['default_primary_url'] = 'https'.strstr($primary_site_url, '://');
     } else {
-        $opt['page']['default_primary_url'] = 'http' . strstr($primary_site_url, '://');
+        $opt['page']['default_primary_url'] = 'http'.strstr($primary_site_url, '://');
     }
 
     // 2. create settings for the current domain
@@ -191,7 +191,7 @@ 
     if (isset($opt['domain'][$current_domain]['url'])) {
         $current_site_url = $opt['domain'][$current_domain]['url'];
     } else {
-        $current_site_url = 'x://' . $current_domain . parse_url($primary_site_url, PHP_URL_PATH);
+        $current_site_url = 'x://'.$current_domain.parse_url($primary_site_url, PHP_URL_PATH);
     }
     if (substr($current_site_url, - 1, 1) != '/') {
         $current_site_url .= '/';
@@ -203,8 +203,8 @@ 
     }
 
     $adr = strstr($current_site_url, '://');
-    $opt['page']['absolute_http_url'] = 'http' . $adr;
-    $opt['page']['absolute_https_url'] = 'https' . $adr;
+    $opt['page']['absolute_http_url'] = 'http'.$adr;
+    $opt['page']['absolute_https_url'] = 'https'.$adr;
     $opt['page']['https']['active'] = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off');
 
     if ($opt['page']['https']['active']) {
@@ -235,19 +235,19 @@ 
         $opt['page']['default_primary_shortlink_url'] = false;
     } else {
         if ($primary_httpsdefault) {
-            $opt['page']['default_primary_shortlink_url'] = 'https://' . $primary_shortlink_domain . '/';
+            $opt['page']['default_primary_shortlink_url'] = 'https://'.$primary_shortlink_domain.'/';
         } else {
-            $opt['page']['default_primary_shortlink_url'] = 'http://' . $primary_shortlink_domain . '/';
+            $opt['page']['default_primary_shortlink_url'] = 'http://'.$primary_shortlink_domain.'/';
         }
 
         if (isset($opt['domain'][$current_domain]['shortlink_domain']) && $opt['domain'][$current_domain]['shortlink_domain']) {
-            $opt['page']['shortlink_url'] = $opt['page']['protocol'] . '://' . $opt['domain'][$current_domain]['shortlink_domain'] . '/';
-            $opt['page']['default_shortlink_url'] = $opt['page']['default_protocol'] . '://' . $opt['domain'][$current_domain]['shortlink_domain'] . '/';
+            $opt['page']['shortlink_url'] = $opt['page']['protocol'].'://'.$opt['domain'][$current_domain]['shortlink_domain'].'/';
+            $opt['page']['default_shortlink_url'] = $opt['page']['default_protocol'].'://'.$opt['domain'][$current_domain]['shortlink_domain'].'/';
         } else {
             if ($current_domain == $primary_domain) {
                 $opt['page']['default_shortlink_url'] = $opt['page']['default_primary_shortlink_url'];
                 $opt['page']['shortlink_url'] =
-                    $opt['page']['protocol'] . strstr($opt['page']['default_shortlink_url'], '://');
+                    $opt['page']['protocol'].strstr($opt['page']['default_shortlink_url'], '://');
             } else {
                 $opt['page']['shortlink_url'] = false;
                 $opt['page']['default_shortlink_url'] = false;
@@ -258,16 +258,16 @@ 
     // 4. set location of uploaded images
 
     if (!isset($opt['logic']['pictures']['dir'])) {
-        $opt['logic']['pictures']['dir'] = dirname(__FILE__) . '/../images/uploads';
+        $opt['logic']['pictures']['dir'] = dirname(__FILE__).'/../images/uploads';
     }  // Ocprop, OKAPI !
     if (!isset($opt['logic']['pictures']['url'])) {
-        $opt['logic']['pictures']['url'] = $opt['page']['default_primary_url'] . 'images/uploads';
+        $opt['logic']['pictures']['url'] = $opt['page']['default_primary_url'].'images/uploads';
     }
     if (!isset($opt['logic']['pictures']['thumb_dir'])) {
-        $opt['logic']['pictures']['thumb_dir'] = $opt['logic']['pictures']['dir'] . '/thumbs';
+        $opt['logic']['pictures']['thumb_dir'] = $opt['logic']['pictures']['dir'].'/thumbs';
     }
     if (!isset($opt['logic']['pictures']['thumb_url'])) {
-        $opt['logic']['pictures']['thumb_url'] = $opt['logic']['pictures']['url'] . '/thumbs';
+        $opt['logic']['pictures']['thumb_url'] = $opt['logic']['pictures']['url'].'/thumbs';
     }
 }
 

htdocs/map2.php

Spacing +60 added lines, -60 removed lines

@@ -9,7 +9,7 @@ 
 
 $build_map_towns_menu = true;
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 /* because the map does access some private info like
  * ignored caches, we need to verify the login data
@@ -67,7 +67,7 @@ 
                        WHERE option_id=6 AND user_id='&1'", true, $login->userid))
 ) {
     $fullscreen = true;
-    $tpl->popup = true;        // disables page header and -frame
+    $tpl->popup = true; // disables page header and -frame
     $tpl->popupmargin = false;
 } else {
     $fullscreen = false;
@@ -133,7 +133,7 @@ 
     $tpl->error($translate->t('There is no google maps key registered for this domain.', '', '', 0));
 }
 
-$tpl->add_header_javascript($opt['page']['protocol'] . '://maps.googleapis.com/maps/api/js?sensor=false&key=' . urlencode($sGMKey) . '&language=' . strtolower($opt['template']['locale']));
+$tpl->add_header_javascript($opt['page']['protocol'].'://maps.googleapis.com/maps/api/js?sensor=false&key='.urlencode($sGMKey).'&language='.strtolower($opt['template']['locale']));
 // https is supported by google, but may make problems in some environments,
 // e.g. does not work with MSIE 7 on WinXP
 $tpl->add_header_javascript('resource2/misc/map/dragzoom_packed.js');
@@ -279,7 +279,7 @@ 
     global $login;
 
     $rsCache = sql_slave(
-        "SELECT " . geomath::getSqlDistanceFormula($nLon, $nLat, $nDistance) . " AS `distance`,
+        "SELECT ".geomath::getSqlDistanceFormula($nLon, $nLat, $nDistance)." AS `distance`,
                                   `caches`.`wp_oc`
                              FROM `caches`
                        INNER JOIN `cache_status` ON `caches`.`status`=`cache_status`.`id`
@@ -389,42 +389,42 @@ 
     $wphandler = new HandlerChildWp();
     $waypoints = $wphandler->getChildWps($rCache['cache_id'], true);
 
-    echo '<caches>' . "\n";
+    echo '<caches>'."\n";
     echo '  <cache ';
-    echo 'name="' . xmlentities($rCache['name']) . '" ';
-    echo 'wpoc="' . xmlentities($rCache['wp_oc']) . '" ';
-    echo 'coords="' . $rCache['longitude'] . ',' . $rCache['latitude'] . '" ';
-    echo 'inactive="' . xmlentities($rCache['inactive']) . '" ';
-    echo 'status_text="' . xmlentities($rCache['statustext']) . '" ';
-    echo 'type_id="' . xmlentities($rCache['type_id']) . '" ';
-    echo 'type_text="' . xmlentities($rCache['type_text']) . '" ';
-    echo 'size="' . xmlentities($rCache['size']) . '" ';
-    echo 'difficulty="' . xmlentities($rCache['difficulty'] / 2) . '" ';
-    echo 'terrain="' . xmlentities($rCache['terrain'] / 2) . '" ';
-    echo 'listed_since="' . xmlentities(strftime($opt['locale'][$opt['template']['locale']]['format']['date'], strtotime($rCache['date_created']))) . '" ';
-    echo 'is_publishdate="' . xmlentities($rCache['is_publishdate']) . '" ';
-    echo 'toprating="' . xmlentities($rCache['toprating']) . '" ';
-    echo 'geokreties="' . xmlentities($nGeokretyCount) . '" ';
-    echo 'found="' . xmlentities(($nFoundCount > 0) ? 1 : 0) . '" ';
-    echo 'notfound="' . xmlentities(($nNotFoundCount > 0) ? 1 : 0) . '" ';
-    echo 'attended="' . xmlentities(($nAttendedCount > 0) ? 1 : 0) . '" ';
-    echo 'oconly="' . xmlentities($rCache['oconly']) . '" ';
-    echo 'owner="' . xmlentities($rCache['owner']) . '" ';
-    echo 'username="' . xmlentities($rCache['username']) . '" ';
-    echo 'userid="' . xmlentities($rCache['user_id']) . '" ';
-    echo 'picurl="' . xmlentities($rCache['picurl']) . '" ';
-    echo 'pictitle="' . xmlentities(trim($rCache['pictitle'])) . '" >\n';
+    echo 'name="'.xmlentities($rCache['name']).'" ';
+    echo 'wpoc="'.xmlentities($rCache['wp_oc']).'" ';
+    echo 'coords="'.$rCache['longitude'].','.$rCache['latitude'].'" ';
+    echo 'inactive="'.xmlentities($rCache['inactive']).'" ';
+    echo 'status_text="'.xmlentities($rCache['statustext']).'" ';
+    echo 'type_id="'.xmlentities($rCache['type_id']).'" ';
+    echo 'type_text="'.xmlentities($rCache['type_text']).'" ';
+    echo 'size="'.xmlentities($rCache['size']).'" ';
+    echo 'difficulty="'.xmlentities($rCache['difficulty'] / 2).'" ';
+    echo 'terrain="'.xmlentities($rCache['terrain'] / 2).'" ';
+    echo 'listed_since="'.xmlentities(strftime($opt['locale'][$opt['template']['locale']]['format']['date'], strtotime($rCache['date_created']))).'" ';
+    echo 'is_publishdate="'.xmlentities($rCache['is_publishdate']).'" ';
+    echo 'toprating="'.xmlentities($rCache['toprating']).'" ';
+    echo 'geokreties="'.xmlentities($nGeokretyCount).'" ';
+    echo 'found="'.xmlentities(($nFoundCount > 0) ? 1 : 0).'" ';
+    echo 'notfound="'.xmlentities(($nNotFoundCount > 0) ? 1 : 0).'" ';
+    echo 'attended="'.xmlentities(($nAttendedCount > 0) ? 1 : 0).'" ';
+    echo 'oconly="'.xmlentities($rCache['oconly']).'" ';
+    echo 'owner="'.xmlentities($rCache['owner']).'" ';
+    echo 'username="'.xmlentities($rCache['username']).'" ';
+    echo 'userid="'.xmlentities($rCache['user_id']).'" ';
+    echo 'picurl="'.xmlentities($rCache['picurl']).'" ';
+    echo 'pictitle="'.xmlentities(trim($rCache['pictitle'])).'" >\n';
 
     foreach ($waypoints as $waypoint) {
         echo '    <wpt ';
-        echo 'typeid="' . xmlentities($waypoint['type']) . '" ';
-        echo 'typename="' . xmlentities($waypoint['name']) . '" ';
-        echo 'typepreposition="' . xmlentities($waypoint['preposition']) . '" ';
-        echo 'image="' . xmlentities($waypoint['image']) . '" ';
+        echo 'typeid="'.xmlentities($waypoint['type']).'" ';
+        echo 'typename="'.xmlentities($waypoint['name']).'" ';
+        echo 'typepreposition="'.xmlentities($waypoint['preposition']).'" ';
+        echo 'image="'.xmlentities($waypoint['image']).'" ';
         echo 'imagewidth="38" imageheight="38" ';
-        echo 'latitude="' . xmlentities($waypoint['latitude']) . '" ';
-        echo 'longitude="' . xmlentities($waypoint['longitude']) . '" ';
-        echo 'description="' . xmlentities(mb_ereg_replace('\r\n', '<br />', htmlentities(trim($waypoint['description']), ENT_NOQUOTES, 'UTF-8'))) . '" />\n';
+        echo 'latitude="'.xmlentities($waypoint['latitude']).'" ';
+        echo 'longitude="'.xmlentities($waypoint['longitude']).'" ';
+        echo 'description="'.xmlentities(mb_ereg_replace('\r\n', '<br />', htmlentities(trim($waypoint['description']), ENT_NOQUOTES, 'UTF-8'))).'" />\n';
     }
 
     echo '  </cache>\n';
@@ -438,9 +438,9 @@ 
 {
     global $login, $opt;
 
-    echo '<caches>' . "\n";
+    echo '<caches>'."\n";
     $rs = sql_slave(
-        "SELECT " . geomath::getSqlDistanceFormula($nLon, $nLat, 0) . " AS `distance`,
+        "SELECT ".geomath::getSqlDistanceFormula($nLon, $nLat, 0)." AS `distance`,
                           `caches`.`name`, `caches`.`wp_oc`
                      FROM `map2_data`
                INNER JOIN `caches` ON `map2_data`.`cache_id`=`caches`.`cache_id`
@@ -449,30 +449,30 @@ 
                       AND (`cache_status`.`allow_user_view`=1 OR `caches`.`user_id`='&3')
                       AND `map2_data`.`result_id`='&2'
                            ORDER BY `distance` ASC LIMIT 30",
-        '%' . $sName . '%',
+        '%'.$sName.'%',
         $nResultId,
         $login->userid
     );
     $caches_found = 0;
     while ($r = sql_fetch_assoc($rs)) {
-        echo '<cache name="' . xmlentities($r['name']) . '" wpoc="' . xmlentities($r['wp_oc']) . '" />' . "\n";
-        ++ $caches_found;
+        echo '<cache name="'.xmlentities($r['name']).'" wpoc="'.xmlentities($r['wp_oc']).'" />'."\n";
+        ++$caches_found;
     }
     sql_free_result($rs);
 
     if (!$caches_found && preg_match('/^[^\s[:punct:]]{2,}\.[^\s[:punct:]]{2,}\.[^\s[:punct:]]{2,}$/', $sName)) {
-        $result = @file_get_contents('http://api.what3words.com/w3w?key=' . $opt['lib']['w3w']['apikey']
-            . '&string=' . urlencode($sName));
+        $result = @file_get_contents('http://api.what3words.com/w3w?key='.$opt['lib']['w3w']['apikey']
+            . '&string='.urlencode($sName));
         if ($result) {
             $json = json_decode($result, true);
             if (!is_null($json['words']) && !is_null($json['position']) && count($json['position']) == 2) {
-                echo '<coord name="' . xmlentities(implode('.', $json['words'])) .
-                    '" latitude="' . xmlentities($json["position"][0]) .
-                    '" longitude="' . xmlentities($json["position"][1]) . '" />' . "\n";
+                echo '<coord name="'.xmlentities(implode('.', $json['words'])).
+                    '" latitude="'.xmlentities($json["position"][0]).
+                    '" longitude="'.xmlentities($json["position"][1]).'" />'."\n";
             }
         }
     }
-    echo '</caches>' . "\n";
+    echo '</caches>'."\n";
 
     exit;
 }
@@ -495,7 +495,7 @@ 
         "SELECT `slave_id`
         FROM `map2_result`
         WHERE `result_id`='&1' AND DATE_ADD(`date_created`, INTERVAL '&2' SECOND)>NOW()",
-        - 2,
+        -2,
         $nResultId,
         $opt['map']['maxcacheage']
     );
@@ -561,8 +561,8 @@ 
     $bMaxRecordReached = ($nRecordCount > $maxrecords);
 
     // output data
-    echo '<searchresult count="' . xmlentities($nRecordCount) . '" available="1"' .
-        ' maxrecordreached="' . ($bMaxRecordReached ? '1' : '0') . '">' . "\n";
+    echo '<searchresult count="'.xmlentities($nRecordCount).'" available="1"'.
+        ' maxrecordreached="'.($bMaxRecordReached ? '1' : '0').'">'."\n";
 
     if (!$bMaxRecordReached) {
         $namequery = ($cachenames ? ", `caches`.`name` AS `cachename`" : "");
@@ -577,7 +577,7 @@ 
                             IF(`found_logs`.`id` IS NULL, 0, 1) AS `found`,
                             IF(`found_logs`.`id` IS NULL AND `notfound_logs`.`id` IS NOT NULL, 1, 0) AS `notfound`,
                             IF(`caches_attributes`.`attrib_id` IS NULL, 0, 1) AS `oconly`" .
-            $namequery . "
+            $namequery."
                        FROM `map2_data`
                  INNER JOIN `caches` ON `map2_data`.`cache_id`=`caches`.`cache_id`
                  INNER JOIN `user` ON `user`.`user_id`=`caches`.`user_id`
@@ -624,19 +624,19 @@ 
                 echo
                     '<c d="'
                     . xmlentities(
-                        $r['wp_oc'] . '/' . round($r['longitude'], 5) . '/' .
-                        round($r['latitude'], 5) . '/' . $r['type'] . '/' . $flags
-                    ) . '"'
-                    . (isset($r['cachename']) ? ' n="' . xmlentities($r['cachename']) . '"' : '')
+                        $r['wp_oc'].'/'.round($r['longitude'], 5).'/'.
+                        round($r['latitude'], 5).'/'.$r['type'].'/'.$flags
+                    ).'"'
+                    . (isset($r['cachename']) ? ' n="'.xmlentities($r['cachename']).'"' : '')
                     . ' />';
             } else {
                 echo
-                    '<cache wp="' . xmlentities($r['wp_oc']) . '"' .
-                    ' lon="' . xmlentities(round($r['longitude'], 5)) . '"' .
-                    ' lat="' . xmlentities(round($r['latitude'], 5)) . '"' .
-                    ' type="' . xmlentities($r['type']) . '"' .
-                    (isset($r['cachename']) ? ' n="' . xmlentities($r['cachename']) . '"' : '') .
-                    ' f="' . xmlentities($flags) . '" />' . "\n";
+                    '<cache wp="'.xmlentities($r['wp_oc']).'"'.
+                    ' lon="'.xmlentities(round($r['longitude'], 5)).'"'.
+                    ' lat="'.xmlentities(round($r['latitude'], 5)).'"'.
+                    ' type="'.xmlentities($r['type']).'"'.
+                    (isset($r['cachename']) ? ' n="'.xmlentities($r['cachename']).'"' : '').
+                    ' f="'.xmlentities($flags).'" />'."\n";
             }
         }
         sql_free_result($rs);

Braces +2 added lines, -1 removed lines

@@ -27,7 +27,8 @@
     $for_cachedesc,
     $html,
     $twolines = false
-) {
+)
+{
     global $opt, $translate;
 
     $ltext = "";

local/devel/strip_private_data.php

Spacing +7 added lines, -7 removed lines

@@ -9,15 +9,15 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../htdocs/';
-require $opt['rootpath'] . 'lib2/cli.inc.php';
+$opt['rootpath'] = __DIR__.'/../../htdocs/';
+require $opt['rootpath'].'lib2/cli.inc.php';
 
 if (!($opt['debug'] & DEBUG_DEVELOPER)) {
     die("This script deletes lot of data and must be run only on development systems.\n");
 }
 if ($argc != 2 || $argv[1] != 'go') {
     die(
-        "This script deletes lot of data. Make sure that you really want to dos this,\n" .
+        "This script deletes lot of data. Make sure that you really want to dos this,\n".
         "and confirm it by adding the parameter 'go'.\n"
     );
 }
@@ -63,11 +63,11 @@ 
 echo "clearing user data\n";
 sql('TRUNCATE `cache_adoption`');
 sql('TRUNCATE `cache_ignore`');
-sql('DELETE FROM `cache_lists` WHERE `is_public`<2');  // trigger deletes dependent data
+sql('DELETE FROM `cache_lists` WHERE `is_public`<2'); // trigger deletes dependent data
 sql('TRUNCATE `cache_list_bookmarks`');
 sql('TRUNCATE `cache_list_watches`');
 sql('TRUNCATE `cache_watches`');
-sql('DELETE FROM `coordinates` WHERE `type`=2');   // personal cache notes and coords
+sql('DELETE FROM `coordinates` WHERE `type`=2'); // personal cache notes and coords
 sql('TRUNCATE `queries`');
 sql('TRUNCATE `user_options`');
 sql(
@@ -132,10 +132,10 @@ 
 
 echo "clearing other nonpublic data\n";
 sql('TRUNCATE `news`');
-$rs = sql("SHOW TABLES WHERE `Tables_in_" . $opt['db']['placeholder']['db'] . "` LIKE '\_%'");
+$rs = sql("SHOW TABLES WHERE `Tables_in_".$opt['db']['placeholder']['db']."` LIKE '\_%'");
 $tables = sql_fetch_column($rs);
 foreach ($tables as $table) {
-    sql('DROP TABLE ' . $table);
+    sql('DROP TABLE '.$table);
 }
 
 echo "done.\n";

htdocs/config2/locale.inc.php

Spacing +6 added lines, -6 removed lines

@@ -17,9 +17,9 @@ 
  *                 $opt['locale']
  ***************************************************************************/
 
-define('OC_LOCALE_ACTIVE', 2);    // enable language and show language button in header line
-define('OC_LOCALE_HIDDEN', 1);    // enable language but hide language button in header line
-define('OC_LOCALE_DISABLED', 0);  //  disable language
+define('OC_LOCALE_ACTIVE', 2); // enable language and show language button in header line
+define('OC_LOCALE_HIDDEN', 1); // enable language but hide language button in header line
+define('OC_LOCALE_DISABLED', 0); //  disable language
 
 $opt['template']['locales']['DE']['status'] = OC_LOCALE_ACTIVE;
 $opt['template']['locales']['DE']['flag'] = 'images/flag/DE.png';
@@ -131,7 +131,7 @@ 
 $opt['locale']['DE']['page']['license'] = '<a rel="license" href="%1"><img alt="Creative Commons Lizenzvertrag" style="border-width:0" src="resource2/ocstyle/images/media/cc-by-nc-nd-small.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">Die <a href="articles.php?page=impressum#datalicense">Inhalte</a> von {site} stehen unter der Creative-Commons-Lizenz <a rel="license" href="%1">BY-NC-ND 3.0 DE</a>.</div>';
 $opt['locale']['DE']['helpwiki'] = 'http://wiki.opencaching.de/index.php/';
 $opt['locale']['DE']['mostly_translated'] = true;
-$opt['locale']['DE']['what3words'] = true;  // "beta"
+$opt['locale']['DE']['what3words'] = true; // "beta"
 
 $opt['locale']['IT']['format']['dateshort'] = '%d/%m/%y';
 $opt['locale']['IT']['format']['dm'] = '%d/%m';
@@ -232,7 +232,7 @@ 
 $opt['locale']['SV']['page']['subtitle1'] = 'Geocaching med Opencaching';
 $opt['locale']['SV']['page']['subtitle2'] = '';
 $opt['locale']['SV']['mostly_translated'] = false;
-$opt['locale']['SV']['what3words'] = true;  // "beta"
+$opt['locale']['SV']['what3words'] = true; // "beta"
 
 $opt['locale']['NO']['format']['dateshort'] = '%d.%m.%y';
 $opt['locale']['NO']['format']['dm'] = '%d.%m.';
@@ -279,7 +279,7 @@ 
 $opt['locale']['RU']['format']['colonspace'] = '';
 $opt['locale']['RU']['country'] = 'RU';
 $opt['locale']['RU']['mostly_translated'] = false;
-$opt['locale']['RU']['what3words'] = true;   // "beta"
+$opt['locale']['RU']['what3words'] = true; // "beta"
 
 $opt['locale']['DA']['format']['dateshort'] = '%d.%m.%y';
 $opt['locale']['DA']['format']['dm'] = '%d.%m.';