OpencachingDeutschland / oc-server3

htdocs/lib2/web.inc.php

Spacing +7 added lines, -7 removed lines

@@ -19,23 +19,23 @@ 
 }
 
 // chicken-egg problem ...
-require_once $opt['rootpath'] . 'lib2/const.inc.php';
+require_once $opt['rootpath'].'lib2/const.inc.php';
 
 // do all output in HTML format
 $opt['gui'] = GUI_HTML;
 
 // include the main library
-require_once $opt['rootpath'] . 'lib2/common.inc.php';
+require_once $opt['rootpath'].'lib2/common.inc.php';
 
 // enforce http or https?
 if ($opt['page']['https']['mode'] == HTTPS_DISABLED) {
     if ($opt['page']['https']['active']) {
-        $tpl->redirect('http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']);
+        $tpl->redirect('http://'.$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']);
     }
     $opt['page']['force_https_login'] = false;
 } elseif ($opt['page']['https']['mode'] == HTTPS_ENFORCED) {
     if (!$opt['page']['https']['active']) {
-        $tpl->redirect('https://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']);
+        $tpl->redirect('https://'.$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']);
     }
     $opt['page']['force_https_login'] = true;
 }
@@ -83,7 +83,7 @@ 
     if (substr($helppage, 0, 1) == "!") {
         substr($helppage, 1);
     } elseif ($helppage != "" && isset($opt['locale'][$help_locale]['helpwiki'])) {
-        return $opt['locale'][$help_locale]['helpwiki'] . str_replace(' ', '_', $helppage);
+        return $opt['locale'][$help_locale]['helpwiki'].str_replace(' ', '_', $helppage);
     } else {
         return "";
     }
@@ -98,8 +98,8 @@ 
         return "";
     } else {
         $imgtitle = $translate->t($title, '', basename(__FILE__), __LINE__);
-        $imgtitle = "alt='" . $imgtitle . "' title='" . $imgtitle . "'";
+        $imgtitle = "alt='".$imgtitle."' title='".$imgtitle."'";
 
-        return "<a class='nooutline' href='" . $helpurl . "' " . $imgtitle . " target='_blank'>";
+        return "<a class='nooutline' href='".$helpurl."' ".$imgtitle." target='_blank'>";
     }
 }

htdocs/cachelist.php

Spacing +4 added lines, -4 removed lines

@@ -7,7 +7,7 @@ 
  *  Shortcut for cachelist search
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $id = isset($_REQUEST['id']) ? $_REQUEST['id'] + 0 : 0;
 $password = isset($_REQUEST['key']) ? $_REQUEST['key'] : '';
@@ -33,9 +33,9 @@ 
         }
     }
 
