OpencachingDeutschland / oc-server3

htdocs/lib2/translate_filescan.class.php

Doc Comments +8 added lines

@@ -76,6 +76,10 @@ 
         }
     }
 
+    /**
+     * @param string $sCode
+     * @param integer $nStartSearch
+     */
     public function findEndOfPHPString($sCode, $nStartSearch)
     {
         $nEnd = 0;
@@ -116,6 +120,10 @@ 
     }
 
     // TODO: performance ... scan once at __construct and store line positions
+
+    /**
+     * @param integer $nPos
+     */
     public function findLineOfPos($nPos)
     {
         $nLine = 1;

Spacing +10 added lines, -10 removed lines

@@ -34,8 +34,8 @@ 
 
     public function scanTranslateFunctionCalls()
     {
-        $nNextPos = strpos($this->msContent, "t" . "('");
-        $nNext_ = strpos($this->msContent, "_" . "('");
+        $nNextPos = strpos($this->msContent, "t"."('");
+        $nNext_ = strpos($this->msContent, "_"."('");
         if ($nNext_ !== false && ($nNextPos === false || $nNext_ < $nNextPos)) {
             $nNextPos = $nNext_;
         }
@@ -68,8 +68,8 @@ 
                 );
             }
 
-            $nNext_ = strpos($this->msContent, "_" . "('", $nNextPos + 1);
-            $nNextPos = strpos($this->msContent, "t" . "('", $nNextPos + 1);
+            $nNext_ = strpos($this->msContent, "_"."('", $nNextPos + 1);
+            $nNextPos = strpos($this->msContent, "t"."('", $nNextPos + 1);
             if ($nNext_ !== false && ($nNextPos === false || $nNext_ < $nNextPos)) {
                 $nNextPos = $nNext_;
             }
@@ -92,11 +92,11 @@ 
 
     public function scanTranslationPlaceholders()
     {
-        $nNextPos = strpos($this->msContent, '{' . 't');
+        $nNextPos = strpos($this->msContent, '{'.'t');
         while ($nNextPos !== false) {
             // check for match
-            if ((substr($this->msContent, $nNextPos, 3) == '{' . 't}') ||
-                (substr($this->msContent, $nNextPos, 3) == '{' . 't ')
+            if ((substr($this->msContent, $nNextPos, 3) == '{'.'t}') ||
+                (substr($this->msContent, $nNextPos, 3) == '{'.'t ')
             ) {
                 $nStart = strpos($this->msContent, '}', $nNextPos);
                 $nEnd = strpos($this->msContent, '{/t}', $nNextPos);
@@ -111,7 +111,7 @@ 
                 );
             }
 
-            $nNextPos = strpos($this->msContent, '{' . 't', $nNextPos + 1);
+            $nNextPos = strpos($this->msContent, '{'.'t', $nNextPos + 1);
         }
     }
 
