OpencachingDeutschland / oc-server3

htdocs/util/watchlist/runwatch.php

Spacing +32 added lines, -32 removed lines

@@ -12,13 +12,13 @@ 
  ***************************************************************************/
 
 // needs absolute rootpath because called as cronjob
-$rootpath = __DIR__ . '/../../';
-require_once $rootpath . 'lib/clicompatbase.inc.php';
-require_once $rootpath . 'lib2/translate.class.php';
-require_once __DIR__ . '/settings.inc.php';
-require_once $rootpath . 'lib/consts.inc.php';
-require_once $rootpath . 'lib/logic.inc.php';
-require_once $rootpath . 'lib2/edithelper.inc.php';
+$rootpath = __DIR__.'/../../';
+require_once $rootpath.'lib/clicompatbase.inc.php';
+require_once $rootpath.'lib2/translate.class.php';
+require_once __DIR__.'/settings.inc.php';
+require_once $rootpath.'lib/consts.inc.php';
+require_once $rootpath.'lib/logic.inc.php';
+require_once $rootpath.'lib2/edithelper.inc.php';
 
 if (!cronjobs_enabled()) {
     exit;
@@ -51,7 +51,7 @@ 
     WHERE cache_logs.cache_id=caches.cache_id
     AND cache_logs.owner_notified=0"
 );
