OpencachingDeutschland / oc-server3

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 .= ' ';
                     }

htdocs/translate.php

Doc Comments +16 added lines

@@ -245,6 +245,9 @@ 
 /* $truncatLastInsert = true   for downloaded file
  * $truncatLastInsert = false  to sign self generated file (in function export)
  */
+/**
+ * @param boolean $truncateLastInsert
+ */
 function calcDataSqlChecksum($truncateLastInsert)
 {
     global $opt;
@@ -390,6 +393,10 @@ 
     $tpl->redirect('translate.php?translang=' . $translang);
 }
 
+/**
+ * @param string $relbasedir
+ * @param string $ext
+ */
 function unlinkFiles($relbasedir, $ext)
 {
     global $opt;
@@ -481,6 +488,9 @@ 
     $tpl->redirect('translate.php?translang=' . $translang);
 }
 
+/**
+ * @param integer $freeId
+ */
 function useId($freeId)
 {
     $lastId = sql_value("SELECT MAX(`id`) FROM `sys_trans`", 0);
@@ -490,6 +500,9 @@ 
     setId($lastId, $freeId);
 }
 
+/**
+ * @param integer $oldId
+ */
 function setId($oldId, $newId)
 {
     global $transIdCols;
@@ -568,6 +581,9 @@ 
     $tpl->redirect('translate.php?translang=' . $translang);
 }
 
+/**
+ * @param string $dir
+ */
 function enumSqlFiles($dir)
 {
     $retval = [];

Switch Indentation +100 added lines, -100 removed lines

@@ -86,69 +86,69 @@ 
 }
 
 switch ($action) {
-    case 'selectlang':
-        break;
+        case 'selectlang':
+            break;
 
-    case 'verify':
-        verify();
-        break;
+        case 'verify':
+            verify();
+            break;
 
-    case 'resetids':
-        resetIds();
-        break;
+        case 'resetids':
+            resetIds();
+            break;
 
-    case 'clearcache':
-        clearCache();
-        break;
+        case 'clearcache':
+            clearCache();
+            break;
 
-    case 'export':
-        export();
-        break;
+        case 'export':
+            export();
+            break;
 
-    case 'xmlexport':
-        xmlexport();
-        break;
+        case 'xmlexport':
+            xmlexport();
+            break;
 
-    case 'xmlimport':
-        break;
+        case 'xmlimport':
+            break;
 
-    case 'xmlimport2':
-        xmlimport2();
-        break;
+        case 'xmlimport2':
+            xmlimport2();
+            break;
 
-    case 'xmlimport3':
-        xmlimport3();
-        break;
+        case 'xmlimport3':
+            xmlimport3();
+            break;
 
-    case 'textexportnew':
-        textexport($translang, false);
-        break;
+        case 'textexportnew':
+            textexport($translang, false);
+            break;
 
-    case 'textexportall':
-        textexport($translang, true);
-        break;
+        case 'textexportall':
+            textexport($translang, true);
+            break;
 
-    case 'textimport':
-        break;
+        case 'textimport':
+            break;
 
-    case 'textimport2':
-        textimport($translang);
-        break;
+        case 'textimport2':
+            textimport($translang);
+            break;
 
-    case 'edit':
-        if (!$access->mayTranslate($translang)) {
-            $tpl->error(ERROR_NO_ACCESS);
-        }
-        edit();
-        break;
+        case 'edit':
+            if (!$access->mayTranslate($translang)) {
+                $tpl->error(ERROR_NO_ACCESS);
+            }
+            edit();
+            break;
 
-    case 'copy_en':
-        copy_english_texts();
-        break;
+        case 'copy_en':
+            copy_english_texts();
+            break;
 
-    case 'listfaults':
-        $trans = sql(
-            "SELECT
+        case 'listfaults':
+            $trans = sql(
+                "SELECT
                 `sys_trans`.`id`,
                 `sys_trans`.`text`
              FROM `sys_trans`
@@ -156,14 +156,14 @@ 
                 ON `sys_trans`.`id`=`sys_trans_ref`.`trans_id`
              WHERE ISNULL(`sys_trans_ref`.`trans_id`)
              ORDER BY `sys_trans`.`id` DESC"
-        );
-        $tpl->assign_rs('trans', $trans);
-        sql_free_result($trans);
-        break;
+            );
+            $tpl->assign_rs('trans', $trans);
+            sql_free_result($trans);
+            break;
 
-    case 'listall':
-        $trans = sql(
-            "SELECT
+        case 'listall':
+            $trans = sql(
+                "SELECT
                 `sys_trans`.`id`,
                 `sys_trans`.`text`,
                 `sys_trans_text`.`text` AS `trans`
@@ -172,48 +172,48 @@ 
                 ON `sys_trans`.`id`=`sys_trans_text`.`trans_id`
                 AND `sys_trans_text`.`lang`='&1'
              ORDER BY `sys_trans`.`id` DESC",
-            $translang
-        );
-        $tpl->assign_rs('trans', $trans);
-        sql_free_result($trans);
-        break;
+                $translang
+            );
+            $tpl->assign_rs('trans', $trans);
+            sql_free_result($trans);
+            break;
 
-    case 'remove':
-        if (!$access->mayTranslate($translang)) {
-            $tpl->error(ERROR_NO_ACCESS);
-        }
-        remove();
-        break;
-
-    case 'scan':
-        scan();
-        break;
-
-    case 'scanstart':
-        scanStart();
-        break;
-
-    case 'scanfile':
-        $filename = isset($_REQUEST['filename']) ? $_REQUEST['filename'] : '';
-        scanFile($filename);
-        exit;
-
-    case 'quicknone':
-        $cookie->un_set('translate_mode');
-        break;
-
-    case 'quicknew':
-        $cookie->set('translate_mode', 'new');
-        break;
-
-    case 'quickall':
-        $cookie->set('translate_mode', 'all');
-        break;
-
-    default:
-        $action = 'listnew';
-        $trans = sql(
-            "SELECT DISTINCT
+        case 'remove':
+            if (!$access->mayTranslate($translang)) {
+                $tpl->error(ERROR_NO_ACCESS);
+            }
+            remove();
+            break;
+
+        case 'scan':
+            scan();
+            break;
+
+        case 'scanstart':
+            scanStart();
+            break;
+
+        case 'scanfile':
+            $filename = isset($_REQUEST['filename']) ? $_REQUEST['filename'] : '';
+            scanFile($filename);
+            exit;
+
+        case 'quicknone':
+            $cookie->un_set('translate_mode');
+            break;
+
+        case 'quicknew':
+            $cookie->set('translate_mode', 'new');
+            break;
+
+        case 'quickall':
+            $cookie->set('translate_mode', 'all');
+            break;
+
+        default:
+            $action = 'listnew';
+            $trans = sql(
+                "SELECT DISTINCT
                 `sys_trans`.`id`,
                 `sys_trans`.`text`
              FROM `sys_trans`
@@ -224,10 +224,10 @@ 
                 ON `sys_trans`.`id`=`sys_trans_ref`.`trans_id`
              WHERE ISNULL(`sys_trans_text`.`trans_id`) OR `sys_trans_text`.`text`=''
              ORDER BY `sys_trans`.`id` DESC",
-            $translang
-        );
-        $tpl->assign_rs('trans', $trans);
-        sql_free_result($trans);
+                $translang
+            );
+            $tpl->assign_rs('trans', $trans);
+            sql_free_result($trans);
 }
 
 $languages = [];

