OpencachingDeutschland / oc-server3

htdocs/lib2/logic/cachelist.class.php

Spacing +20 added lines, -20 removed lines

@@ -8,7 +8,7 @@ 
  *   add/remove etc. is executed instantly
  ***************************************************************************/
 
-require_once __DIR__ . '/../translate.class.php';
+require_once __DIR__.'/../translate.class.php';
 
 define('ERROR_BAD_LISTNAME', 1);
 define('ERROR_DUPLICATE_LISTNAME', 2);
@@ -164,7 +164,7 @@ 
         return sql_value(
             "
             SELECT `entries` FROM `stat_cache_lists`
-            WHERE `stat_cache_lists`.`cache_list_id`='" . sql_escape($this->getId()) . "'",
+            WHERE `stat_cache_lists`.`cache_list_id`='" . sql_escape($this->getId())."'",
             0
         );
     }
@@ -174,7 +174,7 @@ 
         return sql_value(
             "
             SELECT `watchers` FROM `stat_cache_lists`
-            WHERE `stat_cache_lists`.`cache_list_id`='" . sql_escape($this->getId()) . "'",
+            WHERE `stat_cache_lists`.`cache_list_id`='" . sql_escape($this->getId())."'",
             0
         );
     }
@@ -402,7 +402,7 @@ 
     {
         global $login;
 
-        return cachelist::getLists("`cache_lists`.`user_id`='" . sql_escape($login->userid) . "'");
+        return cachelist::getLists("`cache_lists`.`user_id`='".sql_escape($login->userid)."'");
     }
 
     public static function getListsWatchedByMe()
@@ -410,9 +410,9 @@ 
         global $login;
 
         return cachelist::getLists(
-            "`id` IN (SELECT `cache_list_id` FROM `cache_list_watches` WHERE `user_id`='" . sql_escape(
+            "`id` IN (SELECT `cache_list_id` FROM `cache_list_watches` WHERE `user_id`='".sql_escape(
                 $login->userid
-            ) . "')"
+            )."')"
         );
     }
 
@@ -421,9 +421,9 @@ 
         global $login;
 
         return cachelist::getLists(
-            "`id` IN (SELECT `cache_list_id` FROM `cache_list_bookmarks` WHERE `user_id`='" . sql_escape(
+            "`id` IN (SELECT `cache_list_id` FROM `cache_list_bookmarks` WHERE `user_id`='".sql_escape(
                 $login->userid
-            ) . "')"
+            )."')"
         );
     }
 
@@ -436,8 +436,8 @@ 
             LEFT JOIN `stat_cache_lists` ON  `stat_cache_lists`.`cache_list_id`=`cache_lists`.`id`
             LEFT JOIN `user` ON `user`.`user_id`=`cache_lists`.`user_id`
             WHERE `is_public`>=2 AND `entries`>0"
-            . ($namelike ? " AND `name` LIKE '%" . sql_escape($namelike) . "%'" : '')
-            . ($userlike ? " AND `username` LIKE '%" . sql_escape($userlike) . "%'" : ''),
+            . ($namelike ? " AND `name` LIKE '%".sql_escape($namelike)."%'" : '')
+            . ($userlike ? " AND `username` LIKE '%".sql_escape($userlike)."%'" : ''),
             0
         );
     }