-for ($i = 0; $i < mysql_num_rows($rsNewLogs); $i ++) {
+for ($i = 0; $i < mysql_num_rows($rsNewLogs); $i++) {
     $rNewLog = sql_fetch_array($rsNewLogs);
 
     $rsNotified = sql(
@@ -102,7 +102,7 @@ 
     // See http://forum.opencaching.de/index.php?topic=3123.0 on AOL.
     if (sqlValue(
         "SELECT `email_problems` = 0 OR DATEDIFF(NOW(),`last_email_problem`) > 1+DATEDIFF(`last_email_problem`,`first_email_problem`)
-                        FROM `user` WHERE `user_id`='" . sql_escape($rcw['user_id']) . "'",
+                        FROM `user` WHERE `user_id`='" . sql_escape($rcw['user_id'])."'",
         1
     )) {
         process_log_watch($rcw['user_id'], $rcw['log_id']);
@@ -115,7 +115,7 @@ 
 
 /* begin send out everything that has to be sent */
 
-$email_headers = 'From: "' . $mailfrom . '" <' . $mailfrom . '>';
+$email_headers = 'From: "'.$mailfrom.'" <'.$mailfrom.'>';
 
 $rsUsers = sql(
     "SELECT
@@ -134,7 +134,7 @@ 
     WHERE `user`.`watchmail_nextmail`<NOW()",
     $opt['template']['default']['locale']
 );
-for ($i = 0; $i < mysql_num_rows($rsUsers); $i ++) {
+for ($i = 0; $i < mysql_num_rows($rsUsers); $i++) {
     $rUser = sql_fetch_array($rsUsers);
 
     if ($rUser['watchmail_nextmail'] != '0000-00-00 00:00:00') {
@@ -158,7 +158,7 @@ 
                 );
                 if (mysql_num_rows($rsWatchesOwner) > 0) {
                     $logtexts = '';
-                    for ($j = 0; $j < mysql_num_rows($rsWatchesOwner); $j ++) {
+                    for ($j = 0; $j < mysql_num_rows($rsWatchesOwner); $j++) {
                         $rWatch = sql_fetch_array($rsWatchesOwner);
                         $logtexts .= $rWatch['watchtext'];
                     }
@@ -183,7 +183,7 @@ 
                 );
                 if (mysql_num_rows($rsWatchesLog) > 0) {
                     $logtexts = '';
-                    for ($j = 0; $j < mysql_num_rows($rsWatchesLog); $j ++) {
+                    for ($j = 0; $j < mysql_num_rows($rsWatchesLog); $j++) {
                         $rWatch = sql_fetch_array($rsWatchesLog);
                         $logtexts .= $rWatch['watchtext'];
                     }
@@ -209,7 +209,7 @@ 
                     if (is_existent_maildomain(getToMailDomain($mailadr))) {
                         $language = $rUser['language'] ? $rUser['language'] : $opt['template']['default']['locale'];
                         $mailsubject =
-                            '[' . $maildomain . '] ' . $translate->t(
+                            '['.$maildomain.'] '.$translate->t(
                                 'Your watchlist of',
                                 '',
                                 basename(__FILE__),
@@ -217,11 +217,11 @@ 
                                 '',
                                 1,
                                 $language
-                            ) . ' ' . date($opt['locale'][$language]['format']['phpdate']);
+                            ).' '.date($opt['locale'][$language]['format']['phpdate']);
                         mb_send_mail($mailadr, $mailsubject, $mailbody, $email_headers);
 
                         // logentry($module, $eventid, $userid, $objectid1, $objectid2, $logtext, $details)
-                        logentry('watchlist', 2, $rUser['user_id'], 0, 0, 'Sending mail to ' . $mailadr, []);
+                        logentry('watchlist', 2, $rUser['user_id'], 0, 0, 'Sending mail to '.$mailadr, []);
                     }
                 }
 
@@ -320,7 +320,7 @@ 
 
     $logtext = html2plaintext($rLog['text'], $rLog['text_html'] == 0, EMAIL_LINEWRAP);
 
-    $language = sqlValue("SELECT `language` FROM `user` WHERE `user_id`='" . sql_escape($user_id) . "'", null);
+    $language = sqlValue("SELECT `language` FROM `user` WHERE `user_id`='".sql_escape($user_id)."'", null);
     if (!$language) {
         $language = $opt['template']['default']['locale'];
     }
@@ -331,7 +331,7 @@ 
     }
 
     $watchtext =
-        '{date} ' . $translate->t(
+        '{date} '.$translate->t(
             '{user} has logged your cache "{cachename}":',
             '',
             basename(__FILE__),
@@ -339,7 +339,7 @@ 
             '',
             1,
             $language
-        ) . ' {action}{maintenance_flags}' . "\n" . '{shortlink_url}{wp_oc}' . "\n\n" . '{text}' . "\n\n\n\n";
+        ).' {action}{maintenance_flags}'."\n".'{shortlink_url}{wp_oc}'."\n\n".'{text}'."\n\n\n\n";
 
     $watchtext = mb_ereg_replace('{date}', date($dateformat, strtotime($rLog['logdate'])), $watchtext);
     $watchtext = mb_ereg_replace('{wp_oc}', $rLog['wp_oc'], $watchtext);
@@ -349,7 +349,7 @@ 
     $watchtext = mb_ereg_replace('{action}', get_logtype_name($rLog['type'], $language), $watchtext);
     $watchtext = insert_maintenance_flags($rLog, $language, $watchtext);
 
-    $domain = sqlValue("SELECT `domain` FROM `user` WHERE `user_id`='" . sql_escape($user_id) . "'", null);
+    $domain = sqlValue("SELECT `domain` FROM `user` WHERE `user_id`='".sql_escape($user_id)."'", null);
     $urls = get_site_urls($domain);
     if ($urls['shortlink_url']) {
         $watchtext = mb_ereg_replace("{shortlink_url}", $urls['shortlink_url'], $watchtext);
@@ -403,7 +403,7 @@ 
 
     $logtext = html2plaintext($rLog['text'], $rLog['text_html'] == 0, EMAIL_LINEWRAP);
 
-    $language = sqlValue("SELECT `language` FROM `user` WHERE `user_id`='" . sql_escape($user_id) . "'", null);
+    $language = sqlValue("SELECT `language` FROM `user` WHERE `user_id`='".sql_escape($user_id)."'", null);
     if (!$language) {
         $language = $opt['template']['default']['locale'];
     }
@@ -414,7 +414,7 @@ 
     }
 
     $watchtext =
-        '{date} ' . $translate->t(
+        '{date} '.$translate->t(
             '{user} has logged the cache "{cachename}":',
             '',
             basename(__FILE__),
@@ -422,7 +422,7 @@ 
             '',
             1,
             $language
-        ) . ' {action}{maintenance_flags}' . "\n" . '{shortlink_url}{wp_oc}' . "\n{cachelists}\n" . '{text}' . "\n\n\n\n";
+        ).' {action}{maintenance_flags}'."\n".'{shortlink_url}{wp_oc}'."\n{cachelists}\n".'{text}'."\n\n\n\n";
 
     $watchtext = mb_ereg_replace('{date}', date($dateformat, strtotime($rLog['logdate'])), $watchtext);
     $watchtext = mb_ereg_replace('{wp_oc}', $rLog['wp_oc'], $watchtext);
@@ -455,7 +455,7 @@ 
                     '',
                     1,
                     $language
-                ) . ' ' . $cachelist_names[0] . "\n";
+                ).' '.$cachelist_names[0]."\n";
             break;
         default:
             $cachelists =
@@ -467,11 +467,11 @@ 
                     '',
                     1,
                     $language
-                ) . ' ' . implode(', ', $cachelist_names) . "\n";
+                ).' '.implode(', ', $cachelist_names)."\n";
     }
     $watchtext = mb_ereg_replace('{cachelists}', $cachelists, $watchtext);
 
-    $domain = sqlValue("SELECT `domain` FROM `user` WHERE `user_id`='" . sql_escape($user_id) . "'", null);
+    $domain = sqlValue("SELECT `domain` FROM `user` WHERE `user_id`='".sql_escape($user_id)."'", null);
     $urls = get_site_urls($domain);
     if ($urls['shortlink_url']) {
         $watchtext = mb_ereg_replace("{shortlink_url}", $urls['shortlink_url'], $watchtext);
@@ -562,7 +562,7 @@ 
     }
 
     if (file_exists($PidFile)) {
-        echo "Error: Pidfile (" . $PidFile . ") already present at " . __FILE__ . ":" . __LINE__ . "!\n";
+        echo "Error: Pidfile (".$PidFile.") already present at ".__FILE__.":".__LINE__."!\n";
 
         return false;
     } else {
@@ -572,7 +572,7 @@ 
 
             return true;
         } else {
-            echo "can't create Pidfile $PidFile at " . __FILE__ . ":" . __LINE__ . "!\n";
+            echo "can't create Pidfile $PidFile at ".__FILE__.":".__LINE__."!\n";
 
             return false;
         }
@@ -588,7 +588,7 @@ 
         $pid_daemon = fgets($pidfile, 20);
         fclose($pidfile);
 
-        $pid_daemon = (int) $pid_daemon;
+        $pid_daemon = (int)$pid_daemon;
 
         // process running?
         if (posix_kill($pid_daemon, 0)) {
@@ -597,7 +597,7 @@ 
             false;
         } else {
             // no, remove pid_file
-            echo "process not running, removing old pid_file (" . $PidFile . ")\n";
+            echo "process not running, removing old pid_file (".$PidFile.")\n";
             unlink($PidFile);
 
             return true;
@@ -619,10 +619,10 @@ 
             unlink($PidFile);
         }
     } else {
-        echo "Error: can't delete own pidfile (" . $PidFile . ") at " . __FILE__ . ":" . __LINE__ . "!\n";
+        echo "Error: can't delete own pidfile (".$PidFile.") at ".__FILE__.":".__LINE__."!\n";
     }
 
     if ($message) {
-        echo $message . "\n";
+        echo $message."\n";
     }
 }