@@ -120,9 +120,9 @@ 
     {
         $nLine = 1;
 
-        for ($n = 0; $n < $nPos; $n ++) {
+        for ($n = 0; $n < $nPos; $n++) {
             if (substr($this->msContent, $n, 1) == "\n") {
-                $nLine ++;
+                $nLine++;
             }
         }
 

htdocs/lib2/util.inc.php

Doc Comments +13 added lines

@@ -246,11 +246,21 @@ 
     return $ret;
 }
 
+/**
+ * @param string $name
+ * @param string $default
+ *
+ * @return string
+ */
 function getSysConfig($name, $default)
 {
     return sql_value("SELECT `value` FROM `sysconfig` WHERE `name`='&1'", $default, $name);
 }
 
+/**
+ * @param string $name
+ * @param string $value
+ */
 function setSysConfig($name, $value)
 {
     sql(
@@ -333,6 +343,9 @@ 
 }
 
 
+/**
+ * @return string
+ */
 function escape_javascript($text)
 {
     return str_replace('\'', '\\\'', str_replace('"', '"', $text));

Spacing +5 added lines, -5 removed lines

@@ -229,7 +229,7 @@ 
 
     while ($nCurPos < mb_strlen($str)) {
         $nNextSep = mb_strlen($str);
-        for ($nSepPos = 0; $nSepPos < mb_strlen($sep); $nSepPos ++) {
+        for ($nSepPos = 0; $nSepPos < mb_strlen($sep); $nSepPos++) {
             $nThisPos = mb_strpos($str, mb_substr($sep, $nSepPos, 1), $nCurPos);
             if ($nThisPos !== false) {
                 if ($nNextSep > $nThisPos) {
@@ -308,9 +308,9 @@ 
         $retval = 'E ';
     }
 
-    $retval = $retval . sprintf("%03d", floor($lon)) . '° ';
+    $retval = $retval.sprintf("%03d", floor($lon)).'° ';
     $lon = $lon - floor($lon);
-    $retval = $retval . sprintf("%06.3f", round($lon * 60, 3)) . '\'';
+    $retval = $retval.sprintf("%06.3f", round($lon * 60, 3)).'\'';
 
     return $retval;
 }
@@ -325,9 +325,9 @@ 
         $retval = 'N ';
     }
 
-    $retval = $retval . sprintf("%02d", floor($lat)) . '° ';
+    $retval = $retval.sprintf("%02d", floor($lat)).'° ';
     $lat = $lat - floor($lat);
-    $retval = $retval . sprintf("%06.3f", round($lat * 60, 3)) . '\'';
+    $retval = $retval.sprintf("%06.3f", round($lat * 60, 3)).'\'';
 
     return $retval;
 }

htdocs/mydetails.php

Doc Comments +3 added lines

@@ -128,6 +128,9 @@
 }
 
 
+/**
+ * @param boolean $include_editor
+ */
 function assignFromDB($userid, $include_editor)
 {
     global $tpl, $opt, $smilies, $_REQUEST;

Spacing +6 added lines, -6 removed lines

@@ -5,8 +5,8 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
-require_once __DIR__ . '/lib2/edithelper.inc.php';
+require __DIR__.'/lib2/web.inc.php';
+require_once __DIR__.'/lib2/edithelper.inc.php';
 
 $tpl->name = 'mydetails';
 $tpl->menuitem = MNU_MYPROFILE_DETAILS;
@@ -51,8 +51,8 @@ 
 
         while ($record = sql_fetch_array($rs)) {
             $id = $record['id'];
-            $vis = isset($_REQUEST['chk' . $id]) ? $_REQUEST['chk' . $id] + 0 : 0;
-            $value = isset($_REQUEST['inp' . $id]) ? $_REQUEST['inp' . $id] : '';
+            $vis = isset($_REQUEST['chk'.$id]) ? $_REQUEST['chk'.$id] + 0 : 0;
+            $value = isset($_REQUEST['inp'.$id]) ? $_REQUEST['inp'.$id] : '';
             if ($vis != 1) {
                 $vis = 0;
             }
@@ -63,7 +63,7 @@ 
                 $bErrorlen = true;
             } else {
                 if (!$useroptions->setOptValue($id, $value)) {
-                    $error .= $useroptions->getOptName($id) . ', ';
+                    $error .= $useroptions->getOptName($id).', ';
                     $bError = true;
                 }
             }
@@ -172,7 +172,7 @@ 
         }
         if ($descMode == 3) {
             $tpl->add_header_javascript('resource2/tinymce/tiny_mce_gzip.js');
-            $tpl->add_header_javascript('resource2/tinymce/config/user.js.php?lang=' . strtolower($opt['template']['locale']));
+            $tpl->add_header_javascript('resource2/tinymce/config/user.js.php?lang='.strtolower($opt['template']['locale']));
         }
         $tpl->add_header_javascript(editorJsPath());
         $tpl->assign('descMode', $descMode);

htdocs/myprofile.php

Doc Comments +3 added lines

@@ -182,6 +182,9 @@
     $tpl->display();
 }
 
+/**
+ * @param user $user
+ */
 function assignFromUser($user)
 {
     global $tpl;

Spacing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'myprofile';
 $tpl->menuitem = MNU_MYPROFILE_DATA;
@@ -19,7 +19,7 @@ 
 
 if ($login->userid == 0) {
     if ($action == 'change' || $action == 'changeemail') {
-        $tpl->redirect('login.php?target=' . urlencode('myprofile.php?action=change'));
+        $tpl->redirect('login.php?target='.urlencode('myprofile.php?action=change'));
     } else {
         $tpl->redirect('login.php?target=myprofile.php');
     }

htdocs/restorecaches.php

Doc Comments +1 added lines, -1 removed lines

@@ -675,7 +675,7 @@
  * @param $admins
  * @param $wp_oc
  * @param $r
- * @param $field
+ * @param string $field
  * @param $oldvalue
  * @param $newvalue
  */

Indentation +1 added lines, -1 removed lines

@@ -1011,7 +1011,7 @@
                             }
                             $logs_restored = true;
                         }
-                       // if it was not already restored by a later restore operation ...
+                        // if it was not already restored by a later restore operation ...
                     } elseif (sql_value("SELECT `id` FROM `cache_logs` WHERE `id`='&1'", 0, $revert_logid) == 0) {
                         // id, uuid, date_created and last_modified are set automatically;
                         // picture will be updated automatically on picture-restore

Braces +10 added lines, -5 removed lines

@@ -757,7 +757,8 @@ 
                 $cacheid,
                 $rdate
             );
-            if ($r = sql_fetch_assoc($rs)) { // should always be true ...
+            if ($r = sql_fetch_assoc($rs)) {
+// should always be true ...
                 if (!$simulate) {
                     sql(
                         "UPDATE `caches` SET `latitude`='&1', `longitude`='&2' WHERE `cache_id`='&3'",
@@ -790,7 +791,8 @@ 
                 $cacheid,
                 $rdate
             );
-            if ($r = sql_fetch_assoc($rs)) { // should always be true ...
+            if ($r = sql_fetch_assoc($rs)) {
+// should always be true ...
                 if (!$simulate) {
                     sql(
                         "UPDATE `caches` SET `country`='&1'  WHERE `cache_id`='&2'",
@@ -827,7 +829,8 @@ 
             'wp_nc' => 'waypoints'
         ];
 
-        if ($r = sql_fetch_assoc($rs)) {// can be false
+        if ($r = sql_fetch_assoc($rs)) {
+// can be false
             $setfields = "";
             foreach ($fields as $field => $ropt) {
                 if (in_array($ropt, $roptions) && $r[$field] != $cache[$field]) {
@@ -896,13 +899,15 @@ 
 
             while ($r = sql_fetch_assoc($rs)) {
                 if (!$simulate) {
-                    if ($r['desc'] === null) { // was newly created -> delete
+                    if ($r['desc'] === null) {
+// was newly created -> delete
                         sql(
                             "DELETE FROM `cache_desc` WHERE `cache_id`='&1' AND `language`='&2'",
                             $cacheid,
                             $r['language']
                         );
-                    } else {// id, uuid, date_created and last_modified are set automatically
+                    } else {
+// id, uuid, date_created and last_modified are set automatically
                         sql(
                             "INSERT INTO `cache_desc`
                             (`node`, `cache_id`, `language`, `desc`, `desc_html`, `desc_htmledit`, `hint`, `short_desc`)

Spacing +42 added lines, -42 removed lines

@@ -132,8 +132,8 @@ 
 
 */
 
-require __DIR__ . '/lib2/web.inc.php';
-require_once __DIR__ . '/lib2/logic/labels.inc.php';
+require __DIR__.'/lib2/web.inc.php';
+require_once __DIR__.'/lib2/logic/labels.inc.php';
 
 $tpl->name = 'restorecaches';
 $tpl->menuitem = MNU_ADMIN_RESTORE;
@@ -308,12 +308,12 @@ 
 
 function get_archive_data($caches)
 {
-    $cachelist = "(" . implode(",", $caches) . ")";
+    $cachelist = "(".implode(",", $caches).")";
     $data = array();
     $admins = array();
 
     // make waypoint index
-    $rs = sql("SELECT `cache_id`, `wp_oc` FROM `caches` WHERE `cache_id` IN " . $cachelist);
+    $rs = sql("SELECT `cache_id`, `wp_oc` FROM `caches` WHERE `cache_id` IN ".$cachelist);
     while ($r = sql_fetch_assoc($rs)) {
         $wp_oc[$r['cache_id']] = $r['wp_oc'];
     }
@@ -328,7 +328,7 @@ 
             `latitude`,
             `restored_by`
         FROM `cache_coordinates`
-        WHERE `cache_id` IN " . $cachelist . "
+        WHERE `cache_id` IN " . $cachelist."
         ORDER BY `date_created` ASC"
     );
     // order is relevant, because multiple changes per day possible
@@ -336,7 +336,7 @@ 
     while ($r = sql_fetch_assoc($rs)) {
         $coord = new coordinate($r['latitude'], $r['longitude']);
         $coord = $coord->getDecimalMinutes();
-        $coord = $coord['lat'] . " " . $coord['lon'];
+        $coord = $coord['lat']." ".$coord['lon'];
         if (isset($lastcoord[$r['cache_id']]) && $coord != $lastcoord[$r['cache_id']]) {
             // the database contains lots of old coord records with unchanged coords, wtf?
             append_data($data, $admins, $wp_oc, $r, "coord", $lastcoord[$r['cache_id']], $coord);
@@ -348,7 +348,7 @@ 
     // cache country
     $rs = sql("SELECT `cache_id`, LEFT(`date_created`,10) AS `date_modified`, `country`, `restored_by`
                FROM `cache_countries`
-                         WHERE `cache_id` IN " . $cachelist . "
+                         WHERE `cache_id` IN " . $cachelist."
                          ORDER BY `date_created` ASC");
     // order is relevant, because multiple changes per day possible
     $lastcountry = array();
@@ -364,17 +364,17 @@ 
     // all other cache data
     // first the current data ...
     $nextcd = array();
-    $rs = sql("SELECT * FROM `caches` WHERE `cache_id` IN " . $cachelist);
+    $rs = sql("SELECT * FROM `caches` WHERE `cache_id` IN ".$cachelist);
     while ($r = sql_fetch_assoc($rs)) {
         $nextcd[$r['wp_oc']] = $r;
-        $user_id = $r['user_id'];     // is used later for logs
+        $user_id = $r['user_id']; // is used later for logs
     }
     sql_free_result($rs);
 
     // .. and then the changes
     $rs = sql(
         "SELECT * FROM `caches_modified`
-        WHERE `cache_id` IN " . $cachelist . "
+        WHERE `cache_id` IN " . $cachelist."
         ORDER BY `date_modified` DESC"
     );
     while ($r = sql_fetch_assoc($rs)) {
@@ -417,8 +417,8 @@ 
                 $wp_oc,
                 $r,
                 "time",
-                $r['search_time'] . ' h',
-                $nextcd[$wp]['search_time'] . ' h'
+                $r['search_time'].' h',
+                $nextcd[$wp]['search_time'].' h'
             );
         }
         if ($r['way_length'] != $nextcd[$wp]['way_length']) {
@@ -428,8 +428,8 @@ 
                 $wp_oc,
                 $r,
                 "way",
-                $r['way_length'] . ' km',
-                $nextcd[$wp]['way_length'] . ' km'
+                $r['way_length'].' km',
+                $nextcd[$wp]['way_length'].' km'
             );
         }
         if ($r['wp_gc'] != $nextcd[$wp]['wp_gc']) {
@@ -465,9 +465,9 @@ 
     // attributes
     $rs = sql(
         "SELECT * FROM `caches_attributes_modified`
-         WHERE `cache_id` IN " . $cachelist . "  /* OConly attrib is shown, but not restorable */
+         WHERE `cache_id` IN " . $cachelist."  /* OConly attrib is shown, but not restorable */
          ORDER BY `date_modified` ASC"
-    );   // order doesn't matter as long it is date only
+    ); // order doesn't matter as long it is date only
     while ($r = sql_fetch_assoc($rs)) {
         append_data(
             $data,
@@ -475,7 +475,7 @@ 
             $wp_oc,
             $r,
             "attrib",
-            ($r['was_set'] ? "-" : "+") . labels::getLabelValue('cache_attrib', $r['attrib_id']),
+            ($r['was_set'] ? "-" : "+").labels::getLabelValue('cache_attrib', $r['attrib_id']),
             ''
         );
     }
@@ -513,7 +513,7 @@ 
             LENGTH(`short_desc`) AS `sdl`,
             `restored_by`
         FROM `cache_desc_modified`
-        WHERE `cache_id` IN " . $cachelist . "
+        WHERE `cache_id` IN " . $cachelist."
         ORDER BY `date_modified` DESC"
     );
     // order doesn't matter as long only one change per day is recorded
@@ -535,9 +535,9 @@ 
                 $admins,
                 $wp_oc,
                 $r,
-                "desc(" . $r['language'] . ")",
+                "desc(".$r['language'].")",
                 $r['dl'] + 0,
-                ($next['dl'] + 0) . ' bytes'
+                ($next['dl'] + 0).' bytes'
             );
         }
         if ($r['hl'] + 0 != $next['hl'] + 0) {
@@ -546,9 +546,9 @@ 
                 $admins,
                 $wp_oc,
                 $r,
-                "hint(" . $r['language'] . ")",
+                "hint(".$r['language'].")",
                 $r['hl'] + 0,
-                ($next['hl'] + 0) . ' bytes'
+                ($next['hl'] + 0).' bytes'
             );
         }
         if ($r['sdl'] + 0 != $next['sdl'] + 0) {
@@ -557,9 +557,9 @@ 
                 $admins,
                 $wp_oc,
                 $r,
-                "shortdesc(" . $r['language'] . ")",
+                "shortdesc(".$r['language'].")",
                 $r['sdl'] + 0,
-                ($next['sdl'] + 0) . ' bytes'
+                ($next['sdl'] + 0).' bytes'
             );
         }
 
@@ -582,7 +582,7 @@ 
               (SELECT 1 AS `op`, `deletion_date` AS `date_modified`, `cache_id`,
                     `user_id`, `type`, `date`, `restored_by`
                    FROM `cache_logs_archived`
-                  WHERE `cache_id` IN " . $cachelist . "AND `deleted_by`='&1' AND `user_id`<>'&1'
+                  WHERE `cache_id` IN " . $cachelist."AND `deleted_by`='&1' AND `user_id`<>'&1'
                   UNION
                   SELECT 2 AS `op`, `date_modified`, `cache_id`,
                        (SELECT `user_id` FROM `cache_logs_archived` WHERE `id`=`original_id`),
@@ -590,7 +590,7 @@ 
                        (SELECT `date` FROM `cache_logs_archived` WHERE `id`=`original_id`),
                        `restored_by`
                  FROM `cache_logs_restored`
-                  WHERE `cache_id` IN " . $cachelist . ") `logs`
+                  WHERE `cache_id` IN " . $cachelist.") `logs`
                 INNER JOIN `user` ON `user`.`user_id`=`logs`.`user_id`
               ORDER BY `logs`.`date_modified` ASC",
         // order may not be exact when redoing reverts, because delete and insert
@@ -604,7 +604,7 @@ 
             $wp_oc,
             $r,
             $r["op"] == 1 ? "dellog" : "restorelog",
-            "<a href='viewprofile.php?userid=" . $r['user_id'] . "' target='_blank'>" . $r['username'] . "</a>/" . $r['date'],
+            "<a href='viewprofile.php?userid=".$r['user_id']."' target='_blank'>".$r['username']."</a>/".$r['date'],
             ''
         );
     }
@@ -620,10 +620,10 @@ 
 
     $piccacheid = "IF(`object_type`=2, `object_id`, IF(`object_type`=1, IFNULL((SELECT `cache_id` FROM `cache_logs` WHERE `id`=`object_id`),(SELECT `cache_id` FROM `cache_logs_archived` WHERE `id`=`object_id`)), 0))";
     $rs = sql(
-        "SELECT *, " . $piccacheid . "AS `cache_id` FROM `pictures_modified`
-         WHERE " . $piccacheid . " IN " . $cachelist . "
+        "SELECT *, ".$piccacheid."AS `cache_id` FROM `pictures_modified`
+         WHERE " . $piccacheid." IN ".$cachelist."
          ORDER BY `date_modified` ASC"
-    );  // order is relevant for the case of restore-reverts
+    ); // order is relevant for the case of restore-reverts
     while ($r = sql_fetch_assoc($rs)) {
         $r['date_modified'] = substr($r['date_modified'], 0, 10);
         switch ($r['operation']) {
@@ -645,14 +645,14 @@ 
                 $picchange .= "-cache";
                 break;
         }
-        append_data($data, $admins, $wp_oc, $r, $picchange . "pic", $r['title'], '');
+        append_data($data, $admins, $wp_oc, $r, $picchange."pic", $r['title'], '');
     }
     sql_free_result($rs);
 
     // admins
     foreach ($admins as $adate => $adata) {
         foreach ($adata as $awp => $alist) {
-            $data[$adate][$awp] .= "<br /><strong class='adminrestore'>admins:</strong> " . implode(',', $alist);
+            $data[$adate][$awp] .= "<br /><strong class='adminrestore'>admins:</strong> ".implode(',', $alist);
         }
     }
 
@@ -701,9 +701,9 @@ 
     } else {
         $text .= " class='userchange'";
     }
-    $text .= ">$field</strong>: $oldvalue" . ($newvalue != "" ? " &rarr; $newvalue" : "");
+    $text .= ">$field</strong>: $oldvalue".($newvalue != "" ? " &rarr; $newvalue" : "");
     if (isset($data[$mdate][$wp])) {
-        $data[$mdate][$wp] .= ", " . $text;
+        $data[$mdate][$wp] .= ", ".$text;
     } else {
         $data[$mdate][$wp] = $text;
     }
@@ -716,8 +716,8 @@ 
             $admins[$mdate][$wp] = [];
         }
         $admins[$mdate][$wp][$r['restored_by'] + 0]
-            = "<a href='viewprofile.php?userid=" . $r['restored_by'] . "' target='_blank'>" .
-            sql_value("SELECT `username` FROM `user` WHERE `user_id`='&1'", "", $r['restored_by']) .
+            = "<a href='viewprofile.php?userid=".$r['restored_by']."' target='_blank'>".
+            sql_value("SELECT `username` FROM `user` WHERE `user_id`='&1'", "", $r['restored_by']).
             "</a>";
     }
 }
@@ -727,7 +727,7 @@ 
 {
     global $opt, $login;
 
-    sql("SET @restoredby='&1'", $login->userid);         // is evaluated by trigger functions
+    sql("SET @restoredby='&1'", $login->userid); // is evaluated by trigger functions
     sql_slave("SET @restoredby='&1'", $login->userid);
 
     $restored = array();
@@ -837,12 +837,12 @@ 
                     if ($setfields != "") {
                         $setfields .= ",";
                     }
-                    $setfields .= "`$field`='" . sql_escape($r[$field]) . "'";
+                    $setfields .= "`$field`='".sql_escape($r[$field])."'";
                     $restored[$wp][$field] = true;
                 }
             }
             if ($setfields != "" && !$simulate) {
-                sql("UPDATE `caches` SET " . $setfields . " WHERE `cache_id`='&1'", $cacheid);
+                sql("UPDATE `caches` SET ".$setfields." WHERE `cache_id`='&1'", $cacheid);
             }
         }
         sql_free_result($rs);
@@ -1019,7 +1019,7 @@ 
                         // id, uuid, date_created and last_modified are set automatically;
                         // picture will be updated automatically on picture-restore
                         $log = new cachelog();
-                        $log->setNode($r['node']);  // cachelog class currently does not initialize node field
+                        $log->setNode($r['node']); // cachelog class currently does not initialize node field
                         $log->setCacheId($r['cache_id']);
                         $log->setUserId($r['user_id']);
                         $log->setType($r['type'], true);
@@ -1071,7 +1071,7 @@ 
                 }  // not already processed
 
                 if ($error != "") {
-                    $restored[$wp]['internal error - could not $error log ' + $r['id'] + "/" + $logid];
+                    $restored[$wp]['internal error - could not $error log ' +$r['id'] + "/" +$logid];
                 }
                 if ($logs_restored) {
                     $restored[$wp]['logs'] = true;
@@ -1203,7 +1203,7 @@ 
                 }  // not already processed
 
                 if ($error != "") {
-                    $restored[$wp]['internal error - could not $error picture ' . $r['id'] + "/" + $picid] = true;
+                    $restored[$wp]['internal error - could not $error picture '.$r['id'] + "/" +$picid] = true;
                 }
                 if ($pics_restored) {
                     $restored[$wp]['pictures'] = true;

htdocs/search.php

Doc Comments +4 added lines

@@ -1461,6 +1461,10 @@
         }
 
         // helper function for output modules
+
+        /**
+         * @param string $str
+         */
         function append_output($str)
         {
             global $db, $content, $bUseZip;

Spacing +123 added lines, -123 removed lines

@@ -55,10 +55,10 @@ 
  * - wtf is "expert mode"?
  ****************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
-require __DIR__ . '/lib2/logic/data-license.inc.php';
-require __DIR__ . '/lib2/search/search.inc.php';
-require __DIR__ . '/templates2/' . $opt['template']['style'] . '/search.tpl.inc.php';
+require __DIR__.'/lib2/web.inc.php';
+require __DIR__.'/lib2/logic/data-license.inc.php';
+require __DIR__.'/lib2/search/search.inc.php';
+require __DIR__.'/templates2/'.$opt['template']['style'].'/search.tpl.inc.php';
 
 
 //=========================================================
@@ -128,7 +128,7 @@ 
     }
 }
 
