OpencachingDeutschland / oc-server3

htdocs/addtolist.php

Spacing +4 added lines, -4 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'addtolist';
 $tpl->menuitem = MNU_CACHES_ADDTOLIST;
@@ -22,7 +22,7 @@ 
 $tpl->assign('cacheid', $cacheid);
 
 if (isset($_REQUEST['cancel'])) {
-    $tpl->redirect('viewcache.php?cacheid=' . $cacheid);
+    $tpl->redirect('viewcache.php?cacheid='.$cacheid);
 }
 
 $newlist_name = isset($_REQUEST['newlist_name']) ? trim($_REQUEST['newlist_name']) : false;
@@ -44,14 +44,14 @@ 
                     $cachelist->watch(true);
                 }
             }
-            $tpl->redirect('viewcache.php?cacheid=' . $cacheid);
+            $tpl->redirect('viewcache.php?cacheid='.$cacheid);
         }
     } else {
         $cachelist = new cachelist($listid);
         if ($cachelist->exist()) {
             $cachelist->addCacheByID($cacheid);
         }
-        $tpl->redirect('viewcache.php?cacheid=' . $cacheid);
+        $tpl->redirect('viewcache.php?cacheid='.$cacheid);
     }
 }
 

htdocs/newlogs.php

Spacing +17 added lines, -17 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $add_where = '';
 $newLogsPerCountry = $opt['logic']['new_logs_per_country'];
@@ -30,9 +30,9 @@ 
     $country = false;
     $exclude_country = '*';
     $include_country = '%';
-    $add_where = "AND `caches`.`user_id`='" . sql_escape($ownerid) . "' ";
+    $add_where = "AND `caches`.`user_id`='".sql_escape($ownerid)."' ";
     if (!$show_own_logs) {
-        $add_where .= "AND `cache_logs`.`user_id`<>'" . sql_escape($login->userid) . "' ";
+        $add_where .= "AND `cache_logs`.`user_id`<>'".sql_escape($login->userid)."' ";
     }
     $tpl->caching = false;
     $logcount = 100;
@@ -49,7 +49,7 @@ 
     $country = false;
     $exclude_country = '*';
     $include_country = '%';
-    $add_where = "AND `cache_logs`.`user_id`='" . sql_escape($userid) . "' ";
+    $add_where = "AND `cache_logs`.`user_id`='".sql_escape($userid)."' ";
     $tpl->caching = false;
     $logcount = 100;
     $paging = true;
@@ -69,7 +69,7 @@ 
     $tpl->cache_lifetime = 900;
     $tpl->cache_id = $exclude_country;
     $logcount = 250;
-    $paging = false;  // paging would have poor performance for all logs
+    $paging = false; // paging would have poor performance for all logs
     $orderByDate = $logselection == 3 ? "{fromtable}.`order_date` DESC, " : "";
 } else {
     // latest logs for all countries or for one country
@@ -88,7 +88,7 @@ 
     $tpl->cache_lifetime = 300;
     $tpl->cache_id = $country;
     $logcount = 250;
-    $paging = false;  // paging would have poor performance for all logs
+    $paging = false; // paging would have poor performance for all logs
     $orderByDate = $logselection == 3 ? "{fromtable}.`order_date` DESC, " : "";
     $optimize_for_latest_logs = ($country == '' || $country == $opt['page']['main_country']);
 }
@@ -101,7 +101,7 @@ 
 if ($logselection == 1) {
     $add_where .= "AND DATEDIFF(NOW(), {fromtable}.`date`) < 30 ";
 }
-$tpl->cache_id .= "|" . $logselection;
+$tpl->cache_id .= "|".$logselection;
 
 $tpl->change_country_inpage = true;
 
@@ -121,7 +121,7 @@ 
                 `needs_maintenance`, `listing_outdated`, `order_date`
              FROM `cache_logs`
              ORDER BY `date_created` DESC