htdocs/lang/de/ocstyle/varset.inc.php

Spacing +6 added lines, -6 removed lines

@@ -22,13 +22,13 @@ 
 tpl_set_var('loginbox', ' ');
 tpl_set_var(
     'functionsbox',
-    '<a href="index.php?page=suche">' . t('Search') . '</a> | <a href="index.php?page=sitemap">' . t('Sitemap') . '</a>'
+    '<a href="index.php?page=suche">'.t('Search').'</a> | <a href="index.php?page=sitemap">'.t('Sitemap').'</a>'
 );
 tpl_set_var('runtime', '');
 
 //set up main template specific string
 $sLoggedOut =
-    '<form action="' . ($opt['page']['https']['force_login'] ? $opt['page']['absolute_https_url'] : '') . 'login.php" method="post" enctype="application/x-www-form-urlencoded" name="login" dir="ltr" style="display: inline;"><b>'
+    '<form action="'.($opt['page']['https']['force_login'] ? $opt['page']['absolute_https_url'] : '').'login.php" method="post" enctype="application/x-www-form-urlencoded" name="login" dir="ltr" style="display: inline;"><b>'
     . t('User:')
     . '</b>&nbsp;&nbsp;<input name="email" size="10" type="text" class="textboxes" value="" />&nbsp;&nbsp;&nbsp;<b>'
     . t('Password:')
@@ -43,14 +43,14 @@ 
     . '</a></b>';
 
 // target in Loginbox setzen