-$queryid += 0;  // safety measure: force $queryid to be numeric
+$queryid += 0; // safety measure: force $queryid to be numeric
 
 
 //=========================================================
@@ -149,7 +149,7 @@ 
     if (sql_num_rows($query_rs) == 0) {
         // can happen if logged out after query was created (fix for RT #3915)
         $queryid = 0;
-        goto newquery;  // goto needs PHP 5.3
+        goto newquery; // goto needs PHP 5.3
         /*
         $tpl->error($error_query_not_found);
         */
@@ -185,7 +185,7 @@ 
         }
 
         // get findername from finderid
-        $options['finderid'] = isset($options['finderid']) ? $options['finderid'] + 0 : 0;  // Ocprop
+        $options['finderid'] = isset($options['finderid']) ? $options['finderid'] + 0 : 0; // Ocprop
         if (isset($options['finder']) && $options['finderid'] > 0) {
             $rs_name = sql("SELECT `username` FROM `user` WHERE `user_id`='&1'", $options['finderid']);
             if (sql_num_rows($rs_name) == 1) {
@@ -197,7 +197,7 @@ 
         }
 
         // get ownername from ownerid
-        $options['ownerid'] = isset($options['ownerid']) ? $options['ownerid'] + 0 : 0;  // Ocprop
+        $options['ownerid'] = isset($options['ownerid']) ? $options['ownerid'] + 0 : 0; // Ocprop
         if (isset($options['owner']) && $options['ownerid'] > 0) {
             $rs_name = sql("SELECT `username` FROM `user` WHERE `user_id`='&1'", $options['ownerid']);
             if (sql_num_rows($rs_name) == 1) {
@@ -226,10 +226,10 @@ 
     }
 
     // get the search options parameters and store them in the queries table (to view "the next page")
-    $options['f_userowner'] = isset($_REQUEST['f_userowner']) ? $_REQUEST['f_userowner'] : 0;  // Ocprop
-    $options['f_userfound'] = isset($_REQUEST['f_userfound']) ? $_REQUEST['f_userfound'] : 0;  // Ocprop
+    $options['f_userowner'] = isset($_REQUEST['f_userowner']) ? $_REQUEST['f_userowner'] : 0; // Ocprop
+    $options['f_userfound'] = isset($_REQUEST['f_userfound']) ? $_REQUEST['f_userfound'] : 0; // Ocprop
     $options['f_disabled'] = isset($_REQUEST['f_disabled']) ? $_REQUEST['f_disabled'] : 0;
-    $options['f_inactive'] = isset($_REQUEST['f_inactive']) ? $_REQUEST['f_inactive'] : 1;  // Ocprop
+    $options['f_inactive'] = isset($_REQUEST['f_inactive']) ? $_REQUEST['f_inactive'] : 1; // Ocprop
     // f_inactive formerly was used for both, archived and disabled caches.
     // After adding the separate f_disabled option, it is used only for archived
     // caches, but keeps its name for compatibility with existing stored or
@@ -237,15 +237,15 @@ 
     $options['f_ignored'] = isset($_REQUEST['f_ignored']) ? $_REQUEST['f_ignored'] : 1;
     $options['f_otherPlatforms'] = isset($_REQUEST['f_otherPlatforms']) ? $_REQUEST['f_otherPlatforms'] : 0;
     $options['f_geokrets'] = isset($_REQUEST['f_geokrets']) ? $_REQUEST['f_geokrets'] : 0;
-    $options['expert'] = isset($_REQUEST['expert']) ? $_REQUEST['expert'] : 0;  // Ocprop: 0
+    $options['expert'] = isset($_REQUEST['expert']) ? $_REQUEST['expert'] : 0; // Ocprop: 0
     $options['showresult'] = isset($_REQUEST['showresult']) ? $_REQUEST['showresult'] : 0;
-    $options['output'] = isset($_REQUEST['output']) ? $_REQUEST['output'] : 'HTML';  // Ocprop: HTML
+    $options['output'] = isset($_REQUEST['output']) ? $_REQUEST['output'] : 'HTML'; // Ocprop: HTML
     $options['bbox'] = isset($_REQUEST['bbox']) ? $_REQUEST['bbox'] : false;
 
     if (isset($_REQUEST['cache_attribs'])) {
         if ($_REQUEST['cache_attribs'] != '') {
             $aAttribs = mb_split(';', $_REQUEST['cache_attribs']);
-            for ($i = 0; $i < count($aAttribs); $i ++) {
+            for ($i = 0; $i < count($aAttribs); $i++) {
                 $options['cache_attribs'][$aAttribs[$i] + 0] = $aAttribs[$i] + 0;
             }
             unset($aAttribs);
@@ -259,7 +259,7 @@ 
     if (isset($_REQUEST['cache_attribs_not'])) {
         if ($_REQUEST['cache_attribs_not'] != '') {
             $aAttribs = mb_split(';', $_REQUEST['cache_attribs_not']);
-            for ($i = 0; $i < count($aAttribs); $i ++) {
+            for ($i = 0; $i < count($aAttribs); $i++) {
                 $options['cache_attribs_not'][$aAttribs[$i] + 0] = $aAttribs[$i] + 0;
             }
             unset($aAttribs);
@@ -297,7 +297,7 @@ 
 
         $options['finderid'] = isset($_REQUEST['finderid']) ? $_REQUEST['finderid'] : 0;
         $options['finder'] = isset($_REQUEST['finder']) ? stripslashes($_REQUEST['finder']) : '';
-        $options['logtype'] = isset($_REQUEST['logtype']) ? $_REQUEST['logtype'] : '1,7';  // Ocprop
+        $options['logtype'] = isset($_REQUEST['logtype']) ? $_REQUEST['logtype'] : '1,7'; // Ocprop
     } elseif (isset($_REQUEST['searchbyortplz'])) {
         $onlydigits = is_numeric($_REQUEST['ortplz']);
         if ($onlydigits == true) {
@@ -363,7 +363,7 @@ 
         if (!$list->allowView($password)) {
             $tpl->redirect("cachelists.php");
         }
-        $options['cachelist'] = cachelist::getListById($options['listid']);  // null for invalid ID
+        $options['cachelist'] = cachelist::getListById($options['listid']); // null for invalid ID
         $options['cachelist_pw'] = $password;
     } elseif (isset($_REQUEST['searchall'])) {
         if (!$login->logged_in() &&
@@ -538,17 +538,17 @@ 
         if ($options['searchtype'] == 'byname') {
             $sql_select[] = '`caches`.`cache_id` `cache_id`';
             $sql_from = '`caches`';
-            $sql_where[] = '`caches`.`name` LIKE \'%' . sql_escape($options['cachename']) . '%\'';
+            $sql_where[] = '`caches`.`name` LIKE \'%'.sql_escape($options['cachename']).'%\'';
         } elseif ($options['searchtype'] == 'byowner') {
             if ($options['ownerid'] != 0) {
                 $sql_select[] = '`caches`.`cache_id` `cache_id`';
                 $sql_from = '`caches`';
-                $sql_where[] = '`user_id`=\'' . sql_escape($options['ownerid']) . '\'';
+                $sql_where[] = '`user_id`=\''.sql_escape($options['ownerid']).'\'';
             } else {
                 $sql_select[] = '`caches`.`cache_id` `cache_id`';
                 $sql_from = '`caches`';
                 $sql_innerjoin[] = '`user` ON `caches`.`user_id`=`user`.`user_id`';
-                $sql_where[] = '`user`.`username`=\'' . sql_escape($options['owner']) . '\'';
+                $sql_where[] = '`user`.`username`=\''.sql_escape($options['owner']).'\'';
             }
         } elseif (($options['searchtype'] == 'byplz') || ($options['searchtype'] == 'byort')) {
             $locid = $options['locid'];
@@ -563,7 +563,7 @@ 
                     $sql =
                         "SELECT `loc_id`
                          FROM `geodb_textdata`
-                         WHERE `text_type`=500300000 AND `text_val`='" . sql_escape($plz) . "'";
+                         WHERE `text_type`=500300000 AND `text_val`='" . sql_escape($plz)."'";
                     $rs = sql($sql);
                     if (sql_num_rows($rs) == 0) {
                         sql_free_result($rs);
@@ -638,9 +638,9 @@ 
                                 if ($sqlhashes != '') {
                                     $sqlhashes .= ' OR ';
                                 }
-                                $sqlhashes .= '`gns_search`.`simplehash`=' . sprintf("%u", crc32($searchstring));
+                                $sqlhashes .= '`gns_search`.`simplehash`='.sprintf("%u", crc32($searchstring));
 
-                                $wordscount ++;
+                                $wordscount++;
                             }
                         }
 
@@ -922,7 +922,7 @@ 
             // needs distinct because there can be multiple matching logs per cache
             $sql_from = '`caches`';
             $sql_innerjoin[] = '`cache_logs` ON `caches`.`cache_id`=`cache_logs`.`cache_id`';
-            $sql_where[] = '`cache_logs`.`user_id`=\'' . sql_escape($finder_id) . '\'';
+            $sql_where[] = '`cache_logs`.`user_id`=\''.sql_escape($finder_id).'\'';
 
             if ($options['logtype'] != '0') { // 0 = all types
                 $ids = explode(',', $options['logtype']);
@@ -933,18 +933,18 @@ 
                     }
                     $idNumbers .= ($id + 0);
                 }
-                $sql_where[] = '`cache_logs`.`type` IN (' . $idNumbers . ')';
+                $sql_where[] = '`cache_logs`.`type` IN ('.$idNumbers.')';
             }
         } elseif ($options['searchtype'] == 'bycacheid') {
             $sql_select[] = '`caches`.`cache_id` `cache_id`';
             $sql_from = '`caches`';
-            $sql_where[] = '`caches`.`cache_id`=\'' . sql_escape($options['cacheid']) . '\'';
+            $sql_where[] = '`caches`.`cache_id`=\''.sql_escape($options['cacheid']).'\'';
         } elseif ($options['searchtype'] == 'bywp') {
             $sql_select[] = '`caches`.`cache_id` `cache_id`';
             $sql_from = '`caches`';
-            $sql_where[] = '`caches`.`wp_oc`=\'' . sql_escape($options['wp']) . '\'';
+            $sql_where[] = '`caches`.`wp_oc`=\''.sql_escape($options['wp']).'\'';
         } elseif ($options['searchtype'] == 'byfulltext') {
-            require_once $opt['rootpath'] . 'lib2/search/ftsearch.inc.php';
+            require_once $opt['rootpath'].'lib2/search/ftsearch.inc.php';
 
             $fulltext = $options['fulltext'];
             $hashes = ftsearch_hash($fulltext);
@@ -982,27 +982,27 @@ 
             $n = 1;
             foreach ($hashes as $k => $h) {
                 if ($n > 1) {
-                    $sql_innerjoin[] = '`search_index` AS `s' . $n . '` ON `s' . ($n - 1) . '`.`cache_id`=`s' . $n . '`.`cache_id`';
+                    $sql_innerjoin[] = '`search_index` AS `s'.$n.'` ON `s'.($n - 1).'`.`cache_id`=`s'.$n.'`.`cache_id`';
                 } else {
                     $sql_innerjoin[] = '`search_index` AS `s1` ON `s1`.`cache_id`=`caches`.`cache_id`';
                 }
 
-                $sql_where[] = '`s' . $n . '`.`hash`=\'' . sql_escape($h) . '\'';
-                $sql_where[] = '`s' . $n . '`.`object_type` IN (' . implode(',', $ft_types) . ')';
+                $sql_where[] = '`s'.$n.'`.`hash`=\''.sql_escape($h).'\'';
+                $sql_where[] = '`s'.$n.'`.`object_type` IN ('.implode(',', $ft_types).')';
 
-                $n ++;
+                $n++;
             }
 
             $sqlFilter =
-                'SELECT DISTINCT ' . implode(',', $sql_select) .
-                ' FROM ' . $sql_from .
-                ' INNER JOIN ' . implode(' INNER JOIN ', $sql_innerjoin) .
-                ' WHERE ' . implode(' AND ', $sql_where);
+                'SELECT DISTINCT '.implode(',', $sql_select).
+                ' FROM '.$sql_from.
+                ' INNER JOIN '.implode(' INNER JOIN ', $sql_innerjoin).
+                ' WHERE '.implode(' AND ', $sql_where);
 
             sql_drop_temp_table_slave('tmpFTCaches');
             sql_temp_table_slave('tmpFTCaches');
             sql_slave(
-                "CREATE TEMPORARY TABLE &tmpFTCaches (`cache_id` int (11) PRIMARY KEY) " . $sqlFilter
+                "CREATE TEMPORARY TABLE &tmpFTCaches (`cache_id` int (11) PRIMARY KEY) ".$sqlFilter
             );
 
             $sql_select = [];
@@ -1026,7 +1026,7 @@ 
                         SELECT `cache_id`
                         FROM `cache_list_items`
                         LEFT JOIN `cache_lists` ON `cache_lists`.`id`=`cache_list_items`.`cache_list_id`
-                        WHERE `cache_list_id`='" . sql_escape($options['listid']) . "'";
+                        WHERE `cache_list_id`='" . sql_escape($options['listid'])."'";
                 sql_slave($cachesFilter);
                 sql_slave('ALTER TABLE &result_caches ADD PRIMARY KEY (`cache_id`)');
 
@@ -1054,7 +1054,7 @@ 
             $options['f_userowner'] = '0';
         }   // Ocprop
         if ($options['f_userowner'] != 0) {
-            $sql_where[] = '`caches`.`user_id`!=\'' . $login->userid . '\'';
+            $sql_where[] = '`caches`.`user_id`!=\''.$login->userid.'\'';
         }
 
         if (!isset($options['f_userfound'])) {
@@ -1066,7 +1066,7 @@ 
                     (SELECT `cache_logs`.`cache_id`
                      FROM `cache_logs`
                      WHERE
-                        `cache_logs`.`user_id`='" . sql_escape($login->userid) . "'
+                        `cache_logs`.`user_id`='" . sql_escape($login->userid)."'
                         AND `cache_logs`.`type` IN (1, 7))";
         }
         if (!isset($options['f_inactive'])) {
@@ -1093,14 +1093,14 @@ 
             if ($options['f_ignored'] != 0) {
                 // only use this filter, if it is realy needed - this enables better caching in map2.php with ignored-filter
                 if (sql_value_slave(
-                    "SELECT COUNT(*) FROM `cache_ignore` WHERE `user_id`='" . sql_escape($login->userid) . "'",
+                    "SELECT COUNT(*) FROM `cache_ignore` WHERE `user_id`='".sql_escape($login->userid)."'",
                     0
                 ) > 0) {
                     $sql_where[] =
                         "`caches`.`cache_id` NOT IN
                             (SELECT `cache_ignore`.`cache_id`
                              FROM `cache_ignore`
-                             WHERE `cache_ignore`.`user_id`='" . sql_escape($login->userid) . "')";
+                             WHERE `cache_ignore`.`user_id`='" . sql_escape($login->userid)."')";
                 }
             }
         }
@@ -1122,7 +1122,7 @@ 
             $options['country'] = '';
         }
         if ($options['country'] != '') {
-            $sql_where[] = '`caches`.`country`=\'' . sql_escape($options['country']) . '\'';
+            $sql_where[] = '`caches`.`country`=\''.sql_escape($options['country']).'\'';
         }
 
         if (!isset($options['language'])) {
@@ -1134,7 +1134,7 @@ 
             $sql_where[] = '`cache_desc`.`language`=\'' . sql_escape($options['language']) . '\'';
             */
             // optimized query:
-            $sql_where[] = 'INSTR(`caches`.`desc_languages`,\'' . sql_escape($options['language']) . '\')';
+            $sql_where[] = 'INSTR(`caches`.`desc_languages`,\''.sql_escape($options['language']).'\')';
         }
 
         if (!isset($options['adm2'])) {
@@ -1142,50 +1142,50 @@ 
         }
         if ($options['adm2'] != '') {
             $sql_innerjoin[] = '`cache_location` ON `cache_location`.`cache_id`=`caches`.`cache_id`';
-            $sql_where[] = '`cache_location`.`code2`=\'' . sql_escape($options['adm2']) . '\'';
+            $sql_where[] = '`cache_location`.`code2`=\''.sql_escape($options['adm2']).'\'';
         }
 
         if ($options['cachetype'] != '') {
             $types = explode(';', $options['cachetype']);
             if (count($types) < sql_value_slave("SELECT COUNT(*) FROM `cache_type`", 0)) {
-                for ($i = 0; $i < count($types); $i ++) {
-                    $types[$i] = "'" . sql_escape($types[$i]) . "'";
+                for ($i = 0; $i < count($types); $i++) {
+                    $types[$i] = "'".sql_escape($types[$i])."'";
                 }
-                $sql_where[] = '`caches`.`type` IN (' . implode(',', $types) . ')';
+                $sql_where[] = '`caches`.`type` IN ('.implode(',', $types).')';
             }
         }
 
         if ($options['cachesize'] != '') {
             $sizes = explode(';', $options['cachesize']);
             if (count($sizes) < sql_value_slave("SELECT COUNT(*) FROM `cache_size`", 0)) {
-                for ($i = 0; $i < count($sizes); $i ++) {
-                    $sizes[$i] = "'" . sql_escape($sizes[$i]) . "'";
+                for ($i = 0; $i < count($sizes); $i++) {
+                    $sizes[$i] = "'".sql_escape($sizes[$i])."'";
                 }
-                $sql_where[] = '`caches`.`size` IN (' . implode(',', $sizes) . ')';
+                $sql_where[] = '`caches`.`size` IN ('.implode(',', $sizes).')';
             }
         }
 
         if ($options['difficultymin'] != 0) {
-            $sql_where[] = '`caches`.`difficulty`>=\'' . sql_escape($options['difficultymin']) . '\'';
+            $sql_where[] = '`caches`.`difficulty`>=\''.sql_escape($options['difficultymin']).'\'';
         }
         if ($options['difficultymax'] != 0) {
-            $sql_where[] = '`caches`.`difficulty`<=\'' . sql_escape($options['difficultymax']) . '\'';
+            $sql_where[] = '`caches`.`difficulty`<=\''.sql_escape($options['difficultymax']).'\'';
         }
         if ($options['terrainmin'] != 0) {
-            $sql_where[] = '`caches`.`terrain`>=\'' . sql_escape($options['terrainmin']) . '\'';
+            $sql_where[] = '`caches`.`terrain`>=\''.sql_escape($options['terrainmin']).'\'';
         }
         if ($options['terrainmax'] != 0) {
-            $sql_where[] = '`caches`.`terrain`<=\'' . sql_escape($options['terrainmax']) . '\'';
+            $sql_where[] = '`caches`.`terrain`<=\''.sql_escape($options['terrainmax']).'\'';
         }
         if ($options['recommendationmin'] > 0) {
             $sql_innerjoin[] = '`stat_caches` ON `caches`.`cache_id`=`stat_caches`.`cache_id`';
-            $sql_where[] = '`stat_caches`.`toprating`>=\'' . sql_escape($options['recommendationmin']) . '\'';
+            $sql_where[] = '`stat_caches`.`toprating`>=\''.sql_escape($options['recommendationmin']).'\'';
         }
 
         if (isset($options['cache_attribs']) && count($options['cache_attribs']) > 0) {
             foreach ($options['cache_attribs'] as $attr) {
-                $sql_innerjoin[] = '`caches_attributes` AS `a' . ($attr + 0) . '` ON `a' . ($attr + 0) . '`.`cache_id`=`caches`.`cache_id`';
-                $sql_where[] = '`a' . ($attr + 0) . '`.`attrib_id`=' . ($attr + 0);
+                $sql_innerjoin[] = '`caches_attributes` AS `a'.($attr + 0).'` ON `a'.($attr + 0).'`.`cache_id`=`caches`.`cache_id`';
+                $sql_where[] = '`a'.($attr + 0).'`.`attrib_id`='.($attr + 0);
             }
         }
 
@@ -1197,7 +1197,7 @@ 
                          FROM `caches_attributes`
                          WHERE
                             `caches_attributes`.`cache_id`=`caches`.`cache_id`
-                            AND `caches_attributes`.`attrib_id`='" . sql_escape($attr + 0) . "'
+                            AND `caches_attributes`.`attrib_id`='" . sql_escape($attr + 0)."'
                         )";
             }
         }
@@ -1206,7 +1206,7 @@ 
             // bbox=<lon_from>,<lat_from>,<lon_to>,<lat_to>
             $coords = explode(',', $options['bbox']);
             if (count($coords) == 4) {
-                $sql_where[] = '`caches`.`longitude`>=' . ($coords[0] + 0) . ' AND `caches`.`latitude`>=' . ($coords[1] + 0) . ' AND `caches`.`longitude`<=' . ($coords[2] + 0) . ' AND `caches`.`latitude`<=' . ($coords[3] + 0);
+                $sql_where[] = '`caches`.`longitude`>='.($coords[0] + 0).' AND `caches`.`latitude`>='.($coords[1] + 0).' AND `caches`.`longitude`<='.($coords[2] + 0).' AND `caches`.`latitude`<='.($coords[3] + 0);
             }
         }
 
@@ -1215,23 +1215,23 @@ 
             $sql_where[] =
                 '(`cache_status`.`allow_user_view`=1 OR `caches`.`user_id`='
                 . sql_escape($login->userid)
-                . ' OR (`caches`.`status`<>5 AND ' . ($login->hasAdminPriv(ADMIN_USER) ? '1' : '0') . '))';
+                . ' OR (`caches`.`status`<>5 AND '.($login->hasAdminPriv(ADMIN_USER) ? '1' : '0').'))';
         } else {
             $sql_where[] = '`cache_status`.`allow_user_view`=1';
         }
 
         //do the search
-        $innerjoin = sizeof($sql_innerjoin) ? ' INNER JOIN ' . implode(' INNER JOIN ', $sql_innerjoin) : '';
-        $leftjoin = sizeof($sql_leftjoin) ? ' LEFT JOIN ' . implode(' LEFT JOIN ', $sql_leftjoin) : '';
-        $group = sizeof($sql_group) ? ' GROUP BY ' . implode(', ', $sql_group) : '';
-        $having = sizeof($sql_having) ? ' HAVING ' . implode(' AND ', $sql_having) : '';
-
-        $sqlFilter = 'SELECT ' . implode(',', $sql_select) .
-            ' FROM ' . $sql_from .
-            $innerjoin .
-            $leftjoin .
-            ' WHERE ' . implode(' AND ', $sql_where) .
-            $group .
+        $innerjoin = sizeof($sql_innerjoin) ? ' INNER JOIN '.implode(' INNER JOIN ', $sql_innerjoin) : '';
+        $leftjoin = sizeof($sql_leftjoin) ? ' LEFT JOIN '.implode(' LEFT JOIN ', $sql_leftjoin) : '';
+        $group = sizeof($sql_group) ? ' GROUP BY '.implode(', ', $sql_group) : '';
+        $having = sizeof($sql_having) ? ' HAVING '.implode(' AND ', $sql_having) : '';
+
+        $sqlFilter = 'SELECT '.implode(',', $sql_select).
+            ' FROM '.$sql_from.
+            $innerjoin.
+            $leftjoin.
+            ' WHERE '.implode(' AND ', $sql_where).
+            $group.
             $having;
 
         // echo "DEBUG ".$sqlFilter." DEBUG<br>";
@@ -1243,7 +1243,7 @@ 
     //  X6. load output module and output-dependent options
     //=================================================================
 
-    $output_module = mb_strtolower($options['output']);  // Ocprop: HTML, gpx
+    $output_module = mb_strtolower($options['output']); // Ocprop: HTML, gpx
 
     $map2_bounds = ($output_module == 'map2bounds');
     if ($map2_bounds) {
@@ -1252,7 +1252,7 @@ 
 
     if ($map2_bounds && $options['queryid'] == 0) {
         $tpl->error('map2bounds requires queryid');
-    } elseif (!file_exists($opt['rootpath'] . 'lib2/search/search.' . $output_module . '.inc.php')) {
+    } elseif (!file_exists($opt['rootpath'].'lib2/search/search.'.$output_module.'.inc.php')) {
         $tpl->error($outputformat_notexist);
     }
 
@@ -1278,7 +1278,7 @@ 
     // (map2 module will execute and exit; it will use the variables
     // $cachesFilter, $sqlFilter and $map2_bounds and $options['queryid'].)
 
-    require $opt['rootpath'] . 'lib2/search/search.' . $output_module . '.inc.php';
+    require $opt['rootpath'].'lib2/search/search.'.$output_module.'.inc.php';
 
     if (!isset($search_output_file_download)) {
         die("search_output_file_download flag not set for '$output_module' search");
@@ -1303,7 +1303,7 @@ 
             $lat_rad * 180 / 3.14159,
             0,
             $multiplier[$distance_unit]
-        ) . ' `distance`, ';
+        ).' `distance`, ';
     } else {
         if (!$login->logged_in()) {
             $sql .= 'NULL distance, ';
@@ -1326,7 +1326,7 @@ 
                     $record_coords['latitude'],
                     0,
                     $multiplier[$distance_unit]
-                ) . ' `distance`, ';
+                ).' `distance`, ';
             }
             sql_free_result($rs_coords);
         }