-             LIMIT " . (4 * $logcount) . ")"
+             LIMIT " . (4 * $logcount).")"
         );
         $fromtable = '`&loglist0`';
     } else {
@@ -132,16 +132,16 @@ 
     sql_temp_table_slave('loglist');
     sql_slave(
         "CREATE TEMPORARY TABLE &loglist (`id` INT(11) PRIMARY KEY)
-        SELECT " . ($paging ? "SQL_CALC_FOUND_ROWS" : "") . " " . $fromtable . ".`id`
-        FROM " . $fromtable . "
-        INNER JOIN `caches` ON " . $fromtable . ".`cache_id`=`caches`.`cache_id`
+        SELECT " . ($paging ? "SQL_CALC_FOUND_ROWS" : "")." ".$fromtable.".`id`
+        FROM " . $fromtable."
+        INNER JOIN `caches` ON " . $fromtable.".`cache_id`=`caches`.`cache_id`
         INNER JOIN `cache_status` ON `caches`.`status`=`cache_status`.`id`
-        INNER JOIN `user` ON " . $fromtable . ".`user_id`=`user`.`user_id`
+        INNER JOIN `user` ON " . $fromtable.".`user_id`=`user`.`user_id`
         WHERE `cache_status`.`allow_user_view`=1
         AND `caches`.`country` LIKE '&1'
         AND `caches`.`country`<>'&2'
-        " . $add_where . "
-        ORDER BY " . str_replace("{fromtable}", $fromtable, $orderByDate) . $fromtable . ".`date_created` DESC
+        " . $add_where."
+        ORDER BY " . str_replace("{fromtable}", $fromtable, $orderByDate).$fromtable.".`date_created` DESC
         LIMIT &3, &4",
         $include_country,
         $exclude_country,
@@ -202,7 +202,7 @@ 
             ON `caches_attributes`.`cache_id`=`caches`.`cache_id`
             AND `caches_attributes`.`attrib_id`=6
         WHERE IFNULL(`cache_logs_restored`.`restored_by`,0)=0
-        ORDER BY " . $orderByCountry . str_replace("{fromtable}", "`cache_logs`", $orderByDate) . "`cache_logs`.`date_created` DESC",
+        ORDER BY " . $orderByCountry.str_replace("{fromtable}", "`cache_logs`", $orderByDate)."`cache_logs`.`date_created` DESC",
         $opt['template']['locale']
     );
 
@@ -247,7 +247,7 @@ 
             }
             sql_free_result($rsPic);
         }
-        $pics --;
+        $pics--;
 
         $rLog['first'] = false;
         if (isset($caches_logged)) {
@@ -301,7 +301,7 @@ 
 
     $tpl->assign('paging', $paging);
     if ($paging) {
-        $pager = new pager($_SERVER["SCRIPT_NAME"] . '?startat={offset}' . $urlparams);
+        $pager = new pager($_SERVER["SCRIPT_NAME"].'?startat={offset}'.$urlparams);
         $pager->make_from_offset($startat, $total_logs, $logcount);
     }
 }

htdocs/util/stats/rank.php

Spacing +1 added lines, -1 removed lines

@@ -8,4 +8,4 @@
  *  downward compatibility
  ***************************************************************************/
 
-require_once __DIR__ . '/../../util2/stats/rank.php';
+require_once __DIR__.'/../../util2/stats/rank.php';

htdocs/util/attributes/top.php

Spacing +5 added lines, -5 removed lines

@@ -7,8 +7,8 @@ 
 
 header('Content-type: text/html; charset=utf-8');
 
-$rootpath = __DIR__ . '/../../';
-require_once $rootpath . 'lib/common.inc.php';
+$rootpath = __DIR__.'/../../';
+require_once $rootpath.'lib/common.inc.php';
 
 $wp = isset($_REQUEST['wp']) ? $_REQUEST['wp'] : '';
 
@@ -16,7 +16,7 @@ 
     $attrs_set = isset($_REQUEST['cache_attribs']) ? $_REQUEST['cache_attribs'] : '';
     $attrs = mb_split(';', $attrs_set);
 
-    $cache_id = sqlValue("SELECT `cache_id` FROM `caches` WHERE `wp_oc`='" . sql_escape($wp) . "'", 0);
+    $cache_id = sqlValue("SELECT `cache_id` FROM `caches` WHERE `wp_oc`='".sql_escape($wp)."'", 0);
     if ($cache_id == 0) {
         die('cache_id unknown');
     }
@@ -46,7 +46,7 @@ 
     if ($attr_js != '') {
         $attr_js .= ',';
     }
-    $attr_js .= "new Array(" . $r['id'] . ", " . (isset($attrs[$r['id']]) ? 1 : 0) . ", '../../" . $r['icon_undef'] . "', '../../" . $r['icon_large'] . "')";
+    $attr_js .= "new Array(".$r['id'].", ".(isset($attrs[$r['id']]) ? 1 : 0).", '../../".$r['icon_undef']."', '../../".$r['icon_large']."')";
 }
 mysql_free_result($rs);
 ?>