-$target = basename($_SERVER['PHP_SELF']) . '?';
+$target = basename($_SERVER['PHP_SELF']).'?';
 
 // REQUEST-Variablen durchlaufen und an target anhaengen
 $allowed = ['cacheid', 'userid', 'logid', 'desclang', 'descid'];
 reset($_REQUEST);
 while (list ($varname, $varvalue) = each($_REQUEST)) {
     if (in_array($varname, $allowed)) {
-        $target .= $varname . '=' . $varvalue . '&';
+        $target .= $varname.'='.$varvalue.'&';
     }
 }
 if (mb_substr($target, - 1) == '?' || mb_substr($target, - 1) == '&') {
@@ -76,10 +76,10 @@ 
  '<tr><td class="spacer" colspan="2"></td></tr>
     <tr>
         <td class="help" colspan="2">
-            <img src="lang/de/ocstyle/images/misc/hint.gif" border="0" width="15" height="11" alt="' . t('Notice') . '" title="' . t('Notice') . '" />
+            <img src="lang/de/ocstyle/images/misc/hint.gif" border="0" width="15" height="11" alt="' . t('Notice').'" title="'.t('Notice').'" />
             ' . t('Your HTML code will be changed again by a special filter. This is necessary to avoid dangerous HTML-tags,
                  such as &lt;script&gt;. A list of allowed HTML tags, you can find
-                 <a href="articles.php?page=htmltags">here</a>') . '
+                 <a href="articles.php?page=htmltags">here</a>').'
         </td>
     </tr>
     ';

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/cron/runcron.php

Spacing +9 added lines, -9 removed lines

@@ -11,16 +11,16 @@ 
  *
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../';
-require $opt['rootpath'] . 'lib2/cli.inc.php';
+$opt['rootpath'] = __DIR__.'/../../';
+require $opt['rootpath'].'lib2/cli.inc.php';
 
 // test for user who runs the cronjob
 $processUser = posix_getpwuid(posix_geteuid());
 if ($processUser['name'] != $opt['cron']['username']) {
     die(
-        "ERROR: runcron must be run by '" . $opt['cron']['username']
-        . "' but was called by '" . $processUser['name'] . "'\n" .
-        "Try something like 'sudo -u " . $opt['cron']['username'] . " php runcron.php'.\n"
+        "ERROR: runcron must be run by '".$opt['cron']['username']
+        . "' but was called by '".$processUser['name']."'\n".
+        "Try something like 'sudo -u ".$opt['cron']['username']." php runcron.php'.\n"
     );
 }
 
@@ -35,13 +35,13 @@ 
         }
     }
 