@@ -1336,7 +1336,7 @@ 
         $sAddFields .= ', MAX(`cache_logs`.`date`) AS `lastLog`';
         $sAddJoin .= ' LEFT JOIN `cache_logs` ON `caches`.`cache_id`=`cache_logs`.`cache_id`';
         if ($options['sort'] == 'bymylastlog') {
-            $sAddJoin .= ' AND `cache_logs`.`user_id`=' . sql_escape($login->userid);
+            $sAddJoin .= ' AND `cache_logs`.`user_id`='.sql_escape($login->userid);
         }
         $sGroupBy .= ' GROUP BY `caches`.`cache_id`';
     }
@@ -1352,8 +1352,8 @@ 
         . ' FROM `caches`
           LEFT JOIN `stat_caches` ON `caches`.`cache_id`=`stat_caches`.`cache_id`' .
         $sAddJoin
-        . ' WHERE `caches`.`cache_id` IN (' . $sqlFilter . ')' .
-        $sAddWhere . ' ' .
+        . ' WHERE `caches`.`cache_id` IN ('.$sqlFilter.')'.
+        $sAddWhere.' '.
         $sGroupBy;
     $sortby = $options['sort'];
 
@@ -1418,7 +1418,7 @@ 
         $count = 500;
     }
 
-    $sqlLimit = ' LIMIT ' . $startat . ', ' . $count;
+    $sqlLimit = ' LIMIT '.$startat.', '.$count;
 
     if ($search_output_file_download) {
         //===================================================================
@@ -1429,7 +1429,7 @@ 
         // for the case something went wrong and it was not propery cleaned up
 
         sql_temp_table_slave('searchtmp');
-        sql_slave("CREATE TEMPORARY TABLE &searchtmp SELECT " . $sql . $sqlLimit);
+        sql_slave("CREATE TEMPORARY TABLE &searchtmp SELECT ".$sql.$sqlLimit);
 
         $count = sql_value_slave("SELECT COUNT(*) FROM &searchtmp", 0);
         if ($count == 1) {
@@ -1441,7 +1441,7 @@ 
                 '?'
             );
         } else {
-            $sFilebasename = 'ocde' . $options['queryid'];
+            $sFilebasename = 'ocde'.$options['queryid'];
         }
 
         $bUseZip = ($count > $zip_threshold) ||
