OpencachingDeutschland / oc-server3

htdocs/xml/csv/cache.php

Spacing +8 added lines, -8 removed lines

@@ -5,9 +5,9 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../';
-require_once $opt['rootpath'] . 'lib2/web.inc.php';
-require_once $opt['rootpath'] . 'lib2/logic/cache.class.php';
+$opt['rootpath'] = __DIR__.'/../../';
+require_once $opt['rootpath'].'lib2/web.inc.php';
+require_once $opt['rootpath'].'lib2/logic/cache.class.php';
 
 header('Content-type: text/html; charset=utf-8');
 
@@ -35,14 +35,14 @@ 
     } else {
         echo $cache->getCacheId();
         echo ';';
-        echo '"' . mb_ereg_replace('"', '\"', $cache->getName()) . '"';
+        echo '"'.mb_ereg_replace('"', '\"', $cache->getName()).'"';
         echo ';';
-        echo '"' . mb_ereg_replace('"', '\"', $cache->getUsername()) . '"';
+        echo '"'.mb_ereg_replace('"', '\"', $cache->getUsername()).'"';
         echo ';';
-        echo '"' . mb_ereg_replace('"', '\"', $cache->getWPOC()) . '"';
+        echo '"'.mb_ereg_replace('"', '\"', $cache->getWPOC()).'"';
         echo ';';
-        echo '"' . mb_ereg_replace('"', '\"', $cache->getWPGC()) . '"';
+        echo '"'.mb_ereg_replace('"', '\"', $cache->getWPGC()).'"';
         echo ';';
-        echo '""';  // obsolete Navicache WP
+        echo '""'; // obsolete Navicache WP
     }
 }

htdocs/xml/ocxml11.php

Spacing +167 added lines, -167 removed lines

@@ -16,12 +16,12 @@ 
 }
 
 $opt['rootpath'] = '../';
-require_once __DIR__ . '/../lib/common.inc.php';
-require_once __DIR__ . '/../lib2/charset.inc.php';
-require_once __DIR__ . '/../lib2/const.inc.php';
-require_once __DIR__ . '/../lib2/logic/data-license.inc.php';
-require_once __DIR__ . '/../lib2/logic/npas.inc.php';
-require_once __DIR__ .' /../lib2/logic/geomath.class.php';
+require_once __DIR__.'/../lib/common.inc.php';
+require_once __DIR__.'/../lib2/charset.inc.php';
+require_once __DIR__.'/../lib2/const.inc.php';
+require_once __DIR__.'/../lib2/logic/data-license.inc.php';
+require_once __DIR__.'/../lib2/logic/npas.inc.php';
+require_once __DIR__.' /../lib2/logic/geomath.class.php';
 
 if ($error == true) {
     echo 'Unable to connect to database';
@@ -105,7 +105,7 @@ 
     sql('DELETE FROM `xmlsession_data` WHERE `session_id`=&1', $r['id']);
 
     // delete files
-    $path = $zip_basedir . 'ocxml11/' . $r['id'];
+    $path = $zip_basedir.'ocxml11/'.$r['id'];
     if (is_dir($path)) {
         unlinkrecursiv($path);
     }
@@ -192,7 +192,7 @@ 
     if (isset($_REQUEST['country'])) {
         $country = $_REQUEST['country'];
 
-        if (sqlValue('SELECT COUNT(*) FROM `countries` WHERE `short`=\'' . sql_escape($country) . '\'', 0) != 1) {
+        if (sqlValue('SELECT COUNT(*) FROM `countries` WHERE `short`=\''.sql_escape($country).'\'', 0) != 1) {
             die('Unknown country');
         }
 
@@ -237,13 +237,13 @@ 
                 $selection['type'] = 3;
                 if (isset($_REQUEST['wp'])) {
                     $selection['cacheid'] = sqlValue(
-                        "SELECT `cache_id` FROM `caches` WHERE `wp_oc`='" . sql_escape($_REQUEST['wp']) . "'",
+                        "SELECT `cache_id` FROM `caches` WHERE `wp_oc`='".sql_escape($_REQUEST['wp'])."'",
                         0
                     );
                 } else {
                     if (isset($_REQUEST['uuid'])) {
                         $selection['cacheid'] = sqlValue(
-                            "SELECT `cache_id` FROM `caches` WHERE `uuid`='" . sql_escape($_REQUEST['uuid']) . "'",
+                            "SELECT `cache_id` FROM `caches` WHERE `uuid`='".sql_escape($_REQUEST['uuid'])."'",
                             0
                         );
                     } else {
@@ -302,23 +302,23 @@ 
         $xmloutput = '';
         if ($bXmlDecl == '1') {
             if ($sCharset == 'iso-8859-1') {
-                $xmloutput .= '<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>' . "\n";
+                $xmloutput .= '<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>'."\n";
             } else {
                 if ($sCharset == 'utf-8') {
-                    $xmloutput .= '<?xml version="1.0" encoding="utf-8" standalone="yes" ?>' . "\n";
+                    $xmloutput .= '<?xml version="1.0" encoding="utf-8" standalone="yes" ?>'."\n";
                 }
             }
         }
         if ($bOcXmlTag == '1') {
-            $xmloutput .= '<ocxmlsession>' . "\n";
+            $xmloutput .= '<ocxmlsession>'."\n";
         }
-        $xmloutput .= '  <sessionid>' . $sessionid . '</sessionid>' . "\n";
-        $xmloutput .= '  <records user="' . $recordcount['users'] .
-            '" cache="' . $recordcount['caches'] .
-            '" cachedesc="' . $recordcount['cachedescs'] .
-            '" cachelog="' . $recordcount['cachelogs'] .
-            '" picture="' . $recordcount['pictures'] .
-            '" removeobject="' . $recordcount['removedobjects'] . '" />' . "\n";
+        $xmloutput .= '  <sessionid>'.$sessionid.'</sessionid>'."\n";
+        $xmloutput .= '  <records user="'.$recordcount['users'].
+            '" cache="'.$recordcount['caches'].
+            '" cachedesc="'.$recordcount['cachedescs'].
+            '" cachelog="'.$recordcount['cachelogs'].
+            '" picture="'.$recordcount['pictures'].
+            '" removeobject="'.$recordcount['removedobjects'].'" />'."\n";
         if ($bOcXmlTag == '1') {
             $xmloutput .= '</ocxmlsession>';
         }
@@ -387,7 +387,7 @@ 
 
     $logtypes = [];
     $rs = sql('SELECT `id`, `de` FROM log_types');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $logtypes[$r['id']] = $r['de'];
     }
@@ -395,7 +395,7 @@ 
 
     $cachetypes = [];
     $rs = sql('SELECT `id`, `short`, `de` FROM cache_type');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $cachetypes[$r['id']]['de'] = $r['de'];
         $cachetypes[$r['id']]['short'] = $r['short'];
@@ -404,7 +404,7 @@ 
 
     $cachestatus = [];
     $rs = sql('SELECT `id`, `de` FROM cache_status');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $cachestatus[$r['id']]['de'] = $r['de'];
     }
@@ -412,7 +412,7 @@ 
 
     $counties = [];
     $rs = sql('SELECT `short`, `de` FROM countries');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $counties[$r['short']]['de'] = $r['de'];
     }
@@ -420,7 +420,7 @@ 
 
     $cachesizes = [];
     $rs = sql('SELECT `id`, `de` FROM cache_size');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $cachesizes[$r['id']]['de'] = $r['de'];
     }
@@ -428,7 +428,7 @@ 
 
     $languages = [];
     $rs = sql('SELECT `short`, `de` FROM languages');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $languages[$r['short']]['de'] = $r['de'];
     }
@@ -439,32 +439,32 @@ 
     $objecttypes['3'] = 'cachedesc';
     $objecttypes['1'] = 'cachelog';
     $objecttypes['6'] = 'picture';
-    $objecttypes['8'] = 'cachelist';    // not implemented yet
+    $objecttypes['8'] = 'cachelist'; // not implemented yet
 
     /* end now a few dynamically loaded constants */
 
     // temporäre Datei erstellen
