OpencachingDeutschland / oc-server3

htdocs/newcaches.php

Spacing +11 added lines, -12 removed lines

@@ -5,15 +5,14 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'newcaches';
 $tpl->menuitem = MNU_START_NEWCACHES;
 $tpl->change_country_inpage = true;
 
 $startat = isset($_REQUEST['startat']) ? floor($_REQUEST['startat'] + 0) : 0;
-$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] :
-    (isset($_REQUEST['country']) ? $_REQUEST['country'] : '');
+$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] : (isset($_REQUEST['country']) ? $_REQUEST['country'] : '');
 $cachetype = isset($_REQUEST['cachetype']) ? $_REQUEST['cachetype'] + 0 : 0;
 $bEvents = ($cachetype == 6);
 
@@ -24,14 +23,14 @@ 
 }
 
 $tpl->caching = true;
-$tpl->cache_id = $startat . "-" . $country . "-" . $cachetype;
+$tpl->cache_id = $startat."-".$country."-".$cachetype;
 $tpl->cache_lifetime = 300;
 if ($startat > 10 * $perpage) {
     $tpl->cache_lifetime = 3600;
 }
 
 if (!$tpl->is_cached()) {
-    $cachetype_condition = ($cachetype ? " AND `caches`.`type` = " . sql_escape($cachetype) : "");
+    $cachetype_condition = ($cachetype ? " AND `caches`.`type` = ".sql_escape($cachetype) : "");
     if ($bEvents) {
         $cachetype_condition .= " AND `date_hidden` >= curdate()";
     }
@@ -50,14 +49,14 @@ 
             INNER JOIN `user` ON `caches`.`user_id`=`user`.`user_id`
              LEFT JOIN `countries` ON `countries`.`short` = `caches`.`country`
              LEFT JOIN `sys_trans_text` ON `sys_trans_text`.`trans_id` = `countries`.`trans_id`
-                       AND `sys_trans_text`.`lang` = '" . sql_escape($opt['template']['locale']) . "'
+                       AND `sys_trans_text`.`lang` = '".sql_escape($opt['template']['locale'])."'
              LEFT JOIN `caches_attributes` `ca`
                   ON `ca`.`cache_id`=`caches`.`cache_id`
                   AND `ca`.`attrib_id`=6
-             WHERE `caches`.`status` = 1" . ($country ? " AND `caches`.`country`='" . sql_escape($country) . "'" : "") .
-        $cachetype_condition . "
+             WHERE `caches`.`status` = 1" . ($country ? " AND `caches`.`country`='".sql_escape($country)."'" : "").
+        $cachetype_condition."
               ORDER BY `caches`.`$date_field` $sort_order
-                   LIMIT " . sprintf("%d", $startat) . ',
+                   LIMIT ".sprintf("%d", $startat).',
                    ' . ($perpage + 0)
     );
     // see also write_newcaches_urls() in sitemap.class.php
@@ -70,8 +69,8 @@ 
     $startat = isset($_REQUEST['startat']) ? $_REQUEST['startat'] + 0 : 0;
     $cacheype_par = ($cachetype ? "&cachetype=$cachetype" : "");
     if ($country == '') {
-        $count = sql_value_slave("SELECT COUNT(*) FROM `caches` WHERE `caches`.`status`=1" . $cachetype_condition, 0);
-        $pager = new pager("newcaches.php?startat={offset}" . $cacheype_par);
+        $count = sql_value_slave("SELECT COUNT(*) FROM `caches` WHERE `caches`.`status`=1".$cachetype_condition, 0);
+        $pager = new pager("newcaches.php?startat={offset}".$cacheype_par);
     } else {
         $count = sql_value_slave(
             "SELECT COUNT(*)
@@ -81,7 +80,7 @@ 
             0,
             $country
         );
-        $pager = new pager("newcaches.php?country=" . $country . "&startat={offset}" . $cacheype_par);
+        $pager = new pager("newcaches.php?country=".$country."&startat={offset}".$cacheype_par);
     }
     $pager->make_from_offset($startat, $count, 100);
 

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

Braces +4 added lines, -2 removed lines

