OpencachingDeutschland / oc-server3

htdocs/lib2/logic/geomath.class.php

Spacing +3 added lines, -3 removed lines

@@ -179,12 +179,12 @@
         $b1_rad = (90 - $latFrom) * 3.14159 / 180;
         $l1_deg = $lonFrom;
 
-        $lonField = '`' . sql_escape_backtick($tableName) . '`.`' . sql_escape_backtick($lonField) . '`';
-        $latField = '`' . sql_escape_backtick($tableName) . '`.`' . sql_escape_backtick($latField) . '`';
+        $lonField = '`'.sql_escape_backtick($tableName).'`.`'.sql_escape_backtick($lonField).'`';
+        $latField = '`'.sql_escape_backtick($tableName).'`.`'.sql_escape_backtick($latField).'`';
 
         $r = 6370 * $distanceMultiplier;
 
-        $retval = 'acos(cos(' . $b1_rad . ') * cos((90-' . $latField . ') * 3.14159 / 180) + sin(' . $b1_rad . ') * sin((90-' . $latField . ') * 3.14159 / 180) * cos((' . $l1_deg . '-' . $lonField . ') * 3.14159 / 180)) * ' . $r;
+        $retval = 'acos(cos('.$b1_rad.') * cos((90-'.$latField.') * 3.14159 / 180) + sin('.$b1_rad.') * sin((90-'.$latField.') * 3.14159 / 180) * cos(('.$l1_deg.'-'.$lonField.') * 3.14159 / 180)) * '.$r;
 
         return $retval;
     }

htdocs/lib2/logic/labels.inc.php

Spacing +9 added lines, -9 removed lines

@@ -6,11 +6,11 @@ 
  ***************************************************************************/
 
 // try to include cache file
-if (!file_exists($opt['rootpath'] . 'cache2/labels-' . $opt['template']['locale'] . '.inc.php')) {
+if (!file_exists($opt['rootpath'].'cache2/labels-'.$opt['template']['locale'].'.inc.php')) {
     labels::CreateCacheFile();
 }
 
-require $opt['rootpath'] . 'cache2/labels-' . $opt['template']['locale'] . '.inc.php';
+require $opt['rootpath'].'cache2/labels-'.$opt['template']['locale'].'.inc.php';
 
 class labels
 {
@@ -20,7 +20,7 @@ 
     {
         global $opt;
 
-        $f = fopen($opt['rootpath'] . 'cache2/labels-' . $opt['template']['locale'] . '.inc.php', 'w');
+        $f = fopen($opt['rootpath'].'cache2/labels-'.$opt['template']['locale'].'.inc.php', 'w');
         fwrite($f, "<?php\n");
 
         $a = array();
@@ -42,7 +42,7 @@ 
             $a[$r['id']] = $r['name'];
         }
         sql_free_result($rs);
-        fwrite($f, 'labels::addLabels("cache_attrib", "' . str_replace('"', '\\"', serialize($a)) . '");' . "\n");
+        fwrite($f, 'labels::addLabels("cache_attrib", "'.str_replace('"', '\\"', serialize($a)).'");'."\n");
 
         $a = [];
         $rs = sql(
@@ -63,7 +63,7 @@ 
             $a[$r['id']] = $r['name'];
         }
         sql_free_result($rs);
-        fwrite($f, 'labels::addLabels("cache_size", "' . str_replace('"', '\\"', serialize($a)) . '");' . "\n");
+        fwrite($f, 'labels::addLabels("cache_size", "'.str_replace('"', '\\"', serialize($a)).'");'."\n");
 
         $a = [];
         $rs = sql(
@@ -84,7 +84,7 @@ 
             $a[$r['id']] = $r['name'];
         }
         sql_free_result($rs);
-        fwrite($f, 'labels::addLabels("cache_status", "' . str_replace('"', '\\"', serialize($a)) . '");' . "\n");
+        fwrite($f, 'labels::addLabels("cache_status", "'.str_replace('"', '\\"', serialize($a)).'");'."\n");
 
         $a = [];
         $rs = sql(
@@ -105,7 +105,7 @@ 
             $a[$r['id']] = $r['name'];
         }
         sql_free_result($rs);
-        fwrite($f, 'labels::addLabels("cache_type", "' . str_replace('"', '\\"', serialize($a)) . '");' . "\n");
+        fwrite($f, 'labels::addLabels("cache_type", "'.str_replace('"', '\\"', serialize($a)).'");'."\n");
 
         $a = [];
         $rs = sql(
@@ -126,7 +126,7 @@ 
             $a[$r['id']] = $r['name'];
         }
         sql_free_result($rs);
-        fwrite($f, 'labels::addLabels("log_types", "' . str_replace('"', '\\"', serialize($a)) . '");' . "\n");
+        fwrite($f, 'labels::addLabels("log_types", "'.str_replace('"', '\\"', serialize($a)).'");'."\n");
 
         $nLastGroup = 1;
         $a = array();
@@ -155,7 +155,7 @@ 
             $a[] = $r;
         }
         sql_free_result($rs);
-        fwrite($f, 'labels::addLabels("usercountrieslist", "' . str_replace('"', '\\"', serialize($a)) . '");' . "\n");
+        fwrite($f, 'labels::addLabels("usercountrieslist", "'.str_replace('"', '\\"', serialize($a)).'");'."\n");
 
         fwrite($f, "?>");
         fclose($f);

htdocs/lib2/logic/cachelog.class.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
  *   add/remove etc. is executed instantly
  ***************************************************************************/
 
-require_once __DIR__ . '/logtypes.inc.php';
+require_once __DIR__.'/logtypes.inc.php';
 
 class cachelog
 {
@@ -355,7 +355,7 @@ 
         //     return array();
         // Logic Error - log types are still valid when no NEW logs are allowed for the cache.
         // (Would e.g. block admin logs and log-type restoring for locked caches.)
-        return get_cache_log_types($this->getCacheId(), $this->getType());  // depends on userid
+        return get_cache_log_types($this->getCacheId(), $this->getType()); // depends on userid
     }
 
     public static function isDuplicate($cacheId, $userId, $logType, $logDate, $logText)

htdocs/lib2/logic/statpic.class.php

Spacing +2 added lines, -2 removed lines

@@ -71,8 +71,8 @@
         global $opt;
 
         // if data changed - delete statpic of user, if exists - will be recreated on next request
-        if (file_exists($opt['rootpath'] . 'images/statpics/statpic' . $this->nUserId . '.jpg')) {
-            unlink($opt['rootpath'] . 'images/statpics/statpic' . $this->nUserId . '.jpg');
+        if (file_exists($opt['rootpath'].'images/statpics/statpic'.$this->nUserId.'.jpg')) {
+            unlink($opt['rootpath'].'images/statpics/statpic'.$this->nUserId.'.jpg');
         }
     }
 }