@@ -1452,11 +1452,11 @@ 
 
         if (!$db['debug']) {
             if ($bUseZip) {
-                header('Content-type: ' . $content_type_zipped);
-                header('Content-disposition: attachment; filename="' . $sFilebasename . '.zip"');
+                header('Content-type: '.$content_type_zipped);
+                header('Content-disposition: attachment; filename="'.$sFilebasename.'.zip"');
             } else {
-                header('Content-type: ' . $content_type_plain);
-                header('Content-disposition: attachment; filename="' . $sFilebasename . '.' . $output_module . '"');
+                header('Content-type: '.$content_type_plain);
+                header('Content-disposition: attachment; filename="'.$sFilebasename.'.'.$output_module.'"');
             }
         }
 
@@ -1489,9 +1489,9 @@ 
         // output zip file
         if ($bUseZip && !$db['debug']) {
             if ($add_to_zipfile) {
-                $phpzip->add_data($sFilebasename . '.' . $output_module, $content);
+                $phpzip->add_data($sFilebasename.'.'.$output_module, $content);
             }
-            echo $phpzip->save($sFilebasename . '.zip', 'r');
+            echo $phpzip->save($sFilebasename.'.zip', 'r');
         }
     } else {
         //===================================================================
@@ -1565,14 +1565,14 @@ 
     $cachesFilter =
         "CREATE TEMPORARY TABLE &result_caches ENGINE=MEMORY
             SELECT
-                (" . geomath::getSqlDistanceFormula($lon, $lat, $distance, $multiplier[$distance_unit]) . ") `distance`,
+                (" . geomath::getSqlDistanceFormula($lon, $lat, $distance, $multiplier[$distance_unit]).") `distance`,
                 `caches`.`cache_id` `cache_id`
             FROM `caches` FORCE INDEX (`latitude`)
             WHERE
-                `longitude` > " . ($lon - $max_lon_diff) . "
-                AND `longitude` < " . ($lon + $max_lon_diff) . "
-                AND `latitude` > " . ($lat - $max_lat_diff) . "
-                AND `latitude` < " . ($lat + $max_lat_diff) . "
+                `longitude` > " . ($lon - $max_lon_diff)."
+                AND `longitude` < " . ($lon + $max_lon_diff)."
+                AND `latitude` > " . ($lat - $max_lat_diff)."
+                AND `latitude` < " . ($lat + $max_lat_diff)."
             HAVING `distance` < " . ($distance + 0);
     sql_slave($cachesFilter);
     sql_slave("ALTER TABLE &result_caches ADD PRIMARY KEY ( `cache_id` )");
@@ -1687,7 +1687,7 @@ 
             $rs = sql(
                 "SELECT `latitude`, `longitude`
                  FROM `user`
-                 WHERE `user_id`='" . sql_escape($login->userid) . "'"
+                 WHERE `user_id`='" . sql_escape($login->userid)."'"
             );
             $record = sql_fetch_array($rs);
             $lon = $record['longitude'];
@@ -1785,9 +1785,9 @@ 
     }
     $tpl->assign('ortplz', $ortplz);
     if ($options['searchtype'] == 'byplz') {
-        $dByOrtPlzChecked = ($options['searchtype'] == 'byplz');  // Ocprop
+        $dByOrtPlzChecked = ($options['searchtype'] == 'byplz'); // Ocprop
     } elseif ($options['searchtype'] == 'byort') {
-        $dByOrtPlzChecked = ($options['searchtype'] == 'byort');  // Ocprop
+        $dByOrtPlzChecked = ($options['searchtype'] == 'byort'); // Ocprop
     } else {
         $dByOrtPlzChecked = false;
     }
