OpencachingDeutschland / oc-server3

htdocs/lib2/edithelper.inc.php

Spacing +4 added lines, -4 removed lines

@@ -83,10 +83,10 @@ 
         $text = html_entity_decode($text, ENT_COMPAT, 'UTF-8');
     } else {
         // convert smilies ...
-        for ($n = 0; $n < count($smiley['image']); $n ++) {
+        for ($n = 0; $n < count($smiley['image']); $n++) {
             $text = mb_ereg_replace(
-                "<img [^>]*?src=[^>]+?" . str_replace('.', '\.', $smiley['file'][$n]) . "[^>]+?>",
-                "[s![" . $smiley['text'][$n] . "]!s]",
+                "<img [^>]*?src=[^>]+?".str_replace('.', '\.', $smiley['file'][$n])."[^>]+?>",
+                "[s![".$smiley['text'][$n]."]!s]",
                 $text
             );
             // the [s[ ]s] is needed to protect the spaces around the smileys
@@ -118,5 +118,5 @@ 
 
 function editorJsPath()
 {
-    return 'resource2/ocstyle/js/editor.js?ft=' . filemtime('resource2/ocstyle/js/editor.js');
+    return 'resource2/ocstyle/js/editor.js?ft='.filemtime('resource2/ocstyle/js/editor.js');
 }

htdocs/lib2/translateAccess.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once __DIR__ . '/logic/const.inc.php';
+require_once __DIR__.'/logic/const.inc.php';
 
 class translateAccess
 {

htdocs/lib2/sqldebugger.class.php

Spacing +6 added lines, -6 removed lines

@@ -7,7 +7,7 @@ 
  *  This modules gives you a very usefull SQL debugger for MySQL ...
  ***************************************************************************/
 
-require_once $opt['rootpath'] . 'lib2/bench.inc.php';
+require_once $opt['rootpath'].'lib2/bench.inc.php';
 
 $sqldebugger = new sqldebugger();
 
@@ -48,7 +48,7 @@ 
         $command['mode'] = $db['mode'];
         $command['slave'] = $bQuerySlave;
         $command['server'] = $sServer;
-        $command['dblink'] = '' . $dblink;
+        $command['dblink'] = ''.$dblink;
 
         $bUseExplain = false;
         $sql = trim($sql);
@@ -74,11 +74,11 @@ 
                     break;
                 }
                 $command['result'][] = $r;
-                $c ++;
+                $c++;
             }
             sql_free_result($rs);
 
-            $rs = mysql_query('EXPLAIN EXTENDED ' . $sqlexplain, $dblink);
+            $rs = mysql_query('EXPLAIN EXTENDED '.$sqlexplain, $dblink);
             while ($r = sql_fetch_assoc($rs)) {
                 $command['explain'][] = $r;
             }
@@ -126,13 +126,13 @@ 
             return '';
         }
 
-        return 'SELECT * ' . substr($sql, $start);
+        return 'SELECT * '.substr($sql, $start);
     }
 
     public function insert_nocache($sql)
     {
         if (strtoupper(substr($sql, 0, 7)) == 'SELECT ') {
-            $sql = 'SELECT SQL_NO_CACHE ' . substr($sql, 7);
+            $sql = 'SELECT SQL_NO_CACHE '.substr($sql, 7);
         }
 
         return $sql;

htdocs/lib2/rowEditor.class.php

Spacing +18 added lines, -18 removed lines

@@ -9,7 +9,7 @@ 
 {
     public $sTable;
     public $sAutoIncrementField = null;
-    public $pk;     // (idx:name; type, default, nullable, value, insertfunction)
+    public $pk; // (idx:name; type, default, nullable, value, insertfunction)
     public $fields; // (idx:name; type, default, nullable, value, changed, insertfunction)
 
     // status var
@@ -254,7 +254,7 @@ 
             if ($i == $index) {
                 return $k;
             }
-            $i ++;
+            $i++;
         }
     }
 
@@ -315,12 +315,12 @@ 
         $fselect = array();
         $sql = 'SELECT ';
         foreach ($this->fields as $k => $field) {
-            $fselect[] = '`' . sql_escape($k) . '`';
+            $fselect[] = '`'.sql_escape($k).'`';
         }
         $sql .= join(', ', $fselect);
 
-        $sql .= ' FROM `' . sql_escape($this->sTable) . '`';
-        $sql .= ' WHERE ' . $this->pBuildPK();
+        $sql .= ' FROM `'.sql_escape($this->sTable).'`';
+        $sql .= ' WHERE '.$this->pBuildPK();
 
         return $sql;
     }