@@ -99,7 +99,7 @@ 
     <?php
     $rs = sql("SELECT `id`, `icon_large`, `icon_undef` FROM `cache_attrib`");
     while ($r = sql_fetch_assoc($rs)) {
-        echo '<img id="attr' . $r['id'] . '" onmousedown="toggleAttr(' . $r['id'] . ')" src="../../';
+        echo '<img id="attr'.$r['id'].'" onmousedown="toggleAttr('.$r['id'].')" src="../../';
 
         if (isset($attrs[$r['id']])) {
             echo $r['icon_large'];

htdocs/util/attributes/list.php

Spacing +3 added lines, -3 removed lines

@@ -7,8 +7,8 @@ 
 
 header('Content-type: text/html; charset=utf-8');
 
-$rootpath = __DIR__ . '/../../';
-require_once $rootpath . 'lib/common.inc.php';
+$rootpath = __DIR__.'/../../';
+require_once $rootpath.'lib/common.inc.php';
 
 ?>
 <html>
@@ -41,7 +41,7 @@ 
     AND ISNULL(`caches_attributes`.`cache_id`) ORDER BY `caches`.`wp_oc`'
 );
 while ($rCache = sql_fetch_assoc($rsCaches)) {
-    echo '<a href="javascript:select(\'' . $rCache['wp_oc'] . '\')">' . $rCache['wp_oc'] . '<br />';
+    echo '<a href="javascript:select(\''.$rCache['wp_oc'].'\')">'.$rCache['wp_oc'].'<br />';
 }
 mysql_free_result($rsCaches);
 ?>

htdocs/util/google-earth/caches.php

Spacing +1 added lines, -1 removed lines

@@ -5,4 +5,4 @@
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once __DIR__ . '/../../util2/google-earth/caches.php';
+require_once __DIR__.'/../../util2/google-earth/caches.php';

htdocs/util/notification/settings-dist.inc.php

Spacing +2 added lines, -2 removed lines

@@ -9,9 +9,9 @@
     $maildomain = 'opencaching.de';
 }
 
-$mailfrom = 'noreply@' . $maildomain;
+$mailfrom = 'noreply@'.$maildomain;
 
 $debug = false;
 $debug_mailto = 'abc@xyz.de';
 
-$notifypid = $rootpath . 'cache/notify.pid';
+$notifypid = $rootpath.'cache/notify.pid';

htdocs/util/notification/run_notify.php

Spacing +17 added lines, -17 removed lines

@@ -10,15 +10,15 @@ 
  ***************************************************************************/
 
 // needs absolute rootpath because called as cronjob
-$rootpath = __DIR__ . '/../../';
+$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 . 'lib2/ProcessSync.class.php';
-require_once $rootpath . 'lib/logic.inc.php';
-require_once $rootpath . 'lib2/logic/geomath.class.php';
+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.'lib2/ProcessSync.class.php';
+require_once $rootpath.'lib/logic.inc.php';
+require_once $rootpath.'lib2/logic/geomath.class.php';
 
 if (!cronjobs_enabled()) {
     exit;
@@ -86,7 +86,7 @@ 
     switch ($notify['type']) {
         case notify_new_cache: // Type: new cache
             $mailbody = fetch_email_template('notify_newcache', $notify['recp_lang'], $notify['recp_domain']);
-            $mailsubject = '[' . $maildomain . '] ' .
+            $mailsubject = '['.$maildomain.'] '.
                 $translate->t(
                     $notify['oconly'] ? 'New OConly cache:' : 'New cache:',
                     '',
@@ -95,13 +95,13 @@ 
                     '',
                     1,
                     $notify['recp_lang']
-                ) .
-                ' ' . $notify['cachename'];
+                ).
+                ' '.$notify['cachename'];
             break;
 
         case notify_new_oconly: // Type: new OConly flag
             $mailbody = fetch_email_template('notify_newoconly', $notify['recp_lang'], $notify['recp_domain']);
-            $mailsubject = '[' . $maildomain . '] ' .
+            $mailsubject = '['.$maildomain.'] '.
                 $translate->t(
                     'Cache was marked as OConly:',
                     '',
@@ -110,8 +110,8 @@ 
                     '',
                     1,
                     $notify['recp_lang']
-                ) .
-                ' ' . $notify['cachename'];
+                ).
+                ' '.$notify['cachename'];
             break;
 
         default:
@@ -175,7 +175,7 @@ 
         );
 
         /* begin send out everything that has to be sent */
-        $email_headers = 'From: "' . $mailfrom . '" <' . $mailfrom . '>';
+        $email_headers = 'From: "'.$mailfrom.'" <'.$mailfrom.'>';
 
         // send email
         if ($debug == true) {
@@ -188,11 +188,11 @@ 
             mb_send_mail($mailadr, $mailsubject, $mailbody, $email_headers);
         }
     } else {
-        echo "Unknown notification type: " . $notify['type'] . "<br />";
+        echo "Unknown notification type: ".$notify['type']."<br />";
     }
 
     // logentry($module, $eventid, $userid, $objectid1, $objectid2, $logtext, $details)
-    logentry('notify_newcache', 8, $notify['recid'], $notify['cache_id'], 0, 'Sending mail to ' . $mailadr, []);
+    logentry('notify_newcache', 8, $notify['recid'], $notify['cache_id'], 0, 'Sending mail to '.$mailadr, []);
 
     return 0;
 }

htdocs/util/watchlist/settings-dist.inc.php

Spacing +2 added lines, -2 removed lines

@@ -5,9 +5,9 @@
     $maildomain = 'opencaching.de';
 }
 
-$mailfrom = 'noreply@' . $maildomain;
+$mailfrom = 'noreply@'.$maildomain;
 
 $debug = false;
 $debug_mailto = 'abc@xyz.de';
 
-$watchpid = $rootpath . 'cache/watch.pid';
+$watchpid = $rootpath.'cache/watch.pid';