-    if (!is_dir($zip_basedir . 'ocxml11/' . $sessionid)) {
-        mkdir($zip_basedir . 'ocxml11/' . $sessionid);
+    if (!is_dir($zip_basedir.'ocxml11/'.$sessionid)) {
+        mkdir($zip_basedir.'ocxml11/'.$sessionid);
     }
 
     $fileid = 1;
     while (file_exists(
-        $zip_basedir . 'ocxml11/' . $sessionid . '/' . $sessionid . '-' . $filenr . '-' . $fileid . '.xml'
+        $zip_basedir.'ocxml11/'.$sessionid.'/'.$sessionid.'-'.$filenr.'-'.$fileid.'.xml'
     )) {
-        $fileid ++;
+        $fileid++;
     }
 
-    $xmlfilename = $zip_basedir . 'ocxml11/' . $sessionid . '/' . $sessionid . '-' . $filenr . '-' . $fileid . '.xml';
+    $xmlfilename = $zip_basedir.'ocxml11/'.$sessionid.'/'.$sessionid.'-'.$filenr.'-'.$fileid.'.xml';
 
     $f = fopen($xmlfilename, 'w');
 
     if ($bXmlDecl == '1') {
         if ($sCharset == 'iso-8859-1') {
-            fwrite($f, '<?xml version="1.0" encoding="iso-8859-1" standalone="no" ?>' . "\n");
+            fwrite($f, '<?xml version="1.0" encoding="iso-8859-1" standalone="no" ?>'."\n");
         } else {
             if ($sCharset == 'utf-8') {
-                fwrite($f, '<?xml version="1.0" encoding="UTF-8" standalone="no" ?>' . "\n");
+                fwrite($f, '<?xml version="1.0" encoding="UTF-8" standalone="no" ?>'."\n");
             }
         }
     }
@@ -472,7 +472,7 @@ 
     if ($bDocType == '1') {
         fwrite(
             $f,
-            '<!DOCTYPE oc11xml PUBLIC "-//Opencaching Network//DTD OCXml V 1.' . ($ocxmlversion % 10) . '//EN" "http://www.opencaching.de/xml/ocxml' . $ocxmlversion . '.dtd">' . "\n"
+            '<!DOCTYPE oc11xml PUBLIC "-//Opencaching Network//DTD OCXml V 1.'.($ocxmlversion % 10).'//EN" "http://www.opencaching.de/xml/ocxml'.$ocxmlversion.'.dtd">'."\n"
         );
     }
     if ($bOcXmlTag == '1') {
@@ -480,30 +480,30 @@ 
         $r = sql_fetch_array($rs);
         fwrite(
             $f,
-            '<oc11xml version="1.' . ($ocxmlversion % 10) . '" date="' . date(
+            '<oc11xml version="1.'.($ocxmlversion % 10).'" date="'.date(
                 $sDateformat,
                 strtotime($r['date_created'])
-            ) . '" since="' . date($sDateformat, strtotime($r['modified_since'])) . '">' . "\n"
+            ).'" since="'.date($sDateformat, strtotime($r['modified_since'])).'">'."\n"
         );
         mysql_free_result($rs);
     }
 
     if ($bAttrlist == '1') {
         $rs = sql("SELECT SQL_BUFFER_RESULT `id`, `name`, `icon_large`, `icon_no`, `icon_undef` FROM `cache_attrib`");
-        fwrite($f, $t1 . '<attrlist>' . "\n");
+        fwrite($f, $t1.'<attrlist>'."\n");
         while ($r = sql_fetch_assoc($rs)) {
             fwrite(
                 $f,
-                $t2 . '<attr id="' . $r['id'] . '" icon_large="' . xmlentities(
-                    $opt['page']['default_absolute_url'] . $r['icon_large']
-                ) . '" icon_no="' . xmlentities(
-                    $opt['page']['default_absolute_url'] . $r['icon_no']
-                ) . '" icon_undef="' . xmlentities(
-                    $opt['page']['default_absolute_url'] . $r['icon_undef']
-                ) . '">' . xmlcdata($r['name']) . '</attr>' . "\n"
+                $t2.'<attr id="'.$r['id'].'" icon_large="'.xmlentities(
+                    $opt['page']['default_absolute_url'].$r['icon_large']
+                ).'" icon_no="'.xmlentities(
+                    $opt['page']['default_absolute_url'].$r['icon_no']
+                ).'" icon_undef="'.xmlentities(
+                    $opt['page']['default_absolute_url'].$r['icon_undef']
+                ).'">'.xmlcdata($r['name']).'</attr>'."\n"
             );
         }
-        fwrite($f, $t1 . '</attrlist>' . "\n");
+        fwrite($f, $t1.'</attrlist>'."\n");
         sql_free_result($rs);
     }
 
@@ -511,18 +511,18 @@ 
         'SELECT SQL_BUFFER_RESULT `user`.`user_id` `id`, `user`.`node` `node`, `user`.`uuid` `uuid`, `user`.`username` `username`, `user`.`pmr_flag` `pmr_flag`, `user`.`date_created` `date_created`, `user`.`last_modified` `last_modified` FROM `tmpxml_users`, `user` WHERE `tmpxml_users`.`id`=`user`.`user_id`'
     );
     while ($r = sql_fetch_array($rs)) {
-        fwrite($f, $t1 . '<user>' . "\n");
+        fwrite($f, $t1.'<user>'."\n");
 
-        fwrite($f, $t2 . '<id id="' . $r['id'] . '" node="' . $r['node'] . '">' . $r['uuid'] . '</id>' . "\n");
-        fwrite($f, $t2 . '<username>' . xmlcdata($r['username']) . '</username>' . "\n");
-        fwrite($f, $t2 . '<pmr>' . (($r['pmr_flag'] == 0) ? '0' : '1') . '</pmr>' . "\n");
-        fwrite($f, $t2 . '<datecreated>' . date($sDateformat, strtotime($r['date_created'])) . '</datecreated>' . "\n");
+        fwrite($f, $t2.'<id id="'.$r['id'].'" node="'.$r['node'].'">'.$r['uuid'].'</id>'."\n");
+        fwrite($f, $t2.'<username>'.xmlcdata($r['username']).'</username>'."\n");
+        fwrite($f, $t2.'<pmr>'.(($r['pmr_flag'] == 0) ? '0' : '1').'</pmr>'."\n");
+        fwrite($f, $t2.'<datecreated>'.date($sDateformat, strtotime($r['date_created'])).'</datecreated>'."\n");
         fwrite(
             $f,
-            $t2 . '<lastmodified>' . date($sDateformat, strtotime($r['last_modified'])) . '</lastmodified>' . "\n"
+            $t2.'<lastmodified>'.date($sDateformat, strtotime($r['last_modified'])).'</lastmodified>'."\n"
         );
 
-        fwrite($f, $t1 . '</user>' . "\n");
+        fwrite($f, $t1.'</user>'."\n");
     }
     mysql_free_result($rs);
 
@@ -551,8 +551,8 @@ 
         }   // return as micro in old interface version
 
         if ($ocxmlversion >= 15) {
-            $statusflags = ' needs_maintenance="' . $r['needs_maintenance'] . '" listing_outdated="' . $r['listing_outdated'] . '"';
-            $gccom2 = ' gccom2="' . xmlentities($r['wp_gc_maintained']) . '"';
+            $statusflags = ' needs_maintenance="'.$r['needs_maintenance'].'" listing_outdated="'.$r['listing_outdated'].'"';
+            $gccom2 = ' gccom2="'.xmlentities($r['wp_gc_maintained']).'"';
             $nccom = '';
         } else {
             $statusflags = '';
@@ -560,74 +560,74 @@ 
             $nccom = ' nccom=""';
         }
 
-        fwrite($f, $t1 . '<cache>' . "\n");
+        fwrite($f, $t1.'<cache>'."\n");
 
-        fwrite($f, $t2 . '<id id="' . $r['id'] . '" node="' . $r['node'] . '">' . $r['uuid'] . '</id>' . "\n");
+        fwrite($f, $t2.'<id id="'.$r['id'].'" node="'.$r['node'].'">'.$r['uuid'].'</id>'."\n");
         fwrite(
             $f,
-            $t2 . '<userid id="' . $r['user_id'] . '" uuid="' . $r['useruuid'] . '">' . xmlcdata(
+            $t2.'<userid id="'.$r['user_id'].'" uuid="'.$r['useruuid'].'">'.xmlcdata(
                 $r['username']
-            ) . '</userid>' . "\n"
+            ).'</userid>'."\n"
         );