-    $modules_dir = $opt['rootpath'] . 'util2/cron/modules/';
+    $modules_dir = $opt['rootpath'].'util2/cron/modules/';
     $param = count($argv) > 1 ? $argv[1] : '';
 
     if ($param != '' && substr($param, 0, 1) != '-' && !strstr('/', $param)) {
         // run one job manually for debugging purpose
         $ignore_interval = true;
-        require $modules_dir . $argv[1] . '.class.php';
+        require $modules_dir.$argv[1].'.class.php';
     } else {
         if (cronjobs_enabled()) {
             $ignore_interval = false;
@@ -49,9 +49,9 @@ 
             while (false !== ($file = readdir($hDir))) {
                 if (substr($file, -10) == '.class.php') {
                     if ($param == '--show') {
-                        echo 'running ' . $file . "\n";
+                        echo 'running '.$file."\n";
                     }
-                    require $modules_dir . $file;
+                    require $modules_dir.$file;
                 }
             }
         }

htdocs/util2/cron/modules/picture_cleanup.class.php

Spacing +3 added lines, -3 removed lines

@@ -51,9 +51,9 @@
                                 $picture = $instances[$n]['pic'];
                                 echo
                                     'deleting duplicate picture '
-                                    . $picture->getPictureId() . ' ("' . $picture->getTitle() . '")'
-                                    . ' from log ' . $rDuplicatePic['object_id']
-                                    . ' of cache ' . $instances[$n]['cache_id'] . "\n";
+                                    . $picture->getPictureId().' ("'.$picture->getTitle().'")'
+                                    . ' from log '.$rDuplicatePic['object_id']
+                                    . ' of cache '.$instances[$n]['cache_id']."\n";
                                 $picture->delete(false);
                                 $instances[$n]['filesize'] = false;
                                 break;

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/restorecaches.php

Spacing +42 added lines, -42 removed lines

@@ -132,8 +132,8 @@ 
 
 */
 
-require __DIR__ . '/lib2/web.inc.php';
-require_once __DIR__ . '/lib2/logic/labels.inc.php';
+require __DIR__.'/lib2/web.inc.php';
+require_once __DIR__.'/lib2/logic/labels.inc.php';
 
 $tpl->name = 'restorecaches';
 $tpl->menuitem = MNU_ADMIN_RESTORE;
@@ -308,12 +308,12 @@ 
 
 function get_archive_data($caches)
 {
-    $cachelist = "(" . implode(",", $caches) . ")";
+    $cachelist = "(".implode(",", $caches).")";
     $data = array();
     $admins = array();
 
     // make waypoint index
-    $rs = sql("SELECT `cache_id`, `wp_oc` FROM `caches` WHERE `cache_id` IN " . $cachelist);
+    $rs = sql("SELECT `cache_id`, `wp_oc` FROM `caches` WHERE `cache_id` IN ".$cachelist);
     while ($r = sql_fetch_assoc($rs)) {
         $wp_oc[$r['cache_id']] = $r['wp_oc'];
     }
@@ -328,7 +328,7 @@ 
             `latitude`,
             `restored_by`
         FROM `cache_coordinates`
-        WHERE `cache_id` IN " . $cachelist . "
+        WHERE `cache_id` IN " . $cachelist."
         ORDER BY `date_created` ASC"
     );
     // order is relevant, because multiple changes per day possible
@@ -336,7 +336,7 @@ 
     while ($r = sql_fetch_assoc($rs)) {
         $coord = new coordinate($r['latitude'], $r['longitude']);
         $coord = $coord->getDecimalMinutes();
-        $coord = $coord['lat'] . " " . $coord['lon'];
+        $coord = $coord['lat']." ".$coord['lon'];
         if (isset($lastcoord[$r['cache_id']]) && $coord != $lastcoord[$r['cache_id']]) {
             // the database contains lots of old coord records with unchanged coords, wtf?
             append_data($data, $admins, $wp_oc, $r, "coord", $lastcoord[$r['cache_id']], $coord);
@@ -348,7 +348,7 @@ 
     // cache country
     $rs = sql("SELECT `cache_id`, LEFT(`date_created`,10) AS `date_modified`, `country`, `restored_by`
                FROM `cache_countries`
-                         WHERE `cache_id` IN " . $cachelist . "
+                         WHERE `cache_id` IN " . $cachelist."
                          ORDER BY `date_created` ASC");
     // order is relevant, because multiple changes per day possible
     $lastcountry = array();
@@ -364,17 +364,17 @@ 
     // all other cache data
     // first the current data ...
     $nextcd = array();
-    $rs = sql("SELECT * FROM `caches` WHERE `cache_id` IN " . $cachelist);
+    $rs = sql("SELECT * FROM `caches` WHERE `cache_id` IN ".$cachelist);
     while ($r = sql_fetch_assoc($rs)) {
         $nextcd[$r['wp_oc']] = $r;
-        $user_id = $r['user_id'];     // is used later for logs
+        $user_id = $r['user_id']; // is used later for logs
     }
     sql_free_result($rs);
 
     // .. and then the changes
     $rs = sql(
         "SELECT * FROM `caches_modified`
-        WHERE `cache_id` IN " . $cachelist . "
+        WHERE `cache_id` IN " . $cachelist."
         ORDER BY `date_modified` DESC"
     );
     while ($r = sql_fetch_assoc($rs)) {
@@ -417,8 +417,8 @@ 
                 $wp_oc,
                 $r,
                 "time",
-                $r['search_time'] . ' h',
-                $nextcd[$wp]['search_time'] . ' h'
+                $r['search_time'].' h',
+                $nextcd[$wp]['search_time'].' h'
             );
         }
         if ($r['way_length'] != $nextcd[$wp]['way_length']) {
@@ -428,8 +428,8 @@ 
                 $wp_oc,
                 $r,
                 "way",
-                $r['way_length'] . ' km',
-                $nextcd[$wp]['way_length'] . ' km'
+                $r['way_length'].' km',
+                $nextcd[$wp]['way_length'].' km'
             );
         }
         if ($r['wp_gc'] != $nextcd[$wp]['wp_gc']) {
@@ -465,9 +465,9 @@ 
     // attributes
     $rs = sql(
         "SELECT * FROM `caches_attributes_modified`
-         WHERE `cache_id` IN " . $cachelist . "  /* OConly attrib is shown, but not restorable */
+         WHERE `cache_id` IN " . $cachelist."  /* OConly attrib is shown, but not restorable */
          ORDER BY `date_modified` ASC"
-    );   // order doesn't matter as long it is date only
+    ); // order doesn't matter as long it is date only
     while ($r = sql_fetch_assoc($rs)) {
         append_data(
             $data,
@@ -475,7 +475,7 @@ 
             $wp_oc,
             $r,
             "attrib",
-            ($r['was_set'] ? "-" : "+") . labels::getLabelValue('cache_attrib', $r['attrib_id']),
+            ($r['was_set'] ? "-" : "+").labels::getLabelValue('cache_attrib', $r['attrib_id']),
             ''
         );
     }
@@ -513,7 +513,7 @@ 
             LENGTH(`short_desc`) AS `sdl`,
             `restored_by`
         FROM `cache_desc_modified`
-        WHERE `cache_id` IN " . $cachelist . "
+        WHERE `cache_id` IN " . $cachelist."
         ORDER BY `date_modified` DESC"
     );
     // order doesn't matter as long only one change per day is recorded
@@ -535,9 +535,9 @@ 
                 $admins,
                 $wp_oc,
                 $r,
-                "desc(" . $r['language'] . ")",
+                "desc(".$r['language'].")",
                 $r['dl'] + 0,
-                ($next['dl'] + 0) . ' bytes'
+                ($next['dl'] + 0).' bytes'
             );
         }
         if ($r['hl'] + 0 != $next['hl'] + 0) {
@@ -546,9 +546,9 @@ 
                 $admins,
                 $wp_oc,
                 $r,
-                "hint(" . $r['language'] . ")",
+                "hint(".$r['language'].")",
                 $r['hl'] + 0,
-                ($next['hl'] + 0) . ' bytes'
+                ($next['hl'] + 0).' bytes'
             );
         }
         if ($r['sdl'] + 0 != $next['sdl'] + 0) {
@@ -557,9 +557,9 @@ 
                 $admins,
                 $wp_oc,
                 $r,
-                "shortdesc(" . $r['language'] . ")",
+                "shortdesc(".$r['language'].")",
                 $r['sdl'] + 0,
-                ($next['sdl'] + 0) . ' bytes'
+                ($next['sdl'] + 0).' bytes'
             );
         }
 
