OpencachingDeutschland / oc-server3

htdocs/cachelists.php

Spacing +1 added lines, -1 removed lines

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

htdocs/news.php

Spacing +1 added lines, -1 removed lines

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

htdocs/remindemail.php

Spacing +1 added lines, -1 removed lines

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

htdocs/admins.php

Spacing +1 added lines, -1 removed lines

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

htdocs/lib2/search/search.ov2.inc.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  * OVL search output for TOP25, TOP50 etc.
  ****************************************************************************/
 
-require_once $opt['rootpath'] . 'lib2/charset.inc.php';
+require_once $opt['rootpath'].'lib2/charset.inc.php';
 
 $search_output_file_download = true;
 $content_type_plain = 'application/ovl';

htdocs/lib2/common.inc.php

Indentation +1 added lines, -1 removed lines

@@ -277,7 +277,7 @@
     ) {
         return 'https' . strstr($url, '://');
     } elseif (strtolower(substr($url, 0, strlen($opt['page']['absolute_https_url'])))
-                  == $opt['page']['absolute_https_url']
+                    == $opt['page']['absolute_https_url']
               && !$opt['page']['https']['active']
     ) {
         return 'http' . strstr($url, '://');

Spacing +23 added lines, -23 removed lines

@@ -10,7 +10,7 @@ 
  *  TODO: accept-language des Browser auswerten
  ***************************************************************************/
 
-require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 function __autoload($class_name)
 {
@@ -20,8 +20,8 @@ 
         return;
     }
 
-    $file1 = $opt['rootpath'] . 'lib2/' . $class_name . '.class.php';
-    $file2 = $opt['rootpath'] . 'lib2/logic/' . $class_name . '.class.php';
+    $file1 = $opt['rootpath'].'lib2/'.$class_name.'.class.php';
+    $file2 = $opt['rootpath'].'lib2/logic/'.$class_name.'.class.php';
     if (file_exists($file1)) {
         require_once $file1;
     } elseif (file_exists($file2)) {
@@ -43,9 +43,9 @@ 
 mb_regex_encoding('UTF-8');
 
 // set options
-require_once $opt['rootpath'] . 'config2/settings-dist.inc.php';
-require_once $opt['rootpath'] . 'config2/settings.inc.php';
-require_once $opt['rootpath'] . 'config2/verify-settings.inc.php';
+require_once $opt['rootpath'].'config2/settings-dist.inc.php';
+require_once $opt['rootpath'].'config2/settings.inc.php';
+require_once $opt['rootpath'].'config2/verify-settings.inc.php';
 
 foreach ($opt['page']['banned_user_agents'] as $ua) {
     if (strpos($useragent, $ua) !== false) {
@@ -69,10 +69,10 @@ 
     }
 }
 
-require_once $opt['rootpath'] . 'lib2/errorhandler.inc.php';
+require_once $opt['rootpath'].'lib2/errorhandler.inc.php';
 configure_php();
 
-require $opt['rootpath'] . 'lib2/cookie.class.php';
+require $opt['rootpath'].'lib2/cookie.class.php';
 normalize_settings();
 set_language();
 set_usercountry();
@@ -85,30 +85,30 @@ 
         $opt['template']['style'] = $opt['template']['default']['style'];
     }
 
-    if (!is_dir($opt['rootpath'] . 'templates2/' . $opt['template']['style'])) {
+    if (!is_dir($opt['rootpath'].'templates2/'.$opt['template']['style'])) {
         $opt['template']['style'] = $opt['template']['default']['style'];
     }
 } else {
     $opt['template']['style'] = $opt['template']['default']['style'];
 }
-$opt['stylepath'] = $opt['rootpath'] . 'templates2/' . $opt['template']['style'] . '/';
+$opt['stylepath'] = $opt['rootpath'].'templates2/'.$opt['template']['style'].'/';
 
 check_useragent();
 
 /* setup smarty
  *
  */
-require $opt['rootpath'] . 'lib2/OcSmarty.class.php';
+require $opt['rootpath'].'lib2/OcSmarty.class.php';
 $tpl = new OcSmarty();
 
 // include all we need
-require_once $opt['rootpath'] . 'lib2/logic/const.inc.php';
-require_once $opt['rootpath'] . 'lib2/error.inc.php';
-require_once $opt['rootpath'] . 'lib2/util.inc.php';
-require_once $opt['rootpath'] . 'lib2/db.inc.php';
-require_once $opt['rootpath'] . 'lib2/login.class.php';
-require_once $opt['rootpath'] . 'lib2/menu.class.php';
-require_once $opt['rootpath'] . 'lib2/logic/labels.inc.php';
+require_once $opt['rootpath'].'lib2/logic/const.inc.php';
+require_once $opt['rootpath'].'lib2/error.inc.php';
+require_once $opt['rootpath'].'lib2/util.inc.php';
+require_once $opt['rootpath'].'lib2/db.inc.php';
+require_once $opt['rootpath'].'lib2/login.class.php';
+require_once $opt['rootpath'].'lib2/menu.class.php';
+require_once $opt['rootpath'].'lib2/logic/labels.inc.php';
 // require_once $opt['rootpath'] . 'lib2/throttle.inc.php';
 
 // apply post configuration
@@ -123,7 +123,7 @@ 
     $login->userid > 0 &&
     sql_value("SELECT `email_problems` FROM `user` WHERE `user_id`='&1'", 0, $login->userid) != 0
 ) {
-    header("Location: verifyemail.php?page=" . basename($_SERVER['REQUEST_URI']));
+    header("Location: verifyemail.php?page=".basename($_SERVER['REQUEST_URI']));
     exit;
 }
 