-        fwrite($f, $t2 . '<name>' . xmlcdata(($bAllowView ? $r['name'] : '')) . '</name>' . "\n");
+        fwrite($f, $t2.'<name>'.xmlcdata(($bAllowView ? $r['name'] : '')).'</name>'."\n");
         fwrite(
             $f,
-            $t2 . '<longitude>' . sprintf('%01.5f', ($bAllowView ? $r['longitude'] : 0)) . '</longitude>' . "\n"
+            $t2.'<longitude>'.sprintf('%01.5f', ($bAllowView ? $r['longitude'] : 0)).'</longitude>'."\n"
         );
-        fwrite($f, $t2 . '<latitude>' . sprintf('%01.5f', ($bAllowView ? $r['latitude'] : 0)) . '</latitude>' . "\n");
+        fwrite($f, $t2.'<latitude>'.sprintf('%01.5f', ($bAllowView ? $r['latitude'] : 0)).'</latitude>'."\n");
         fwrite(
             $f,
-            $t2 . '<type id="' . $r['type'] . '" short="' . xmlentities(
+            $t2.'<type id="'.$r['type'].'" short="'.xmlentities(
                 $cachetypes[$r['type']]['short']
-            ) . '">' . xmlcdata($cachetypes[$r['type']]['de']) . '</type>' . "\n"
+            ).'">'.xmlcdata($cachetypes[$r['type']]['de']).'</type>'."\n"
         );
         fwrite(
             $f,
-            $t2 . '<status id="' . $r['status'] . '"' . $statusflags . '>' . xmlcdata(
+            $t2.'<status id="'.$r['status'].'"'.$statusflags.'>'.xmlcdata(
                 $cachestatus[$r['status']]['de']
-            ) . '</status>' . "\n"
+            ).'</status>'."\n"
         );
         fwrite(
             $f,
-            $t2 . '<country id="' . $r['country'] . '">' . xmlcdata(
+            $t2.'<country id="'.$r['country'].'">'.xmlcdata(
                 $counties[$r['country']]['de']
-            ) . '</country>' . "\n"
+            ).'</country>'."\n"
         );
-        fwrite($f, $t2 . '<size id="' . $r['size'] . '">' . xmlcdata($cachesizes[$r['size']]['de']) . '</size>' . "\n");
-        fwrite($f, $t2 . '<desclanguages>' . $r['desclanguages'] . '</desclanguages>' . "\n");
-        fwrite($f, $t2 . '<difficulty>' . sprintf('%01.1f', $r['difficulty'] / 2) . '</difficulty>' . "\n");
-        fwrite($f, $t2 . '<terrain>' . sprintf('%01.1f', $r['terrain'] / 2) . '</terrain>' . "\n");
-        fwrite($f, $t2 . '<rating waylength="' . $r['way_length'] . '" needtime="' . $r['search_time'] . '" />' . "\n");
+        fwrite($f, $t2.'<size id="'.$r['size'].'">'.xmlcdata($cachesizes[$r['size']]['de']).'</size>'."\n");
+        fwrite($f, $t2.'<desclanguages>'.$r['desclanguages'].'</desclanguages>'."\n");
+        fwrite($f, $t2.'<difficulty>'.sprintf('%01.1f', $r['difficulty'] / 2).'</difficulty>'."\n");
+        fwrite($f, $t2.'<terrain>'.sprintf('%01.1f', $r['terrain'] / 2).'</terrain>'."\n");
+        fwrite($f, $t2.'<rating waylength="'.$r['way_length'].'" needtime="'.$r['search_time'].'" />'."\n");
         fwrite(
             $f,
-            $t2 . '<waypoints oc="' . xmlentities($r['wp_oc']) . '" gccom="' . xmlentities(
+            $t2.'<waypoints oc="'.xmlentities($r['wp_oc']).'" gccom="'.xmlentities(
                 $r['wp_gc']
-            ) . '"' . $gccom2 . $nccom . ' />' . "\n"
+            ).'"'.$gccom2.$nccom.' />'."\n"
         );
-        fwrite($f, $t2 . '<datehidden>' . date($sDateformat, strtotime($r['date_hidden'])) . '</datehidden>' . "\n");
+        fwrite($f, $t2.'<datehidden>'.date($sDateformat, strtotime($r['date_hidden'])).'</datehidden>'."\n");
         if ($ocxmlversion >= 12) {
-            $pd = ' ispublishdate="' . $r['is_publishdate'] . '"';
+            $pd = ' ispublishdate="'.$r['is_publishdate'].'"';
         } else {
             $pd = "";
         }
         fwrite(
             $f,
-            $t2 . '<datecreated' . $pd . '>' . date(
+            $t2.'<datecreated'.$pd.'>'.date(
                 $sDateformat,
                 strtotime($r['date_created'])
-            ) . '</datecreated>' . "\n"
+            ).'</datecreated>'."\n"
         );
         fwrite(
             $f,
-            $t2 . '<lastmodified>' . date($sDateformat, strtotime($r['last_modified'])) . '</lastmodified>' . "\n"
+            $t2.'<lastmodified>'.date($sDateformat, strtotime($r['last_modified'])).'</lastmodified>'."\n"
         );
         if ($ocxmlversion >= 14) {
             fwrite(
                 $f,
-                $t2 . '<listing_lastmodified>' . date(
+                $t2.'<listing_lastmodified>'.date(
                     $sDateformat,
                     strtotime($r['listing_last_modified'])
-                ) . '</listing_lastmodified>' . "\n"
+                ).'</listing_lastmodified>'."\n"
             );
         }
 
@@ -638,16 +638,16 @@ 
                               WHERE `caches_attributes`.`cache_id`='&1'",
             $r['id']
         );
-        fwrite($f, $t2 . '<attributes>' . "\n");
+        fwrite($f, $t2.'<attributes>'."\n");
         while ($rAttribute = sql_fetch_assoc($rsAttributes)) {
             fwrite(
                 $f,
-                $t3 . '<attribute id="' . ($rAttribute['id'] + 0) . '">' . xmlcdata(
+                $t3.'<attribute id="'.($rAttribute['id'] + 0).'">'.xmlcdata(
                     $rAttribute['name']
-                ) . '</attribute>' . "\n"
+                ).'</attribute>'."\n"
             );
         }
-        fwrite($f, $t2 . '</attributes>' . "\n");
+        fwrite($f, $t2.'</attributes>'."\n");
         sql_free_result($rsAttributes);
 
         if ($ocxmlversion >= 13) {
@@ -662,23 +662,23 @@ 
                               ORDER BY `coordinates`.`id` ASC",
                 $r['id']
             );
-            fwrite($f, $t2 . '<wpts>' . "\n");
+            fwrite($f, $t2.'<wpts>'."\n");
             while ($rWaypoint = sql_fetch_assoc($rsWaypoints)) {
                 fwrite(
                     $f,
-                    $t3 . '<wpt id="' . ($rWaypoint['id'] + 0) . '" type="' . ($rWaypoint['type'] + 0) . '" typename="' . xmlentities(
+                    $t3.'<wpt id="'.($rWaypoint['id'] + 0).'" type="'.($rWaypoint['type'] + 0).'" typename="'.xmlentities(
                         $rWaypoint['type_name']
-                    ) . '" longitude="' . sprintf('%01.5f', $rWaypoint['longitude']) . '" latitude="' . sprintf(
+                    ).'" longitude="'.sprintf('%01.5f', $rWaypoint['longitude']).'" latitude="'.sprintf(
                         '%01.5f',
                         $rWaypoint['latitude']
-                    ) . '">' . xmlcdata($rWaypoint['description']) . '</wpt>' . "\n"
+                    ).'">'.xmlcdata($rWaypoint['description']).'</wpt>'."\n"
                 );
             }
-            fwrite($f, $t2 . '</wpts>' . "\n");
+            fwrite($f, $t2.'</wpts>'."\n");
             sql_free_result($rsWaypoints);
         }
 
-        fwrite($f, $t1 . '</cache>' . "\n");
+        fwrite($f, $t1.'</cache>'."\n");
     }
     mysql_free_result($rs);
 