-    $tpl->redirect("search.php?searchto=searchbylist&listid=" . $id .
-        ($password != "" ? "&listkey=" . urlencode($password) : "") .
-        "&showresult=1&f_disabled=0&f_inactive=0&f_ignored=1&sort=byname" . $invalid_waypoints);
+    $tpl->redirect("search.php?searchto=searchbylist&listid=".$id.
+        ($password != "" ? "&listkey=".urlencode($password) : "").
+        "&showresult=1&f_disabled=0&f_inactive=0&f_ignored=1&sort=byname".$invalid_waypoints);
 } else {
     $tpl->redirect("cachelists.php");
 }

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);
@@ -674,8 +674,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 @@ 
                     $activation_column = ' ';
                 } elseif ($publish == 'later') {
                     $sel_status = 5;
-                    $activation_date = "'" . date(
+                    $activation_date = "'".date(
                             'Y-m-d H:i:s',
                             mktime(
                                 $activate_hour,
@@ -822,7 +822,7 @@ 
                                 $activate_month,
                                 $activate_day,
                                 $activate_year
-                            )). "'";
+                            ))."'";
                 } elseif ($publish == 'notnow') {
                     $sel_status = 5;
                     $activation_date = 'NULL';
@@ -902,7 +902,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')",
@@ -915,14 +915,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 +5 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
 
@@ -577,6 +579,7 @@ 
             if ($lat_h != '' || $lat_min != '') {
                 if (!mb_ereg_match('^[0-9]{1,2}$', $lat_h)) {
                     tpl_set_var('lat_message', $error_lat_not_ok);
+        }
                     $error = true;
                     $lat_h_not_ok = true;
                 } else {

htdocs/mystatpic.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once __DIR__ . '/./lib2/web.inc.php';
+require_once __DIR__.'/./lib2/web.inc.php';
 
 $tpl->name = 'mystatpic';
 $tpl->menuitem = MNU_MYPROFILE_DATA_STATPIC;

htdocs/query.php

Spacing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'query';
 $tpl->menuitem = MNU_MYPROFILE_QUERIES;
@@ -72,7 +72,7 @@ 
     if ($submit == true) {
         $options = sql_value("SELECT `options` FROM `queries` WHERE `id`='&1'", false, $queryid);
         if (!$options) {
-            $tpl->error(ERROR_UNKNOWN);   // query does not exist
+            $tpl->error(ERROR_UNKNOWN); // query does not exist
         } elseif ($sortby || $sortorder || $creationdate) {
             $oa = unserialize($options);
             if ($sortby) {

Braces +5 added lines, -4 removed lines

@@ -39,7 +39,8 @@ 
 } elseif ($action == 'delete') {
     $queryid = isset($_REQUEST['queryid']) ? $_REQUEST['queryid'] + 0 : 0;
     deletequery($queryid);
-} else { // default: view
+} else {
+// default: view
     viewqueries();
 }
 
@@ -106,9 +107,9 @@ 
             }
         } else {
             // save as
-            if (sql_value("SELECT COUNT(*) FROM `queries` WHERE `id`='&1' AND `user_id`='&2'", 0, $saveas_queryid, $login->userid) == 0)
-                $tpl->assign('errorMustSelectQuery', true);
-            else {
+            if (sql_value("SELECT COUNT(*) FROM `queries` WHERE `id`='&1' AND `user_id`='&2'", 0, $saveas_queryid, $login->userid) == 0) {
+                            $tpl->assign('errorMustSelectQuery', true);
+            } else {
                 sql("UPDATE `queries` SET `options`='&1' WHERE `id`='&2'", $options, $saveas_queryid);
                 $tpl->redirect('query.php?action=view');
             }

htdocs/config2/settings-dist.inc.php

Spacing +23 added lines, -23 removed lines

@@ -108,7 +108,7 @@ 
 // database placeholder
 
 // productive database with opencaching-tables
-$opt['db']['placeholder']['db'] = '';    // selected by default
+$opt['db']['placeholder']['db'] = ''; // selected by default
 
 // empty database for temporary table creation
 $opt['db']['placeholder']['tmpdb'] = '';
@@ -122,14 +122,14 @@ 
 $opt['system']['maillog']['syslog_db_user'] = '';
 $opt['system']['maillog']['syslog_db_password'] = '';
 $opt['system']['maillog']['syslog_db_table'] = '';
-$opt['system']['maillog']['syslog_oc_host'] = '';  // 'host_name' column in syslog DB
-$opt['system']['maillog']['syslog_mta'] = 'postfix/smtp%';  // 'program' column in syslog DB
-$opt['system']['maillog']['column']['id'] = 'id';               // 'ID'
-$opt['system']['maillog']['column']['created'] = 'created';     // 'ReceivedAt'
+$opt['system']['maillog']['syslog_oc_host'] = ''; // 'host_name' column in syslog DB
+$opt['system']['maillog']['syslog_mta'] = 'postfix/smtp%'; // 'program' column in syslog DB
+$opt['system']['maillog']['column']['id'] = 'id'; // 'ID'
+$opt['system']['maillog']['column']['created'] = 'created'; // 'ReceivedAt'
 $opt['system']['maillog']['column']['host_name'] = 'host_name'; // 'FromHost'
-$opt['system']['maillog']['column']['message'] = 'message';     // 'Message'
-$opt['system']['maillog']['column']['program'] = 'program';     // 'SysLogTag'
-$opt['system']['maillog']['inactivity_warning'] = 30;   // warn after N days without new entries
+$opt['system']['maillog']['column']['message'] = 'message'; // 'Message'
+$opt['system']['maillog']['column']['program'] = 'program'; // 'SysLogTag'
+$opt['system']['maillog']['inactivity_warning'] = 30; // warn after N days without new entries
 
 /* cookie or session
  *
@@ -151,15 +151,15 @@ 
  * 
  * other parameters may be customized
  */
-$opt['session']['mode'] = SAVE_COOKIE;     // don't change - other option "SAVE_SESSION" is not implemented properly
+$opt['session']['mode'] = SAVE_COOKIE; // don't change - other option "SAVE_SESSION" is not implemented properly
 $opt['session']['cookiename'] = 'oc_devel'; // only with SAVE_COOKIE
 $opt['session']['path'] = '/';
-$opt['session']['domain'] = '';    // may be overwritten by $opt['domain'][...]['cookiedomain']
+$opt['session']['domain'] = ''; // may be overwritten by $opt['domain'][...]['cookiedomain']
 
 /* maximum session lifetime
  */
 $opt['session']['expire']['cookie'] = 31536000; // when cookies used (default 1 year)
-$opt['session']['expire']['url'] = 1800;        // when no cookies used (default 30 min since last call), attention to session.js
+$opt['session']['expire']['url'] = 1800; // when no cookies used (default 30 min since last call), attention to session.js
 
 /* If the Referer was sent by the client and the substring was not found,
  * the embedded session id will be marked as invalid.
@@ -185,7 +185,7 @@ 
 /* other template options
  *
  */
-$opt['page']['origin_url'] = 'http://www.opencaching.de/';  // production installation for this OC site
+$opt['page']['origin_url'] = 'http://www.opencaching.de/'; // production installation for this OC site
 $opt['page']['develsystem'] = false;
 $opt['page']['teampic_url'] = 'http://www.opencaching.de/images/team/';
 $opt['page']['teammember_url'] = 'http://www.opencaching.de/';
@@ -219,7 +219,7 @@ 
     'newcaches' => [
         'show' => true,
         'url' => 'http://www.opencaching.de',
-        'urlname' => '',  // optional: show other name than the url-domain
+        'urlname' => '', // optional: show other name than the url-domain
     ],
 ];
 
@@ -277,7 +277,7 @@ 
 $opt['logic']['pictures']['dummy']['bgcolor'] = [255, 255, 255];
 $opt['logic']['pictures']['dummy']['text'] = '';
 $opt['logic']['pictures']['dummy']['textcolor'] = [0, 0, 0];
-$opt['logic']['pictures']['dummy']['replacepic'] = $opt['rootpath'] . 'images/';
+$opt['logic']['pictures']['dummy']['replacepic'] = $opt['rootpath'].'images/';
 
 /* cachemaps (obsolete)
  */
@@ -379,7 +379,7 @@ 
 
 /* license-related functions
  */
-$opt['logic']['license']['newusers'] = 2;  // see license constants in lib2/logic/const.inc.php
+$opt['logic']['license']['newusers'] = 2; // see license constants in lib2/logic/const.inc.php
 $opt['logic']['license']['admin'] = true;
 $opt['logic']['license']['disclaimer'] = false;
 $opt['logic']['license']['terms'] = 'articles.php?page=impressum#datalicense';
@@ -387,18 +387,18 @@ 
 
 /* optional APIs
  */
-$opt['logic']['api']['email_problems']['key'] = '';   // must be set to enable
-$opt['logic']['api']['user_inactivity']['key'] = '';  // must be set to enable
+$opt['logic']['api']['email_problems']['key'] = ''; // must be set to enable
+$opt['logic']['api']['user_inactivity']['key'] = ''; // must be set to enable
 
 /* cache report info settings
  */
 $opt['logic']['cache_reports']['delaydays'] = 2;
-$opt['logic']['cache_reports']['min_processperday'] = 5;   // set to 0 to disable
-$opt['logic']['cache_reports']['max_processperday'] = 20;  // set to 0 to disable
+$opt['logic']['cache_reports']['min_processperday'] = 5; // set to 0 to disable
+$opt['logic']['cache_reports']['max_processperday'] = 20; // set to 0 to disable
 
 /* cronjob
  */
-$opt['cron']['username'] = 'apache';   // system username for cronjobs
+$opt['cron']['username'] = 'apache'; // system username for cronjobs
 
 /* phpbb news integration (index.php, outdated)
  *
@@ -496,7 +496,7 @@ 
 // a redirect to redirect-setting will be done
 // (use exact same url with slashes etc. as registered by garmin)
 $opt['lib']['garmin']['domain'] = 'www.site.org';
-$opt['lib']['garmin']['url'] = 'http://' . $opt['lib']['garmin']['domain'] . '/';
+$opt['lib']['garmin']['url'] = 'http://'.$opt['lib']['garmin']['domain'].'/';
 
 // if the plugin is not called from the correct domain, redirect to this site
 // (e.g. domain called without www. prefix) - must match domain of $opt['lib']['garmin']['url']
@@ -524,7 +524,7 @@ 
 
 // max number of caches displayed in google maps
 if (isset($_SERVER['HTTP_USER_AGENT'])) {
-    $user_agent = " " . $_SERVER['HTTP_USER_AGENT'];
+    $user_agent = " ".$_SERVER['HTTP_USER_AGENT'];
     if (strpos($user_agent, "MSIE") && !strpos($user_agent, "Opera")) {
         $opt['map']['maxrecords'] = 200;
     } else {
@@ -540,7 +540,7 @@ 
 /*
  * OKAPI
  */
-$opt['okapi']['var_dir'] = $opt['rootpath'] . 'var/okapi';
+$opt['okapi']['var_dir'] = $opt['rootpath'].'var/okapi';
 $opt['okapi']['github_access_token'] = null;
 
 /* Opencaching Node Daemon

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.';
@@ -94,12 +94,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
@@ -174,9 +174,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
@@ -187,7 +187,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 .= '/';
@@ -199,8 +199,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']) {
@@ -231,18 +231,18 @@ 
         $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']['shortlink_url'] = $opt['page']['protocol'].strstr(
                         $opt['page']['default_shortlink_url'],
                         '://'
                     );
@@ -256,16 +256,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/config2/settings-sample.inc.php

Spacing +4 added lines, -4 removed lines

@@ -66,8 +66,8 @@ 
  * other parameters may be customized
  */
 $opt['session']['mode'] = SAVE_COOKIE;
-$opt['session']['cookiename'] = '<cookiename>';   // e.g. 'ocde'
-$opt['session']['domain'] = '<.do.main>';  // may be overwritten by $opt['domain'][...]['cookiedomain']
+$opt['session']['cookiename'] = '<cookiename>'; // e.g. 'ocde'
+$opt['session']['domain'] = '<.do.main>'; // may be overwritten by $opt['domain'][...]['cookiedomain']
 
 /* If the Referer was sent by the client and the substring was not found,
  * the embedded session id will be marked as invalid.
@@ -100,7 +100,7 @@ 
 
 /* default locale
  */
-$opt['template']['default']['locale'] = 'DE';   // can be overwritten by $opt['domain'][<domain>]['locale']
+$opt['template']['default']['locale'] = 'DE'; // can be overwritten by $opt['domain'][<domain>]['locale']
 
 /* multi-domain settings
  *
@@ -191,7 +191,7 @@ 
  */
 $opt['lib']['garmin']['domain'] = '<domain>';
 $opt['lib']['garmin']['key'] = '00112233445566778899AABBCCDDEEFF00';
-$opt['lib']['garmin']['url'] = 'http://' . $opt['lib']['garmin']['domain'] . '/';
+$opt['lib']['garmin']['url'] = 'http://'.$opt['lib']['garmin']['domain'].'/';
 $opt['lib']['garmin']['page_url'] = 'http://<domain>/';
 
 // developer.what3words.com API Key

htdocs/config2/settings-dev.inc.php

Spacing +3 added lines, -3 removed lines

@@ -80,7 +80,7 @@ 
 );
 
 $opt['page']['develsystem'] = true;
-$opt['page']['max_logins_per_hour'] = 1000;    // for development ...
+$opt['page']['max_logins_per_hour'] = 1000; // for development ...
 
 $opt['mail']['from'] = 'root';
 $opt['mail']['subject'] = '[local.opencaching.de] ';
@@ -102,7 +102,7 @@ 
 $opt['lib']['garmin']['key'] = '00112233445566778899AABBCCDDEEFF00';
 $opt['lib']['garmin']['domain'] = 'local.opencaching.de';
 $opt['lib']['garmin']['url'] = 'http://local.opencaching.de/';
-$opt['lib']['garmin']['page_url'] = $opt['lib']['garmin']['url'] . ($dev_codepath == '*' ? '' : $dev_codepath . 'htdocs/');
+$opt['lib']['garmin']['page_url'] = $opt['lib']['garmin']['url'].($dev_codepath == '*' ? '' : $dev_codepath.'htdocs/');
 
 // developer.what3words.com API Key
 $opt['lib']['w3w']['apikey'] = 'YOURAPIKEY';
@@ -112,7 +112,7 @@ 
 $opt['page']['showsocialmedia'] = true;
 $opt['page']['headoverlay'] = 'oc_head_alpha3';
 
-$opt['logic']['pictures']['dummy']['replacepic'] = $dev_basepath . $dev_codepath . 'htdocs/images/no_image_license.png';
+$opt['logic']['pictures']['dummy']['replacepic'] = $dev_basepath.$dev_codepath.'htdocs/images/no_image_license.png';
 $opt['logic']['license']['disclaimer'] = true;
 $opt['logic']['admin']['listingadmin_notification'] = 'root';