@@ -582,7 +582,7 @@ 
               (SELECT 1 AS `op`, `deletion_date` AS `date_modified`, `cache_id`,
                     `user_id`, `type`, `date`, `restored_by`
                    FROM `cache_logs_archived`
-                  WHERE `cache_id` IN " . $cachelist . "AND `deleted_by`='&1' AND `user_id`<>'&1'
+                  WHERE `cache_id` IN " . $cachelist."AND `deleted_by`='&1' AND `user_id`<>'&1'
                   UNION
                   SELECT 2 AS `op`, `date_modified`, `cache_id`,
                        (SELECT `user_id` FROM `cache_logs_archived` WHERE `id`=`original_id`),
@@ -590,7 +590,7 @@ 
                        (SELECT `date` FROM `cache_logs_archived` WHERE `id`=`original_id`),
                        `restored_by`
                  FROM `cache_logs_restored`
-                  WHERE `cache_id` IN " . $cachelist . ") `logs`
+                  WHERE `cache_id` IN " . $cachelist.") `logs`
                 INNER JOIN `user` ON `user`.`user_id`=`logs`.`user_id`
               ORDER BY `logs`.`date_modified` ASC",
         // order may not be exact when redoing reverts, because delete and insert
@@ -604,7 +604,7 @@ 
             $wp_oc,
             $r,
             $r["op"] == 1 ? "dellog" : "restorelog",
-            "<a href='viewprofile.php?userid=" . $r['user_id'] . "' target='_blank'>" . $r['username'] . "</a>/" . $r['date'],
+            "<a href='viewprofile.php?userid=".$r['user_id']."' target='_blank'>".$r['username']."</a>/".$r['date'],
             ''
         );
     }
@@ -620,10 +620,10 @@ 
 
     $piccacheid = "IF(`object_type`=2, `object_id`, IF(`object_type`=1, IFNULL((SELECT `cache_id` FROM `cache_logs` WHERE `id`=`object_id`),(SELECT `cache_id` FROM `cache_logs_archived` WHERE `id`=`object_id`)), 0))";
     $rs = sql(
-        "SELECT *, " . $piccacheid . "AS `cache_id` FROM `pictures_modified`
-         WHERE " . $piccacheid . " IN " . $cachelist . "
+        "SELECT *, ".$piccacheid."AS `cache_id` FROM `pictures_modified`
+         WHERE " . $piccacheid." IN ".$cachelist."
          ORDER BY `date_modified` ASC"
-    );  // order is relevant for the case of restore-reverts
+    ); // order is relevant for the case of restore-reverts
     while ($r = sql_fetch_assoc($rs)) {
         $r['date_modified'] = substr($r['date_modified'], 0, 10);
         switch ($r['operation']) {
@@ -645,14 +645,14 @@ 
                 $picchange .= "-cache";
                 break;
         }
-        append_data($data, $admins, $wp_oc, $r, $picchange . "pic", $r['title'], '');
+        append_data($data, $admins, $wp_oc, $r, $picchange."pic", $r['title'], '');
     }
     sql_free_result($rs);
 
     // admins
     foreach ($admins as $adate => $adata) {
         foreach ($adata as $awp => $alist) {
-            $data[$adate][$awp] .= "<br /><strong class='adminrestore'>admins:</strong> " . implode(',', $alist);
+            $data[$adate][$awp] .= "<br /><strong class='adminrestore'>admins:</strong> ".implode(',', $alist);
         }
     }
 
@@ -701,9 +701,9 @@ 
     } else {
         $text .= " class='userchange'";
     }
-    $text .= ">$field</strong>: $oldvalue" . ($newvalue != "" ? " &rarr; $newvalue" : "");
+    $text .= ">$field</strong>: $oldvalue".($newvalue != "" ? " &rarr; $newvalue" : "");
     if (isset($data[$mdate][$wp])) {
-        $data[$mdate][$wp] .= ", " . $text;
+        $data[$mdate][$wp] .= ", ".$text;
     } else {
         $data[$mdate][$wp] = $text;
     }