@@ -698,18 +698,18 @@ 
     while ($r = sql_fetch_array($rs)) {
         $bAllowView = ($r['allow_user_view'] == 1);
 
-        fwrite($f, $t1 . '<cachedesc>' . "\n");
+        fwrite($f, $t1.'<cachedesc>'."\n");
 
-        fwrite($f, $t2 . '<id id="' . $r['id'] . '" node="' . $r['node'] . '">' . $r['uuid'] . '</id>' . "\n");
-        fwrite($f, $t2 . '<cacheid id="' . $r['cache_id'] . '">' . $r['cacheuuid'] . '</cacheid>' . "\n");
+        fwrite($f, $t2.'<id id="'.$r['id'].'" node="'.$r['node'].'">'.$r['uuid'].'</id>'."\n");
+        fwrite($f, $t2.'<cacheid id="'.$r['cache_id'].'">'.$r['cacheuuid'].'</cacheid>'."\n");
 
         fwrite(
             $f,
-            $t2 . '<language id="' . $r['language'] . '">' . xmlcdata(
+            $t2.'<language id="'.$r['language'].'">'.xmlcdata(
                 $languages[$r['language']]['de']
-            ) . '</language>' . "\n"
+            ).'</language>'."\n"
         );
-        fwrite($f, $t2 . '<shortdesc>' . xmlcdata(($bAllowView ? $r['short_desc'] : '')) . '</shortdesc>' . "\n");
+        fwrite($f, $t2.'<shortdesc>'.xmlcdata(($bAllowView ? $r['short_desc'] : '')).'</shortdesc>'."\n");
 
         $desc = $r['desc'];
         if ($r['desc_html'] == 0) {
@@ -728,10 +728,10 @@ 
             true
         );
         if ($bLicense) {
-            fwrite($f, $t2 . '<license>' . xmlcdata($disclaimer) . '</license>' . "\n");
+            fwrite($f, $t2.'<license>'.xmlcdata($disclaimer).'</license>'."\n");
         } else {
             if ($disclaimer != "") {
-                $desc .= "<p><em>" . $disclaimer . "</em></p>";
+                $desc .= "<p><em>".$disclaimer."</em></p>";
             }
         }
 
@@ -739,21 +739,21 @@ 
 
         fwrite(
             $f,
-            $t2 . '<desc html="' . (($r['desc_html'] == 1) ? '1' : '0') . '">' . xmlcdata(
+            $t2.'<desc html="'.(($r['desc_html'] == 1) ? '1' : '0').'">'.xmlcdata(
                 ($bAllowView ? $desc : '')
-            ) . '</desc>' . "\n"
+            ).'</desc>'."\n"
         );
 
         $r['hint'] = mb_ereg_replace('<br />', '', $r['hint']);
         $r['hint'] = html_entity_decode($r['hint'], ENT_COMPAT, 'UTF-8');
 
-        fwrite($f, $t2 . '<hint>' . xmlcdata(($bAllowView ? $r['hint'] : '')) . '</hint>' . "\n");
+        fwrite($f, $t2.'<hint>'.xmlcdata(($bAllowView ? $r['hint'] : '')).'</hint>'."\n");
         fwrite(
             $f,
-            $t2 . '<lastmodified>' . date($sDateformat, strtotime($r['last_modified'])) . '</lastmodified>' . "\n"
+            $t2.'<lastmodified>'.date($sDateformat, strtotime($r['last_modified'])).'</lastmodified>'."\n"
         );
 
-        fwrite($f, $t1 . '</cachedesc>' . "\n");
+        fwrite($f, $t1.'</cachedesc>'."\n");
     }
     mysql_free_result($rs);
 
@@ -794,7 +794,7 @@ 
         }
 
         if ($ocxmlversion >= 13) {
-            $teamcomment = ' teamcomment="' . $r['oc_team_comment'] . '"';
+            $teamcomment = ' teamcomment="'.$r['oc_team_comment'].'"';
         } else {
             $teamcomment = '';
             if ($r['type'] > 8) {
@@ -803,51 +803,51 @@ 
         }
 
         if ($ocxmlversion >= 15) {
-            $statusflags = ' needs_maintenance="' . $r['needs_maintenance'] . '" listing_outdated="' . $r['listing_outdated'] . '"';
+            $statusflags = ' needs_maintenance="'.$r['needs_maintenance'].'" listing_outdated="'.$r['listing_outdated'].'"';
         } else {
             $statusflags = '';
         }
 
-        fwrite($f, $t1 . '<cachelog>' . "\n");
-        fwrite($f, $t2 . '<id id="' . $r['id'] . '" node="' . $r['node'] . '">' . $r['uuid'] . '</id>' . "\n");
-        fwrite($f, $t2 . '<cacheid id="' . $r['cache_id'] . '">' . $r['cacheuuid'] . '</cacheid>' . "\n");
+        fwrite($f, $t1.'<cachelog>'."\n");
+        fwrite($f, $t2.'<id id="'.$r['id'].'" node="'.$r['node'].'">'.$r['uuid'].'</id>'."\n");
+        fwrite($f, $t2.'<cacheid id="'.$r['cache_id'].'">'.$r['cacheuuid'].'</cacheid>'."\n");
         fwrite(
             $f,
-            $t2 . '<userid id="' . $r['user_id'] . '" uuid="' . $r['useruuid'] . '">' . xmlcdata(
+            $t2.'<userid id="'.$r['user_id'].'" uuid="'.$r['useruuid'].'">'.xmlcdata(
                 $r['username']
-            ) . '</userid>' . "\n"
+            ).'</userid>'."\n"
         );
         fwrite(
             $f,
-            $t2 . '<logtype id="' . $r['type'] . '" recommended="' . $r['recommended'] . '"' . $teamcomment . $statusflags . '>' . xmlcdata(
+            $t2.'<logtype id="'.$r['type'].'" recommended="'.$r['recommended'].'"'.$teamcomment.$statusflags.'>'.xmlcdata(
                 $logtypes[$r['type']]
-            ) . '</logtype>' . "\n"
+            ).'</logtype>'."\n"
         );
         fwrite(
             $f,
-            $t2 . '<date>' . date(
+            $t2.'<date>'.date(
                 $ocxmlversion >= 13 ? $sDateformat : $sDateshort,
                 strtotime($r['date'])
-            ) . '</date>' . "\n"
+            ).'</date>'."\n"
         );
         fwrite(
             $f,
-            $t2 . '<text html="' . $r['text_html'] . '">' . xmlcdata(
+            $t2.'<text html="'.$r['text_html'].'">'.xmlcdata(
                 ($bAllowView ? $r['text'] : '')
-            ) . '</text>' . "\n"
+            ).'</text>'."\n"
         );
-        fwrite($f, $t2 . '<datecreated>' . date($sDateformat, strtotime($r['date_created'])) . '</datecreated>' . "\n");
+        fwrite($f, $t2.'<datecreated>'.date($sDateformat, strtotime($r['date_created'])).'</datecreated>'."\n");
         fwrite(
             $f,
-            $t2 . '<lastmodified>' . date($sDateformat, strtotime($r['last_modified'])) . '</lastmodified>' . "\n"
+            $t2.'<lastmodified>'.date($sDateformat, strtotime($r['last_modified'])).'</lastmodified>'."\n"
         );
         if ($ocxmlversion >= 14) {
             fwrite(
                 $f,
-                $t2 . '<log_lastmodified>' . date(
+                $t2.'<log_lastmodified>'.date(
                     $sDateformat,
                     strtotime($r['log_last_modified'])
-                ) . '</log_lastmodified>' . "\n"
+                ).'</log_lastmodified>'."\n"
             );
         }
 
@@ -862,10 +862,10 @@ 
                 false,
                 true
             );
-            fwrite($f, $t2 . '<license>' . xmlcdata($disclaimer) . '</license>' . "\n");
+            fwrite($f, $t2.'<license>'.xmlcdata($disclaimer).'</license>'."\n");
         }
 
-        fwrite($f, $t1 . '</cachelog>' . "\n");
+        fwrite($f, $t1.'</cachelog>'."\n");
     }
     mysql_free_result($rs);
 