@@ -330,9 +330,9 @@ 
         $fwhere = array();
         foreach ($this->pk as $k => $field) {
             if ($field['value'] === null) {
-                $fwhere[] = 'ISNULL(`' . sql_escape($k) . '`)';
+                $fwhere[] = 'ISNULL(`'.sql_escape($k).'`)';
             } else {
-                $fwhere[] = '`' . sql_escape($k) . '`=\'' . sql_escape($field['value']) . '\'';
+                $fwhere[] = '`'.sql_escape($k).'`=\''.sql_escape($field['value']).'\'';
             }
         }
 
@@ -462,7 +462,7 @@ 
 
     public function pBuildInsert()
     {
-        $sql = 'INSERT IGNORE INTO `' . sql_escape($this->sTable) . '` (';
+        $sql = 'INSERT IGNORE INTO `'.sql_escape($this->sTable).'` (';
 
         $sFields = array();
         $sValues = array();
@@ -480,7 +480,7 @@ 
                 continue;
             }
 
-            $sFields[] = '`' . sql_escape($k) . '`';
+            $sFields[] = '`'.sql_escape($k).'`';
 
             if ((($field['insertfunction'] & RE_INSERT_OVERWRITE) == RE_INSERT_OVERWRITE) || (($field['changed'] == false) && ($field['insertfunction'] != RE_INSERT_NOTHING))) {
                 if (($field['insertfunction'] & RE_INSERT_NOW) == RE_INSERT_NOW) {
@@ -492,7 +492,7 @@ 
                 if ($field['value'] === null) {
                     $sValues[] = 'NULL';
                 } else {
-                    $sValues[] = '\'' . sql_escape($this->pFormatValueSql($field['type'], $field['value'])) . '\'';
+                    $sValues[] = '\''.sql_escape($this->pFormatValueSql($field['type'], $field['value'])).'\'';
                 }
             }
         }
@@ -502,7 +502,7 @@ 
                 continue;
             }
 
-            $sFields[] = '`' . sql_escape($k) . '`';
+            $sFields[] = '`'.sql_escape($k).'`';
 
             if ((($field['insertfunction'] & RE_INSERT_OVERWRITE) == RE_INSERT_OVERWRITE) || (($field['changed'] == false) && ($field['insertfunction'] != RE_INSERT_NOTHING))) {
                 if (($field['insertfunction'] & RE_INSERT_NOW) == RE_INSERT_NOW) {
@@ -514,7 +514,7 @@ 
                 if ($field['value'] === null) {
                     $sValues[] = 'NULL';
                 } else {
-                    $sValues[] = '\'' . sql_escape($this->pFormatValueSql($field['type'], $field['value'])) . '\'';
+                    $sValues[] = '\''.sql_escape($this->pFormatValueSql($field['type'], $field['value'])).'\'';
                 }
             }
         }
@@ -528,7 +528,7 @@ 
 
     public function pBuildUpdate()
     {
-        $sql = 'UPDATE IGNORE `' . sql_escape($this->sTable) . '` SET ';
+        $sql = 'UPDATE IGNORE `'.sql_escape($this->sTable).'` SET ';
 
         $sSet = '';
         foreach ($this->fields as $k => $field) {
@@ -538,9 +538,9 @@ 
                 }
 
                 if ($field['value'] === null) {
-                    $sSet .= '`' . sql_escape($k) . '`=NULL';
+                    $sSet .= '`'.sql_escape($k).'`=NULL';
                 } else {
-                    $sSet .= '`' . sql_escape($k) . '`=\'' . sql_escape($this->pFormatValueSql($field['type'], $field['value'])) . '\'';
+                    $sSet .= '`'.sql_escape($k).'`=\''.sql_escape($this->pFormatValueSql($field['type'], $field['value'])).'\'';
                 }
             }
         }
@@ -567,12 +567,12 @@ 
         }
 
         if ($this->fields[$field]['value'] === null) {
-            $sSet = '`' . sql_escape($field) . '`=NULL';
+            $sSet = '`'.sql_escape($field).'`=NULL';
         } else {
-            $sSet = '`' . sql_escape($field) . '`=\'' . sql_escape($this->pFormatValueSql($this->fields[$field]['type'], $this->fields[$field]['value'])) . '\'';
+            $sSet = '`'.sql_escape($field).'`=\''.sql_escape($this->pFormatValueSql($this->fields[$field]['type'], $this->fields[$field]['value'])).'\'';
         }
 
-        $sql = 'UPDATE `' . sql_escape($this->sTable) . '` SET ' . $sSet;
+        $sql = 'UPDATE `'.sql_escape($this->sTable).'` SET '.$sSet;
         $sql .= ' WHERE ';
         $sql .= $this->pBuildPK();
 