@@ -149,7 +149,7 @@ 
 
     if (isset($opt['logic']['cachemaps']['wmsurl']) && strstr($opt['logic']['cachemaps']['wmsurl'], '://')) {
         $opt['logic']['cachemaps']['wmsurl'] =
-            $opt['page']['protocol'] . strstr($opt['logic']['cachemaps']['wmsurl'], '://');
+            $opt['page']['protocol'].strstr($opt['logic']['cachemaps']['wmsurl'], '://');
     }
 }
 
@@ -234,7 +234,7 @@ 
         $cookie->set('locale', $opt['template']['locale'], $opt['template']['default']['locale']);
     }
 
-    bindtextdomain('messages', $opt['rootpath'] . 'cache2/translate');
+    bindtextdomain('messages', $opt['rootpath'].'cache2/translate');
     set_php_locale();
     textdomain('messages');
 }
@@ -275,12 +275,12 @@ 
     if (strtolower(substr($url, 0, strlen($opt['page']['absolute_http_url']))) == $opt['page']['absolute_http_url']
         && $opt['page']['https']['active']
     ) {
-        return 'https' . strstr($url, '://');
+        return 'https'.strstr($url, '://');
     } elseif (strtolower(substr($url, 0, strlen($opt['page']['absolute_https_url'])))
                   == $opt['page']['absolute_https_url']
               && !$opt['page']['https']['active']
     ) {
-        return 'http' . strstr($url, '://');
+        return 'http'.strstr($url, '://');
     } else {
         return $url;
     }

htdocs/thumbs.php

Spacing +40 added lines, -40 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $login->verify();
 
