OpencachingDeutschland / oc-server3

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/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;
 }

Braces +1 added lines, -2 removed lines

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

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;
 }

Braces +2 added lines, -4 removed lines

@@ -1,14 +1,12 @@
 <?php
   if (isset($_REQUEST['cacheid'])) {
     $cacheID = $_REQUEST['cacheid'];
-  }
-  else {
+  } else {
     $cacheID = 0;
   }
   if (isset($_REQUEST['lang'])) {
     $lang = $_REQUEST['lang'];
-  }
-  else {
+  } else {
     $lang = 'de';
   }
 ?>

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';
 ?>
 

Braces +6 added lines, -5 removed lines

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

htdocs/mailto.php

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
 $text = isset($_REQUEST['text']) ? $_REQUEST['text'] : '';
 if (isset($_REQUEST['emailaddress'])) {
     $bEmailaddress = ($_REQUEST['emailaddress'] == 1);
-}
-else {
+} else {
     $own_user = new user($login->userid);
     $bEmailaddress = $own_user->getUsermailSendAddress();
 }

Spacing +4 added lines, -4 removed lines

@@ -5,14 +5,14 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'mailto';
 $tpl->menuitem = MNU_USER_MAILTO;
 
 $login->verify();
 if ($login->userid == 0) {
-    $tpl->redirect('login.php?target=' . urlencode($tpl->target));
+    $tpl->redirect('login.php?target='.urlencode($tpl->target));
 }
 
 $userid = isset($_REQUEST['userid']) ? $_REQUEST['userid'] + 0 : 0;
@@ -36,7 +36,7 @@ 
     $wp = $_REQUEST['wp'];
     $cachename = trim(sql_value("SELECT `name` FROM `caches` WHERE `wp_oc`='&1'", '', $wp));
     if ($cachename) {
-        $subject = $translate->t('Your geocache', '', 0, 0) . ' "' . $cachename . '" (' . $wp . ')';
+        $subject = $translate->t('Your geocache', '', 0, 0).' "'.$cachename.'" ('.$wp.')';
     }
 } elseif (isset($_REQUEST['reportid']) && $login->admin) {
     $rs = sql(
@@ -47,7 +47,7 @@ 
         $_REQUEST['reportid']
     );
     if ($r = sql_fetch_assoc($rs)) {
-        $subject = $translate->t('Your geocache report for', '', 0, 0) . ' ' . $r['wp_oc'] . ' (' . $r['name'] . ')';
+        $subject = $translate->t('Your geocache report for', '', 0, 0).' '.$r['wp_oc'].' ('.$r['name'].')';
     }
     sql_free_result($rs);
 }

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);
     }
 

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

@@ -63,7 +63,7 @@ 
                 // only a few percent of caches. We must rely on fast data caching.
 
                 $rs = sql_slave(
-                    "SELECT
+                    "select
                         $fields,
                         `user`.`username`,
                         `pics`.`date_created` AS `picdate`
@@ -99,7 +99,7 @@ 
                 // This saves us one grouped subquery.
 
                 $rs = sql_slave(
-                    "SELECT $fields, `user`.`username`, `pics`.`date_created` AS `picdate`
+                    "select $fields, `user`.`username`, `pics`.`date_created` AS `picdate`
                      FROM
                         (SELECT `uuid`, `url`, `title`, `date_created`, `object_id`
                          FROM `pictures`
@@ -138,7 +138,7 @@ 
                 // all pics of one user, except spoilers and invisibles
 
                 $rs = sql(
-                    "SELECT $fields, `logs`.`date` AS `picdate`
+                    "select $fields, `logs`.`date` AS `picdate`
                      FROM `pictures` `pics`
                      $join_logs
                      $join_caches
@@ -154,7 +154,7 @@ 
                 // by an old log deletion (we should remove those ...)
 
                 $rs = sql(
-                    "SELECT $fields, `logs`.`date` AS `picdate`
+                    "select $fields, `logs`.`date` AS `picdate`
                      FROM `pictures` AS `pics`
                      $join_logs
                      WHERE `object_type`=1 AND `logs`.`user_id`='&1'
@@ -191,7 +191,7 @@ 
                 // in listing view
 
                 $rs = sql(
-                    "SELECT $fields, `user`.`username`, `logs`.`date` AS `picdate`
+                    "select $fields, `user`.`username`, `logs`.`date` AS `picdate`
                      FROM `pictures` AS `pics`
                      $join_logs
                      $join_user

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++;
                             }
                         }
                     }

htdocs/lib2/logic/cracklib.inc.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 
     // min. 4 different chars
     $chars = array();
-    for ($i = 0; $i < mb_strlen($pw); $i ++) {
+    for ($i = 0; $i < mb_strlen($pw); $i++) {
         $chars[mb_substr($pw, $i, 1)] = true;
     }
 

Braces +2 added lines, -1 removed lines

@@ -75,7 +75,8 @@
 
     // $pw may not contain one of $addwords[]
     foreach ($wordlist as $v) {
-        if (mb_stripos($pw_lc, $v) !== false) {// mb_stripos needs PHP 5.2
+        if (mb_stripos($pw_lc, $v) !== false) {
+// mb_stripos needs PHP 5.2
             return false;
         }
     }