OpencachingDeutschland / oc-server3

htdocs/lib2/pager.class.php

Doc Comments +10 added lines

@@ -18,6 +18,9 @@ 
     // Use {page} in link_url als placeholder for the selected page number
     // and/or {offset} for the 0-based data offset of the selected page.
 
+    /**
+     * @param string $link_url
+     */
     public function __construct($link_url, $min_pages_shown = 2, $max_pages_shown = 15)
     {
         global $tpl;
@@ -31,6 +34,10 @@ 
     }
 
 
+    /**
+     * @param double $current_page
+     * @param double $total_pages
+     */
     public function make_from_pagenr($current_page, $total_pages, $page_size = false)
     {
         global $tpl;
@@ -94,6 +101,9 @@ 
     }
 
 
+    /**
+     * @param boolean $page_size
+     */
     private function pagelink($page, $page_size)
     {
         return mb_ereg_replace(

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
             $to_page = min($last_page, max($first_page, $current_page - $lrspan) + $this->max_pages_shown - 1);
             $from_page = max($first_page, $to_page - $this->max_pages_shown + 1);
 
-            for ($page = $from_page; $page <= $to_page; $page ++) {
+            for ($page = $from_page; $page <= $to_page; $page++) {
                 if ($page == $current_page) {
                     $pages[$page] = false;
                 } else {

htdocs/lib2/rowEditor.class.php

Doc Comments +50 added lines

@@ -19,6 +19,10 @@ 
 
     /* primaryKey may be an array
      */
+
+    /**
+     * @param string $sTable
+     */
     public function __construct($sTable)
     {
         $this->pk = array();
@@ -26,6 +30,11 @@ 
         $this->sTable = $sTable;
     }
 
+    /**
+     * @param string $sField
+     * @param boolean $bNullable
+     * @param integer $nInsertFunction
+     */
     public function addPKInt($sField, $nDefault, $bNullable, $nInsertFunction = RE_INSERT_NOTHING)
     {
         $this->pk[$sField] = array(
@@ -100,6 +109,11 @@ 
         );
     }
 
+    /**
+     * @param string $sField
+     * @param boolean $bNullable
+     * @param integer $nInsertFunction
+     */
     public function addInt($sField, $nDefault, $bNullable, $nInsertFunction = RE_INSERT_NOTHING)
     {
         $this->fields[$sField] = array(
@@ -112,6 +126,11 @@ 
         );
     }
 
+    /**
+     * @param string $sField
+     * @param integer $nDefault
+     * @param boolean $bNullable
+     */
     public function addFloat($sField, $nDefault, $bNullable, $nInsertFunction = RE_INSERT_NOTHING)
     {
         $this->fields[$sField] = array(
@@ -124,6 +143,11 @@ 
         );
     }
 
+    /**
+     * @param string $sField
+     * @param integer $nDefault
+     * @param boolean $bNullable
+     */
     public function addDouble($sField, $nDefault, $bNullable, $nInsertFunction = RE_INSERT_NOTHING)
     {
         $this->fields[$sField] = array(
@@ -136,6 +160,11 @@ 
         );
     }
 
+    /**
+     * @param string $sField
+     * @param boolean $bNullable
+     * @param integer $nInsertFunction
+     */
     public function addString($sField, $sDefault, $bNullable, $nInsertFunction = RE_INSERT_NOTHING)
     {
         $this->fields[$sField] = array(
@@ -148,6 +177,10 @@ 
         );
     }
 
+    /**
+     * @param string $sField
+     * @param boolean $bNullable
+     */
     public function addBoolean($sField, $bDefault, $bNullable, $nInsertFunction = RE_INSERT_NOTHING)
     {
         $this->fields[$sField] = array(
@@ -160,6 +193,11 @@ 
         );
     }
 
+    /**
+     * @param string $sField
+     * @param boolean $bNullable
+     * @param integer $nInsertFunction
+     */
     public function addDate($sField, $dDefault, $bNullable, $nInsertFunction = RE_INSERT_NOTHING)
     {
         $this->fields[$sField] = array(
@@ -339,6 +377,9 @@ 
         return join(' AND ', $fwhere);
     }
 
+    /**
+     * @param string $sField
+     */
     public function getValue($sField)
     {
         if (isset($this->pk[$sField])) {
@@ -353,6 +394,9 @@ 
         return $this->fields[$sField]['default'];
     }
 
+    /**
+     * @param string $sField
+     */
     public function getChanged($sField)
     {
         return $this->fields[$sField]['changed'];
@@ -367,6 +411,9 @@ 
         }
     }
 
+    /**
+     * @param string $sField
+     */
     public function setValue($sField, $sValue)
     {
         if ($this->bLoaded == false || ($this->bAddNew == false && $this->bExist == false)) {
@@ -556,6 +603,9 @@ 
         return $sql;
     }
 
+    /**
+     * @param string $field
+     */
     public function saveField($field)
     {
         if ($this->bLoaded == false || $this->bExist == false || $this->bAddNew == true) {

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

Doc Comments +1 added lines

@@ -13,6 +13,7 @@
      *
      * @param int    $items number of feeditems to parse from feed
      * @param string $url   url of the feed to parse
+     * @param boolean $includetext
      *
      * @return string $item feeditems as HTML-string
      */

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

Braces +2 added lines, -1 removed lines

@@ -71,7 +71,8 @@
                                 // e.g. in SMF Forum Threads
                             } elseif (!in_array(htmlspecialchars_decode($item->title), $headlines) &&
                                 strpos($item->title, 'VERSCHOBEN') === false
-                            ) { // hack to exclude forum thread-move messages
+                            ) {
+// hack to exclude forum thread-move messages
                                 // fill array
                                 $rss[] = array(
                                     'pubDate' => date('Y-m-d', strtotime($item->pubDate)),

htdocs/lib2/search/ftsearch.inc.php

Doc Comments +6 added lines

@@ -159,6 +159,9 @@ 
 }
 
 // str = long text
+/**
+ * @param boolean $simple
+ */
 function ftsearch_split(&$str, $simple)
 {
     global $ftsearch_ignores;
@@ -488,6 +491,9 @@ 
     sql("DELETE FROM `search_index_times` WHERE `object_type`='&1' AND `object_id`='&2'", $object_type, $object_id);
 }
 
+/**
+ * @param integer $object_type
+ */
 function ftsearch_set_entries($object_type, $object_id, $cache_id, &$text, $last_modified)
 {
     ftsearch_delete_entries($object_type, $object_id, $cache_id);

Spacing +3 added lines, -3 removed lines

@@ -188,7 +188,7 @@ 
     $str = '';
 
     ftsearch_load_ignores();
-    for ($i = count($astr) - 1; $i >= 0; $i --) {
+    for ($i = count($astr) - 1; $i >= 0; $i--) {
         // ignore?
         if (array_search(mb_strtolower($astr[$i]), $ftsearch_ignores) !== false) {
             unset($astr[$i]);
@@ -237,11 +237,11 @@ 
     }
 
     // doppelte chars ersetzen
-    for ($c = ord('a'); $c <= ord('z'); $c ++) {
+    for ($c = ord('a'); $c <= ord('z'); $c++) {
         $old_str = '';
         while ($old_str != $str) {
             $old_str = $str;
-            $str = mb_ereg_replace(chr($c) . chr($c), chr($c), $str);
+            $str = mb_ereg_replace(chr($c).chr($c), chr($c), $str);
         }
         $old_str = '';
     }

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

Doc Comments +3 added lines

@@ -569,6 +569,9 @@
     return $str;
 }
 
+/**
+ * @return string
+ */
 function changePlaceholder($str, $inverse = false)
 {
     static $translate = array(

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.html.inc.php

Doc Comments +4 added lines

@@ -202,6 +202,10 @@
 }
 
 
+/**
+ * @param string $interval
+ * @param string $dateTimeEnd
+ */
 function dateDiff($interval, $dateTimeBegin, $dateTimeEnd)
 {
     //Parse about any English textual datetime

Spacing +9 added lines, -9 removed lines

@@ -24,7 +24,7 @@ 
                     LEFT JOIN `caches_attributes` AS `tbloconly`
                            ON `caches`.`cache_id`=`tbloconly`.`cache_id` AND `tbloconly`.`attrib_id`=6
                     LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`cache_type`.`trans_id`
-                          AND `stt`.`lang`=\'' . sql_escape($opt['template']['locale']) . '\'';
+                          AND `stt`.`lang`=\'' . sql_escape($opt['template']['locale']).'\'';
 
 
 function search_output()
@@ -38,11 +38,11 @@ 
     $tpl->menuitem = MNU_CACHES_SEARCH_RESULT;
 
     $startat = floor($startat / $caches_per_page) * $caches_per_page;
-    $sql .= ' LIMIT ' . $startat . ', ' . $caches_per_page;
+    $sql .= ' LIMIT '.$startat.', '.$caches_per_page;
 
     // run SQL query
     sql_enable_foundrows();
-    $rs_caches = sql_slave("SELECT SQL_BUFFER_RESULT SQL_CALC_FOUND_ROWS " . $sql);
+    $rs_caches = sql_slave("SELECT SQL_BUFFER_RESULT SQL_CALC_FOUND_ROWS ".$sql);
     $resultcount = sql_value_slave('SELECT FOUND_ROWS()', 0);
     sql_foundrows_done();
     $tpl->assign('results_count', $resultcount);
@@ -95,13 +95,13 @@ 
         if ($options['sort'] != 'bymylastlog' || !$login->logged_in()) {
             $ownlogs = "";
         } else {
-            $ownlogs = " AND `cache_logs`.`user_id`='" . sql_escape($login->userid) . "'";
+            $ownlogs = " AND `cache_logs`.`user_id`='".sql_escape($login->userid)."'";
         }
         $sql = "
                 SELECT `cache_logs`.`id`, `cache_logs`.`type`, `cache_logs`.`date`, `log_types`.`icon_small`
                 FROM `cache_logs`, `log_types`
-                WHERE `cache_logs`.`cache_id`='" . sql_escape($rCache['cache_id']) . "'
-                      AND `log_types`.`id`=`cache_logs`.`type`" . $ownlogs . "
+                WHERE `cache_logs`.`cache_id`='" . sql_escape($rCache['cache_id'])."'
+                      AND `log_types`.`id`=`cache_logs`.`type`" . $ownlogs."
                 ORDER BY `cache_logs`.`order_date` DESC, `cache_logs`.`date_created` DESC, `cache_logs`.`id` DESC
                 LIMIT 6";
         $rs = sql_slave($sql);
@@ -138,12 +138,12 @@ 
 
     $tpl->assign('caches', $caches);
 
-    $page = 'search.php?queryid=' . $options['queryid'] . '&startat={offset}&sortby=' . $options['sort'];
+    $page = 'search.php?queryid='.$options['queryid'].'&startat={offset}&sortby='.$options['sort'];
     if (isset($options['sortorder']) && $options['sortorder']) {
-        $page .= "&sortorder=" . $options['sortorder'];
+        $page .= "&sortorder=".$options['sortorder'];
     }
     if (isset($options['creationdate']) && $options['creationdate']) {
-        $page .= "&creationdate=" . $options['creationdate'];
+        $page .= "&creationdate=".$options['creationdate'];
     }
     $pager = new pager($page, 2, 9);
     $pager->make_from_offset($startat, $resultcount, $caches_per_page);

htdocs/lib2/search/search.xml.inc.php

Doc Comments +3 added lines

@@ -203,6 +203,9 @@
     return $str;
 }
 
+/**
+ * @param string $str
+ */
 function lf2crlf($str)
 {
     return str_replace("\r\r\n", "\r\n", str_replace("\n", "\r\n", $str));

Spacing +9 added lines, -9 removed lines

@@ -35,13 +35,13 @@ 
         <status id=\"{statusid}\">{status}</status>
         <lon value=\"{lonvalue}\">{lon}</lon>
         <lat value=\"{latvalue}\">{lat}</lat>
-        <distance unit=\"" . $distance_unit . "\">{distance}</distance>
+        <distance unit=\"" . $distance_unit."\">{distance}</distance>
         <type id=\"{typeid}\">{type}</type>
         <difficulty>{difficulty}</difficulty>
         <terrain>{terrain}</terrain>
         <size id=\"{sizeid}\">{container}</size>
         <country id=\"{countryid}\">{country}</country>
-        <link><![CDATA[" . $opt['page']['default_absolute_url'] . "viewcache.php?wp={waypoint}]]></link>
+        <link><![CDATA[" . $opt['page']['default_absolute_url']."viewcache.php?wp={waypoint}]]></link>
         <desc><![CDATA[{shortdesc}]]></desc>
         <hints><![CDATA[{hints}]]></hints>
     </cache>
@@ -49,7 +49,7 @@ 
 
     // create temporary table
     sql_temp_table_slave('searchtmp');
-    sql_slave('CREATE TEMPORARY TABLE &searchtmp SELECT SQL_BUFFER_RESULT SQL_CALC_FOUND_ROWS ' . $sql . $sqlLimit);
+    sql_slave('CREATE TEMPORARY TABLE &searchtmp SELECT SQL_BUFFER_RESULT SQL_CALC_FOUND_ROWS '.$sql.$sqlLimit);
 
     $resultcount = sql_value_slave('SELECT FOUND_ROWS()', 0);
 
@@ -59,17 +59,17 @@ 
 
     // start output
     if (!$db['debug']) {
-        header("Content-type: application/xml; charset=" . $encoding);
+        header("Content-type: application/xml; charset=".$encoding);
         //header("Content-Disposition: attachment; filename=" . $sFilebasename . ".txt");
 
-        echo "<?xml version=\"1.0\" encoding=\"" . $encoding . "\"?>\n";
+        echo "<?xml version=\"1.0\" encoding=\"".$encoding."\"?>\n";
         echo "<result>\n";
 
         echo "    <docinfo>\n";
-        echo "        <results>" . $rCount['count'] . "</results>\n";
-        echo "        <startat>" . $startat . "</startat>\n";
-        echo "        <perpage>" . $count . "</perpage>\n";
-        echo "        <total>" . $resultcount . "</total>\n";
+        echo "        <results>".$rCount['count']."</results>\n";
+        echo "        <startat>".$startat."</startat>\n";
+        echo "        <perpage>".$count."</perpage>\n";
+        echo "        <total>".$resultcount."</total>\n";
         echo "    </docinfo>\n";
     }
 

htdocs/lib2/sqldebugger.class.php

Doc Comments +9 added lines

@@ -107,6 +107,9 @@ 
         return $rsResult;
     }
 
+    /**
+     * @param string $sql
+     */
     public function strip_temptable($sql)
     {
         $start = stripos($sql, 'SELECT ');
@@ -118,6 +121,9 @@ 
         return substr($sql, $start);
     }
 
+    /**
+     * @param string $sql
+     */
     public function strip_from($sql)
     {
         $start = stripos($sql, 'FROM ');
@@ -129,6 +135,9 @@ 
         return 'SELECT * ' . substr($sql, $start);
     }
 
+    /**
+     * @param string $sql
+     */
     public function insert_nocache($sql)
     {
         if (strtoupper(substr($sql, 0, 7)) == 'SELECT ') {

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/ss_zip.class.php

Doc Comments +5 added lines, -1 removed lines

@@ -283,7 +283,7 @@ 
     /** Removes entry from the archive.
      * please be very carefull with this function, there is no undo after you save the archive
      *
-     * @return bool true on success or false on failure
+     * @return boolean|null true on success or false on failure
      *
      * @param int $idx
      */
@@ -334,6 +334,10 @@ 
         return $idx >= 0 and $idx < $this->cnt;
     }
 
+    /**
+     * @param string $name
+     * @param string $data
+     */
     public function _write($name, $data)
     {
         $fp = fopen($name, "w");

Spacing +11 added lines, -11 removed lines

@@ -143,9 +143,9 @@ 
 
         }
         $fnl = strlen($filename);
-        $fh = "\x14\x00";    // ver needed to extract
-        $fh .= "\x00\x00";    // gen purpose bit flag
-        $fh .= "\x08\x00";    // compression method
+        $fh = "\x14\x00"; // ver needed to extract
+        $fh .= "\x00\x00"; // gen purpose bit flag
+        $fh .= "\x08\x00"; // compression method
         $fh .= "\x00\x00\x00\x00"; // last mod time and date
         $fh .= pack(
             "V3v2",
@@ -159,7 +159,7 @@ 
 
         //local file header
         $lfh = "PK\x03\x04";
-        $lfh .= $fh . $filename;
+        $lfh .= $fh.$filename;
         $zipdata = $lfh;
         $zipdata .= $gzdata;
         $zipdata .= pack("V3", $crc, $gzsize, $datasize);
@@ -170,16 +170,16 @@ 
                 "va*v3V2",
                 0,
                 $fh,
-                0,        // file comment length
-                0,        // disk number start
-                0,        // internal file attributes
-                $attr,    // external file attributes - 'archive/directory' bit set
+                0, // file comment length
+                0, // disk number start
+                0, // internal file attributes
+                $attr, // external file attributes - 'archive/directory' bit set
                 $this->offset
-            ) . $filename;
+            ).$filename;
 
         $this->offset += 42 + $fnl + $gzsize;
         $this->cdir[] = $cdir;
-        $this->cnt ++;
+        $this->cnt++;
         $this->idx = $this->cnt - 1;
     }
 
@@ -228,7 +228,7 @@ 
                 $cdsl, // size of central dir
                 $zdsl, // offset to start of central dir
                 0
-            );              // .zip file comment length
+            ); // .zip file comment length
         return $this->zipfile;
     }