Spacing +48 added lines, -48 removed lines

@@ -5,9 +5,9 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
-require_once __DIR__ . '/lib2/translate.class.php';
-require_once __DIR__ . '/lib2/translationHandler.class.php';
+require __DIR__.'/lib2/web.inc.php';
+require_once __DIR__.'/lib2/translate.class.php';
+require_once __DIR__.'/lib2/translationHandler.class.php';
 
 /* config section
  */
@@ -249,11 +249,11 @@ 
 {
     global $opt;
 
-    if (!file_exists($opt['rootpath'] . '../sql/static-data/data.sql')) {
+    if (!file_exists($opt['rootpath'].'../sql/static-data/data.sql')) {
         return '';
     }
 
-    $content = file_get_contents($opt['rootpath'] . '../sql/static-data/data.sql');
+    $content = file_get_contents($opt['rootpath'].'../sql/static-data/data.sql');
 
     // at the end is an INSERT of the current checksum
     // to calculate this checksum, we have to trim the end before that statement and the linefeed before
@@ -282,7 +282,7 @@ 
     sql("DELETE FROM `sys_trans_text` WHERE `trans_id`='&1'", $id);
     sql("DELETE FROM `sys_trans_ref` WHERE `trans_id`='&1'", $id);
 
-    $tpl->redirect('translate.php?translang=' . $translang);
+    $tpl->redirect('translate.php?translang='.$translang);
 }
 
 function edit()
@@ -311,7 +311,7 @@ 
             );
         }
         sql_free_result($rs);
-        $tpl->redirect('translate.php?translang=' . $translang . '&action=edit&id=' . $id);
+        $tpl->redirect('translate.php?translang='.$translang.'&action=edit&id='.$id);
     } else {
         if (isset($_REQUEST['submit'])) {
             $transText = isset($_REQUEST['transText']) ? $_REQUEST['transText'] : '';
@@ -347,14 +347,14 @@ 
 
     // built sql string to search for texts with little difference (levensthein() would be better, but not available in MYSQL)
     $sWhereSql =
-        "SOUNDEX('" . sql_escape($r['text']) . "')=SOUNDEX(`sys_trans`.`text`)
-         OR SOUNDEX('" . sql_escape($r['text']) . "')=SOUNDEX(`sys_trans_text`.`text`)";
+        "SOUNDEX('".sql_escape($r['text'])."')=SOUNDEX(`sys_trans`.`text`)
+         OR SOUNDEX('" . sql_escape($r['text'])."')=SOUNDEX(`sys_trans_text`.`text`)";
 
     $trans = sql(
         "SELECT DISTINCT `sys_trans`.`id`, `sys_trans`.`text`
          FROM `sys_trans`
          INNER JOIN `sys_trans_text` ON `sys_trans`.`id`=`sys_trans_text`.`trans_id`
-         WHERE `sys_trans`.`id`!='&1' AND (" . $sWhereSql . ")",
+         WHERE `sys_trans`.`id`!='&1' AND (" . $sWhereSql.")",
         $id
     );
     $tpl->assign_rs('trans', $trans);
@@ -387,7 +387,7 @@ 
 
     $translationHandler->createMessageFiles();
 
-    $tpl->redirect('translate.php?translang=' . $translang);
+    $tpl->redirect('translate.php?translang='.$translang);
 }
 
 function unlinkFiles($relbasedir, $ext)
@@ -398,12 +398,12 @@ 
         $relbasedir .= '/';
     }
 