htdocs/lib2/logic/logpics.class.php

Spacing +5 added lines, -5 removed lines

@@ -17,12 +17,12 @@ 
     const FOR_STARTPAGE_GALLERY = 1;
     const FOR_NEWPICS_GALLERY = 2;
     const FOR_USER_STAT = 3;
-    const FOR_USER_GALLERY = 4;   // params: userid
+    const FOR_USER_GALLERY = 4; // params: userid
     const FOR_MYHOME_GALLERY = 5;
-    const FOR_CACHE_STAT = 6;     // params: cacheid
-    const FOR_CACHE_GALLERY = 7;  // params: cacheid
+    const FOR_CACHE_STAT = 6; // params: cacheid
+    const FOR_CACHE_GALLERY = 7; // params: cacheid
 
-    const MAX_PICTURES_PER_GALLERY_PAGE = 48;   // must be multiple of 6
+    const MAX_PICTURES_PER_GALLERY_PAGE = 48; // must be multiple of 6
 
 
     public static function get($purpose, $userid = 0, $cacheid = 0)
@@ -232,7 +232,7 @@ 
         $pictures = self::get($purpose, $userid, $cacheid);
         $tpl->assign('pictures', array_slice($pictures, $startat, self::MAX_PICTURES_PER_GALLERY_PAGE));
 
-        $pager = new pager($url . "&startat={offset}");
+        $pager = new pager($url."&startat={offset}");
         $pager->make_from_offset($startat, count($pictures), self::MAX_PICTURES_PER_GALLERY_PAGE);
     }
 

htdocs/lib2/logic/user.class.php

Spacing +21 added lines, -21 removed lines

@@ -8,8 +8,8 @@ 
  *   add/remove etc. is executed instantly
  ***************************************************************************/
 
-require_once __DIR__ . '/cracklib.inc.php';
-require_once __DIR__ . '/../translate.class.php';
+require_once __DIR__.'/cracklib.inc.php';
+require_once __DIR__.'/../translate.class.php';
 
 class user
 {
@@ -760,8 +760,8 @@ 
         $mail->to = $this->getEMail();
         $mail->subject = $translate->t('Registration confirmation', '', basename(__FILE__), __LINE__);
         $mail->assign('domain', $opt['page']['domain']);
-        $mail->assign('activation_page', $opt['page']['absolute_url'] . 'activation.php');
-        $mail->assign('short_activation_page', $opt['page']['absolute_url'] . 'a.php');
+        $mail->assign('activation_page', $opt['page']['absolute_url'].'activation.php');
+        $mail->assign('short_activation_page', $opt['page']['absolute_url'].'a.php');
         $mail->assign('username', $this->getUsername());
         $mail->assign('userid', $this->getUserId());
         $mail->assign('last_name', $this->getLastName());
@@ -834,7 +834,7 @@ 
             $mail->returnPath = $fromUser->getEMail();
         }
 