htdocs/lib2/RSSParser.class.php

Spacing +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
                                     'description' => $item->description
                                 );
                                 // increment counter
-                                $i ++;
+                                $i++;
                                 // htmlspecialchars_decode() works around inconsistent HTML encoding
                                 // e.g. in SMF Forum Threads
                             } elseif (!in_array(htmlspecialchars_decode($item->title), $headlines) &&
@@ -78,9 +78,9 @@ 
                                     'title' => $item->title,
                                     'link' => $item->link
                                 );
-                                $headlines[] = "" . htmlspecialchars_decode($item->title);
+                                $headlines[] = "".htmlspecialchars_decode($item->title);
                                 // increment counter
-                                $i ++;
+                                $i++;
                             }
                         }
                     }

htdocs/lib2/smiley.inc.php

Spacing +2 added lines, -2 removed lines

@@ -90,8 +90,8 @@
 
     $smiley_a = array();
     for ($n = 0; $n < count($smiley['file']); ++ $n) {
-        $smiley['image'][$n] = '<img src="' . $opt['template']['smiley'] . $smiley['file'][$n] . '" alt="' . $smiley['text'][$n] . '" border="0" width="18px" height="18px" />';
-        $smiley['spaced_image'][$n] = ' ' . $smiley['image'][$n] . ' ';
+        $smiley['image'][$n] = '<img src="'.$opt['template']['smiley'].$smiley['file'][$n].'" alt="'.$smiley['text'][$n].'" border="0" width="18px" height="18px" />';
+        $smiley['spaced_image'][$n] = ' '.$smiley['image'][$n].' ';
         $smiley_a[] = [
             'text' => $smiley['text'][$n],
             'file' => $smiley['file'][$n],

htdocs/lib2/OcSmarty.class.php

Spacing +34 added lines, -34 removed lines

@@ -7,9 +7,9 @@ 
  *  Inherit Smarty-Class and extend it
  ***************************************************************************/
 
-require_once __DIR__ . '/../vendor/autoload.php';
-require_once $opt['rootpath'] . 'lib2/db.inc.php';
-require_once $opt['rootpath'] . 'lib2/logic/labels.inc.php';
+require_once __DIR__.'/../vendor/autoload.php';
+require_once $opt['rootpath'].'lib2/db.inc.php';
+require_once $opt['rootpath'].'lib2/logic/labels.inc.php';
 
 class OcSmarty extends Smarty
 {
@@ -17,7 +17,7 @@ 
     public $main_template = 'sys_main';
     public $bench = null;
     public $compile_id = null;
-    public $cache_id = null;    // This is a smarty caching ID, not a caches.cache_id.
+    public $cache_id = null; // This is a smarty caching ID, not a caches.cache_id.
     public $title = '';
     public $menuitem = null;
     public $nowpsearch = false;
@@ -40,17 +40,17 @@ 
     public function __construct()
     {
         global $opt, $sqldebugger;
-        require_once $opt['rootpath'] . 'lib2/bench.inc.php';
+        require_once $opt['rootpath'].'lib2/bench.inc.php';
         $this->bench = new CBench();
         $this->bench->start();
 
         // configuration
         $this->template_dir = $opt['stylepath'];
-        $this->compile_dir = $opt['rootpath'] . 'cache2/smarty/compiled/';
-        $this->cache_dir = $opt['rootpath'] . 'cache2/smarty/cache/';
+        $this->compile_dir = $opt['rootpath'].'cache2/smarty/compiled/';
+        $this->cache_dir = $opt['rootpath'].'cache2/smarty/cache/';
         $this->plugins_dir = [
             'plugins',
-            __DIR__ . '/../src/Oc/SmartyPlugins'
+            __DIR__.'/../src/Oc/SmartyPlugins'
         ];
 
         // disable caching ... if caching is enabled, 1 hour is default
@@ -58,7 +58,7 @@ 
         $this->cache_lifetime = 3600; // default
 
         // register additional functions
-        require_once __DIR__ . '/../src/Oc/SmartyPlugins/block.nocache.php';
+        require_once __DIR__.'/../src/Oc/SmartyPlugins/block.nocache.php';
         $this->register_block('nocache', 'smarty_block_nocache', false);
         $this->load_filter('pre', 't');
 
@@ -73,7 +73,7 @@ 
 
         // process debug level
         if (($opt['debug'] & DEBUG_SQLDEBUGGER) == DEBUG_SQLDEBUGGER) {
-            require_once $opt['rootpath'] . 'lib2/sqldebugger.class.php';
+            require_once $opt['rootpath'].'lib2/sqldebugger.class.php';
         } elseif (($opt['debug'] & DEBUG_OUTOFSERVICE) == DEBUG_OUTOFSERVICE) {
             $this->name = 'sys_outofservice';
             $this->display();
@@ -87,13 +87,13 @@ 
                 $this->target = '';
             }
         } else {
-            $target = basename($_SERVER['PHP_SELF']) . '?';
+            $target = basename($_SERVER['PHP_SELF']).'?';
 
             // REQUEST-Variablen durchlaufen und an target anhaengen
             reset($_REQUEST);
             while (list($varname, $varvalue) = each($_REQUEST)) {
                 if (in_array($varname, $opt['logic']['targetvars'])) {
-                    $target .= urlencode($varname) . '=' . urlencode($varvalue) . '&';
+                    $target .= urlencode($varname).'='.urlencode($varvalue).'&';
                 }
             }
             reset($_REQUEST);
@@ -177,7 +177,7 @@ 
         $optn['page']['absolute_urlpath'] = parse_url($opt['page']['absolute_url'], PHP_URL_PATH);
         $optn['page']['absolute_http_url'] = $opt['page']['absolute_http_url'];
         $optn['page']['default_absolute_url'] = $opt['page']['default_absolute_url'];
-        $optn['page']['login_url'] = ($opt['page']['https']['force_login'] ? $opt['page']['absolute_https_url'] : '') . 'login.php';
+        $optn['page']['login_url'] = ($opt['page']['https']['force_login'] ? $opt['page']['absolute_https_url'] : '').'login.php';
         $optn['page']['target'] = $this->target;
         $optn['page']['showdonations'] = $opt['page']['showdonations'];
         $optn['page']['title'] = $opt['page']['title'];
@@ -303,7 +303,7 @@ 
         }
         $this->assign('sys_dbslave', ($db['slave_id'] != - 1));
 
-        if ($this->template_exists($this->name . '.tpl')) {
+        if ($this->template_exists($this->name.'.tpl')) {
             $this->assign('template', $this->name);
         } elseif ($this->name != 'sys_error') {
             $this->error(ERROR_TEMPLATE_NOT_FOUND);
@@ -314,15 +314,15 @@ 
 
         $this->assign(
             'screen_css_time',
-            filemtime($opt['rootpath'] . "resource2/" . $opt['template']['style'] . "/css/style_screen.css")
+            filemtime($opt['rootpath']."resource2/".$opt['template']['style']."/css/style_screen.css")
         );
         $this->assign(
             'screen_msie_css_time',
-            filemtime($opt['rootpath'] . "resource2/" . $opt['template']['style'] . "/css/style_screen_msie.css")
+            filemtime($opt['rootpath']."resource2/".$opt['template']['style']."/css/style_screen_msie.css")
         );
         $this->assign(
             'print_css_time',
-            filemtime($opt['rootpath'] . "resource2/" . $opt['template']['style'] . "/css/style_print.css")
+            filemtime($opt['rootpath']."resource2/".$opt['template']['style']."/css/style_print.css")
         );
 
         // check if the template is compiled
@@ -342,9 +342,9 @@ 
         }
 
         if (($opt['debug'] & DEBUG_SQLDEBUGGER) == DEBUG_SQLDEBUGGER) {
-            require_once $opt['rootpath'] . 'lib2/sqldebugger.class.php';
+            require_once $opt['rootpath'].'lib2/sqldebugger.class.php';
 
-            parent::fetch($this->main_template . '.tpl', $this->get_cache_id(), $this->get_compile_id());
+            parent::fetch($this->main_template.'.tpl', $this->get_cache_id(), $this->get_compile_id());
 
             $this->clear_all_assign();
             $this->main_template = 'sys_sqldebugger';
@@ -361,10 +361,10 @@ 
             $opt['debug'] = $opt['debug'] & ~DEBUG_SQLDEBUGGER;
 
             $this->header();
-            parent::display($this->main_template . '.tpl');
+            parent::display($this->main_template.'.tpl');
         } else {
             $this->header();
-            parent::display($this->main_template . '.tpl', $this->get_cache_id(), $this->get_compile_id());
+            parent::display($this->main_template.'.tpl', $this->get_cache_id(), $this->get_compile_id());
         }
 
         exit;
@@ -385,8 +385,8 @@ 
 
         $args = func_get_args();
         unset($args[0]);
-        for ($i = 1; isset($args[$i]); $i ++) {
-            $this->assign('p' . $i, $args[$i]);
+        for ($i = 1; isset($args[$i]); $i++) {
+            $this->assign('p'.$i, $args[$i]);
         }
 
         $this->name = 'error';
@@ -405,7 +405,7 @@ 
             }
         }
 
-        return parent::is_cached($this->main_template . '.tpl', $this->get_cache_id(), $this->get_compile_id());
+        return parent::is_cached($this->main_template.'.tpl', $this->get_cache_id(), $this->get_compile_id());
     }
 
     public function get_cache_id()
@@ -416,14 +416,14 @@ 
         // Probably this is no safety or stability issue, but to be sure we restrict
         // the ID to a reasonable set of characters:
 
-        return $this->name . '|' . mb_ereg_replace('/[^A-Za-z0-9_\|\-\.]/', '', $this->cache_id);
+        return $this->name.'|'.mb_ereg_replace('/[^A-Za-z0-9_\|\-\.]/', '', $this->cache_id);
     }
 
     public function get_compile_id()
     {
         global $opt;
 
-        return $opt['template']['style'] . '|' . $opt['template']['locale'] . '|' . $this->compile_id;
+        return $opt['template']['style'].'|'.$opt['template']['locale'].'|'.$this->compile_id;
     }
 
     public function redirect($page)
@@ -445,21 +445,21 @@ 
             if (substr($page, 0, 1) == '/') {
                 $page = substr($page, 1);
             }
-            $page = $opt['page']['absolute_url'] . $page;
+            $page = $opt['page']['absolute_url'].$page;
         }
 
         if ($opt['session']['mode'] == SAVE_SESSION) {
             if (defined('SID') && SID != '' && session_id() != '') {
                 if (strpos($page, '?') === false) {
-                    header("Location: " . $page . '?' . urlencode(session_name()) . '=' . urlencode(session_id()));
+                    header("Location: ".$page.'?'.urlencode(session_name()).'='.urlencode(session_id()));
                 } else {
-                    header("Location: " . $page . '&' . urlencode(session_name()) . '=' . urlencode(session_id()));
+                    header("Location: ".$page.'&'.urlencode(session_name()).'='.urlencode(session_id()));
                 }
             } else {
-                header("Location: " . $page);
+                header("Location: ".$page);
             }
         } else {
-            header("Location: " . $page);
+            header("Location: ".$page);
         }
         exit;
     }