@@ -446,8 +446,8 @@ 
     {
         return cachelist::getLists(
             "`is_public`>=2 AND `entries`>0"
-            . ($namelike ? " AND `name` LIKE '%" . sql_escape($namelike) . "%'" : '')
-            . ($userlike ? " AND `username` LIKE '%" . sql_escape($userlike) . "%'" : ''),
+            . ($namelike ? " AND `name` LIKE '%".sql_escape($namelike)."%'" : '')
+            . ($userlike ? " AND `username` LIKE '%".sql_escape($userlike)."%'" : ''),
             0,
             $startat,
             $maxitems,
@@ -458,7 +458,7 @@ 
     public static function getPublicListsOf($userid)
     {
         return cachelist::getLists(
-            "`is_public`>=2 AND `entries`>0 AND `cache_lists`.`user_id`='" . sql_escape($userid) . "'"
+            "`is_public`>=2 AND `entries`>0 AND `cache_lists`.`user_id`='".sql_escape($userid)."'"
         );
     }
 
@@ -471,7 +471,7 @@ 
             "
             SELECT `user_id`
             FROM `caches`
-            WHERE `cache_id`='" . sql_escape($cacheid) . "'",
+            WHERE `cache_id`='" . sql_escape($cacheid)."'",
             0
         );
         $my_watches = sql_fetch_column(
@@ -483,15 +483,15 @@ 
             `id` IN
                 (SELECT `cache_list_id`
                  FROM `cache_list_items`
-                 WHERE `cache_id`='" . sql_escape($cacheid) . "')
+                 WHERE `cache_id`='" . sql_escape($cacheid)."')
             AND
             (
-                `cache_lists`.`user_id`='" . sql_escape($login->userid) . "' " .
-            ($all ? "OR `is_public`= 3 " : "") .
+                `cache_lists`.`user_id`='" . sql_escape($login->userid)."' ".
+            ($all ? "OR `is_public`= 3 " : "").
             "OR (`is_public`> 0 AND
-                   `cache_lists`.`id` IN ('" . implode("','", array_map('sql_escape', $my_watches)) . "'))
+                   `cache_lists`.`id` IN ('" . implode("','", array_map('sql_escape', $my_watches))."'))
             )",
-            "`cache_lists`.`user_id`<>'" . sql_escape($cache_owner_id) . "'",
+            "`cache_lists`.`user_id`<>'".sql_escape($cache_owner_id)."'",
             0,
             20,
             true