-        $mail->subject = $translate->t('E-Mail from', '', basename(__FILE__), __LINE__, '', 1, $language) . ' ' . $fromUser->getUsername() . ': ' . $sSubject;
+        $mail->subject = $translate->t('E-Mail from', '', basename(__FILE__), __LINE__, '', 1, $language).' '.$fromUser->getUsername().': '.$sSubject;
         $mail->assign('usersubject', $sSubject);
         $mail->assign('text', $sText);
         $mail->assign('username', $this->getUsername());
@@ -906,7 +906,7 @@ 
             $login->userid,
             $this->nUserId,
             0,
-            'User ' . sql_escape($this->getUsername()) . ' disabled',
+            'User '.sql_escape($this->getUsername()).' disabled',
             serialize($backup)
         );
 
@@ -1026,9 +1026,9 @@ 
         if ($num_caches > 0) {
             $cache_descs = array();
             $rs = sql(
-                "SELECT `id`, `language`, `desc`, `hint` " .
-                "FROM `cache_desc`,`caches` " .
-                "WHERE `caches`.`cache_id`=`cache_desc`.`cache_id` " .
+                "SELECT `id`, `language`, `desc`, `hint` ".
+                "FROM `cache_desc`,`caches` ".
+                "WHERE `caches`.`cache_id`=`cache_desc`.`cache_id` ".
                 "AND `caches`.`user_id`='&1'",
                 $this->getUserId()
             );
@@ -1073,10 +1073,10 @@ 
                 }
 
                 sql(
-                    "UPDATE `cache_desc` " .
-                    "SET `desc`='&1',`hint`='&2' " .
+                    "UPDATE `cache_desc` ".
+                    "SET `desc`='&1',`hint`='&2' ".
                     "WHERE `id`='&3'",
-                    "<em>" . $descmsg . "</em>",
+                    "<em>".$descmsg."</em>",
                     '',
                     $desc['id']
                 );
@@ -1175,7 +1175,7 @@ 
         global $opt;
 
         // load bmp-support