@@ -1856,8 +1856,8 @@ 
         $rCachetype['checked'] =
             ($options['cachetype'] == '')
             || (strpos(
-                ';' . $options['cachetype'] . ';',
-                ';' . $rCachetype['id'] . ';'
+                ';'.$options['cachetype'].';',
+                ';'.$rCachetype['id'].';'
             ) !== false);
         $rCachetype['unchecked'] = !$rCachetype['checked'];
     }
@@ -1870,8 +1870,8 @@ 
     while ($r = sql_fetch_assoc($rs)) {
         $cachesizes[$r['id']]['checked'] =
             (strpos(
-                ';' . $options['cachesize'] . ';',
-                ';' . $r['id'] . ';'
+                ';'.$options['cachesize'].';',
+                ';'.$r['id'].';'
             ) !== false)
             || ($options['cachesize'] == '');
     }
@@ -2022,7 +2022,7 @@ 
             $line = mb_ereg_replace('{color}', $rAttrGroup['color'], $line);
 
             $group_line .= $line;
-            $nLineAttrCount2 ++;
+            $nLineAttrCount2++;
         }
         sql_free_result($rs);
 
@@ -2133,7 +2133,7 @@ 
             $line = mb_ereg_replace('{color}', $rAttrGroup['color'], $line);
 
             $group_line .= $line;