@@ -500,7 +500,7 @@ 
 
     public static function getListById($listid)
     {
-        $lists = cachelist::getLists("`id`='" . sql_escape($listid) . "'");
+        $lists = cachelist::getLists("`id`='".sql_escape($listid)."'");
         if (count($lists)) {
             $lists[0]['description_for_display'] = use_current_protocol_in_html($lists[0]['description']);
 

Braces +2 added lines, -1 removed lines

@@ -109,7 +109,8 @@
                 $this->getUserId(),
                 $this->getId(),
                 $name
-            )) {// $this->getId() is 0 when creating a new list -> condition has no effect
+            )) {
+// $this->getId() is 0 when creating a new list -> condition has no effect
                 return ERROR_DUPLICATE_LISTNAME;
             } elseif ($visibility >= 2 && strlen($name) < 10) {
                 return ERROR_BAD_LISTNAME;

htdocs/lib2/logic/const.inc.php

Spacing +21 added lines, -21 removed lines

@@ -16,28 +16,28 @@ 
 define('RE_TYPE_FLOAT', 5);
 define('RE_TYPE_DOUBLE', 6);
 
-define('RE_INSERT_NOTHING', 0);       //
-define('RE_INSERT_OVERWRITE', 1);     // ignore given values and use function
-define('RE_INSERT_IGNORE', 2);        // dont use this column on insert
+define('RE_INSERT_NOTHING', 0); //
+define('RE_INSERT_OVERWRITE', 1); // ignore given values and use function
+define('RE_INSERT_IGNORE', 2); // dont use this column on insert
 define('RE_INSERT_AUTOINCREMENT', 4); // column is an auto increment column
-define('RE_INSERT_AUTOUUID', 8);      // if empty, UUID is generated by before insert trigger (not supported for primary key fields)
-define('RE_INSERT_NOW', 16);          // NOW()
+define('RE_INSERT_AUTOUUID', 8); // if empty, UUID is generated by before insert trigger (not supported for primary key fields)
+define('RE_INSERT_NOW', 16); // NOW()
 
 define('EUROPEAN_LETTERS', 'A-Za-zÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ');
 // ASCII + ISO-8859-1 0xC0..0xFF
-define('REGEX_USERNAME', '^[' . EUROPEAN_LETTERS . '0-9\.\-_@=)(\/\\\&*+~#][' . EUROPEAN_LETTERS . '0-9\.\-_ @=)(\/\\\&*+~#]{1,58}[' . EUROPEAN_LETTERS . '0-9\.\-_@=)(\/\\\&*+~#]$');
-define('REGEX_PASSWORD', '^[' . EUROPEAN_LETTERS . '0-9\.\-_ @=)(\/\\\&*+~#]{3,60}$');
-define('REGEX_LAST_NAME', '^[' . EUROPEAN_LETTERS . '][' . EUROPEAN_LETTERS . '0-9\.\- ]{0,58}[' . EUROPEAN_LETTERS . '0-9\.]$');
+define('REGEX_USERNAME', '^['.EUROPEAN_LETTERS.'0-9\.\-_@=)(\/\\\&*+~#]['.EUROPEAN_LETTERS.'0-9\.\-_ @=)(\/\\\&*+~#]{1,58}['.EUROPEAN_LETTERS.'0-9\.\-_@=)(\/\\\&*+~#]$');
+define('REGEX_PASSWORD', '^['.EUROPEAN_LETTERS.'0-9\.\-_ @=)(\/\\\&*+~#]{3,60}$');
+define('REGEX_LAST_NAME', '^['.EUROPEAN_LETTERS.']['.EUROPEAN_LETTERS.'0-9\.\- ]{0,58}['.EUROPEAN_LETTERS.'0-9\.]$');
 define('REGEX_FIRST_NAME', REGEX_LAST_NAME);
-define('REGEX_STATPIC_TEXT', '^[' . EUROPEAN_LETTERS . '0-9\.\-_ @=)(\/\\\&*\$+~#!§%;,-?:\[\]{}¹²³\'\"`\|µ°\%]{0,30}$');
+define('REGEX_STATPIC_TEXT', '^['.EUROPEAN_LETTERS.'0-9\.\-_ @=)(\/\\\&*\$+~#!§%;,-?:\[\]{}¹²³\'\"`\|µ°\%]{0,30}$');
 
-define('ADMIN_TRANSLATE', 1);     // edit translation
-define('ADMIN_MAINTAINANCE', 2);  // check table etc.
-define('ADMIN_USER', 4);          // drop users, caches etc.
-define('ADMIN_NEWS', 8);          // obsolete / reserved
-define('ADMIN_RESTORE', 16);      // restore vandalized listings
-define('ADMIN_ROOT', 128 | 127);  // root + all previous rights
-define('ADMIN_LISTING', 1024);    // can edit any cache listings
+define('ADMIN_TRANSLATE', 1); // edit translation
+define('ADMIN_MAINTAINANCE', 2); // check table etc.
+define('ADMIN_USER', 4); // drop users, caches etc.
+define('ADMIN_NEWS', 8); // obsolete / reserved
+define('ADMIN_RESTORE', 16); // restore vandalized listings
+define('ADMIN_ROOT', 128 | 127); // root + all previous rights
+define('ADMIN_LISTING', 1024); // can edit any cache listings
 
 define('ATTRIB_SELECTED', 1);
 define('ATTRIB_UNSELECTED', 2);
@@ -79,11 +79,11 @@ 
 // ID 15 was temporarily used and is reserved, see commit dda7ef0. Continue with 16.
 
 // user.data_license values
-define('OLD_DATA_LICSENSE', 0);                       // before deadline
-define('NEW_DATA_LICENSE_ACTIVELY_DECLINED', 1);      // declined license
-define('NEW_DATA_LICENSE_ACTIVELY_ACCEPTED', 2);      // accepted new license on registration
-define('NEW_DATA_LICENSE_PASSIVELY_ACCEPTED', 3);     // did not decline license until deadline
-define('NEW_DATA_LICENSE_PASSIVELY_DECLINED', 4);     // could not accept/decline because disabled
+define('OLD_DATA_LICSENSE', 0); // before deadline
+define('NEW_DATA_LICENSE_ACTIVELY_DECLINED', 1); // declined license
+define('NEW_DATA_LICENSE_ACTIVELY_ACCEPTED', 2); // accepted new license on registration
+define('NEW_DATA_LICENSE_PASSIVELY_ACCEPTED', 3); // did not decline license until deadline
+define('NEW_DATA_LICENSE_PASSIVELY_DECLINED', 4); // could not accept/decline because disabled
 
 //picture upload/resize parameters
 define('PICTURE_QUALITY', 85);

htdocs/lib2/logic/cacheIcon.class.php

Spacing +4 added lines, -4 removed lines

@@ -10,8 +10,8 @@ 
 
     public static function get($user_id, $cache_id, $cache_status, $cache_userid, $iconname)
     {
-        $iconname = mb_eregi_replace("cache/", "", $iconname);   // for old cache_type table contents
-        $iconext = "." . mb_eregi_replace("^.*\.", "", $iconname);
+        $iconname = mb_eregi_replace("cache/", "", $iconname); // for old cache_type table contents
+        $iconext = ".".mb_eregi_replace("^.*\.", "", $iconname);
         $iconname = mb_eregi_replace("\..*", "", $iconname);
 
         // add status
@@ -30,7 +30,7 @@ 
                 break;
             case 5:
                 $iconname .= "-s";
-                break;      // fix for RT ticket #3403
+                break; // fix for RT ticket #3403
             case 6:
                 $iconname .= "-a";
                 break;
@@ -65,7 +65,7 @@ 
             }
         }
 
