OpencachingDeutschland / oc-server3

htdocs/src/Oc/SmartyPlugins/block.nocache.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         if (!isset($counter[$name])) {
             $counter[$name] = 0;
         }
-        $counter[$name] ++;
+        $counter[$name]++;
 
         if ($smarty->_cache_including) {
             $param = isset($smarty->_cache_info['cached_vars'][$name][$counter[$name]]) ? $smarty->_cache_info['cached_vars'][$name][$counter[$name]] : [];

htdocs/src/Oc/SmartyPlugins/function.season.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
     ];
 
     $nTimestamp = time();
-    for ($nIndex = 0; $nIndex < count($seasons); $nIndex ++) {
+    for ($nIndex = 0; $nIndex < count($seasons); $nIndex++) {
         if (strtotime($seasons[$nIndex][0]) > $nTimestamp) {
             return $params['winter'];
         } //'';

htdocs/restorecaches.php

Indentation +1 added lines, -1 removed lines

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

Spacing +42 added lines, -42 removed lines

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

htdocs/okapi_settings.php

Indentation +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
         'DATA_LICENSE_URL' => $opt['page']['absolute_url'] . $opt['logic']['license']['terms'],
         'DEBUG'            => ($opt['debug'] & DEBUG_DEVELOPER != 0),
         'DEBUG_PREVENT_SEMAPHORES'
-                           => !$opt['php']['semaphores'],  # not available on old developer system
+                            => !$opt['php']['semaphores'],  # not available on old developer system
         'DB_SERVER'        => $opt['db']['servername'],
         'DB_NAME'          => $opt['db']['placeholder']['db'],
         'DB_USERNAME'      => $opt['db']['username'],
@@ -54,7 +54,7 @@ 
         'OC_NODE_ID'       => $opt['logic']['node']['id'],
         'OC_COOKIE_NAME'   => $opt['session']['cookiename'] . 'data',
         'OCDE_HTML_PURIFIER_SETTINGS'
-                           => $opt['html_purifier'],
+                            => $opt['html_purifier'],
         'GITHUB_ACCESS_TOKEN' => $opt['okapi']['github_access_token'],
     );
 }

Spacing +11 added lines, -11 removed lines

@@ -16,24 +16,24 @@ 
     # [3] http://code.google.com/p/opencaching-api/issues/detail?id=132
 
     $opt['rootpath'] = $GLOBALS['rootpath'];