@@ -716,8 +716,8 @@ 
             $admins[$mdate][$wp] = [];
         }
         $admins[$mdate][$wp][$r['restored_by'] + 0]
-            = "<a href='viewprofile.php?userid=" . $r['restored_by'] . "' target='_blank'>" .
-            sql_value("SELECT `username` FROM `user` WHERE `user_id`='&1'", "", $r['restored_by']) .
+            = "<a href='viewprofile.php?userid=".$r['restored_by']."' target='_blank'>".
+            sql_value("SELECT `username` FROM `user` WHERE `user_id`='&1'", "", $r['restored_by']).
             "</a>";
     }
 }
@@ -727,7 +727,7 @@ 
 {
     global $opt, $login;
 
-    sql("SET @restoredby='&1'", $login->userid);         // is evaluated by trigger functions
+    sql("SET @restoredby='&1'", $login->userid); // is evaluated by trigger functions
     sql_slave("SET @restoredby='&1'", $login->userid);
 
     $restored = array();
@@ -837,12 +837,12 @@ 
                     if ($setfields != "") {
                         $setfields .= ",";
                     }
-                    $setfields .= "`$field`='" . sql_escape($r[$field]) . "'";
+                    $setfields .= "`$field`='".sql_escape($r[$field])."'";
                     $restored[$wp][$field] = true;
                 }
             }
             if ($setfields != "" && !$simulate) {
-                sql("UPDATE `caches` SET " . $setfields . " WHERE `cache_id`='&1'", $cacheid);
+                sql("UPDATE `caches` SET ".$setfields." WHERE `cache_id`='&1'", $cacheid);
             }
         }
         sql_free_result($rs);
@@ -1019,7 +1019,7 @@ 
                         // id, uuid, date_created and last_modified are set automatically;
                         // picture will be updated automatically on picture-restore
                         $log = new cachelog();
-                        $log->setNode($r['node']);  // cachelog class currently does not initialize node field
+                        $log->setNode($r['node']); // cachelog class currently does not initialize node field
                         $log->setCacheId($r['cache_id']);
                         $log->setUserId($r['user_id']);
                         $log->setType($r['type'], true);