@@ -39,7 +39,7 @@ 
             $login->hasAdminPriv(ADMIN_USER) ? 1 : 0
         ) == 0) {
             if ($debug == 1) {
-                die('Debug: line ' . __LINE__);
+                die('Debug: line '.__LINE__);
             } else {
                 $tpl->redirect(thumbpath('extern', 1));
             }
@@ -57,14 +57,14 @@ 
             $login->hasAdminPriv(ADMIN_USER) ? 1 : 0
         ) == 0) {
             if ($debug == 1) {
-                die('Debug: line ' . __LINE__);
+                die('Debug: line '.__LINE__);
             } else {
                 $tpl->redirect(thumbpath('extern', 2));
             }
         }
     } else {
         if ($debug == 1) {
-            die('Debug: line ' . __LINE__);
+            die('Debug: line '.__LINE__);
         } else {
             $tpl->redirect(thumbpath('intern', $default_object_type));
         }
@@ -72,7 +72,7 @@ 
 
     if ($r['local'] == 0) {
         if ($debug == 1) {
-            die('Debug: line ' . __LINE__);
+            die('Debug: line '.__LINE__);
         } else {
             $tpl->redirect(thumbpath('extern', $r['object_type']));
         }
@@ -80,7 +80,7 @@ 
 
     if (($r['spoiler'] == 1) && ($showspoiler != 1)) {
         if ($debug == 1) {
-            die('Debug: line ' . __LINE__);
+            die('Debug: line '.__LINE__);
         } else {
             $tpl->redirect(thumbpath('spoiler', $r['object_type']));
         }
@@ -89,9 +89,9 @@ 
     $imgurl = $r['url'];
     $urlparts = mb_split('/', $imgurl);
 
-    if (!file_exists($opt['logic']['pictures']['dir'] . '/' . $urlparts[count($urlparts) - 1])) {
+    if (!file_exists($opt['logic']['pictures']['dir'].'/'.$urlparts[count($urlparts) - 1])) {
         if ($debug == 1) {
-            die('Debug: line ' . __LINE__);
+            die('Debug: line '.__LINE__);
         } else {
             $tpl->redirect(thumbpath('intern', $r['object_type']));
         }
@@ -104,11 +104,11 @@ 
     }
 
     if (!file_exists(
-        $opt['logic']['pictures']['thumb_dir'] . '/' . mb_substr(
+        $opt['logic']['pictures']['thumb_dir'].'/'.mb_substr(
             $urlparts[count($urlparts) - 1],
             0,
             1
-        ) . '/' . mb_substr($urlparts[count($urlparts) - 1], 1, 1) . '/' . $urlparts[count($urlparts) - 1]
+        ).'/'.mb_substr($urlparts[count($urlparts) - 1], 1, 1).'/'.$urlparts[count($urlparts) - 1]
     )
     ) {
         $bGenerate = true;
@@ -117,7 +117,7 @@ 
     if ($bGenerate) {
         if ($r['unknown_format'] == 1) {
             if ($debug == 1) {
-                die('Debug: line ' . __LINE__);
+                die('Debug: line '.__LINE__);
             } else {
                 $tpl->redirect(thumbpath('format', $r['object_type']));
             }
@@ -128,11 +128,11 @@ 
         $filenameparts = mb_split('\\.', $filename);
         $extension = mb_strtolower($filenameparts[count($filenameparts) - 1]);
 
-        if (mb_strpos(';' . $opt['logic']['pictures']['extensions'] . ';', ';' . $extension . ';') === false) {
+        if (mb_strpos(';'.$opt['logic']['pictures']['extensions'].';', ';'.$extension.';') === false) {
             sql("UPDATE `pictures` SET `unknown_format`=1 WHERE `uuid`='&1'", $r['uuid']);
 
             if ($debug == 1) {
-                die('Debug: line ' . __LINE__);
+                die('Debug: line '.__LINE__);
             } else {
                 $tpl->redirect(thumbpath('format', $r['object_type']));
             }
@@ -143,20 +143,20 @@ 
         }
         switch ($extension) {
             case 'jpg':
-                $im = imagecreatefromjpeg($opt['logic']['pictures']['dir'] . '/' . $filename);
+                $im = imagecreatefromjpeg($opt['logic']['pictures']['dir'].'/'.$filename);
                 break;
 
             case 'gif':
-                $im = imagecreatefromgif($opt['logic']['pictures']['dir'] . '/' . $filename);
+                $im = imagecreatefromgif($opt['logic']['pictures']['dir'].'/'.$filename);
                 break;
 
             case 'png':
-                $im = imagecreatefrompng($opt['logic']['pictures']['dir'] . '/' . $filename);
+                $im = imagecreatefrompng($opt['logic']['pictures']['dir'].'/'.$filename);
                 break;
 
             case 'bmp':
-                require $opt['rootpath'] . 'lib2/imagebmp.inc.php';
-                $im = imagecreatefrombmp($opt['logic']['pictures']['dir'] . '/' . $filename);
+                require $opt['rootpath'].'lib2/imagebmp.inc.php';
+                $im = imagecreatefrombmp($opt['logic']['pictures']['dir'].'/'.$filename);
                 break;
         }
 
@@ -164,7 +164,7 @@ 
             sql("UPDATE `pictures` SET `unknown_format`=1 WHERE `uuid`='&1'", $r['uuid']);
 
             if ($debug == 1) {
-                die('Debug: line ' . __LINE__);
+                die('Debug: line '.__LINE__);
             } else {
                 $tpl->redirect(thumbpath('format', $r['object_type']));
             }
@@ -201,15 +201,15 @@ 
         imagecopyresampled($thumbimage, $im, 0, 0, 0, 0, $thumbwidth, $thumbheight, $imwidth, $imheight);
 
         // Create directory
-        if (!file_exists($opt['logic']['pictures']['thumb_dir'] . '/' . mb_substr($filename, 0, 1))) {
-            mkdir($opt['logic']['pictures']['thumb_dir'] . '/' . mb_substr($filename, 0, 1));
+        if (!file_exists($opt['logic']['pictures']['thumb_dir'].'/'.mb_substr($filename, 0, 1))) {
+            mkdir($opt['logic']['pictures']['thumb_dir'].'/'.mb_substr($filename, 0, 1));
         }
         if (!file_exists(
-            $opt['logic']['pictures']['thumb_dir'] . '/' . mb_substr($filename, 0, 1) . '/' . mb_substr($filename, 1, 1)
+            $opt['logic']['pictures']['thumb_dir'].'/'.mb_substr($filename, 0, 1).'/'.mb_substr($filename, 1, 1)
         )
         ) {
             mkdir(
-                $opt['logic']['pictures']['thumb_dir'] . '/' . mb_substr($filename, 0, 1) . '/' . mb_substr(
+                $opt['logic']['pictures']['thumb_dir'].'/'.mb_substr($filename, 0, 1).'/'.mb_substr(
                     $filename,
                     1,
                     1
@@ -218,48 +218,48 @@ 
         }
 
         $savedir =
-            $opt['logic']['pictures']['thumb_dir'] . '/'
-            . mb_substr($filename, 0, 1) . '/'
+            $opt['logic']['pictures']['thumb_dir'].'/'
+            . mb_substr($filename, 0, 1).'/'
             . mb_substr($filename, 1, 1);
 
         switch ($extension) {
             case 'jpg':
-                imagejpeg($thumbimage, $savedir . '/' . $filename);
+                imagejpeg($thumbimage, $savedir.'/'.$filename);
                 break;
 
             case 'gif':
-                imagegif($thumbimage, $savedir . '/' . $filename);
+                imagegif($thumbimage, $savedir.'/'.$filename);
                 break;
 
             case 'png':
-                imagepng($thumbimage, $savedir . '/' . $filename);
+                imagepng($thumbimage, $savedir.'/'.$filename);
                 break;
 
             case 'bmp':
-                imagebmp($thumbimage, $savedir . '/' . $filename);
+                imagebmp($thumbimage, $savedir.'/'.$filename);
                 break;
         }
 
         sql(
             "UPDATE `pictures` SET `thumb_last_generated`=NOW(), `thumb_url`='&1' WHERE `uuid`='&2'",
-            $opt['logic']['pictures']['thumb_url'] . '/' . mb_substr($filename, 0, 1) . '/' . mb_substr(
+            $opt['logic']['pictures']['thumb_url'].'/'.mb_substr($filename, 0, 1).'/'.mb_substr(
                 $filename,
                 1,
                 1
-            ) . '/' . $filename,
+            ).'/'.$filename,
             $r['uuid']
         );
 
         if ($debug == 1) {
-            die($opt['logic']['pictures']['thumb_url'] . '/' . $filename);
+            die($opt['logic']['pictures']['thumb_url'].'/'.$filename);
         } else {
             $tpl->redirect(
                 use_current_protocol(
-                    $opt['logic']['pictures']['thumb_url'] . '/' . mb_substr($filename, 0, 1) . '/' . mb_substr(
+                    $opt['logic']['pictures']['thumb_url'].'/'.mb_substr($filename, 0, 1).'/'.mb_substr(
                         $filename,
                         1,
                         1
-                    ) . '/' . $filename
+                    ).'/'.$filename
                 )
             );
         }
@@ -272,7 +272,7 @@ 
     }
 } else {
     if ($debug == 1) {
-        die('Debug: line ' . __LINE__);
+        die('Debug: line '.__LINE__);
     } else {
         $tpl->redirect(thumbpath('404', $default_object_type));
     }
@@ -287,18 +287,18 @@ 
         || ($object_type != 1 && $object_type != 2)
     ) {
         if ($debug == 1) {
-            die('Debug: line ' . __LINE__);
+            die('Debug: line '.__LINE__);
         } else {
             $name = 'intern';
             $object_type = $default_object_type;
         }
     }
 
-    $imgdir = 'resource2/' . $opt['template']['style'] . '/images/thumb/';
-    $filename = 'thumb' . $name . '_' . $object_type . '.gif';
-    $thumbpath = $imgdir . strtolower($opt['template']['locale']) . '/' . $filename;
+    $imgdir = 'resource2/'.$opt['template']['style'].'/images/thumb/';
+    $filename = 'thumb'.$name.'_'.$object_type.'.gif';
+    $thumbpath = $imgdir.strtolower($opt['template']['locale']).'/'.$filename;
     if (!file_exists($thumbpath)) {
-        $thumbpath = $imgdir . 'en/' . $filename;
+        $thumbpath = $imgdir.'en/'.$filename;
     }
 
     return $thumbpath;

htdocs/util2/gns/mkadmtxt.php

Spacing +6 added lines, -6 removed lines

@@ -10,8 +10,8 @@ 
  ***************************************************************************/
 
 $opt['rootpath'] = '../../';
-require_once $opt['rootpath'] . 'lib2/cli.inc.php';
-require_once $opt['rootpath'] . 'lib2/search/search.inc.php';
+require_once $opt['rootpath'].'lib2/cli.inc.php';
+require_once $opt['rootpath'].'lib2/search/search.inc.php';
 
 
 $rsLocations = sql("SELECT `uni`, `lat`, `lon`, `rc`, `cc1`, `adm1` FROM `gns_locations` WHERE `dsg` LIKE 'PPL%'");
@@ -23,7 +23,7 @@ 
 
     // den nächsgelegenen Ort in den geodb ermitteln
     $sql =
-        "SELECT " .
+        "SELECT ".
             geomath::getSqlDistanceFormula(
                 $rLocations['lon'],
                 $rLocations['lat'],
@@ -32,12 +32,12 @@ 
                 'lon',
                 'lat',
                 'geodb_coordinates'
-            ) . " `distance`,
+            )." `distance`,
             `geodb_coordinates`.`loc_id` `loc_id`
          FROM `geodb_coordinates`
          WHERE
-            `lon` > '" . sql_escape($minlon) . "' AND `lon` < '" . sql_escape($maxlon) . "' AND
-            `lat` > '" . sql_escape($minlat) . "' AND `lat` < '" . sql_escape($maxlat) . "'
+            `lon` > '" . sql_escape($minlon)."' AND `lon` < '".sql_escape($maxlon)."' AND
+            `lat` > '" . sql_escape($minlat)."' AND `lat` < '".sql_escape($maxlat)."'
          HAVING `distance` < 10
          ORDER BY `distance` ASC
          LIMIT 1";

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