-    if ($opt['rootpath'] . $relbasedir) {
-        if ($dh = opendir($opt['rootpath'] . $relbasedir)) {
+    if ($opt['rootpath'].$relbasedir) {
+        if ($dh = opendir($opt['rootpath'].$relbasedir)) {
             while (($file = readdir($dh)) !== false) {
-                if ($file != '.' && $file != '..' && is_file($opt['rootpath'] . $relbasedir . $file)) {
-                    if (substr($file, - (strlen($ext) + 1), strlen($ext) + 1) == '.' . $ext) {
-                        unlink($opt['rootpath'] . $relbasedir . $file);
+                if ($file != '.' && $file != '..' && is_file($opt['rootpath'].$relbasedir.$file)) {
+                    if (substr($file, - (strlen($ext) + 1), strlen($ext) + 1) == '.'.$ext) {
+                        unlink($opt['rootpath'].$relbasedir.$file);
                     }
                 }
             }
@@ -478,7 +478,7 @@ 
     $lastId = sql_value("SELECT MAX(`id`) FROM `sys_trans`", 0);
     sql("ALTER TABLE `sys_trans` AUTO_INCREMENT = &1", $lastId + 1);
 
-    $tpl->redirect('translate.php?translang=' . $translang);
+    $tpl->redirect('translate.php?translang='.$translang);
 }
 
 function useId($freeId)
@@ -500,9 +500,9 @@ 
 
     foreach ($transIdCols as $col) {
         sql(
-            "UPDATE `" . $col['table'] . "`
-             SET `" . $col['trans_id'] . "`='&1'
-             WHERE `" . $col['trans_id'] . "`='&2'",
+            "UPDATE `".$col['table']."`
+             SET `" . $col['trans_id']."`='&1'
+             WHERE `" . $col['trans_id']."`='&2'",
             $newId,
             $oldId
         );
@@ -513,9 +513,9 @@ 
 {
     global $opt, $tpl, $translang;
 
-    $structure = enumSqlFiles($opt['rootpath'] . '../sql/tables');
+    $structure = enumSqlFiles($opt['rootpath'].'../sql/tables');
     foreach ($structure AS $sTable) {
-        sql_export_structure_to_file($opt['rootpath'] . '../sql/tables/' . $sTable . '.sql', $sTable);
+        sql_export_structure_to_file($opt['rootpath'].'../sql/tables/'.$sTable.'.sql', $sTable);
     }
 
     // static data tables
@@ -551,21 +551,21 @@ 
     $stab[] = 'towns';
     $stab[] = 'watches_waitingtypes';
 
-    sql_export_tables_to_file($opt['rootpath'] . '../sql/static-data/data.sql', $stab);
+    sql_export_tables_to_file($opt['rootpath'].'../sql/static-data/data.sql', $stab);
 
     $checksum = calcDataSqlChecksum(false);
-    $f = fopen($opt['rootpath'] . '../sql/static-data/data.sql', 'a');
+    $f = fopen($opt['rootpath'].'../sql/static-data/data.sql', 'a');
     fwrite(
         $f,
         "INSERT INTO `sysconfig` (`name`, `value`)"
-        . " VALUES ('datasql_checksum', '" . sql_escape($checksum) . "')"
-        . " ON DUPLICATE KEY UPDATE `value`='" . sql_escape($checksum) . "';\n"
+        . " VALUES ('datasql_checksum', '".sql_escape($checksum)."')"
+        . " ON DUPLICATE KEY UPDATE `value`='".sql_escape($checksum)."';\n"
     );
     fclose($f);
 
     setSysConfig('datasql_checksum', $checksum);
 
-    $tpl->redirect('translate.php?translang=' . $translang);
+    $tpl->redirect('translate.php?translang='.$translang);
 }
 
 function enumSqlFiles($dir)
@@ -594,9 +594,9 @@ 
         $hDir = opendir($dir);
         if ($hDir !== false) {
             while (($file = readdir($hDir)) !== false) {
-                if (is_file($dir . '/' . $file)) {
+                if (is_file($dir.'/'.$file)) {
                     if ((substr($file, - 4) == '.tpl') || (substr($file, - 4) == '.php')) {
-                        $files[] = $dir . '/' . $file;
+                        $files[] = $dir.'/'.$file;
                     }
                 }
             }
@@ -690,7 +690,7 @@ 
         $writer->writeAttribute('id', $r['id']);
 
         $writer->writeElement('code', $r['text']);
-        for ($n = 0; $n < count($lang); $n ++) {
+        for ($n = 0; $n < count($lang); $n++) {
             $writer->writeElement(
                 $lang[$n],
                 sql_value(
@@ -712,9 +712,9 @@ 
         while ($rUsage = sql_fetch_assoc($rsUsage)) {
             $line = '';
             if ($rUsage['line'] != 0) {
-                $line = ' (' . $rUsage['line'] . ')';
+                $line = ' ('.$rUsage['line'].')';
             }
-            $writer->writeElement('usage', $rUsage['resource_name'] . $line);
+            $writer->writeElement('usage', $rUsage['resource_name'].$line);
         }
         sql_free_result($rsUsage);
 
@@ -738,7 +738,7 @@ 
 
     $scanlang = [];
     foreach ($opt['locale'] AS $k => $v) {
-        if (isset($_REQUEST['lang' . $k]) && ($_REQUEST['lang' . $k] == '1')) {
+        if (isset($_REQUEST['lang'.$k]) && ($_REQUEST['lang'.$k] == '1')) {
             $scanlang[] = $k;
         }
     }
@@ -818,15 +818,15 @@ 
 
     $nCount = isset($_REQUEST['count']) ? $_REQUEST['count'] + 0 : 0;
 
-    for ($nIndex = 1; $nIndex <= $nCount; $nIndex ++) {
-        if (isset($_REQUEST['useitem' . $nIndex]) && ($_REQUEST['useitem' . $nIndex] == '1')) {
-            $sCode = base64_decode($_REQUEST['code' . $nIndex]);
+    for ($nIndex = 1; $nIndex <= $nCount; $nIndex++) {
+        if (isset($_REQUEST['useitem'.$nIndex]) && ($_REQUEST['useitem'.$nIndex] == '1')) {
+            $sCode = base64_decode($_REQUEST['code'.$nIndex]);
             $transId = sql_value("SELECT `id` FROM `sys_trans` WHERE `text`='&1'", 0, $sCode);
 
             if ($transId != 0) {
                 foreach ($opt['locale'] AS $k => $v) {
-                    if (isset($_REQUEST[$k . $nIndex . 'new'])) {
-                        $sText = base64_decode($_REQUEST[$k . $nIndex . 'new']);
+                    if (isset($_REQUEST[$k.$nIndex.'new'])) {
+                        $sText = base64_decode($_REQUEST[$k.$nIndex.'new']);
 
                         sql(
                             "INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`)
@@ -842,7 +842,7 @@ 
         }
     }
 
-    $tpl->redirect('translate.php?translang=' . $translang);
+    $tpl->redirect('translate.php?translang='.$translang);
 }
 
 function textexport($translang, $all)
@@ -872,9 +872,9 @@ 
             $translang
         );
         if (($all) || (mb_strlen($translated) == 0)) {
-            $thisline = $r['id'] . "\r\n";
-            $thisline .= $r['text'] . "\r\n";
-            $thisline .= $translated . "\r\n";
+            $thisline = $r['id']."\r\n";
+            $thisline .= $r['text']."\r\n";
+            $thisline .= $translated."\r\n";
             $thisline .= "\r\n";
             echo($thisline);
         }
@@ -1010,8 +1010,8 @@ 
     }
 
     while (($file = readdir($hDir)) !== false) {
-        if ($file != '.' && $file != '..' && is_dir($basedir . $file)) {
-            addClassesDirectoriesToDirlist($basedir . $file);
+        if ($file != '.' && $file != '..' && is_dir($basedir.$file)) {
+            addClassesDirectoriesToDirlist($basedir.$file);
         }
     }
     closedir($hDir);
@@ -1026,9 +1026,9 @@ 
         if (!isset($col['verify']) || $col['verify']) {
             $rs = sql(
                 "SELECT
-                    `" . $col['text'] . "` `text`,
-                    `" . $col['trans_id'] . "` `trans_id`
-                 FROM `" . $col['table'] . "`"
+                    `" . $col['text']."` `text`,
+                    `" . $col['trans_id']."` `trans_id`
+                 FROM `" . $col['table']."`"
             );
             while ($r = sql_fetch_assoc($rs)) {
                 $st = sql_value(
@@ -1048,7 +1048,7 @@ 
                 if ($en != $r['text'] || $st != $r['text']) {
                     $inconsistencies[] = [
                         'id' => $r['trans_id'],
-                        'col' => $col['table'] . '.' . $col['text'],
+                        'col' => $col['table'].'.'.$col['text'],
                         'org_text' => $r['text'],
                         'sys_trans' => $st,
                         'en_text' => $en,

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

@@ -231,7 +231,7 @@ 
 }
 
 $languages = [];
-foreach ($opt['locale'] AS $k => $v) {
+foreach ($opt['locale'] as $k => $v) {
     if ($access->mayTranslate($k)) {
         $languages[] = $k;
     }
@@ -514,7 +514,7 @@ 
     global $opt, $tpl, $translang;
 
     $structure = enumSqlFiles($opt['rootpath'] . '../sql/tables');
-    foreach ($structure AS $sTable) {
+    foreach ($structure as $sTable) {
         sql_export_structure_to_file($opt['rootpath'] . '../sql/tables/' . $sTable . '.sql', $sTable);
     }
 
@@ -590,7 +590,7 @@ 
     global $tpl, $msDirlist;
 
     $files = [];
-    foreach ($msDirlist AS $dir) {
+    foreach ($msDirlist as $dir) {
         $hDir = opendir($dir);
         if ($hDir !== false) {
             while (($file = readdir($hDir)) !== false) {
@@ -625,7 +625,7 @@ 
     /* check if supplied filename is within allowed path!
      */
     $bFound = false;
-    foreach ($msDirlist AS $dir) {
+    foreach ($msDirlist as $dir) {
         if (substr($dir, - 1) != '/') {
             $dir .= '/';
         }
@@ -651,7 +651,7 @@ 
     $transFileScan = new translate_filescan($filename);
     $transFileScan->parse();
 
-    foreach ($transFileScan->textlist AS $item) {
+    foreach ($transFileScan->textlist as $item) {
         $translationHandler->addText($item['text'], $filename, $item['line']);
     }
 
@@ -666,7 +666,7 @@ 
     header('Content-Disposition:attachment;filename="translation.xml"');
 
     $lang = [];
-    foreach ($opt['template']['locales'] AS $k => $v) {
+    foreach ($opt['template']['locales'] as $k => $v) {
         $lang[] = $k;
     }
 
@@ -737,7 +737,7 @@ 
     }
 
     $scanlang = [];
-    foreach ($opt['locale'] AS $k => $v) {
+    foreach ($opt['locale'] as $k => $v) {
         if (isset($_REQUEST['lang' . $k]) && ($_REQUEST['lang' . $k] == '1')) {
             $scanlang[] = $k;
         }
@@ -758,10 +758,10 @@ 
      */
     $saTexts = [];
 
-    foreach ($doc->documentElement->childNodes AS $textnode) {
+    foreach ($doc->documentElement->childNodes as $textnode) {
         if ($textnode->nodeType == XML_ELEMENT_NODE) {
             $codeElements = $textnode->getElementsByTagName('code');
-            foreach ($scanlang AS $lang) {
+            foreach ($scanlang as $lang) {
                 $langElements = $textnode->getElementsByTagName($lang);
 
                 $sCodeText = $codeElements->item(0)->nodeValue;
@@ -824,7 +824,7 @@ 
             $transId = sql_value("SELECT `id` FROM `sys_trans` WHERE `text`='&1'", 0, $sCode);
 
             if ($transId != 0) {
-                foreach ($opt['locale'] AS $k => $v) {
+                foreach ($opt['locale'] as $k => $v) {
                     if (isset($_REQUEST[$k . $nIndex . 'new'])) {
                         $sText = base64_decode($_REQUEST[$k . $nIndex . 'new']);
 

htdocs/util/notification/run_notify.php

Doc Comments +3 added lines

@@ -197,6 +197,9 @@
     return 0;
 }
 
+/**
+ * @param string $domain
+ */
 function is_existent_maildomain($domain)
 {
     $smtp_serverlist = [];

Spacing +17 added lines, -17 removed lines

@@ -10,15 +10,15 @@ 
  ***************************************************************************/
 
 // needs absolute rootpath because called as cronjob
-$rootpath = __DIR__ . '/../../';
+$rootpath = __DIR__.'/../../';
 
-require_once $rootpath . 'lib/clicompatbase.inc.php';
-require_once $rootpath . 'lib2/translate.class.php';
-require_once __DIR__ . '/settings.inc.php';
-require_once $rootpath . 'lib/consts.inc.php';
-require_once $rootpath . 'lib2/ProcessSync.class.php';
-require_once $rootpath . 'lib/logic.inc.php';
-require_once $rootpath . 'lib2/logic/geomath.class.php';
+require_once $rootpath.'lib/clicompatbase.inc.php';
+require_once $rootpath.'lib2/translate.class.php';
+require_once __DIR__.'/settings.inc.php';
+require_once $rootpath.'lib/consts.inc.php';
+require_once $rootpath.'lib2/ProcessSync.class.php';
+require_once $rootpath.'lib/logic.inc.php';
+require_once $rootpath.'lib2/logic/geomath.class.php';
 
 if (!cronjobs_enabled()) {
     exit;
@@ -86,7 +86,7 @@ 
     switch ($notify['type']) {
         case notify_new_cache: // Type: new cache
             $mailbody = fetch_email_template('notify_newcache', $notify['recp_lang'], $notify['recp_domain']);
-            $mailsubject = '[' . $maildomain . '] ' .
+            $mailsubject = '['.$maildomain.'] '.
                 $translate->t(
                     $notify['oconly'] ? 'New OConly cache:' : 'New cache:',
                     '',
@@ -95,13 +95,13 @@ 
                     '',
                     1,
                     $notify['recp_lang']
-                ) .
-                ' ' . $notify['cachename'];
+                ).
+                ' '.$notify['cachename'];
             break;
 
         case notify_new_oconly: // Type: new OConly flag
             $mailbody = fetch_email_template('notify_newoconly', $notify['recp_lang'], $notify['recp_domain']);
-            $mailsubject = '[' . $maildomain . '] ' .
+            $mailsubject = '['.$maildomain.'] '.
                 $translate->t(
                     'Cache was marked as OConly:',
                     '',
@@ -110,8 +110,8 @@ 
                     '',
                     1,
                     $notify['recp_lang']
-                ) .
-                ' ' . $notify['cachename'];
+                ).
+                ' '.$notify['cachename'];
             break;
 
         default:
@@ -175,7 +175,7 @@ 
         );
 
         /* begin send out everything that has to be sent */
-        $email_headers = 'From: "' . $mailfrom . '" <' . $mailfrom . '>';
+        $email_headers = 'From: "'.$mailfrom.'" <'.$mailfrom.'>';
 
         // send email
         if ($debug == true) {
@@ -188,11 +188,11 @@ 
             mb_send_mail($mailadr, $mailsubject, $mailbody, $email_headers);
         }
     } else {
-        echo "Unknown notification type: " . $notify['type'] . "<br />";
+        echo "Unknown notification type: ".$notify['type']."<br />";
     }
 
     // logentry($module, $eventid, $userid, $objectid1, $objectid2, $logtext, $details)
-    logentry('notify_newcache', 8, $notify['recid'], $notify['cache_id'], 0, 'Sending mail to ' . $mailadr, []);
+    logentry('notify_newcache', 8, $notify['recid'], $notify['cache_id'], 0, 'Sending mail to '.$mailadr, []);
 
     return 0;
 }

htdocs/util/watchlist/runwatch.php

Doc Comments +6 added lines

@@ -484,6 +484,9 @@ 
     );
 }
 
+/**
+ * @param string $watchtext
+ */
 function insert_maintenance_flags($rLog, $language, $watchtext)
 {
     global $translate;
@@ -510,6 +513,9 @@ 
     return mb_ereg_replace('{maintenance_flags}', $flagtext, $watchtext);
 }
 
+/**
+ * @param string $domain
+ */
 function is_existent_maildomain($domain)
 {
     $smtp_serverlist = [];

Spacing +32 added lines, -32 removed lines

@@ -12,13 +12,13 @@ 
  ***************************************************************************/
 
 // needs absolute rootpath because called as cronjob
-$rootpath = __DIR__ . '/../../';
-require_once $rootpath . 'lib/clicompatbase.inc.php';
-require_once $rootpath . 'lib2/translate.class.php';
-require_once __DIR__ . '/settings.inc.php';
-require_once $rootpath . 'lib/consts.inc.php';
-require_once $rootpath . 'lib/logic.inc.php';
-require_once $rootpath . 'lib2/edithelper.inc.php';
+$rootpath = __DIR__.'/../../';
+require_once $rootpath.'lib/clicompatbase.inc.php';
+require_once $rootpath.'lib2/translate.class.php';
+require_once __DIR__.'/settings.inc.php';
+require_once $rootpath.'lib/consts.inc.php';
+require_once $rootpath.'lib/logic.inc.php';
+require_once $rootpath.'lib2/edithelper.inc.php';
 
 if (!cronjobs_enabled()) {
     exit;
@@ -51,7 +51,7 @@ 
     WHERE cache_logs.cache_id=caches.cache_id
     AND cache_logs.owner_notified=0"
 );
-for ($i = 0; $i < mysql_num_rows($rsNewLogs); $i ++) {
+for ($i = 0; $i < mysql_num_rows($rsNewLogs); $i++) {
     $rNewLog = sql_fetch_array($rsNewLogs);
 
     $rsNotified = sql(
@@ -102,7 +102,7 @@ 
     // See http://forum.opencaching.de/index.php?topic=3123.0 on AOL.
     if (sqlValue(
         "SELECT `email_problems` = 0 OR DATEDIFF(NOW(),`last_email_problem`) > 1+DATEDIFF(`last_email_problem`,`first_email_problem`)
-                        FROM `user` WHERE `user_id`='" . sql_escape($rcw['user_id']) . "'",
+                        FROM `user` WHERE `user_id`='" . sql_escape($rcw['user_id'])."'",
         1
     )) {
         process_log_watch($rcw['user_id'], $rcw['log_id']);
@@ -115,7 +115,7 @@ 
 
 /* begin send out everything that has to be sent */
 
-$email_headers = 'From: "' . $mailfrom . '" <' . $mailfrom . '>';
+$email_headers = 'From: "'.$mailfrom.'" <'.$mailfrom.'>';
 
 $rsUsers = sql(
     "SELECT
@@ -134,7 +134,7 @@ 
     WHERE `user`.`watchmail_nextmail`<NOW()",
     $opt['template']['default']['locale']
 );
-for ($i = 0; $i < mysql_num_rows($rsUsers); $i ++) {
+for ($i = 0; $i < mysql_num_rows($rsUsers); $i++) {
     $rUser = sql_fetch_array($rsUsers);
 
     if ($rUser['watchmail_nextmail'] != '0000-00-00 00:00:00') {
@@ -158,7 +158,7 @@ 
                 );
                 if (mysql_num_rows($rsWatchesOwner) > 0) {
                     $logtexts = '';
-                    for ($j = 0; $j < mysql_num_rows($rsWatchesOwner); $j ++) {
+                    for ($j = 0; $j < mysql_num_rows($rsWatchesOwner); $j++) {
                         $rWatch = sql_fetch_array($rsWatchesOwner);
                         $logtexts .= $rWatch['watchtext'];
                     }
@@ -183,7 +183,7 @@ 
                 );
                 if (mysql_num_rows($rsWatchesLog) > 0) {
                     $logtexts = '';
-                    for ($j = 0; $j < mysql_num_rows($rsWatchesLog); $j ++) {
+                    for ($j = 0; $j < mysql_num_rows($rsWatchesLog); $j++) {
                         $rWatch = sql_fetch_array($rsWatchesLog);
                         $logtexts .= $rWatch['watchtext'];
                     }
@@ -208,7 +208,7 @@ 
                 if ($mailadr != '') {
                     if (is_existent_maildomain(getToMailDomain($mailadr))) {
                         $language = $rUser['language'] ? $rUser['language'] : $opt['template']['default']['locale'];
-                        $mailsubject = '[' . $maildomain . '] ' . $translate->t(
+                        $mailsubject = '['.$maildomain.'] '.$translate->t(
                                 'Your watchlist of',
                                 '',
                                 basename(__FILE__),
@@ -216,11 +216,11 @@ 
                                 '',
                                 1,
                                 $language
-                            ) . ' ' . date($opt['locale'][$language]['format']['phpdate']);
+                            ).' '.date($opt['locale'][$language]['format']['phpdate']);
                         mb_send_mail($mailadr, $mailsubject, $mailbody, $email_headers);
 
                         // logentry($module, $eventid, $userid, $objectid1, $objectid2, $logtext, $details)
-                        logentry('watchlist', 2, $rUser['user_id'], 0, 0, 'Sending mail to ' . $mailadr, []);
+                        logentry('watchlist', 2, $rUser['user_id'], 0, 0, 'Sending mail to '.$mailadr, []);
                     }
                 }
 
@@ -319,7 +319,7 @@ 
 
     $logtext = html2plaintext($rLog['text'], $rLog['text_html'] == 0, EMAIL_LINEWRAP);
 
-    $language = sqlValue("SELECT `language` FROM `user` WHERE `user_id`='" . sql_escape($user_id) . "'", null);
+    $language = sqlValue("SELECT `language` FROM `user` WHERE `user_id`='".sql_escape($user_id)."'", null);
     if (!$language) {
         $language = $opt['template']['default']['locale'];
     }
@@ -329,7 +329,7 @@ 
         $dateformat = $opt['locale'][$language]['format']['phpdatetime'];
     }
 
-    $watchtext = '{date} ' . $translate->t(
+    $watchtext = '{date} '.$translate->t(
             '{user} has logged your cache "{cachename}":',
             '',
             basename(__FILE__),
@@ -337,7 +337,7 @@ 
             '',
             1,
             $language
-        ) . ' {action}{maintenance_flags}' . "\n" . '{shortlink_url}{wp_oc}' . "\n\n" . '{text}' . "\n\n\n\n";
+        ).' {action}{maintenance_flags}'."\n".'{shortlink_url}{wp_oc}'."\n\n".'{text}'."\n\n\n\n";
 
     $watchtext = mb_ereg_replace('{date}', date($dateformat, strtotime($rLog['logdate'])), $watchtext);
     $watchtext = mb_ereg_replace('{wp_oc}', $rLog['wp_oc'], $watchtext);
@@ -347,7 +347,7 @@ 
     $watchtext = mb_ereg_replace('{action}', get_logtype_name($rLog['type'], $language), $watchtext);
     $watchtext = insert_maintenance_flags($rLog, $language, $watchtext);
 
-    $domain = sqlValue("SELECT `domain` FROM `user` WHERE `user_id`='" . sql_escape($user_id) . "'", null);
+    $domain = sqlValue("SELECT `domain` FROM `user` WHERE `user_id`='".sql_escape($user_id)."'", null);
     $urls = get_site_urls($domain);
     if ($urls['shortlink_url']) {
         $watchtext = mb_ereg_replace("{shortlink_url}", $urls['shortlink_url'], $watchtext);
@@ -401,7 +401,7 @@ 
 
     $logtext = html2plaintext($rLog['text'], $rLog['text_html'] == 0, EMAIL_LINEWRAP);
 
-    $language = sqlValue("SELECT `language` FROM `user` WHERE `user_id`='" . sql_escape($user_id) . "'", null);
+    $language = sqlValue("SELECT `language` FROM `user` WHERE `user_id`='".sql_escape($user_id)."'", null);
     if (!$language) {
         $language = $opt['template']['default']['locale'];
     }
@@ -411,7 +411,7 @@ 
         $dateformat = $opt['locale'][$language]['format']['phpdatetime'];
     }
 
-    $watchtext = '{date} ' . $translate->t(
+    $watchtext = '{date} '.$translate->t(
             '{user} has logged the cache "{cachename}":',
             '',
             basename(__FILE__),
@@ -419,7 +419,7 @@ 
             '',
             1,
             $language
-        ) . ' {action}{maintenance_flags}' . "\n" . '{shortlink_url}{wp_oc}' . "\n{cachelists}\n" . '{text}' . "\n\n\n\n";
+        ).' {action}{maintenance_flags}'."\n".'{shortlink_url}{wp_oc}'."\n{cachelists}\n".'{text}'."\n\n\n\n";
 
     $watchtext = mb_ereg_replace('{date}', date($dateformat, strtotime($rLog['logdate'])), $watchtext);
     $watchtext = mb_ereg_replace('{wp_oc}', $rLog['wp_oc'], $watchtext);
@@ -451,7 +451,7 @@ 
                     '',
                     1,
                     $language
-                ) . ' ' . $cachelist_names[0] . "\n";
+                ).' '.$cachelist_names[0]."\n";
             break;
         default:
             $cachelists = $translate->t(
@@ -462,11 +462,11 @@ 
                     '',
                     1,
                     $language
-                ) . ' ' . implode(', ', $cachelist_names) . "\n";
+                ).' '.implode(', ', $cachelist_names)."\n";
     }
     $watchtext = mb_ereg_replace('{cachelists}', $cachelists, $watchtext);
 
-    $domain = sqlValue("SELECT `domain` FROM `user` WHERE `user_id`='" . sql_escape($user_id) . "'", null);
+    $domain = sqlValue("SELECT `domain` FROM `user` WHERE `user_id`='".sql_escape($user_id)."'", null);
     $urls = get_site_urls($domain);
     if ($urls['shortlink_url']) {
         $watchtext = mb_ereg_replace("{shortlink_url}", $urls['shortlink_url'], $watchtext);
@@ -557,7 +557,7 @@ 
     }
 
     if (file_exists($PidFile)) {
-        echo "Error: Pidfile (" . $PidFile . ") already present at " . __FILE__ . ":" . __LINE__ . "!\n";
+        echo "Error: Pidfile (".$PidFile.") already present at ".__FILE__.":".__LINE__."!\n";
 
         return false;
     } else {
@@ -567,7 +567,7 @@ 
 
             return true;
         } else {
-            echo "can't create Pidfile $PidFile at " . __FILE__ . ":" . __LINE__ . "!\n";
+            echo "can't create Pidfile $PidFile at ".__FILE__.":".__LINE__."!\n";
 
             return false;
         }
@@ -583,7 +583,7 @@ 
         $pid_daemon = fgets($pidfile, 20);
         fclose($pidfile);
 
-        $pid_daemon = (int) $pid_daemon;
+        $pid_daemon = (int)$pid_daemon;
 
         // process running?
         if (posix_kill($pid_daemon, 0)) {
@@ -592,7 +592,7 @@ 
             false;
         } else {
             // no, remove pid_file
-            echo "process not running, removing old pid_file (" . $PidFile . ")\n";
+            echo "process not running, removing old pid_file (".$PidFile.")\n";
             unlink($PidFile);
 
             return true;
@@ -614,10 +614,10 @@ 
             unlink($PidFile);
         }
     } else {
-        echo "Error: can't delete own pidfile (" . $PidFile . ") at " . __FILE__ . ":" . __LINE__ . "!\n";
+        echo "Error: can't delete own pidfile (".$PidFile.") at ".__FILE__.":".__LINE__."!\n";
     }
 
     if ($message) {
-        echo $message . "\n";
+        echo $message."\n";
     }
 }

htdocs/util2/cron/modules/geokrety.class.php

Doc Comments +32 added lines

@@ -61,6 +61,10 @@ 
 
     /* remove given file
      */
+
+    /**
+     * @param string $file
+     */
     public function removeXML($file)
     {
         @unlink($file);
@@ -68,6 +72,10 @@ 
 
     /* import the given XML file
      */
+
+    /**
+     * @param string $file
+     */
     public function importXML($file)
     {
         global $opt;
@@ -124,6 +132,9 @@ 
         setSysConfig('geokrety_lastupdate', date($opt['db']['dateformat'], strtotime($startupdate)));
     }
 
+    /**
+     * @param DOMNode $element
+     */
     public function importGeoKret($element)
     {
         global $opt;
@@ -204,6 +215,9 @@ 
     }
 
 
+    /**
+     * @param DOMNode $element
+     */
     public function importMove($element)
     {
         global $opt;
@@ -292,6 +306,9 @@ 
     }
 
 
+    /**
+     * @param integer $id
+     */
     public function checkGeoKretType($id, $name)
     {
         sql(
@@ -302,6 +319,9 @@ 
     }
 
 
+    /**
+     * @param integer $id
+     */
     public function checkUser($id, $name)
     {
         if ($id == 0) {
@@ -312,6 +332,9 @@ 
     }
 
 
+    /**
+     * @param integer $id
+     */
     public function checkMoveType($id, $name)
     {
         sql(
@@ -322,6 +345,9 @@ 
     }
 
 
+    /**
+     * @param string $element
+     */
     public function GetNodeValue(&$domnode, $element)
     {
         $subnode = $domnode->getElementsByTagName($element);
@@ -333,6 +359,12 @@ 
     }
 
 
+    /**
+     * @param string $element
+     * @param string $attr
+     *
+     * @return string
+     */
     public function GetNodeAttribute(&$domnode, $element, $attr)
     {
         $subnode = $domnode->getElementsByTagName($element);

Spacing +9 added lines, -9 removed lines

@@ -42,17 +42,17 @@ 
     {
         global $opt;
 
-        if (!@mkdir(__DIR__ . '/../../../cache2/geokrety')) {
+        if (!@mkdir(__DIR__.'/../../../cache2/geokrety')) {
             // die('can\'t create geogrety cache dir');
         }
-        $path = __DIR__ . '/../../../cache2/geokrety/import-' . date('Ymd-His') . '.xml';
+        $path = __DIR__.'/../../../cache2/geokrety/import-'.date('Ymd-His').'.xml';
 
         // Changed default-value for getSysConfig() from '2005-01-01 00:00:00' to 'NOW - 9d 12h'
         // to safely stay in api-limit, even when client and server are in different time zones.
         $modifiedsince = strtotime(
             getSysConfig('geokrety_lastupdate', date($opt['db']['dateformat'], time() - 60 * 60 * 24 * 9.5))
         );
-        if (!@copy('http://geokrety.org/export.php?modifiedsince=' . date('YmdHis', $modifiedsince - 1), $path)) {
+        if (!@copy('http://geokrety.org/export.php?modifiedsince='.date('YmdHis', $modifiedsince - 1), $path)) {
             return false;
         }
 
@@ -81,19 +81,19 @@ 
 
         $xr->read();
         if ($xr->nodeType != XMLReader::ELEMENT) {
-            echo 'error: First element expected, aborted' . "\n";
+            echo 'error: First element expected, aborted'."\n";
 
             return;
         }
         if ($xr->name != 'gkxml') {
-            echo 'error: First element not valid, aborted' . "\n";
+            echo 'error: First element not valid, aborted'."\n";
 
             return;
         }
 
         $startupdate = $xr->getAttribute('date');
         if ($startupdate == '') {
-            echo 'error: Date attribute not valid, aborted' . "\n";
+            echo 'error: Date attribute not valid, aborted'."\n";
 
             return;
         }
@@ -115,7 +115,7 @@ 
                         break;
                 }
 
-                $nRecordsCount ++;
+                $nRecordsCount++;
             }
         } while ($xr->next());
 
@@ -253,7 +253,7 @@ 
         $waypoints = $element->getElementsByTagName('waypoints');
         if ($waypoints->length > 0) {
             $wpItems = $waypoints->item(0)->getElementsByTagName('waypoint');
-            for ($i = 0; $i < $wpItems->length; $i ++) {
+            for ($i = 0; $i < $wpItems->length; $i++) {
                 $wp = mb_trim($wpItems->item($i)->nodeValue);
                 if ($wp != '') {
                     sql("INSERT INTO `gk_move_waypoint` (`id`, `wp`) VALUES ('&1', '&2')", $id, $wp);
@@ -285,7 +285,7 @@ 
                 WHERE `id`='&2' AND `wp`!=''",
                 $gkid,
                 $r['id']
-            );  // "late log" bugfix: replaced $id paramter by $r['id']
+            ); // "late log" bugfix: replaced $id paramter by $r['id']
         } else {
             // do nothing
         }

htdocs/util2/cron/modules/sitemaps.class.php

Doc Comments +3 added lines

@@ -61,6 +61,9 @@
         $this->ping_searchengine('http://www.bing.com/webmaster/ping.aspx?siteMap=' . $url);
     }
 
+    /**
+     * @param string $url
+     */
     public function ping_searchengine($url)
     {
         $curl = curl_init($url);

Spacing +9 added lines, -9 removed lines

@@ -50,15 +50,15 @@ 
         global $opt;
 
         $url = urlencode(
-            ($opt['page']['https']['mode'] == HTTPS_ENFORCED ? $opt['page']['absolute_https_url'] : $opt['page']['absolute_http_url']) . 'sitemap.xml'
+            ($opt['page']['https']['mode'] == HTTPS_ENFORCED ? $opt['page']['absolute_https_url'] : $opt['page']['absolute_http_url']).'sitemap.xml'
         );
 
-        $this->ping_searchengine('http://www.google.com/webmasters/tools/ping?sitemap=' . $url);
+        $this->ping_searchengine('http://www.google.com/webmasters/tools/ping?sitemap='.$url);
         $this->ping_searchengine(
-            'http://search.yahooapis.com/SiteExplorerService/V1/updateNotification?appid=USERID&url=' . $url
+            'http://search.yahooapis.com/SiteExplorerService/V1/updateNotification?appid=USERID&url='.$url
         );
-        $this->ping_searchengine('http://submissions.ask.com/ping?sitemap=' . $url);
-        $this->ping_searchengine('http://www.bing.com/webmaster/ping.aspx?siteMap=' . $url);
+        $this->ping_searchengine('http://submissions.ask.com/ping?sitemap='.$url);
+        $this->ping_searchengine('http://www.bing.com/webmaster/ping.aspx?siteMap='.$url);
     }
 
     public function ping_searchengine($url)
@@ -90,7 +90,7 @@ 
         $nCount = sql_value("SELECT COUNT(*) FROM `caches` WHERE `caches`.`status`=1", 0);
         $nIndex = 0;
         while ($nIndex < $nCount) {
-            $this->oSitemapXML->write('newcaches.php?startat=' . $nIndex, time(), 'always');
+            $this->oSitemapXML->write('newcaches.php?startat='.$nIndex, time(), 'always');
             $nIndex += 100;
         }
     }
@@ -99,7 +99,7 @@ 
     {
         $rs = sql("SELECT SQL_BUFFER_RESULT `user_id` FROM `user`");
         while ($r = sql_fetch_assoc($rs)) {
-            $this->oSitemapXML->write('viewprofile.php?userid=' . $r['user_id'], time() - 31 * 24 * 60 * 60);
+            $this->oSitemapXML->write('viewprofile.php?userid='.$r['user_id'], time() - 31 * 24 * 60 * 60);
         }
         sql_free_result($rs);
     }
@@ -110,7 +110,7 @@ 
             "SELECT SQL_BUFFER_RESULT MAX(`last_modified`) AS `d`, `cache_id` FROM `cache_logs` GROUP BY `cache_id`"
         );
         while ($r = sql_fetch_assoc($rs)) {
-            $this->oSitemapXML->write('viewlogs.php?cacheid=' . $r['cache_id'], strtotime($r['d']));
+            $this->oSitemapXML->write('viewlogs.php?cacheid='.$r['cache_id'], strtotime($r['d']));
         }
         sql_free_result($rs);
     }
@@ -142,7 +142,7 @@ 
                 $r['cache_id']
             );
             $this->oSitemapXML->write(
-                'viewcache.php?wp=' . $r['wp_oc'] . '&desclang=' . $r['language'],
+                'viewcache.php?wp='.$r['wp_oc'].'&desclang='.$r['language'],
                 strtotime($dLastMod)
             );
         }