@@ -1071,7 +1071,7 @@ 
                 }  // not already processed
 
                 if ($error != "") {
-                    $restored[$wp]['internal error - could not $error log ' + $r['id'] + "/" + $logid];
+                    $restored[$wp]['internal error - could not $error log ' +$r['id'] + "/" +$logid];
                 }
                 if ($logs_restored) {
                     $restored[$wp]['logs'] = true;
@@ -1203,7 +1203,7 @@ 
                 }  // not already processed
 
                 if ($error != "") {
-                    $restored[$wp]['internal error - could not $error picture ' . $r['id'] + "/" + $picid] = true;
+                    $restored[$wp]['internal error - could not $error picture '.$r['id'] + "/" +$picid] = true;
                 }
                 if ($pics_restored) {
                     $restored[$wp]['pictures'] = true;

htdocs/lib/sqldebugger.inc.php

Spacing +22 added lines, -22 removed lines

@@ -9,7 +9,7 @@ 
  * Unicode Reminder メモ
  ****************************************************************************/
 
-require_once $opt['rootpath'] . 'lib/bench.inc.php';
+require_once $opt['rootpath'].'lib/bench.inc.php';
 
 $sqldbg_cmdNo = 0;
 $sqldbg_sumTimes = 0;
@@ -155,9 +155,9 @@ 
     global $sqldbg_cmdNo;
     global $sqldbg_sumTimes;
 
-    $sqldbg_cmdNo ++;
+    $sqldbg_cmdNo++;
 
-    echo '<p class="sqlno"><span class="white">/*</span> SQL command ' . $sqldbg_cmdNo . ' ';
+    echo '<p class="sqlno"><span class="white">/*</span> SQL command '.$sqldbg_cmdNo.' ';
     if ($bSlave) {
         echo '<span class="slave_title">(slave)</span>';
     }
@@ -224,19 +224,19 @@ 
         $bFirstLine = true;
         $nLine = 0;
         $rs = mysql_query($sqlexplain, $dblink);
-        echo '<div class="selrows">Number of selected rows: ' . mysql_num_rows($rs) . '</div>';
+        echo '<div class="selrows">Number of selected rows: '.mysql_num_rows($rs).'</div>';
 
         echo '<table class="firstresultrow" border="1">';
 
         while ($r = sql_fetch_assoc($rs)) {
             $usebr = true;
-            $nLine ++;
+            $nLine++;
             if ($bFirstLine == true) {
-                echo '<tr>' . "\n";
+                echo '<tr>'."\n";
                 foreach ($r as $field => $value) {
-                    echo '<th>' . htmlspecialchars($field, ENT_COMPAT, 'UTF-8') . '</th>' . "\n";
+                    echo '<th>'.htmlspecialchars($field, ENT_COMPAT, 'UTF-8').'</th>'."\n";
                 }
-                echo '</tr>' . "\n";
+                echo '</tr>'."\n";
             }
 
             if ($bFirstLine) {
@@ -246,9 +246,9 @@ 
             }
 
             foreach ($r as $value) {
-                echo '<td>' . htmlspecialchars(($value != null) ? $value : 'NULL', ENT_COMPAT, 'UTF-8') . '</td>';
+                echo '<td>'.htmlspecialchars(($value != null) ? $value : 'NULL', ENT_COMPAT, 'UTF-8').'</td>';
             }
-            echo '</tr>' . "\n";
+            echo '</tr>'."\n";
 
             if ($nLine == 25) {
                 break;
@@ -261,27 +261,27 @@ 
         echo '<table class="explain" border="1">';
 
         $bFirstLine = true;
-        $rs = mysql_query('EXPLAIN EXTENDED ' . $sqlexplain);
+        $rs = mysql_query('EXPLAIN EXTENDED '.$sqlexplain);
         while ($r = sql_fetch_assoc($rs)) {
             if ($bFirstLine == true) {
                 echo '<tr>';
                 foreach ($r as $field => $value) {
-                    echo '<th>' . htmlspecialchars($field, ENT_COMPAT, 'UTF-8') . '</th>';
+                    echo '<th>'.htmlspecialchars($field, ENT_COMPAT, 'UTF-8').'</th>';
                 }
-                echo '</tr>' . "\n";
+                echo '</tr>'."\n";
 
                 $bFirstLine = false;
             }
 
             echo '<tr>';
             foreach ($r as $value) {
-                echo '<td>' . htmlspecialchars(
+                echo '<td>'.htmlspecialchars(
                     ($value != null) ? mb_ereg_replace('\*/', '* /', $value) : 'NULL',
                     ENT_COMPAT,
                     'UTF-8'
-                ) . '</td>';
+                ).'</td>';
             }
-            echo '</tr>' . "\n";
+            echo '</tr>'."\n";
         }
         echo '</table>';
         $usebr = true;
@@ -303,14 +303,14 @@ 
         echo '<table>';
         $rs = mysql_query('SHOW WARNINGS', $dblink);
         while ($r = sql_fetch_assoc($rs)) {
-            echo '<tr><td>' . htmlspecialchars($r['Message'], ENT_COMPAT, 'UTF-8') . '</td></tr>';
+            echo '<tr><td>'.htmlspecialchars($r['Message'], ENT_COMPAT, 'UTF-8').'</td></tr>';
         }
         echo '</table>';
         echo '</div>';
     }
 
-    echo '<div class="runtime">Runtime: ' . sprintf('%01.5f', $bSqlExecution->Diff()) . ' sek.</div>';
-    echo '<div class="affectedrows">Number of affected rows: ' . mysql_affected_rows($dblink) . '</div>';
+    echo '<div class="runtime">Runtime: '.sprintf('%01.5f', $bSqlExecution->Diff()).' sek.</div>';
+    echo '<div class="affectedrows">Number of affected rows: '.mysql_affected_rows($dblink).'</div>';
 
     echo '<div class="white">*/</div></div>';
 
@@ -322,7 +322,7 @@ 
     global $sqldbg_sumTimes;
 
     echo '<span class="white">/*</span><div class="allruntime"><hr>';
-    echo 'Runtime sum: ' . sprintf('%01.5f', $sqldbg_sumTimes) . ' sek.<span class="white">*/</span></div>';
+    echo 'Runtime sum: '.sprintf('%01.5f', $sqldbg_sumTimes).' sek.<span class="white">*/</span></div>';
 
     echo '</body></html>';
     exit;
@@ -347,13 +347,13 @@ 
         return '';
     }
 
-    return 'SELECT * ' . mb_substr($sql, $start);
+    return 'SELECT * '.mb_substr($sql, $start);
 }
 
 function sqldbg_insert_nocache($sql)
 {
     if (mb_strtoupper(mb_substr($sql, 0, 7)) == 'SELECT ') {
-        $sql = 'SELECT SQL_NO_CACHE ' . mb_substr($sql, 7);
+        $sql = 'SELECT SQL_NO_CACHE '.mb_substr($sql, 7);
     }
 
     return $sql;

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);
             }