@@ -475,8 +475,8 @@ 
 
         // ok ... redirect the get-data
         $target = ($opt['page']['https']['force_login'] ? 'https' : $opt['page']['protocol'])
-            . '://' . $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"];
-        $this->redirect('login.php?target=' . urlencode($target));
+            . '://'.$_SERVER["HTTP_HOST"].$_SERVER["REQUEST_URI"];
+        $this->redirect('login.php?target='.urlencode($target));
     }
 
     public function assign_rs($name, $rs)
@@ -520,7 +520,7 @@ 
             // Date in the past
             header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
             // always modified
-            header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+            header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 
             // set the cookie
             $cookie->header();

htdocs/lib2/search/search.gpx.inc.php

Spacing +40 added lines, -40 removed lines

@@ -29,13 +29,13 @@ 
 
     $gpxHead =
         '<?xml version="1.0" encoding="utf-8"?>
-<gpx xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1.0" creator="' . $server_name . ' - ' . $server_address . '" xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd http://www.groundspeak.com/cache/1/0/1 http://www.groundspeak.com/cache/1/0/1/cache.xsd" xmlns="http://www.topografix.com/GPX/1/0">
-  <name>Cache listing generated from ' . $server_name . '</name>
-  <desc>This is a waypoint file generated from ' . $server_name . '{wpchildren}</desc>
+<gpx xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1.0" creator="' . $server_name.' - '.$server_address.'" xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd http://www.groundspeak.com/cache/1/0/1 http://www.groundspeak.com/cache/1/0/1/cache.xsd" xmlns="http://www.topografix.com/GPX/1/0">
+  <name>Cache listing generated from ' . $server_name.'</name>
+  <desc>This is a waypoint file generated from ' . $server_name.'{wpchildren}</desc>
   <author>Opencaching.de</author>