-        return $iconname . $iconext;
+        return $iconname.$iconext;
     }
 
 }

htdocs/lib2/logic/data-license.inc.php

Spacing +4 added lines, -4 removed lines

@@ -54,7 +54,7 @@ 
 
             $ltext = "© ";
             if ($html) {
-                $ltext .= "<a href='" . $server_address . "viewprofile.php?userid=" . $userid . "' target='_blank'>";
+                $ltext .= "<a href='".$server_address."viewprofile.php?userid=".$userid."' target='_blank'>";
             }
             $ltext .= $username;
             if ($html) {
@@ -62,7 +62,7 @@ 
             }
             $ltext .= ", ";
             if ($html) {
-                $ltext .= "<a href='" . $server_address . "viewcache.php?cacheid=" . $cacheid . "' target='_blank'>";
+                $ltext .= "<a href='".$server_address."viewcache.php?cacheid=".$cacheid."' target='_blank'>";
             }
             $ltext .= $opt['page']['sitename'];
             if ($html) {
@@ -70,14 +70,14 @@ 
             }
             $ltext .= ", ";
             if ($html) {
-                $ltext .= "<a href='" . $lurl . "' target='_blank'>";
+                $ltext .= "<a href='".$lurl."' target='_blank'>";
             }
             $ltext .= "CC BY-NC-ND";
             if ($html) {
                 $ltext .= "</a>";
             }
             if ($for_cachedesc) {
-                $ltext .= ", " . $asof . " " . date($df);
+                $ltext .= ", ".$asof." ".date($df);
             }
         }
 

Braces +2 added lines, -1 removed lines

@@ -27,7 +27,8 @@
     $for_cachedesc,
     $html,
     $twolines = false
-) {
+)
+{
     global $opt, $translate;
 
     $ltext = "";

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

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
  *
  ***************************************************************************/
 
-require_once __DIR__ . '/const.inc.php';
+require_once __DIR__.'/const.inc.php';
 
 class useroptions
 {
@@ -150,7 +150,7 @@ 
             $this->nOptions[$pId]['option_value'] = $pValue;
 
             return true;
-        } elseif (preg_match("/" . $this->nOptions[$pId]['check_regex'] . "/", $pValue) || strlen($pValue) == 0) {
+        } elseif (preg_match("/".$this->nOptions[$pId]['check_regex']."/", $pValue) || strlen($pValue) == 0) {
             $this->nOptions[$pId]['option_value'] = $pValue;
 
             return true;