@@ -895,30 +895,30 @@ 
     while ($r = sql_fetch_array($rs)) {
         $bAllowView = ($r['auv'] == 1);
 
-        fwrite($f, $t1 . '<picture>' . "\n");
-        fwrite($f, $t2 . '<id id="' . $r['id'] . '" node="' . $r['node'] . '">' . $r['uuid'] . '</id>' . "\n");
-        fwrite($f, $t2 . '<url>' . xmlcdata(($bAllowView ? $r['url'] : '')) . '</url>' . "\n");
-        fwrite($f, $t2 . '<title>' . xmlcdata(($bAllowView ? $r['title'] : '')) . '</title>' . "\n");
+        fwrite($f, $t1.'<picture>'."\n");
+        fwrite($f, $t2.'<id id="'.$r['id'].'" node="'.$r['node'].'">'.$r['uuid'].'</id>'."\n");
+        fwrite($f, $t2.'<url>'.xmlcdata(($bAllowView ? $r['url'] : '')).'</url>'."\n");
+        fwrite($f, $t2.'<title>'.xmlcdata(($bAllowView ? $r['title'] : '')).'</title>'."\n");
         fwrite(
             $f,
-            $t2 . '<object id="' . $r['object_id'] . '" type="' . $r['object_type'] . '" typename="' . xmlentities(
+            $t2.'<object id="'.$r['object_id'].'" type="'.$r['object_type'].'" typename="'.xmlentities(
                 $objecttypes[$r['object_type']]
-            ) . '">' . object_id2uuid($r['object_id'], $r['object_type']) . '</object>' . "\n"
+            ).'">'.object_id2uuid($r['object_id'], $r['object_type']).'</object>'."\n"
         );
         if ($ocxmlversion >= 13) {
             fwrite(
                 $f,
-                $t2 . '<picattr spoiler="' . $r['spoiler'] . '" display="' . $r['display'] . '" preview="' . $r['mappreview'] . '" />' . "\n"
+                $t2.'<picattr spoiler="'.$r['spoiler'].'" display="'.$r['display'].'" preview="'.$r['mappreview'].'" />'."\n"
             );
         } else {
-            fwrite($f, $t2 . '<attributes spoiler="' . $r['spoiler'] . '" display="' . $r['display'] . '" />' . "\n");
+            fwrite($f, $t2.'<attributes spoiler="'.$r['spoiler'].'" display="'.$r['display'].'" />'."\n");
         }
-        fwrite($f, $t2 . '<datecreated>' . date($sDateformat, strtotime($r['date_created'])) . '</datecreated>' . "\n");
+        fwrite($f, $t2.'<datecreated>'.date($sDateformat, strtotime($r['date_created'])).'</datecreated>'."\n");
         fwrite(
             $f,
-            $t2 . '<lastmodified>' . date($sDateformat, strtotime($r['last_modified'])) . '</lastmodified>' . "\n"
+            $t2.'<lastmodified>'.date($sDateformat, strtotime($r['last_modified'])).'</lastmodified>'."\n"
         );
-        fwrite($f, $t2 . '<position>' . $r['seq'] . '</position>' . "\n");
+        fwrite($f, $t2.'<position>'.$r['seq'].'</position>'."\n");
 
         if ($bLicense) {
             $lang = ($sLanguage != "" ? $sLanguage : $r['language']);
@@ -931,10 +931,10 @@ 
                 false,
                 true
             );
-            fwrite($f, $t2 . '<license>' . xmlcdata($disclaimer) . '</license>' . "\n");
+            fwrite($f, $t2.'<license>'.xmlcdata($disclaimer).'</license>'."\n");
         }
 
-        fwrite($f, $t1 . '</picture>' . "\n");
+        fwrite($f, $t1.'</picture>'."\n");
     }
     mysql_free_result($rs);
 
@@ -944,31 +944,31 @@ 
                                    FROM `tmpxml_removedobjects`, `removed_objects` WHERE `removed_objects`.`id`=`tmpxml_removedobjects`.`id`'
     );
     while ($r = sql_fetch_array($rs)) {
-        fwrite($f, $t1 . '<removedobject>' . "\n");
-        fwrite($f, $t2 . '<id id="' . $r['id'] . '" node="' . $r['node'] . '" />' . "\n");
+        fwrite($f, $t1.'<removedobject>'."\n");
+        fwrite($f, $t2.'<id id="'.$r['id'].'" node="'.$r['node'].'" />'."\n");
         fwrite(
             $f,
-            $t2 . '<object id="' . $r['localid'] . '" type="' . $r['type'] . '" typename="' . xmlentities(
+            $t2.'<object id="'.$r['localid'].'" type="'.$r['type'].'" typename="'.xmlentities(
                 $objecttypes[$r['type']]
-            ) . '">' . $r['uuid'] . '</object>' . "\n"
+            ).'">'.$r['uuid'].'</object>'."\n"
         );
-        fwrite($f, $t2 . '<removeddate>' . date($sDateformat, strtotime($r['removed_date'])) . '</removeddate>' . "\n");
-        fwrite($f, $t1 . '</removedobject>' . "\n");
+        fwrite($f, $t2.'<removeddate>'.date($sDateformat, strtotime($r['removed_date'])).'</removeddate>'."\n");
+        fwrite($f, $t1.'</removedobject>'."\n");
     }
     mysql_free_result($rs);
 
     if ($bOcXmlTag == '1') {
-        fwrite($f, '</oc11xml>' . "\n");
+        fwrite($f, '</oc11xml>'."\n");
     }
 
     fclose($f);
 
-    $rel_xmlfile = 'ocxml11/' . $sessionid . '/' . $sessionid . '-' . $filenr . '-' . $fileid . '.xml';
-    $rel_zipfile = 'ocxml11/' . $sessionid . '/' . $sessionid . '-' . $filenr . '-' . $fileid;
+    $rel_xmlfile = 'ocxml11/'.$sessionid.'/'.$sessionid.'-'.$filenr.'-'.$fileid.'.xml';
+    $rel_zipfile = 'ocxml11/'.$sessionid.'/'.$sessionid.'-'.$filenr.'-'.$fileid;
 
     // zippen und url-redirect
     if ($ziptype == '0') {
-        tpl_redirect($zip_wwwdir . $rel_xmlfile);
+        tpl_redirect($zip_wwwdir.$rel_xmlfile);
         exit;
     } else {
         if ($ziptype == 'zip') {
@@ -986,17 +986,17 @@ 
         }
     }
 
-    $call = $safemode_zip . ' --type=' . escapeshellcmd($ziptype) . ' --src=' . escapeshellcmd(
+    $call = $safemode_zip.' --type='.escapeshellcmd($ziptype).' --src='.escapeshellcmd(
             $rel_xmlfile
-        ) . ' --dst=' . escapeshellcmd($rel_zipfile);
+        ).' --dst='.escapeshellcmd($rel_zipfile);
     system($call);
 
     // datei vorhanden?
-    if (!file_exists($zip_basedir . $rel_zipfile)) {
+    if (!file_exists($zip_basedir.$rel_zipfile)) {
         die('all ok, but zip failed - internal server error');
     }
 
-    tpl_redirect($zip_wwwdir . $rel_zipfile);
+    tpl_redirect($zip_wwwdir.$rel_zipfile);
 
     exit;
 }
@@ -1048,7 +1048,7 @@ 
             }
             sql(
                 "INSERT INTO xmlsession_data (`session_id`, `object_type`, `object_id`)
-                 SELECT &1, 2, `cache_id` FROM `caches` WHERE " . $wherefield . " >= '&2' AND `status`!=5",
+                 SELECT &1, 2, `cache_id` FROM `caches` WHERE " . $wherefield." >= '&2' AND `status`!=5",
                 $sessionid,
                 $sModifiedSince
             );
@@ -1137,31 +1137,31 @@ 
                         'longitude',
                         'latitude',
                         'cache_coordinates'
-                    ) . ' `distance` ';
+                    ).' `distance` ';
                 $sql .= 'FROM `caches`, `cache_coordinates` WHERE ';
                 $sql .= '`cache_coordinates`.`cache_id`=`caches`.`cache_id`';
                 $sql .= ' AND `caches`.`status`!=5';