-            $nLineAttrCount1 ++;
+            $nLineAttrCount1++;
         }
         sql_free_result($rs);
 
@@ -2255,7 +2255,7 @@ 
             $pnew = '';
             foreach ($param as $p) {
                 if ($pnew != '') {
-                    $pnew .= ';' . $p;
+                    $pnew .= ';'.$p;
                 } else {
                     $pnew .= $p;
                 }
@@ -2265,9 +2265,9 @@ 
         }
 
         if ($urlparamString != '') {
-            $urlparamString .= '&' . $name . '=' . urlencode($param);
+            $urlparamString .= '&'.$name.'='.urlencode($param);
         } else {
-            $urlparamString = $name . '=' . urlencode($param);
+            $urlparamString = $name.'='.urlencode($param);
         }
     }
     $urlparamString .= '';
@@ -2278,13 +2278,13 @@ 
 
 function outputUniidSelectionForm($uniSql, $options)
 {
-    global $tpl;  // settings
+    global $tpl; // settings
     global $locline, $secondlocationname;
 
     $urlparamString = prepareLocSelectionForm($options);
 
     sql_temp_table_slave('uniids');
-    sql_slave("CREATE TEMPORARY TABLE &uniids ENGINE=MEMORY " . $uniSql);
+    sql_slave("CREATE TEMPORARY TABLE &uniids ENGINE=MEMORY ".$uniSql);
     sql_slave("ALTER TABLE &uniids ADD PRIMARY KEY (`uni_id`)");
 
     // locidsite
@@ -2297,7 +2297,7 @@ 
     $tpl->assign('resultscount', $count);
 
     // create page browser
-    $pager = new pager('search.php?' . $urlparamString . '&locidsite={offset}');
+    $pager = new pager('search.php?'.$urlparamString.'&locidsite={offset}');
     $pager->make_from_offset($locidsite, ceil($count / 20), 1);
 
     // create locations list
@@ -2317,7 +2317,7 @@ 
          FROM `gns_locations`, &uniids
          WHERE &uniids.`uni_id`=`gns_locations`.`uni`
          ORDER BY `gns_locations`.`full_name` ASC
-         LIMIT " . ($locidsite * 20) . ", 20"
+         LIMIT " . ($locidsite * 20).", 20"
     );
 
     $nr = $locidsite * 20 + 1;
@@ -2354,7 +2354,7 @@ 
         $thislocation = mb_ereg_replace('{parentlocations}', $locString, $thislocation);
 
         // koordinaten ermitteln
-        $coordString = help_latToDegreeStr($r['lat']) . ' ' . help_lonToDegreeStr($r['lon']);
+        $coordString = help_latToDegreeStr($r['lat']).' '.help_lonToDegreeStr($r['lon']);
         $thislocation = mb_ereg_replace('{coords}', htmlspecialchars($coordString, ENT_COMPAT, 'UTF-8'), $thislocation);
 
         if ($r['olduni'] != 0) {
@@ -2384,12 +2384,12 @@ 
             htmlspecialchars($r['full_name'], ENT_COMPAT, 'UTF-8'),
             $thislocation
         );
-        $thislocation = mb_ereg_replace('{urlparams}', $urlparamString . '&locid={locid}', $thislocation);
+        $thislocation = mb_ereg_replace('{urlparams}', $urlparamString.'&locid={locid}', $thislocation);
         $thislocation = mb_ereg_replace('{locid}', urlencode($r['uni_id']), $thislocation);
         $thislocation = mb_ereg_replace('{nr}', $nr, $thislocation);
 
-        $nr ++;
-        $locations .= $thislocation . "\n";
+        $nr++;
+        $locations .= $thislocation."\n";
     }
     sql_free_result($rs);
     sql_drop_temp_table_slave('uniids');
@@ -2406,12 +2406,12 @@ 
     global $tpl;
     global $locline, $bgcolor1, $bgcolor2;
 
-    require_once __DIR__ . '/lib2/logic/geodb.inc.php';
+    require_once __DIR__.'/lib2/logic/geodb.inc.php';
 
-    $urlparamString = prepareLocSelectionForm($options) . '&locid={locid}';
+    $urlparamString = prepareLocSelectionForm($options).'&locid={locid}';
 
     sql_temp_table_slave('locids');
-    sql_slave("CREATE TEMPORARY TABLE &locids ENGINE=MEMORY " . $locSql);
+    sql_slave("CREATE TEMPORARY TABLE &locids ENGINE=MEMORY ".$locSql);
     sql_slave("ALTER TABLE &locids ADD PRIMARY KEY (`loc_id`)");
 
     $rs = sql_slave(
@@ -2439,12 +2439,12 @@ 
 
         $rb = GeoDb::regierungsbezirkFromLocid($r['loc_id']);
         if ($rb != '') {
-            $locString .= ' &gt; ' . htmlspecialchars($rb, ENT_COMPAT, 'UTF-8');
+            $locString .= ' &gt; '.htmlspecialchars($rb, ENT_COMPAT, 'UTF-8');
         }
 
         $lk = GeoDb::landkreisFromLocid($r['loc_id']);
         if ($lk != '') {
-            $locString .= ' &gt; ' . htmlspecialchars($lk, ENT_COMPAT, 'UTF-8');
+            $locString .= ' &gt; '.htmlspecialchars($lk, ENT_COMPAT, 'UTF-8');
         }
 
         $thislocation = mb_ereg_replace('{parentlocations}', $locString, $thislocation);
@@ -2459,9 +2459,9 @@ 
             $r['loc_id']
         );
         if ($rCoords = sql_fetch_array($rsCoords)) {
-            $coordString = help_latToDegreeStr($rCoords['lat']) . ' ' . help_lonToDegreeStr($rCoords['lon']);
+            $coordString = help_latToDegreeStr($rCoords['lat']).' '.help_lonToDegreeStr($rCoords['lon']);
         } else {
-            $coordString = '[' . $no_location_coords . ']';
+            $coordString = '['.$no_location_coords.']';
         }
 
         $thislocation = mb_ereg_replace('{coords}', htmlspecialchars($coordString, ENT_COMPAT, 'UTF-8'), $thislocation);
@@ -2481,8 +2481,8 @@ 
             $thislocation = mb_ereg_replace('{bgcolor}', $bgcolor2, $thislocation);
         }
 
-        $nr ++;
-        $locations .= $thislocation . "\n";
+        $nr++;
+        $locations .= $thislocation."\n";
     }
 
     $tpl->assign('locations', $locations);

Braces +24 added lines, -12 removed lines

@@ -84,7 +84,8 @@ 
 $called_by_search = isset($_REQUEST['calledbysearch']) ? $_REQUEST['calledbysearch'] <> 0 : true;
 $called_by_profile_query = false;
 