-  <email>' . text_xmlentities($opt['mail']['contact']) . '</email>
-  <url>' . $server_domain . '</url>
-  <urlname>' . $opt['page']['slogan'] . '</urlname>
+  <email>' . text_xmlentities($opt['mail']['contact']).'</email>
+  <url>' . $server_domain.'</url>
+  <urlname>' . $opt['page']['slogan'].'</urlname>
   <time>{time}</time>
   <keywords>cache, geocache, opencaching, waypoint</keywords>
 ';
@@ -45,8 +45,8 @@ 
     <time>{time}</time>
     <name>{waypoint}</name>
     <desc>{cachename}</desc>
-    <src>' . $server_domain . '</src>
-    <url>' . $server_address . 'viewcache.php?cacheid={cacheid}</url>
+    <src>' . $server_domain.'</src>
+    <url>' . $server_address.'viewcache.php?cacheid={cacheid}</url>
     <urlname>{cachename}</urlname>
     <sym>{sym}</sym>
     <type>Geocache|{type}</type>
@@ -111,7 +111,7 @@ 
     <name>{name}</name>
     <cmt>{comment}</cmt>
     <desc>{desc}</desc>
-    <url>' . $server_address . 'viewcache.php?cacheid={cacheid}</url>
+    <url>' . $server_address.'viewcache.php?cacheid={cacheid}</url>
     <urlname>{parent} {cachename}</urlname>
     <sym>{type}</sym>
     <type>Waypoint|{type}</type>