-        require_once $opt['rootpath'] . 'lib2/imagebmp.inc.php';
+        require_once $opt['rootpath'].'lib2/imagebmp.inc.php';
 
         // paths cleared by trailing '/'
         if (substr($opt['logic']['pictures']['dir'], - 1) != '/') {
@@ -1221,18 +1221,18 @@ 
          */
         if ($object_type == OBJECT_CACHE) {// get filenames of the pictures of $this' caches
             $rs = sql(
-                "SELECT `pictures`.`url` " .
-                "FROM `pictures`,`caches` " .
-                "WHERE `caches`.`cache_id`=`pictures`.`object_id`" .
+                "SELECT `pictures`.`url` ".
+                "FROM `pictures`,`caches` ".
+                "WHERE `caches`.`cache_id`=`pictures`.`object_id`".
                 " AND `pictures`.`object_type`='&1' AND `caches`.`user_id`='&2'",
                 OBJECT_CACHE,
                 $this->getUserId()
             );
         } elseif ($object_type == OBJECT_CACHELOG) {// get filenames of the pictures of $this' logs
             $rs = sql(
-                "SELECT `pictures`.`url` " .
-                "FROM `pictures`,`cache_logs` " .
-                "WHERE `cache_logs`.`id`=`pictures`.`object_id`" .
+                "SELECT `pictures`.`url` ".
+                "FROM `pictures`,`cache_logs` ".
+                "WHERE `cache_logs`.`id`=`pictures`.`object_id`".
                 " AND `pictures`.`object_type`='&1' AND `cache_logs`.`user_id`='&2'",
                 OBJECT_CACHELOG,
                 $this->getUserId()
@@ -1284,7 +1284,7 @@ 
 
                 // check for replacement-image
                 if ($pdummy && isset($opt['logic']['pictures']['dummy']['replacepic'])
-                    && $opt['logic']['pictures']['dummy']['replacepic'] != $opt['rootpath'] . 'images/'
+                    && $opt['logic']['pictures']['dummy']['replacepic'] != $opt['rootpath'].'images/'
                     && file_exists($opt['logic']['pictures']['dummy']['replacepic'])
                 ) {
 
@@ -1460,7 +1460,7 @@ 
             $login->userid,
             $this->nUserId,
             0,
-            'User ' . sql_escape($this->getUsername()) . ' deleted',
+            'User '.sql_escape($this->getUsername()).' deleted',
             serialize($backup)
         );
 

htdocs/lib2/logic/geodb.class.php

Spacing +7 added lines, -7 removed lines

@@ -32,7 +32,7 @@ 
 
     private static function setCacheLocation($cache_id)
     {
-        echo $cache_id . "\n";
+        echo $cache_id."\n";
         $rs = sqll(
             "SELECT `latitude`, `longitude`, `last_modified`
              FROM `caches`
@@ -95,16 +95,16 @@ 
         $rs = sqll(
             "SELECT
                 `geodb_coordinates`.`loc_id` `loc_id`,
-                (( " . $lon . " - `geodb_coordinates`.`lon` ) * ( " . $lon . " - `geodb_coordinates`.`lon` ) +
-                 ( " . $lat . " - `geodb_coordinates`.`lat` ) * ( " . $lat . " - `geodb_coordinates`.`lat` )) `dist`
+                (( " . $lon." - `geodb_coordinates`.`lon` ) * ( ".$lon." - `geodb_coordinates`.`lon` ) +
+                 ( " . $lat." - `geodb_coordinates`.`lat` ) * ( ".$lat." - `geodb_coordinates`.`lat` )) `dist`
              FROM `geodb_coordinates`
              INNER JOIN `geodb_locations` ON `geodb_coordinates`.`loc_id`=`geodb_locations`.`loc_id`
              WHERE
                 `geodb_locations`.`loc_type`=100700000
-                AND `geodb_coordinates`.`lon` > " . ($lon - 0.15) . "
-                AND `geodb_coordinates`.`lon` < " . ($lon + 0.15) . "
-                AND `geodb_coordinates`.`lat` > " . ($lat - 0.15) . "
-                AND `geodb_coordinates`.`lat` < " . ($lat + 0.15) . "
+                AND `geodb_coordinates`.`lon` > " . ($lon - 0.15)."
+                AND `geodb_coordinates`.`lon` < " . ($lon + 0.15)."
+                AND `geodb_coordinates`.`lat` > " . ($lat - 0.15)."
+                AND `geodb_coordinates`.`lat` < " . ($lat + 0.15)."
              ORDER BY `dist` ASC
              LIMIT 1"
         );

htdocs/lib2/logic/npas.inc.php

Spacing +2 added lines, -2 removed lines

@@ -34,10 +34,10 @@
 
     $npas = get_npas($cache_id);
     if ($npas) {
-        $desc = "<p>" . str_replace('%1', helppagelink('npa'), _('This geocache is probably placed within the following protected areas (%1Info</a>):')) . "</p>\n" .
+        $desc = "<p>".str_replace('%1', helppagelink('npa'), _('This geocache is probably placed within the following protected areas (%1Info</a>):'))."</p>\n".
             "<ul>\n";
         foreach ($npas as $npa) {
-            $desc .= "<li>" . $npa['npaTypeName'] . ": <a href='http://www.google.de/search?q=" . urlencode($npa['npaTypeName'] . ' ' . $npa['npaName']) . "' target='_blank'>" . $npa['npaName'] . "</a></li>\n";
+            $desc .= "<li>".$npa['npaTypeName'].": <a href='http://www.google.de/search?q=".urlencode($npa['npaTypeName'].' '.$npa['npaName'])."' target='_blank'>".$npa['npaName']."</a></li>\n";
         }
         $desc .= "</ul>\n";
     } else {

htdocs/lib2/logic/attribute.class.php

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
                     LEFT JOIN `sys_trans_text` AS `tt2`
                         ON `t2`.`id`=`tt2`.`trans_id`
                         AND `tt2`.`lang`='&1'
-                    WHERE `cache_attrib`.`group_id`='&2'" . $sAddWhereSql . "
+                    WHERE `cache_attrib`.`group_id`='&2'" . $sAddWhereSql."
                     AND NOT IFNULL(`cache_attrib`.`hidden`, 0)=1
                     ORDER BY `cache_attrib`.`group_id` ASC",
                     $opt['template']['locale'],
@@ -116,7 +116,7 @@ 
             }
             while ($rAttr = sql_fetch_assoc($rsAttr)) {
                 if ($firstLetterUppercase) {
-                    $rAttr['name'] = mb_strtoupper(mb_substr($rAttr['name'], 0, 1)) . mb_substr($rAttr['name'], 1);
+                    $rAttr['name'] = mb_strtoupper(mb_substr($rAttr['name'], 0, 1)).mb_substr($rAttr['name'], 1);
                 }
                 $attr[] = $rAttr;
                 if ($rAttr['search_default']) {