OpencachingDeutschland / oc-server3

htdocs/thumbs.php

Spacing +39 added lines, -39 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $login->verify();
 
@@ -41,7 +41,7 @@ 
             ) == 0
         ) {
             if ($debug == 1) {
-                die('Debug: line ' . __LINE__);
+                die('Debug: line '.__LINE__);
             } else {
                 $tpl->redirect(thumbpath('extern', 1));
             }
@@ -60,14 +60,14 @@ 
             ) == 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));
         }
@@ -75,7 +75,7 @@ 
 
     if ($r['local'] == 0) {
         if ($debug == 1) {
-            die('Debug: line ' . __LINE__);
+            die('Debug: line '.__LINE__);
         } else {
             $tpl->redirect(thumbpath('extern', $r['object_type']));
         }
@@ -83,7 +83,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']));
         }
@@ -92,9 +92,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']));
         }
@@ -107,11 +107,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;
@@ -120,7 +120,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']));
             }
@@ -131,11 +131,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']));
             }
@@ -146,20 +146,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;
         }
 
@@ -167,7 +167,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']));
             }
@@ -204,15 +204,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
@@ -220,7 +220,7 @@ 
             );
         }
 
-        $savedir = $opt['logic']['pictures']['thumb_dir'] . '/' . mb_substr($filename, 0, 1) . '/' . mb_substr(
+        $savedir = $opt['logic']['pictures']['thumb_dir'].'/'.mb_substr($filename, 0, 1).'/'.mb_substr(
                 $filename,
                 1,
                 1
@@ -228,42 +228,42 @@ 
 
         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
                 )
             );
         }
@@ -276,7 +276,7 @@ 
     }
 } else {
     if ($debug == 1) {
-        die('Debug: line ' . __LINE__);
+        die('Debug: line '.__LINE__);
     } else {
         $tpl->redirect(thumbpath('404', $default_object_type));
     }
@@ -291,18 +291,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/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/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';

htdocs/util/change_owner/cache.php

Spacing +6 added lines, -6 removed lines

@@ -10,9 +10,9 @@ 
 
 header('Content-type: text/html; charset=utf-8');
 
-$rootpath = __DIR__ . '/../../';
-require_once $rootpath . 'lib/common.inc.php';
-require_once $rootpath . 'lib/eventhandler.inc.php';
+$rootpath = __DIR__.'/../../';
+require_once $rootpath.'lib/common.inc.php';
+require_once $rootpath.'lib/eventhandler.inc.php';
 
 $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
 
@@ -54,15 +54,15 @@ 
     echo 'Besitzer geändert';
 
     // logentry($module, $eventid, $userid, $objectid1, $objectid2, $logtext, $details)
-    logentry('approving', 4, 0, $cacheid, 0, 'Owner changed ' . $cacheid, '');
+    logentry('approving', 4, 0, $cacheid, 0, 'Owner changed '.$cacheid, '');
 
     exit;
 } elseif ($action == 'showcache') {
     $wp = isset($_REQUEST['waypoint']) ? $_REQUEST['waypoint'] : 0;
     $newusername = isset($_REQUEST['newusername']) ? $_REQUEST['newusername'] : 0;
 
-    $cacheid = sqlValue("SELECT cache_id FROM caches WHERE wp_oc='" . sql_escape($wp) . "'", 0);
-    $userid = sqlValue("SELECT user_id FROM user WHERE username='" . sql_escape($newusername) . "'", '');
+    $cacheid = sqlValue("SELECT cache_id FROM caches WHERE wp_oc='".sql_escape($wp)."'", 0);
+    $userid = sqlValue("SELECT user_id FROM user WHERE username='".sql_escape($newusername)."'", '');
 
     if ($cacheid == 0) {
         die('Cache nicht gefunden!');

htdocs/oconly81.php

Spacing +3 added lines, -3 removed lines

@@ -5,8 +5,8 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
-require __DIR__ . '/lib2/logic/oconly81.inc.php';
+require __DIR__.'/lib2/web.inc.php';
+require __DIR__.'/lib2/logic/oconly81.inc.php';
 
 $showall = (@$_REQUEST['showall'] == 1);
 
@@ -46,7 +46,7 @@ 
     INNER JOIN &oconly81 ON &oconly81.`user_id`=`user`.`user_id`
     GROUP BY `user`.`user_id`
     ORDER BY `count` DESC, `username` ASC " .
-    ($showall ? "" : "LIMIT " . sql_escape($opt['logic']['oconly81']['default_maxusers'] + 1))
+    ($showall ? "" : "LIMIT ".sql_escape($opt['logic']['oconly81']['default_maxusers'] + 1))
 );
 
 $tpl->assign_rs('users', $rs);