@@ -251,18 +251,18 @@ 
         } else {
             // Ocprop:  <groundspeak:encoded_hints>(.*?)<\/groundspeak:encoded_hints>
             $hint = html_entity_decode(strip_tags($r['hint']), ENT_COMPAT, "UTF-8");
-            $thisline = mb_ereg_replace('{hints}', '      <groundspeak:encoded_hints>' . text_xmlentities($hint) . '</groundspeak:encoded_hints>', $thisline);
+            $thisline = mb_ereg_replace('{hints}', '      <groundspeak:encoded_hints>'.text_xmlentities($hint).'</groundspeak:encoded_hints>', $thisline);
         }
 
         $thisline = mb_ereg_replace('{shortdesc}', text_xmlentities($r['short_desc']), $thisline);
 
         $desc = $r['desc'];
-        $desc = str_replace(' src="images/uploads/', ' src="' . $server_address . 'images/uploads/', $desc);
+        $desc = str_replace(' src="images/uploads/', ' src="'.$server_address.'images/uploads/', $desc);
         if ($r['listing_outdated']) {
-            $desc = "<p style='color:#c00000'><strong>" .
-                $translate->t('This geocache description may be outdated.', '', basename(__FILE__), __LINE__) . '</strong> ' .
-                $translate->t('See the log entries for more information.', '', basename(__FILE__), __LINE__) .
-                "</p>\n" . $desc;
+            $desc = "<p style='color:#c00000'><strong>".
+                $translate->t('This geocache description may be outdated.', '', basename(__FILE__), __LINE__).'</strong> '.
+                $translate->t('See the log entries for more information.', '', basename(__FILE__), __LINE__).
+                "</p>\n".$desc;
         }
         $license = getLicenseDisclaimer(
             $r['userid'],
@@ -304,14 +304,14 @@ 
             $sDiffDecimals = '.5';
         }
         $r['difficulty'] -= $r['difficulty'] % 2;
-        $thisline = mb_ereg_replace('{difficulty}', ($r['difficulty'] / 2) . $sDiffDecimals, $thisline);
+        $thisline = mb_ereg_replace('{difficulty}', ($r['difficulty'] / 2).$sDiffDecimals, $thisline);
 
         $sTerrDecimals = '';
         if ($r['terrain'] % 2) {
             $sTerrDecimals = '.5';
         }
         $r['terrain'] -= $r['terrain'] % 2;
-        $thisline = mb_ereg_replace('{terrain}', ($r['terrain'] / 2) . $sTerrDecimals, $thisline);
+        $thisline = mb_ereg_replace('{terrain}', ($r['terrain'] / 2).$sTerrDecimals, $thisline);
 
         $thisline = mb_ereg_replace('{owner}', text_xmlentities($r['username']), $thisline);
         $thisline = mb_ereg_replace('{userid}', $r['userid'], $thisline);
@@ -342,7 +342,7 @@ 
                 $thislog = mb_ereg_replace('{type}', $gpxLogType[3], $thislog);
                 $thislog = mb_ereg_replace('{text}', text_xmlentities($cacheNote['note']), $thislog);
 
-                $logentries .= $thislog . "\n";
+                $logentries .= $thislog."\n";
             }
         }
 
@@ -373,7 +373,7 @@ 
                 WHERE
                     `cache_logs`.`user_id`=`user`.`user_id` AND
                     `cache_logs`.`cache_id`='&1' AND
-                    `user`.`user_id`" . $user_operator . "'&2'
+                    `user`.`user_id`" . $user_operator."'&2'
                 ORDER BY
                     `cache_logs`.`order_date` DESC,
                     `cache_logs`.`date_created` DESC,