-                $sql .= ' AND `cache_coordinates`.`latitude` > ' . geomath::getMinLat(
+                $sql .= ' AND `cache_coordinates`.`latitude` > '.geomath::getMinLat(
                         $selection['lon'],
                         $selection['lat'],
                         $selection['distance']
                     );
-                $sql .= ' AND `cache_coordinates`.`latitude` < ' . geomath::getMaxLat(
+                $sql .= ' AND `cache_coordinates`.`latitude` < '.geomath::getMaxLat(
                         $selection['lon'],
                         $selection['lat'],
                         $selection['distance']
                     );
-                $sql .= ' AND `cache_coordinates`.`longitude` >' . geomath::getMinLon(
+                $sql .= ' AND `cache_coordinates`.`longitude` >'.geomath::getMinLon(
                         $selection['lon'],
                         $selection['lat'],
                         $selection['distance']
                     );
-                $sql .= ' AND `cache_coordinates`.`longitude` < ' . geomath::getMaxLon(
+                $sql .= ' AND `cache_coordinates`.`longitude` < '.geomath::getMaxLon(
                         $selection['lon'],
                         $selection['lat'],
                         $selection['distance']
                     );
-                $sql .= ' HAVING `distance` < ' . ($selection['distance'] + 0);
+                $sql .= ' HAVING `distance` < '.($selection['distance'] + 0);
 
                 sql($sql);
             } else {
@@ -1300,7 +1300,7 @@ 
 //    echo $startat . ' ' . $endat . '<br><br>';
 //    echo '<table>';
 //    echo '<tr><td>sql-start</td><td>sql-count</td><td>count</td><td>begin</td><td>end</td></tr>';
-    for ($i = 0; $i < 6; $i ++) {
+    for ($i = 0; $i < 6; $i++) {
         if (($startat >= $recordnr[$i]) && ($startat + 500 < $recordnr[$i + 1])) {
             if ($recordnr[$i + 1] - $startat > 500) {
                 $limits[$i] = ['start' => $startat - $recordnr[$i], 'count' => 500];
@@ -1403,7 +1403,7 @@ 
         $str = output_convert($str);
         $str = mb_ereg_replace(']]>', ']] >', $str);
 
-        return '<![CDATA[' . filterevilchars($str) . ']]>';
+        return '<![CDATA['.filterevilchars($str).']]>';
     } else {
         return xmlentities($str);
     }
@@ -1422,7 +1422,7 @@ 
     $from[4] = '\'';
     $to[4] = '&apos;';
 
-    for ($i = 0; $i <= 4; $i ++) {
+    for ($i = 0; $i <= 4; $i++) {
         $str = mb_ereg_replace($from[$i], $to[$i], $str);
     }
 
@@ -1501,13 +1501,13 @@ 
 
     $hDir = opendir($path);
     if ($hDir === false) {
-        ++ $notunlinked;
+        ++$notunlinked;
     } else {
         while (false !== ($file = readdir($hDir))) {
             if (($file != '.') && ($file != '..')) {
-                if (is_dir($path . $file)) {
-                    if (unlinkrecursiv($path . $file . '/') == false) {
-                        $notunlinked ++;
+                if (is_dir($path.$file)) {
+                    if (unlinkrecursiv($path.$file.'/') == false) {
+                        $notunlinked++;
                     }
                 } else {
                     if ((mb_substr($file, - 4) == '.zip') ||
@@ -1515,9 +1515,9 @@ 
                         (mb_substr($file, - 4) == '.bz2') ||
                         (mb_substr($file, - 4) == '.xml')
                     ) {
-                        @unlink($path . $file);
+                        @unlink($path.$file);
                     } else {
-                        $notunlinked ++;
+                        $notunlinked++;
                     }
                 }
             }

htdocs/editlog.php

Spacing +31 added lines, -31 removed lines

@@ -13,12 +13,12 @@ 
  *  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/logic/logtypes.inc.php';
-require_once __DIR__ . '/lib/recommendation.inc.php';
-require_once __DIR__ . '/lib2/edithelper.inc.php';
+require_once __DIR__.'/lib/common.inc.php';
+require_once __DIR__.'/lib2/logic/logtypes.inc.php';
+require_once __DIR__.'/lib/recommendation.inc.php';
+require_once __DIR__.'/lib2/edithelper.inc.php';
 
 //Preprocessing
 if ($error == false) {
@@ -34,7 +34,7 @@ 
         tpl_set_var('username', '');
         tpl_set_var('message_start', '');
         tpl_set_var('message_end', '');
-        tpl_set_var('target', 'editlog.php?logid=' . urlencode($log_id));
+        tpl_set_var('target', 'editlog.php?logid='.urlencode($log_id));
         tpl_set_var('message', $login_required);
         tpl_set_var('helplink', helppagelink('login'));
     } else {
@@ -72,8 +72,8 @@ 
         if (($log_record !== false && (($log_record['status'] != 6) || ($log_record['cache_user_id'] == $login->userid && $log_record['user_id'] == $login->userid)) &&
                 $log_record['status'] != 7) || $useradmin
         ) {
-            require $stylepath . '/editlog.inc.php';
-            require $stylepath . '/rating.inc.php';
+            require $stylepath.'/editlog.inc.php';
+            require $stylepath.'/rating.inc.php';
 
             if ($log_record['node'] != $oc_nodeid) {
                 tpl_errorMsg('editlog', $error_wrong_node);
@@ -133,9 +133,9 @@ 
 
                 // check if user has exceeded his top 10% limit
                 $is_top = sqlValue(
-                    "SELECT COUNT(`cache_id`) FROM `cache_rating` WHERE `user_id`='" . sql_escape(
+                    "SELECT COUNT(`cache_id`) FROM `cache_rating` WHERE `user_id`='".sql_escape(
                         $usr['userid']
-                    ) . "' AND `cache_id`='" . sql_escape($log_record['cache_id']) . "'",
+                    )."' AND `cache_id`='".sql_escape($log_record['cache_id'])."'",
                     0
                 );
                 $user_founds = sqlValue(
@@ -144,11 +144,11 @@ 
                      LEFT JOIN `stat_user` ON `user`.`user_id`=`stat_user`.`user_id`
                      WHERE `user`.`user_id`='" . sql_escape(
                         $usr['userid']
-                    ) . "'",
+                    )."'",
                     0
                 );
                 $user_tops = sqlValue(
-                    "SELECT COUNT(`user_id`) FROM `cache_rating` WHERE `user_id`='" . sql_escape($usr['userid']) . "'",
+                    "SELECT COUNT(`user_id`) FROM `cache_rating` WHERE `user_id`='".sql_escape($usr['userid'])."'",
                     0
                 );
 
@@ -156,7 +156,7 @@ 
                     $rating_msg = mb_ereg_replace(
                         '{chk_sel}',
                         ($is_top ? 'checked' : ''),
-                        $rating_allowed . '<br />' . $rating_stat
+                        $rating_allowed.'<br />'.$rating_stat
                     );
                     $rating_msg = mb_ereg_replace('{max}', floor($user_founds * rating_percentage / 100), $rating_msg);
                     $rating_msg = mb_ereg_replace('{curr}', $user_tops, $rating_msg);
@@ -169,14 +169,14 @@ 
                     }
 
                     if ($user_tops) {
-                        $rating_msg .= '<br />' . $rating_maywithdraw;
+                        $rating_msg .= '<br />'.$rating_maywithdraw;
                     }
                 }
 
                 tpl_set_var('rating_message', mb_ereg_replace('{rating_msg}', $rating_msg, $rating_tpl));
 
                 if (isset($_POST['descMode'])) {
-                    $descMode = $_POST['descMode'] + 0;  // Ocprop: 2
+                    $descMode = $_POST['descMode'] + 0; // Ocprop: 2
                     if (($descMode < 1) || ($descMode > 3)) {
                         $descMode = 3;
                     }
@@ -325,14 +325,14 @@ 
                     if (is_latest_log($log_record['cache_id'], $log_record['log_id'])) {
                         $newstatus = sqlValue(
                             "SELECT `cache_status` FROM `log_types`
-                             WHERE `id`='" . sql_escape($log_type) . "'",
+                             WHERE `id`='" . sql_escape($log_type)."'",
                             false
                         );
                         if ($newstatus && $newstatus != $log_record['status']) {
                             sql("SET @STATUS_CHANGE_USER_ID='&1'", $login->userid);
                             sql(
-                                "UPDATE `caches` SET `status`='" . sql_escape($newstatus) . "'
-                                 WHERE `cache_id`='" . sql_escape($log_record['cache_id']) . "'"
+                                "UPDATE `caches` SET `status`='".sql_escape($newstatus)."'
+                                 WHERE `cache_id`='" . sql_escape($log_record['cache_id'])."'"
                             );
                         }
                     }
@@ -340,7 +340,7 @@ 
                     //update user-stat if type changed
                     if ($log_record['logtype'] != $log_type) {
                         //call eventhandler
-                        require_once $opt['rootpath'] . 'lib/eventhandler.inc.php';
+                        require_once $opt['rootpath'].'lib/eventhandler.inc.php';
                         event_change_log_type($log_record['cache_id'], $usr['userid'] + 0);
                     }
 
@@ -381,7 +381,7 @@ 
 
                     //display cache page
                     tpl_redirect(
-                        'viewcache.php?cacheid=' . urlencode($log_record['cache_id']) . '&log=A#log' . urlencode(
+                        'viewcache.php?cacheid='.urlencode($log_record['cache_id']).'&log=A#log'.urlencode(
                             $log_id
                         )
                     );
@@ -403,9 +403,9 @@ 
                 $logtypeoptions = '';
                 foreach ($allowed_logtypes as $logtype) {
                     $selected = ($log_record['logtype'] == $logtype ? ' selected="selected"' : '');
-                    $logtypeoptions .= '<option value="' . $logtype . '"' . $selected . '>';
+                    $logtypeoptions .= '<option value="'.$logtype.'"'.$selected.'>';
                     $logtypeoptions .= htmlspecialchars($logtype_names[$logtype], ENT_COMPAT, 'UTF-8');
-                    $logtypeoptions .= '</option>' . "\n";
+                    $logtypeoptions .= '</option>'."\n";
                 }
                 $disable_typechange = $disable_statuschange && $log_record['is_status_log'];
                 tpl_set_var('type_edit_disabled', $disable_typechange ? $type_edit_disabled : '');
@@ -434,7 +434,7 @@ 
                 tpl_set_var('logminute', htmlspecialchars($log_time_minute, ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('cachename', htmlspecialchars($cache_name, ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('cacheid', $log_record['cache_id']);
-                tpl_set_var('reset', $reset);  // obsolete
+                tpl_set_var('reset', $reset); // obsolete
                 tpl_set_var('submit', $submit);
                 tpl_set_var('logid', $log_id);
                 tpl_set_var('date_message', !$date_ok ? $date_message : '');
@@ -448,7 +448,7 @@ 
                 // Text / normal HTML / HTML editor
                 tpl_set_var('use_tinymce', (($descMode == 3) ? 1 : 0));
 
-                $headers = tpl_get_var('htmlheaders') . "\n";
+                $headers = tpl_get_var('htmlheaders')."\n";
                 if ($descMode == 1) {
                     tpl_set_var('descMode', 1);
                 } else {
@@ -456,15 +456,15 @@ 
                         tpl_set_var('descMode', 2);
                     } else {
                         // 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/log.js.php?logid=0&lang=' .
+                        $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/log.js.php?logid=0&lang='.
                             strtolower(
                                 $locale
-                            ) . '"></script>' . "\n";
+                            ).'"></script>'."\n";
                         tpl_set_var('descMode', 3);
                     }
                 }
-                $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);
 
                 if ($use_log_pw == true && $log_pw != '') {
@@ -485,12 +485,12 @@ 
                             $tmp_smiley = $smiley_link;
                             $tmp_smiley = mb_ereg_replace('{smiley_image}', $smiley['image'][$i], $tmp_smiley);
                             $tmp_smiley = mb_ereg_replace('{smiley_symbol}', $smiley['text'][$i], $tmp_smiley);
-                            $smilies = $smilies . '&nbsp;' .
+                            $smilies = $smilies.'&nbsp;'.
                                 mb_ereg_replace(
                                     '{smiley_file}',
                                     $smiley['file'][$i],
                                     $tmp_smiley
-                                ) . '&nbsp;';
+                                ).'&nbsp;';
                         }
                     }
                     tpl_set_var('smileypath', $opt['template']['smiley']);
@@ -517,7 +517,7 @@ 
     $lastest_log_id = sqlValue(
         "
         SELECT `id` FROM `cache_logs`
-        WHERE `cache_id`='" . sql_escape($cache_id) . "'
+        WHERE `cache_id`='" . sql_escape($cache_id)."'
         ORDER BY `order_date` DESC, `date_created` DESC, `id` DESC
         LIMIT 1",
         0,

htdocs/newcaches.php

Spacing +11 added lines, -12 removed lines

@@ -5,15 +5,14 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'newcaches';
 $tpl->menuitem = MNU_START_NEWCACHES;
 $tpl->change_country_inpage = true;
 
 $startat = isset($_REQUEST['startat']) ? floor($_REQUEST['startat'] + 0) : 0;
-$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] :
-    (isset($_REQUEST['country']) ? $_REQUEST['country'] : '');
+$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] : (isset($_REQUEST['country']) ? $_REQUEST['country'] : '');
 $cachetype = isset($_REQUEST['cachetype']) ? $_REQUEST['cachetype'] + 0 : 0;
 $bEvents = ($cachetype == 6);
 
@@ -24,14 +23,14 @@ 
 }
 
 $tpl->caching = true;
-$tpl->cache_id = $startat . "-" . $country . "-" . $cachetype;
+$tpl->cache_id = $startat."-".$country."-".$cachetype;
 $tpl->cache_lifetime = 300;
 if ($startat > 10 * $perpage) {
     $tpl->cache_lifetime = 3600;
 }
 
 if (!$tpl->is_cached()) {
-    $cachetype_condition = ($cachetype ? " AND `caches`.`type` = " . sql_escape($cachetype) : "");
+    $cachetype_condition = ($cachetype ? " AND `caches`.`type` = ".sql_escape($cachetype) : "");
     if ($bEvents) {
         $cachetype_condition .= " AND `date_hidden` >= curdate()";
     }
@@ -50,14 +49,14 @@ 
             INNER JOIN `user` ON `caches`.`user_id`=`user`.`user_id`
              LEFT JOIN `countries` ON `countries`.`short` = `caches`.`country`
              LEFT JOIN `sys_trans_text` ON `sys_trans_text`.`trans_id` = `countries`.`trans_id`
-                       AND `sys_trans_text`.`lang` = '" . sql_escape($opt['template']['locale']) . "'
+                       AND `sys_trans_text`.`lang` = '".sql_escape($opt['template']['locale'])."'
              LEFT JOIN `caches_attributes` `ca`
                   ON `ca`.`cache_id`=`caches`.`cache_id`
                   AND `ca`.`attrib_id`=6
-             WHERE `caches`.`status` = 1" . ($country ? " AND `caches`.`country`='" . sql_escape($country) . "'" : "") .
-        $cachetype_condition . "
+             WHERE `caches`.`status` = 1" . ($country ? " AND `caches`.`country`='".sql_escape($country)."'" : "").
+        $cachetype_condition."
               ORDER BY `caches`.`$date_field` $sort_order
-                   LIMIT " . sprintf("%d", $startat) . ',
+                   LIMIT ".sprintf("%d", $startat).',
                    ' . ($perpage + 0)
     );
     // see also write_newcaches_urls() in sitemap.class.php
@@ -70,8 +69,8 @@ 
     $startat = isset($_REQUEST['startat']) ? $_REQUEST['startat'] + 0 : 0;
     $cacheype_par = ($cachetype ? "&cachetype=$cachetype" : "");
     if ($country == '') {
-        $count = sql_value_slave("SELECT COUNT(*) FROM `caches` WHERE `caches`.`status`=1" . $cachetype_condition, 0);
-        $pager = new pager("newcaches.php?startat={offset}" . $cacheype_par);
+        $count = sql_value_slave("SELECT COUNT(*) FROM `caches` WHERE `caches`.`status`=1".$cachetype_condition, 0);
+        $pager = new pager("newcaches.php?startat={offset}".$cacheype_par);
     } else {
         $count = sql_value_slave(
             "SELECT COUNT(*)
@@ -81,7 +80,7 @@ 
             0,
             $country
         );
-        $pager = new pager("newcaches.php?country=" . $country . "&startat={offset}" . $cacheype_par);
+        $pager = new pager("newcaches.php?country=".$country."&startat={offset}".$cacheype_par);
     }
     $pager->make_from_offset($startat, $count, 100);
 

htdocs/okapi_settings.php

Spacing +11 added lines, -11 removed lines

@@ -16,24 +16,24 @@ 
     # [3] http://code.google.com/p/opencaching-api/issues/detail?id=132
 
     $opt['rootpath'] = $GLOBALS['rootpath'];
-    require $opt['rootpath'] . 'lib2/const.inc.php';   # (into the *local* scope!)
-    require $opt['rootpath'] . 'config2/settings-dist.inc.php';
-    require $opt['rootpath'] . 'config2/settings.inc.php';
+    require $opt['rootpath'].'lib2/const.inc.php'; # (into the *local* scope!)
+    require $opt['rootpath'].'config2/settings-dist.inc.php';
+    require $opt['rootpath'].'config2/settings.inc.php';
     
     return array(
 
         # Settings which ARE NOT present in settings.inc.php:
 
-        'OC_BRANCH' => 'oc.de',  # Tell OKAPI to work in "OCDE mode".
+        'OC_BRANCH' => 'oc.de', # Tell OKAPI to work in "OCDE mode".
 
         # Settings which ARE present in settings.inc.php:
 
         'ADMINS'           => array($opt['db']['warn']['mail'], 'rygielski@mimuw.edu.pl'),
         'FROM_FIELD'       => $opt['mail']['contact'],
-        'DATA_LICENSE_URL' => $opt['page']['absolute_url'] . $opt['logic']['license']['terms'],
+        'DATA_LICENSE_URL' => $opt['page']['absolute_url'].$opt['logic']['license']['terms'],
         'DEBUG'            => ($opt['debug'] & DEBUG_DEVELOPER != 0),
         'DEBUG_PREVENT_SEMAPHORES'
-                           => !$opt['php']['semaphores'],  # not available on old developer system
+                           => !$opt['php']['semaphores'], # not available on old developer system
         'DB_SERVER'        => $opt['db']['servername'],
         'DB_NAME'          => $opt['db']['placeholder']['db'],
         'DB_USERNAME'      => $opt['db']['username'],
@@ -43,16 +43,16 @@ 
         'TIMEZONE'         => $opt['php']['timezone'],
         'SITE_URL'         => $opt['page']['absolute_url'],
         'REGISTRATION_URL' => $opt['page']['https']['mode'] != HTTPS_DISABLED
-                                  ? 'https://' . $opt['page']['domain'] . '/register.php'
-                                  : $opt['page']['absolute_url'] . 'register.php',
+                                  ? 'https://'.$opt['page']['domain'].'/register.php'
+                                  : $opt['page']['absolute_url'].'register.php',
         'VAR_DIR'          => $opt['okapi']['var_dir'],
         'IMAGES_DIR'       => rtrim($opt['logic']['pictures']['dir'], '/'),
         'IMAGES_URL'       => rtrim($opt['logic']['pictures']['url'], '/').'/',
         'IMAGE_MAX_UPLOAD_SIZE' => 2 * $opt['logic']['pictures']['maxsize'],
-        'IMAGE_MAX_PIXEL_COUNT' => 786432,  # 1024 x 768; TODO: move PICTURE_MAX_LONG_SIDE to settings
-        'SITE_LOGO'        => $opt['page']['absolute_url'] . 'resource2/' . $opt['template']['default']['style'] . '/images/oclogo/oc_logo_alpha3.png',
+        'IMAGE_MAX_PIXEL_COUNT' => 786432, # 1024 x 768; TODO: move PICTURE_MAX_LONG_SIDE to settings
+        'SITE_LOGO'        => $opt['page']['absolute_url'].'resource2/'.$opt['template']['default']['style'].'/images/oclogo/oc_logo_alpha3.png',
         'OC_NODE_ID'       => $opt['logic']['node']['id'],
-        'OC_COOKIE_NAME'   => $opt['session']['cookiename'] . 'data',
+        'OC_COOKIE_NAME'   => $opt['session']['cookiename'].'data',
         'OCDE_HTML_PURIFIER_SETTINGS'
                            => $opt['html_purifier'],
         'GITHUB_ACCESS_TOKEN' => $opt['okapi']['github_access_token'],

htdocs/a.php

Spacing +1 added lines, -1 removed lines

@@ -7,4 +7,4 @@
  *  Activation page shortcut to keep URLs in activation Emails short
  ***************************************************************************/
 
-require __DIR__ . '/activation.php';
+require __DIR__.'/activation.php';

htdocs/log.php

Spacing +10 added lines, -10 removed lines

@@ -11,11 +11,11 @@ 
 }
 
 // include librarys
-require __DIR__ . '/lib2/web.inc.php';
-require_once __DIR__ . '/lib2/logic/cache.class.php';
-require_once __DIR__ . '/lib2/logic/user.class.php';
-require_once __DIR__ . '/lib2/logic/cachelog.class.php';
-require_once __DIR__ . '/lib2/edithelper.inc.php';
+require __DIR__.'/lib2/web.inc.php';
+require_once __DIR__.'/lib2/logic/cache.class.php';
+require_once __DIR__.'/lib2/logic/user.class.php';
+require_once __DIR__.'/lib2/logic/cachelog.class.php';
+require_once __DIR__.'/lib2/edithelper.inc.php';
 
 // prepare template and menue
 $tpl->name = 'log_cache';
@@ -121,7 +121,7 @@ 
     // get logtext editormode (from form or from userprofile)
     // 1 = text; 2 = HTML; 3 = tinyMCE
     if (isset($_POST['descMode'])) {
-        $descMode = $_POST['descMode'] + 0;  // Ocprop: 2
+        $descMode = $_POST['descMode'] + 0; // Ocprop: 2
         if (($descMode < 1) || ($descMode > 3)) {
             $descMode = 3;
         }
@@ -146,7 +146,7 @@ 
     if ($descMode == 3) {
         $tpl->add_header_javascript('resource2/tinymce/tiny_mce_gzip.js');
         $tpl->add_header_javascript(
-            'resource2/tinymce/config/log.js.php?lang=' . strtolower($opt['template']['locale'])
+            'resource2/tinymce/config/log.js.php?lang='.strtolower($opt['template']['locale'])
         );
     }
     $tpl->add_header_javascript(editorJsPath());
@@ -158,7 +158,7 @@ 
     if (is_numeric($logDateMonth)
         && is_numeric($logDateDay)
         && is_numeric($logDateYear)
-        && ($logTimeHour . $logTimeMinute == "" || is_numeric($logTimeHour))
+        && ($logTimeHour.$logTimeMinute == "" || is_numeric($logTimeHour))
         && ($logTimeMinute == "" || is_numeric($logTimeMinute))
     ) {
         $validate['dateOk'] = checkdate($logDateMonth, $logDateDay, $logDateYear)
@@ -223,7 +223,7 @@ 
          * set seconds 00:00:01, means "00:00 was logged"
          * set seconds 00:00:00, means "no time was logged"
          */
-        $logTimeSecond = ($logTimeHour . $logTimeMinute != ""
+        $logTimeSecond = ($logTimeHour.$logTimeMinute != ""
                 && $logTimeHour == 0
                 && $logTimeMinute == 0) + 0;
 
@@ -279,7 +279,7 @@ 
         }
 
         // finished, redirect to listing
-        $tpl->redirect('viewcache.php?cacheid=' . $cache->getCacheId());
+        $tpl->redirect('viewcache.php?cacheid='.$cache->getCacheId());
     }
 
     // assign values to template

htdocs/resource2/ocstyle/images/head/rotator.php

Spacing +9 added lines, -9 removed lines

@@ -159,7 +159,7 @@ 
 $img = null;
 
 if (substr($folder, - 1) != '/') {
-    $folder = $folder . '/';
+    $folder = $folder.'/';
 }
 
 $fileList = [];
@@ -177,22 +177,22 @@ 
 
 if (count($fileList) > 0) {
     $imageNumber = floor(time() / $interval) % count($fileList);
-    $img = $folder . $fileList[$imageNumber];
+    $img = $folder.$fileList[$imageNumber];
 }
 
 if ($img != null) {
     $imageInfo = pathinfo($img);
-    header('Content-type: ' . $extList[$imageInfo['extension']]);
+    header('Content-type: '.$extList[$imageInfo['extension']]);
 
     // Cache-Lebensdauer (in Minuten)
-    $exp_gmt = gmdate("D, d M Y H:i:s", time() + $interval) . " GMT";
-    $mod_gmt = gmdate("D, d M Y H:i:s", time()) . " GMT";
+    $exp_gmt = gmdate("D, d M Y H:i:s", time() + $interval)." GMT";
+    $mod_gmt = gmdate("D, d M Y H:i:s", time())." GMT";
 
-    header("Expires: " . $exp_gmt);
-    header("Last-Modified: " . $mod_gmt);
-    header("Cache-Control: public, max-age=" . $interval);
+    header("Expires: ".$exp_gmt);
+    header("Last-Modified: ".$mod_gmt);
+    header("Cache-Control: public, max-age=".$interval);
     // Speziell f�r MSIE 5
-    header("Cache-Control: pre-check=" . $interval, false);
+    header("Cache-Control: pre-check=".$interval, false);
 
     readfile($img);
 } else {

htdocs/ocmap.php

Spacing +1 added lines, -1 removed lines

@@ -6,4 +6,4 @@
  ***************************************************************************/
 
 $nongc = true;
-require __DIR__ . '/map2.php';
+require __DIR__.'/map2.php';