-if (isset($_REQUEST['queryid']) || isset($_REQUEST['showresult'])) {  // Ocprop: showresult, queryid
+if (isset($_REQUEST['queryid']) || isset($_REQUEST['showresult'])) {
+// Ocprop: showresult, queryid
     $bCookieQueryid = false;
     $queryid = isset($_REQUEST['queryid']) ? $_REQUEST['queryid'] : 0;
     if ($queryid &&
@@ -208,7 +209,8 @@ 
             sql_free_result($rs_name);
         }
     }
-} else {  // $queryid == 0
+} else {
+// $queryid == 0
     // build search options from GET/POST parameters or default values
 
     // hack
@@ -287,12 +289,14 @@ 
         if (!isset($_REQUEST['utf8'])) {
             $options['cachename'] = iconv("ISO-8859-1", "UTF-8", $options['cachename']);
         }
-    } elseif (isset($_REQUEST['searchbyowner'])) { // Ocprop
+    } elseif (isset($_REQUEST['searchbyowner'])) {
+// Ocprop
         $options['searchtype'] = 'byowner';
 
         $options['ownerid'] = isset($_REQUEST['ownerid']) ? $_REQUEST['ownerid'] : 0;
         $options['owner'] = isset($_REQUEST['owner']) ? stripslashes($_REQUEST['owner']) : '';
-    } elseif (isset($_REQUEST['searchbyfinder'])) { // Ocprop
+    } elseif (isset($_REQUEST['searchbyfinder'])) {
+// Ocprop
         $options['searchtype'] = 'byfinder';
 
         $options['finderid'] = isset($_REQUEST['finderid']) ? $_REQUEST['finderid'] : 0;
@@ -437,7 +441,8 @@ 
 $bRememberQuery = isset($_REQUEST['skipqueryid']) ? !$_REQUEST['skipqueryid'] : true;
 // This is used by the map, which implements its own query-caching.
 if ($bRememberQuery) {
-    if ($queryid == 0 && $options['showresult'] != 0) { // 'showresult' = "execute query"
+    if ($queryid == 0 && $options['showresult'] != 0) {
+// 'showresult' = "execute query"
         sql(
             "INSERT INTO `queries` (`user_id`, `options`, `last_queried`) VALUES (0, '&1', NOW())",
             serialize($options)
@@ -854,7 +859,8 @@ 
                 outputSearchForm($options);
                 exit;
             }
-        } elseif ($options['searchtype'] == 'bydistance') { // Ocprop
+        } elseif ($options['searchtype'] == 'bydistance') {
+// Ocprop
             //check the entered data
             if (isset($options['lat']) && isset($options['lon'])) {
                 $lat = $options['lat'] + 0;
@@ -924,7 +930,8 @@ 
             $sql_innerjoin[] = '`cache_logs` ON `caches`.`cache_id`=`cache_logs`.`cache_id`';
             $sql_where[] = '`cache_logs`.`user_id`=\'' . sql_escape($finder_id) . '\'';
 
-            if ($options['logtype'] != '0') { // 0 = all types
+            if ($options['logtype'] != '0') {
+// 0 = all types
                 $ids = explode(',', $options['logtype']);
                 $idNumbers = '0';
                 foreach ($ids as $id) {
@@ -1405,7 +1412,8 @@ 
     }
 
     $count = $caches_per_page;
-    if (isset($_REQUEST['count'])) { // Ocprop
+    if (isset($_REQUEST['count'])) {
+// Ocprop
         $count = floor($_REQUEST['count'] + 0);
     }
     if ($count == 'max') {
@@ -1525,7 +1533,8 @@ 
     } else {
         exit;
     }
-} else { // $options['showresult'] == 0
+} else {
+// $options['showresult'] == 0
     //=============================================================
     //  F5. present search options form to the user
     //=============================================================
@@ -1597,7 +1606,8 @@ 
 
     if (isset($options['sort'])) {
         $bBynameChecked = ($options['sort'] == 'byname');
-    } else { // Ocprop
+    } else {
+// Ocprop
         $bBynameChecked = (!$login->logged_in());
     }
     $tpl->assign('byname_checked', $bBynameChecked);
@@ -1759,7 +1769,8 @@ 
     }
     if ($options['searchtype'] == 'bydistance') {
         $dByDistanceChecked = ($options['searchtype'] == 'bydistance');
-    } else { // Ocprop
+    } else {
+// Ocprop
         $dByDistanceChecked = false;
     }
     $tpl->assign('dbydistance_checked', $dByDistanceChecked);
@@ -1800,7 +1811,8 @@ 
     );
     if ($options['searchtype'] == 'bywaypoint') {
         $dByWaypointChecked = ($options['searchtype'] == 'bywaypoint');
-    } else { // Ocprop
+    } else {
+// Ocprop
         $dByWaypointChecked = false;
     }
     $tpl->assign('dbywaypoint_checked', $dByWaypointChecked);

htdocs/src/Oc/Libse/ChildWp/PresenterChildWp.php

Doc Comments +6 added lines

@@ -54,6 +54,9 @@ 
         $this->onDoSubmit($this->coordinate->getCoordinate(), $this->getDesc());
     }
 
+    /**
+     * @param \Oc\Libse\Coordinate\CoordinateCoordinate $coordinate
+     */
     abstract protected function onDoSubmit($coordinate, $description);
 
     protected function getType()
@@ -74,6 +77,9 @@ 
         $this->typeImages = $childWpHandler->getChildNamesAndImages();
     }
 
+    /**
+     * @param \Oc\Libse\Coordinate\CoordinateCoordinate $coords
+     */
     public function initCoordinate($coords)
     {
         $this->coordinate->init($coords->latitude(), $coords->longitude());

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 use Oc\Libse\Validator\AlwaysValidValidator;
 use Oc\Libse\Validator\ArrayValidator;
 
-require_once __DIR__ . '/../../../../lib2/error.inc.php';
+require_once __DIR__.'/../../../../lib2/error.inc.php';
 
 abstract class PresenterChildWp
 {

htdocs/src/Oc/Libse/Coordinate/PresenterCoordinate.php

Doc Comments +6 added lines

@@ -35,6 +35,9 @@ 
         $this->init(0, 0);
     }
 
+    /**
+     * @param boolean $request
+     */
     private function initRequest($request)
     {
         if ($request) {
@@ -44,6 +47,9 @@ 
         return new RequestHttp();
     }
 
+    /**
+     * @param boolean $translator
+     */
     private function initTranslator($translator)
     {
         if ($translator) {

htdocs/src/Oc/SmartyPlugins/prefilter.t.php

Doc Comments +8 added lines

@@ -84,6 +84,11 @@ 
 /* $block ... {t[ a=$a|nbsp b="a" ...]}
  *
  */
+/**
+ * @param string $block
+ * @param string $message
+ * @param integer $line
+ */
 function smarty_prefilter_t_process_block($block, $message, &$smarty, $line)
 {
     if ($message != '') {
@@ -252,6 +257,9 @@ 
     return $attrs;
 }
 
+/**
+ * @param string[] $needles
+ */
 function smarty_prefilter_t_strpos_multi($haystack, $needles)
 {
     $arg = func_get_args();

Spacing +12 added lines, -12 removed lines

@@ -57,10 +57,10 @@ 
     $end = 0;
     while (($start = smarty_prefilter_t_strpos_multi(
             $source,
-            [$smarty->left_delimiter . 't ', $smarty->left_delimiter . 't' . $smarty->right_delimiter],
+            [$smarty->left_delimiter.'t ', $smarty->left_delimiter.'t'.$smarty->right_delimiter],
             $end
         )) !== false) {
-        $end = mb_strpos($source, $smarty->left_delimiter . '/t' . $smarty->right_delimiter, $start);
+        $end = mb_strpos($source, $smarty->left_delimiter.'/t'.$smarty->right_delimiter, $start);
         $block_t = mb_substr($source, $start, $end - $start);
 
         $messgage_start = mb_strrpos($block_t, '}') + 1;
@@ -72,7 +72,7 @@ 
         );
 
         $output .= mb_substr($source, $output_start, $start - $output_start);
-        $output_start = $end + mb_strlen($smarty->left_delimiter . $smarty->right_delimiter) + 2;
+        $output_start = $end + mb_strlen($smarty->left_delimiter.$smarty->right_delimiter) + 2;
 
         $output .= $block_t;
     }
@@ -116,11 +116,11 @@ 
                     if ($block != '') {
                         $block .= ' ';
                     }
-                    $block .= $k . '=' . $v;
+                    $block .= $k.'='.$v;
                 }
 
                 // pass it to block.t
-                return $smarty->left_delimiter . 't ' . $block . $smarty->right_delimiter . $message . $smarty->left_delimiter . '/t' . $smarty->right_delimiter;
+                return $smarty->left_delimiter.'t '.$block.$smarty->right_delimiter.$message.$smarty->left_delimiter.'/t'.$smarty->right_delimiter;
             }
             unset($attrs['plural']);
             unset($attrs['count']);
@@ -148,7 +148,7 @@ 
 
     /* Tokenize tag attributes. */
     preg_match_all(
-        '~(?:' . $smarty->_obj_call_regexp . '|' . $smarty->_qstr_regexp . ' | (?>[^"\'=\s]+)
+        '~(?:'.$smarty->_obj_call_regexp.'|'.$smarty->_qstr_regexp.' | (?>[^"\'=\s]+)
                       )+ |
                       [=]
                     ~x',
@@ -206,16 +206,16 @@ 
                             if ($token == 'null') {
                                 $token = 'null';
                             } else {
-                                if (preg_match('~^' . $smarty->_num_const_regexp . '|0[xX][0-9a-fA-F]+$~', $token)) {
+                                if (preg_match('~^'.$smarty->_num_const_regexp.'|0[xX][0-9a-fA-F]+$~', $token)) {
                                     /* treat integer literally */
                                 } else {
                                     if (!preg_match(
-                                        '~^' . $smarty->_obj_call_regexp . '|' . $smarty->_var_regexp . '(?:' . $smarty->_mod_regexp . ')*$~',
+                                        '~^'.$smarty->_obj_call_regexp.'|'.$smarty->_var_regexp.'(?:'.$smarty->_mod_regexp.')*$~',
                                         $token
                                     )
                                     ) {
                                         /* treat as a string, double-quote it escaping quotes */
-                                        $token = '"' . addslashes($token) . '"';
+                                        $token = '"'.addslashes($token).'"';
                                     }
                                 }
                             }
@@ -299,12 +299,12 @@ 
     $number = 1;
     foreach ($attrs as $attr) {
         if (is_numeric($attr)) {
-            $trans = mb_ereg_replace('%' . $number, $attr, $trans);
+            $trans = mb_ereg_replace('%'.$number, $attr, $trans);
         } else {
-            $trans = mb_ereg_replace('%' . $number, $smarty->left_delimiter . $attr . $smarty->right_delimiter, $trans);
+            $trans = mb_ereg_replace('%'.$number, $smarty->left_delimiter.$attr.$smarty->right_delimiter, $trans);
         }
 
-        $number ++;
+        $number++;
     }
 
     return $trans;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 
                 // rebuild block with replaced plural
                 $block = '';
-                foreach ($attrs AS $k => $v) {
+                foreach ($attrs as $k => $v) {
                     if ($block != '') {
                         $block .= ' ';
                     }