OpencachingDeutschland / oc-server3

htdocs/okapi_settings.php

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/a.php

Spacing +1 added lines, -1 removed lines

@@ -7,4 +7,4 @@
  *  Activation page shortcut to keep URLs in activation Emails short
  ***************************************************************************/
 
-require __DIR__ . '/activation.php';
+require __DIR__.'/activation.php';

htdocs/log.php

Spacing +10 added lines, -10 removed lines

@@ -11,11 +11,11 @@ 
 }
 
 // include librarys
-require __DIR__ . '/lib2/web.inc.php';
-require_once __DIR__ . '/lib2/logic/cache.class.php';
-require_once __DIR__ . '/lib2/logic/user.class.php';
-require_once __DIR__ . '/lib2/logic/cachelog.class.php';
-require_once __DIR__ . '/lib2/edithelper.inc.php';
+require __DIR__.'/lib2/web.inc.php';
+require_once __DIR__.'/lib2/logic/cache.class.php';
+require_once __DIR__.'/lib2/logic/user.class.php';
+require_once __DIR__.'/lib2/logic/cachelog.class.php';
+require_once __DIR__.'/lib2/edithelper.inc.php';
 
 // prepare template and menue
 $tpl->name = 'log_cache';
@@ -121,7 +121,7 @@ 
     // get logtext editormode (from form or from userprofile)
     // 1 = text; 2 = HTML; 3 = tinyMCE
     if (isset($_POST['descMode'])) {
-        $descMode = $_POST['descMode'] + 0;  // Ocprop: 2
+        $descMode = $_POST['descMode'] + 0; // Ocprop: 2
         if (($descMode < 1) || ($descMode > 3)) {
             $descMode = 3;
         }
@@ -146,7 +146,7 @@ 
     if ($descMode == 3) {
         $tpl->add_header_javascript('resource2/tinymce/tiny_mce_gzip.js');
         $tpl->add_header_javascript(
-            'resource2/tinymce/config/log.js.php?lang=' . strtolower($opt['template']['locale'])
+            'resource2/tinymce/config/log.js.php?lang='.strtolower($opt['template']['locale'])
         );
     }
     $tpl->add_header_javascript(editorJsPath());
@@ -158,7 +158,7 @@ 
     if (is_numeric($logDateMonth)
         && is_numeric($logDateDay)
         && is_numeric($logDateYear)
-        && ($logTimeHour . $logTimeMinute == "" || is_numeric($logTimeHour))
+        && ($logTimeHour.$logTimeMinute == "" || is_numeric($logTimeHour))
         && ($logTimeMinute == "" || is_numeric($logTimeMinute))
     ) {
         $validate['dateOk'] = checkdate($logDateMonth, $logDateDay, $logDateYear)
@@ -223,7 +223,7 @@ 
          * set seconds 00:00:01, means "00:00 was logged"
          * set seconds 00:00:00, means "no time was logged"
          */
-        $logTimeSecond = ($logTimeHour . $logTimeMinute != ""
+        $logTimeSecond = ($logTimeHour.$logTimeMinute != ""
                 && $logTimeHour == 0
                 && $logTimeMinute == 0) + 0;
 
@@ -279,7 +279,7 @@ 
         }
 
         // finished, redirect to listing
-        $tpl->redirect('viewcache.php?cacheid=' . $cache->getCacheId());
+        $tpl->redirect('viewcache.php?cacheid='.$cache->getCacheId());
     }
 
     // assign values to template

htdocs/resource2/ocstyle/images/head/rotator.php

Spacing +9 added lines, -9 removed lines

@@ -159,7 +159,7 @@ 
 $img = null;
 
 if (substr($folder, - 1) != '/') {
-    $folder = $folder . '/';
+    $folder = $folder.'/';
 }
 
 $fileList = [];
@@ -177,22 +177,22 @@ 
 
 if (count($fileList) > 0) {
     $imageNumber = floor(time() / $interval) % count($fileList);
-    $img = $folder . $fileList[$imageNumber];
+    $img = $folder.$fileList[$imageNumber];
 }
 
 if ($img != null) {
     $imageInfo = pathinfo($img);
-    header('Content-type: ' . $extList[$imageInfo['extension']]);
+    header('Content-type: '.$extList[$imageInfo['extension']]);
 
     // Cache-Lebensdauer (in Minuten)
-    $exp_gmt = gmdate("D, d M Y H:i:s", time() + $interval) . " GMT";
-    $mod_gmt = gmdate("D, d M Y H:i:s", time()) . " GMT";
+    $exp_gmt = gmdate("D, d M Y H:i:s", time() + $interval)." GMT";
+    $mod_gmt = gmdate("D, d M Y H:i:s", time())." GMT";
 
-    header("Expires: " . $exp_gmt);
-    header("Last-Modified: " . $mod_gmt);
-    header("Cache-Control: public, max-age=" . $interval);
+    header("Expires: ".$exp_gmt);
+    header("Last-Modified: ".$mod_gmt);
+    header("Cache-Control: public, max-age=".$interval);
     // Speziell f�r MSIE 5
-    header("Cache-Control: pre-check=" . $interval, false);
+    header("Cache-Control: pre-check=".$interval, false);
 
     readfile($img);
 } else {

htdocs/ocmap.php

Spacing +1 added lines, -1 removed lines

@@ -6,4 +6,4 @@
  ***************************************************************************/
 
 $nongc = true;
-require __DIR__ . '/map2.php';
+require __DIR__.'/map2.php';

htdocs/viewcache.php

Spacing +11 added lines, -11 removed lines

@@ -14,8 +14,8 @@ 
 use Oc\Libse\Http\RequestHttp;
 use Oc\Libse\Language\TranslatorLanguage;
 
-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';
 
 $login->verify();
 
@@ -28,7 +28,7 @@ 
     if ($count > 0) {
         $formatter = new FormatterCoordinate();
 
-        for ($i = 0; $i < $count; $i ++) {
+        for ($i = 0; $i < $count; $i++) {
             $waypoints[$i]['coord']['lat'] = $waypoints[$i]['coordinate']->latitude();
             $waypoints[$i]['coord']['lon'] = $waypoints[$i]['coordinate']->longitude();
             $waypoints[$i]['coordinateHtml'] = $formatter->formatHtml($waypoints[$i]['coordinate'], '<br />');
@@ -78,9 +78,9 @@ 
 
 $desclang = isset($_REQUEST['desclang']) ? $_REQUEST['desclang'] : false;
 if ($desclang) {
-    $sPreferedDescLang = $_REQUEST['desclang'] . ',' . $opt['template']['locale'] . ',EN';
+    $sPreferedDescLang = $_REQUEST['desclang'].','.$opt['template']['locale'].',EN';
 } else {
-    $sPreferedDescLang = $opt['template']['locale'] . ',EN';
+    $sPreferedDescLang = $opt['template']['locale'].',EN';
 }
 
 $logpics = isset($_REQUEST['logpics']) && ($_REQUEST['logpics'] == 1);
@@ -203,7 +203,7 @@ 
         $digits = 0;
     }
 }
-$rCache['waylength'] = sprintf('%.' . $digits . 'f', $rCache['waylength']);
+$rCache['waylength'] = sprintf('%.'.$digits.'f', $rCache['waylength']);
 
 // replace links
 $rCache['desc'] = use_current_protocol_in_html($rCache['desc']);
@@ -243,7 +243,7 @@ 
 }
 
 $tpl->assign('cache', $rCache);
-$tpl->title = $rCache['wpoc'] . ' ' . $rCache['name'];
+$tpl->title = $rCache['wpoc'].' '.$rCache['name'];
 
 $coord = new coordinate($rCache['latitude'], $rCache['longitude']);
 $tpl->assign('coordinates', $coord->getDecimalMinutes());
@@ -391,11 +391,11 @@ 
  */
 $tpl->assign('show_logpics', $logpics ? 1 : 0);
 if ($logpics) {
-    LogPics::setPaging(LogPics::FOR_CACHE_GALLERY, 0, $cacheid, "viewcache.php?cacheid=" . $cacheid . "&logpics=1");
+    LogPics::setPaging(LogPics::FOR_CACHE_GALLERY, 0, $cacheid, "viewcache.php?cacheid=".$cacheid."&logpics=1");
     $tpl->assign(
         'subtitle',
-        "&lt;&lt; <a href='viewcache.php?cacheid=" . $cacheid . "'>" .
-        $translate->t('Back to the cache description', '', basename(__FILE__), __LINE__) . "</a>"
+        "&lt;&lt; <a href='viewcache.php?cacheid=".$cacheid."'>".
+        $translate->t('Back to the cache description', '', basename(__FILE__), __LINE__)."</a>"
     );
 
 } else {
@@ -424,7 +424,7 @@ 
 }
 
 $cachemap['iframe'] = $opt['logic']['cachemaps']['iframe'];
-$url = $opt['page']['protocol'] . strstr($opt['logic']['cachemaps']['url'], '://');
+$url = $opt['page']['protocol'].strstr($opt['logic']['cachemaps']['url'], '://');
 $url = str_replace('{userzoom}', $userzoom, $url);
 $url = str_replace('{latitude}', $rCache['latitude'], $url);
 $url = str_replace('{longitude}', $rCache['longitude'], $url);

htdocs/src/Oc/SmartyPlugins/modifier.smiley.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
  * @subpackage plugins
  */
 
-require_once $opt['rootpath'] . 'lib2/smiley.inc.php';
+require_once $opt['rootpath'].'lib2/smiley.inc.php';
 
 function smarty_modifier_smiley($string)
 {

htdocs/src/Oc/SmartyPlugins/prefilter.t.php

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;

htdocs/src/Oc/SmartyPlugins/outputfilter.session.php

Spacing +6 added lines, -6 removed lines

@@ -24,9 +24,9 @@ 
         if (SID != '' && session_id() != '') {
             $text = preg_replace(
                 '/<\\/form>/i',
-                '<input type="hidden" name="' . htmlspecialchars(session_name()) . '" value="' . htmlspecialchars(
+                '<input type="hidden" name="'.htmlspecialchars(session_name()).'" value="'.htmlspecialchars(
                     session_id()
-                ) . '" /></form>',
+                ).'" /></form>',
                 $text
             );
             $text = preg_replace_callback(
@@ -59,12 +59,12 @@ 
     }
 
     if (strpos($match[2], '?') === false) {
-        return 'href=' . $match[1] . $match[2] . '?' . urlencode(session_name()) . '=' . urlencode(
+        return 'href='.$match[1].$match[2].'?'.urlencode(session_name()).'='.urlencode(
             session_id()
-        ) . $match[3];
+        ).$match[3];
     } else {
-        return 'href=' . $match[1] . $match[2] . '&' . urlencode(session_name()) . '=' . urlencode(
+        return 'href='.$match[1].$match[2].'&'.urlencode(session_name()).'='.urlencode(
             session_id()
-        ) . $match[3];
+        ).$match[3];
     }
 }