@@ -32,7 +32,8 @@ 
 $cacheId = 0;
 if (isset($_REQUEST['wp'])) {
     $cacheId = cache::cacheIdFromWP($_REQUEST['wp']);
-} elseif (isset($_REQUEST['cacheid'])) { // Ocprop
+} elseif (isset($_REQUEST['cacheid'])) {
+// Ocprop
     $cacheId = $_REQUEST['cacheid'];
 }
 
@@ -217,7 +218,8 @@ 
     $validate['duplicateLog'] = true;
 
     // all checks done, no error => log
-    if (isset($_POST['submitform']) && $loggable) {  // Ocprop
+    if (isset($_POST['submitform']) && $loggable) {
+// Ocprop
         /*
          * check if time is logged
          * set seconds 00:00:01, means "00:00 was logged"

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

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

Spacing +14 added lines, -14 removed lines

@@ -30,7 +30,7 @@ 
     $lonMin = $lon - floor($lon);
     $lon -= $lonMin;
 
-    $retval = '<select name="' . htmlspecialchars($prefix, ENT_QUOTES, 'UTF-8') . 'NS">';
+    $retval = '<select name="'.htmlspecialchars($prefix, ENT_QUOTES, 'UTF-8').'NS">';
     if ($bLatNeg) {
         $retval .= '<option value="N">N</option>';
         $retval .= '<option value="S" selected="selected">S</option>';
@@ -40,28 +40,28 @@ 
     }
     $retval .= '</select>&nbsp;';
 
-    $retval .= '<input type="text" name="' . htmlspecialchars(
+    $retval .= '<input type="text" name="'.htmlspecialchars(
             $prefix,
             ENT_QUOTES,
             'UTF-8'
-        ) . 'Lat" value="' . htmlspecialchars(
+        ).'Lat" value="'.htmlspecialchars(
             sprintf('%02d', $lat),
             ENT_QUOTES,
             'UTF-8'
-        ) . '" size="1" maxlength="2" />&deg; ';
-    $retval .= '<input type="text" name="' . htmlspecialchars(
+        ).'" size="1" maxlength="2" />&deg; ';
+    $retval .= '<input type="text" name="'.htmlspecialchars(
             $prefix,
             ENT_QUOTES,
             'UTF-8'
-        ) . 'LatMin" value="' . htmlspecialchars(
+        ).'LatMin" value="'.htmlspecialchars(
             sprintf('%06.3f', $latMin * 60),
             ENT_QUOTES,
             'UTF-8'
-        ) . '" size="5" maxlength="6" /> \'';
+        ).'" size="5" maxlength="6" /> \'';
 
     $retval .= '<br />';
 
-    $retval .= '<select name="' . htmlspecialchars($prefix, ENT_QUOTES, 'UTF-8') . 'EW">';
+    $retval .= '<select name="'.htmlspecialchars($prefix, ENT_QUOTES, 'UTF-8').'EW">';
     if ($bLonNeg) {
         $retval .= '<option value="E">E</option>';
         $retval .= '<option value="W" selected="selected">W</option>';
@@ -71,24 +71,24 @@ 
     }
     $retval .= '</select>&nbsp;';
 
-    $retval .= '<input type="text" name="' . htmlspecialchars(
+    $retval .= '<input type="text" name="'.htmlspecialchars(
             $prefix,
             ENT_QUOTES,
             'UTF-8'
-        ) . 'Lon" value="' . htmlspecialchars(
+        ).'Lon" value="'.htmlspecialchars(
             sprintf('%03d', $lon),
             ENT_QUOTES,
             'UTF-8'
-        ) . '" size="2" maxlength="3" />&deg; ';
-    $retval .= '<input type="text" name="' . htmlspecialchars(
+        ).'" size="2" maxlength="3" />&deg; ';
+    $retval .= '<input type="text" name="'.htmlspecialchars(
             $prefix,
             ENT_QUOTES,
             'UTF-8'
-        ) . 'LonMin" value="' . htmlspecialchars(
+        ).'LonMin" value="'.htmlspecialchars(
             sprintf('%06.3f', $lonMin * 60),
             ENT_QUOTES,
             'UTF-8'
-        ) . '" size="5" maxlength="6" /> \'';
+        ).'" size="5" maxlength="6" /> \'';
 
     return $retval;
 }