@@ -390,7 +390,7 @@ 
                 $thislog = mb_ereg_replace('{username}', text_xmlentities($rLog['username']), $thislog);
 
                 if ($rLog['type'] == 3 && $rLog['needs_maintenance'] == 2) {
-                    $logtype = 'Needs Maintenance';   // with capital M, other than cache attribute
+                    $logtype = 'Needs Maintenance'; // with capital M, other than cache attribute
                 } elseif (isset($gpxLogType[$rLog['type']])) {
                     $logtype = $gpxLogType[$rLog['type']];
                 } else {
@@ -416,16 +416,16 @@ 
                     foreach ($flags as &$flag) {
                         $ft = $translate->t($flag, '', basename(__FILE__), __LINE__);
                         if (strstr($flag, 'is ok') == false) {
-                            $flag = '<span style="color:#c00000">' . $ft . '</span>';
+                            $flag = '<span style="color:#c00000">'.$ft.'</span>';
                         } else {
-                            $flag = '<span style="color:#00c000">' . $ft . '</span>';
+                            $flag = '<span style="color:#00c000">'.$ft.'</span>';
                         }
                     }
-                    $logtext = "<p><i>" . implode(', ', $flags) . "</i></p>\n" . $logtext;
+                    $logtext = "<p><i>".implode(', ', $flags)."</i></p>\n".$logtext;
                 }
                 $thislog = mb_ereg_replace('{text}', text_xmlentities($logtext), $thislog);
 
-                $logentries .= $thislog . "\n";
+                $logentries .= $thislog."\n";
             }
         }
         mysql_free_result($rsLogs);
@@ -451,7 +451,7 @@ 
                 $thisattribute = mb_ereg_replace('{attrib_id}', $rAttrib['gc_id'], $gpxAttributes);
                 $thisattribute = mb_ereg_replace('{attrib_inc}', $rAttrib['gc_inc'], $thisattribute);
                 $thisattribute = mb_ereg_replace('{attrib_name}', text_xmlentities($rAttrib['gc_name']), $thisattribute);
-                $attribentries .= $thisattribute . "\n";
+                $attribentries .= $thisattribute."\n";
                 $gc_ids[$rAttrib['gc_id']] = true;
             }
         }
@@ -462,7 +462,7 @@ 
             $thisattribute = mb_ereg_replace('{attrib_inc}', '1', $thisattribute);
             $thisattribute = mb_ereg_replace('{attrib_name}', 'Needs maintenance', $thisattribute);
             // with lowercase m, other than log type
-            $attribentries .= $thisattribute . "\n";
+            $attribentries .= $thisattribute."\n";
         }
 
         $thisline = mb_ereg_replace('{attributes}', $attribentries, $thisline);
@@ -489,7 +489,7 @@ 
             $thiskrety = mb_ereg_replace('{gkref}', sprintf("GK%04X", $rGK['id']), $thiskrety);
             $thiskrety = mb_ereg_replace('{gkname}', text_xmlentities($rGK['name']), $thiskrety);
 
-            $gkentries .= $thiskrety . "\n";
+            $gkentries .= $thiskrety."\n";
         }
         mysql_free_result($rsGeokrety);
         $thisline = mb_ereg_replace('{geokrety}', $gkentries, $thisline);
@@ -497,42 +497,42 @@ 
         // additional waypoints, including personal cache note
         $childWaypoints = $childwphandler->getChildWps($r['cacheid']);
         $n = 1;