-    require $opt['rootpath'] . 'lib2/const.inc.php';   # (into the *local* scope!)
-    require $opt['rootpath'] . 'config2/settings-dist.inc.php';
-    require $opt['rootpath'] . 'config2/settings.inc.php';
+    require $opt['rootpath'].'lib2/const.inc.php'; # (into the *local* scope!)
+    require $opt['rootpath'].'config2/settings-dist.inc.php';
+    require $opt['rootpath'].'config2/settings.inc.php';
     
     return array(
 
         # Settings which ARE NOT present in settings.inc.php:
 
-        'OC_BRANCH' => 'oc.de',  # Tell OKAPI to work in "OCDE mode".
+        'OC_BRANCH' => 'oc.de', # Tell OKAPI to work in "OCDE mode".
 
         # Settings which ARE present in settings.inc.php:
 
         'ADMINS'           => array($opt['db']['warn']['mail'], 'rygielski@mimuw.edu.pl'),
         'FROM_FIELD'       => $opt['mail']['contact'],
-        'DATA_LICENSE_URL' => $opt['page']['absolute_url'] . $opt['logic']['license']['terms'],
+        'DATA_LICENSE_URL' => $opt['page']['absolute_url'].$opt['logic']['license']['terms'],
         'DEBUG'            => ($opt['debug'] & DEBUG_DEVELOPER != 0),
         'DEBUG_PREVENT_SEMAPHORES'
-                           => !$opt['php']['semaphores'],  # not available on old developer system
+                           => !$opt['php']['semaphores'], # not available on old developer system
         'DB_SERVER'        => $opt['db']['servername'],
         'DB_NAME'          => $opt['db']['placeholder']['db'],
         'DB_USERNAME'      => $opt['db']['username'],
@@ -43,16 +43,16 @@ 
         'TIMEZONE'         => $opt['php']['timezone'],
         'SITE_URL'         => $opt['page']['absolute_url'],
         'REGISTRATION_URL' => $opt['page']['https']['mode'] != HTTPS_DISABLED
-                                  ? 'https://' . $opt['page']['domain'] . '/register.php'
-                                  : $opt['page']['absolute_url'] . 'register.php',
+                                  ? 'https://'.$opt['page']['domain'].'/register.php'
+                                  : $opt['page']['absolute_url'].'register.php',
         'VAR_DIR'          => $opt['okapi']['var_dir'],
         'IMAGES_DIR'       => rtrim($opt['logic']['pictures']['dir'], '/'),
         'IMAGES_URL'       => rtrim($opt['logic']['pictures']['url'], '/').'/',
         'IMAGE_MAX_UPLOAD_SIZE' => 2 * $opt['logic']['pictures']['maxsize'],
-        'IMAGE_MAX_PIXEL_COUNT' => 786432,  # 1024 x 768; TODO: move PICTURE_MAX_LONG_SIDE to settings
-        'SITE_LOGO'        => $opt['page']['absolute_url'] . 'resource2/' . $opt['template']['default']['style'] . '/images/oclogo/oc_logo_alpha3.png',
+        'IMAGE_MAX_PIXEL_COUNT' => 786432, # 1024 x 768; TODO: move PICTURE_MAX_LONG_SIDE to settings
+        'SITE_LOGO'        => $opt['page']['absolute_url'].'resource2/'.$opt['template']['default']['style'].'/images/oclogo/oc_logo_alpha3.png',
         'OC_NODE_ID'       => $opt['logic']['node']['id'],
-        'OC_COOKIE_NAME'   => $opt['session']['cookiename'] . 'data',
+        'OC_COOKIE_NAME'   => $opt['session']['cookiename'].'data',
         'OCDE_HTML_PURIFIER_SETTINGS'
                            => $opt['html_purifier'],
         'GITHUB_ACCESS_TOKEN' => $opt['okapi']['github_access_token'],

htdocs/resource2/tinymce/config/log.js.php

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
-  if (isset($_REQUEST['lang'])) {
+    if (isset($_REQUEST['lang'])) {
     $lang = $_REQUEST['lang'];
-  }
-  else {
+    }
+    else {
     $lang = 'de';
-  }
+    }
 ?>
 tinyMCE_GZ.init({
     plugins : 'advhr,contextmenu,emotions,insertdatetime,paste,table',

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 
 function imageBrowser(field_name, url, type, win)
 {
-  window.open('../../../../imagebrowser.php?logid=<?php echo isset($_REQUEST['logid']) ? ($_REQUEST['logid']+0) : 0; ?>', '', 'width=450,height=550,menubar=no,scrollbars=yes,status=no,location=no,resizable=yes,status=no,dependent');
+  window.open('../../../../imagebrowser.php?logid=<?php echo isset($_REQUEST['logid']) ? ($_REQUEST['logid'] + 0) : 0; ?>', '', 'width=450,height=550,menubar=no,scrollbars=yes,status=no,location=no,resizable=yes,status=no,dependent');
   fileBrowserWin = win;
   fileBrowserFieldName = field_name;
 }

htdocs/resource2/tinymce/config/desc.js.php

Indentation +8 added lines, -8 removed lines

@@ -1,16 +1,16 @@
 <?php
-  if (isset($_REQUEST['cacheid'])) {
+    if (isset($_REQUEST['cacheid'])) {
     $cacheID = $_REQUEST['cacheid'];
-  }
-  else {
+    }
+    else {
     $cacheID = 0;
-  }
-  if (isset($_REQUEST['lang'])) {
+    }
+    if (isset($_REQUEST['lang'])) {
     $lang = $_REQUEST['lang'];
-  }
-  else {
+    }
+    else {
     $lang = 'de';
-  }
+    }
 ?>
 tinyMCE_GZ.init({
     plugins : 'advhr,contextmenu,emotions,insertdatetime,paste,table',

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 
 function imageBrowser(field_name, url, type, win)
 {
-  window.open('../../../../imagebrowser.php?cacheid=<?php echo $cacheID+0; ?>', '', 'width=450,height=550,menubar=no,scrollbars=yes,status=no,location=no,resizable=yes,status=no,dependent');
+  window.open('../../../../imagebrowser.php?cacheid=<?php echo $cacheID + 0; ?>', '', 'width=450,height=550,menubar=no,scrollbars=yes,status=no,location=no,resizable=yes,status=no,dependent');
   fileBrowserWin = win;
   fileBrowserFieldName = field_name;
 }

htdocs/resource2/tinymce/config/user.js.php

Indentation +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
-  if (isset($_REQUEST['lang']))
+    if (isset($_REQUEST['lang']))
     $lang = $_REQUEST['lang'];
-  else
+    else
     $lang = 'de';
 ?>
 

htdocs/lib2/logic/logpics.class.php

Indentation +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
         global $login;
 
         $fields =
-          "`pics`.`uuid` AS `pic_uuid`,
+            "`pics`.`uuid` AS `pic_uuid`,
            `pics`.`url` AS `pic_url`,
            `pics`.`title`,
            `pics`.`date_created`,

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

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
         // number of points in the polygon
         $n = count($polygon);
         $poly1 = $polygon[0];
-        for ($i = 1; $i <= $n; $i ++) {
+        for ($i = 1; $i <= $n; $i++) {
             $poly1XY = explode(' ', $poly1);
             $poly1x = $poly1XY[0];
             $poly1y = $poly1XY[1];
@@ -44,7 +44,7 @@ 
                         if ($poly1y != $poly2y) {
                             $xinters = ($py - $poly1y) * ($poly2x - $poly1x) / ($poly2y - $poly1y) + $poly1x;
                             if ($poly1x == $poly2x || $px <= $xinters) {
-                                $counter ++;
+                                $counter++;
                             }
                         }
                     }