-        $digits = "%0" . strlen(count($childWaypoints)) . "d";
+        $digits = "%0".strlen(count($childWaypoints))."d";
 
         foreach ($childWaypoints as $childWaypoint) {
             $thiswp = $gpxWaypoints;
             $thiswp = mb_ereg_replace('{wp_lat}', sprintf('%01.5f', $childWaypoint['latitude']), $thiswp);
             $thiswp = mb_ereg_replace('{wp_lon}', sprintf('%01.5f', $childWaypoint['longitude']), $thiswp);
             $thiswp = mb_ereg_replace('{time}', $time, $thiswp);
-            $thiswp = mb_ereg_replace('{name}', $r['waypoint'] . '-' . sprintf($digits, $n), $thiswp);
+            $thiswp = mb_ereg_replace('{name}', $r['waypoint'].'-'.sprintf($digits, $n), $thiswp);
             $thiswp = mb_ereg_replace('{cachename}', text_xmlentities($r['name']), $thiswp);
             $thiswp = mb_ereg_replace('{comment}', text_xmlentities($childWaypoint['description']), $thiswp);
             $thiswp = mb_ereg_replace('{desc}', text_xmlentities($childWaypoint['name']), $thiswp);
             switch ($childWaypoint['type']) {
                 case 1:
                     $wp_typename = "Parking Area";
-                    break;  // well-known garmin symbols
+                    break; // well-known garmin symbols
                 case 2:
                     $wp_typename = "Flag, Green";
-                    break;   // stage / ref point
+                    break; // stage / ref point
                 case 3:
                     $wp_typename = "Flag, Blue";
-                    break;    // path
+                    break; // path
                 case 4:
                     $wp_typename = "Circle with X";
                     break; // final
                 case 5:
                     $wp_typename = "Diamond, Green";
-                    break;  // point of interest
+                    break; // point of interest
                 default:
                     $wp_typename = "Flag, Blue";
-                    break;  // for the case new types are forgotten here ..
+                    break; // for the case new types are forgotten here ..
             }
             $thiswp = mb_ereg_replace('{type}', text_xmlentities($wp_typename), $thiswp);
             $thiswp = mb_ereg_replace('{parent}', $r['waypoint'], $thiswp);
             $thiswp = mb_ereg_replace('{cacheid}', $r['cacheid'], $thiswp);
             $waypoints .= $thiswp;
-            ++ $n;
+            ++$n;
         }
 
         if ($cacheNote && !empty($cacheNote['latitude']) && !empty($cacheNote['longitude'])) {
@@ -540,7 +540,7 @@ 
             $thiswp = mb_ereg_replace('{wp_lat}', sprintf('%01.5f', $cacheNote['latitude']), $thiswp);
             $thiswp = mb_ereg_replace('{wp_lon}', sprintf('%01.5f', $cacheNote['longitude']), $thiswp);
             $thiswp = mb_ereg_replace('{time}', $time, $thiswp);
-            $thiswp = mb_ereg_replace('{name}', $r['waypoint'] . 'NOTE', $thiswp);
+            $thiswp = mb_ereg_replace('{name}', $r['waypoint'].'NOTE', $thiswp);
             $thiswp = mb_ereg_replace('{cachename}', text_xmlentities($r['name']), $thiswp);
             $thiswp = mb_ereg_replace('{comment}', text_xmlentities($cacheNote['note']), $thiswp);
             $thiswp = mb_ereg_replace('{desc}', text_xmlentities($cache_note_text), $thiswp);
@@ -620,11 +620,11 @@ 
         $cacheid
     );
     while ($r = sql_fetch_array($rs)) {
-        $retval .= '<div style="float:left; padding:8px"><a href="' . $r['url'] . '" target="_blank">' .
-            '<img src="' . $server_address . 'thumbs.php?type=2&uuid=' . $r["uuid"] . '" />' .
-            '</a><br />' . $r['title'];
+        $retval .= '<div style="float:left; padding:8px"><a href="'.$r['url'].'" target="_blank">'.
+            '<img src="'.$server_address.'thumbs.php?type=2&uuid='.$r["uuid"].'" />'.
+            '</a><br />'.$r['title'];
         if ($r['spoiler']) {
-            $retval .= ' (' . _('click on spoiler to display') . ')';
+            $retval .= ' ('._('click on spoiler to display').')';
         }
         $retval .= "</div>";
     }

htdocs/lib2/search/search.txt.inc.php

Spacing +4 added lines, -4 removed lines

@@ -116,10 +116,10 @@ 
 
         if ($r['html'] == 0) {
             $thisline = mb_ereg_replace('{htmlwarn}', '', $thisline);
-            $thisline = mb_ereg_replace('{desc}', decodeEntities(strip_tags($r['desc'])) . $license, $thisline);
+            $thisline = mb_ereg_replace('{desc}', decodeEntities(strip_tags($r['desc'])).$license, $thisline);
         } else {
             $thisline = mb_ereg_replace('{htmlwarn}', " ($converted_from_html)", $thisline);
-            $thisline = mb_ereg_replace('{desc}', html2txt($r['desc']) . $license, $thisline);
+            $thisline = mb_ereg_replace('{desc}', html2txt($r['desc']).$license, $thisline);
         }
 
         $thisline = mb_ereg_replace('{type}', $r['type'], $thisline);
@@ -197,7 +197,7 @@ 
                 $thislog = mb_ereg_replace('{text}', html2txt($rLog['text']), $thislog);
             }
 
-            $logentries .= $thislog . "\n";
+            $logentries .= $thislog."\n";
         }
         $thisline = mb_ereg_replace('{logs}', $logentries, $thisline);
 
@@ -205,7 +205,7 @@ 
         if (!$bUseZip) {
             echo $thisline;
         } else {
-            $phpzip->add_data($r['waypoint'] . '.txt', $thisline);
+            $phpzip->add_data($r['waypoint'].'.txt', $thisline);
         }
     }
     mysql_free_result($rs);