OpencachingDeutschland / oc-server3

htdocs/newlogsrest.php

Spacing +1 added lines, -1 removed lines

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

htdocs/garmin.php

Spacing +7 added lines, -7 removed lines

@@ -5,9 +5,9 @@ 
  * Unicode Reminder メモ
  ****************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
-require_once __DIR__ . '/lib2/logic/labels.inc.php';
-require_once __DIR__ . '/lib2/logic/cache.class.php';
+require __DIR__.'/lib2/web.inc.php';
+require_once __DIR__.'/lib2/logic/labels.inc.php';
+require_once __DIR__.'/lib2/logic/cache.class.php';
 
 $tpl->name = 'garmin';
 $tpl->popup = 1;
@@ -30,9 +30,9 @@ 
 // be needed.
 
 if (($opt['lib']['garmin']['domain'] != $_SERVER['HTTP_HOST']) && !isset($_REQUEST['redirect'])) {
-    $redirect = $opt['lib']['garmin']['page_url'] . 'garmin.php?redirect=1&cacheid=' . $cacheid;
+    $redirect = $opt['lib']['garmin']['page_url'].'garmin.php?redirect=1&cacheid='.$cacheid;
     if (isset($_REQUEST['templocale'])) {
-        $redirect .= '&templocale=' . $_REQUEST['templocale'];
+        $redirect .= '&templocale='.$_REQUEST['templocale'];
     }
     $tpl->redirect($redirect);
     exit;
@@ -52,9 +52,9 @@ 
 $tpl->assign('crypt', $bCrypt);
 
 if (isset($_REQUEST['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';
 }
 
 //get cache record

htdocs/mywatches.php

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 = 'mywatches';
 $tpl->menuitem = MNU_MYPROFILE_WATCHES;
 
 $login->verify();
 if ($login->userid == 0) {
-    $tpl->redirect('login.php?target=' . urlencode($tpl->target));
+    $tpl->redirect('login.php?target='.urlencode($tpl->target));
 }
 
 $action = isset($_REQUEST['action']) ? mb_strtolower($_REQUEST['action']) : '';
@@ -48,14 +48,14 @@ 
     }
 
     $hours = array();
-    for ($i = 0; $i < 24; $i ++) {
+    for ($i = 0; $i < 24; $i++) {
         $hours[] = [
             'value' => $i,
             'time' => mktime($i, 0, 0)
         ];
     }
     $weekdays = array();
-    for ($i = 1; $i <= 7; $i ++) {
+    for ($i = 1; $i <= 7; $i++) {
         $weekdays[] = array(
             'value' => $i,
             'time' => mktime(0, 0, 0, 0, $i + 5, 2000)

htdocs/mydetails.php

Spacing +6 added lines, -6 removed lines

@@ -5,8 +5,8 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
-require_once __DIR__ . '/lib2/edithelper.inc.php';
+require __DIR__.'/lib2/web.inc.php';
+require_once __DIR__.'/lib2/edithelper.inc.php';
 
 $tpl->name = 'mydetails';
 $tpl->menuitem = MNU_MYPROFILE_DETAILS;
@@ -51,8 +51,8 @@ 
 
         while ($record = sql_fetch_array($rs)) {
             $id = $record['id'];
-            $vis = isset($_REQUEST['chk' . $id]) ? $_REQUEST['chk' . $id] + 0 : 0;
-            $value = isset($_REQUEST['inp' . $id]) ? $_REQUEST['inp' . $id] : '';
+            $vis = isset($_REQUEST['chk'.$id]) ? $_REQUEST['chk'.$id] + 0 : 0;
+            $value = isset($_REQUEST['inp'.$id]) ? $_REQUEST['inp'.$id] : '';
             if ($vis != 1) {
                 $vis = 0;
             }
@@ -63,7 +63,7 @@ 
                 $bErrorlen = true;
             } else {
                 if (!$useroptions->setOptValue($id, $value)) {
-                    $error .= $useroptions->getOptName($id) . ', ';
+                    $error .= $useroptions->getOptName($id).', ';
                     $bError = true;
                 }
             }
@@ -172,7 +172,7 @@ 
         }
         if ($descMode == 3) {
             $tpl->add_header_javascript('resource2/tinymce/tiny_mce_gzip.js');
-            $tpl->add_header_javascript('resource2/tinymce/config/user.js.php?lang=' . strtolower($opt['template']['locale']));
+            $tpl->add_header_javascript('resource2/tinymce/config/user.js.php?lang='.strtolower($opt['template']['locale']));
         }
         $tpl->add_header_javascript(editorJsPath());
         $tpl->assign('descMode', $descMode);

htdocs/doc/sql/stored-proc/old/distance.php

Spacing +4 added lines, -4 removed lines

@@ -9,13 +9,13 @@
  ***************************************************************************/
 
 $opt['rootpath'] = '../../../';
-require_once $opt['rootpath'] . 'lib/clicompatbase.inc.php';
+require_once $opt['rootpath'].'lib/clicompatbase.inc.php';
 
-if (!file_exists($opt['rootpath'] . 'util/mysql_root/sql_root.inc.php')) {
-    die("\n" . 'install util/mysql_root/sql_root.inc.php' . "\n\n");
+if (!file_exists($opt['rootpath'].'util/mysql_root/sql_root.inc.php')) {
+    die("\n".'install util/mysql_root/sql_root.inc.php'."\n\n");
 }
 
-require_once $opt['rootpath'] . 'util/mysql_root/sql_root.inc.php';
+require_once $opt['rootpath'].'util/mysql_root/sql_root.inc.php';
 
 /* begin db connect */
 db_root_connect();

htdocs/doc/sql/stored-proc/maintain-113.inc.php

Spacing +3 added lines, -3 removed lines

@@ -448,7 +448,7 @@ 
 
    SELECT GROUP_CONCAT(DISTINCT `language` ORDER BY `language` SEPARATOR ',') INTO dl FROM `cache_desc` WHERE `cache_id`=nCacheId GROUP BY `cache_id` ;
    UPDATE `caches` SET `desc_languages`=dl, default_desclang=PREFERED_LANG(dl, '&1') WHERE `cache_id`=nCacheId LIMIT 1;
- END;", strtoupper($lang . ',EN'));
+ END;", strtoupper($lang.',EN'));
 
 // set caches.desc_languages of all caches, fill cache_desc_prefered and return number of modified rows
 sql_dropProcedure('sp_updateall_caches_descLanguages');
@@ -456,7 +456,7 @@ 
  BEGIN
    UPDATE `caches`, (SELECT `cache_id`, GROUP_CONCAT(DISTINCT `language` ORDER BY `language` SEPARATOR ',') AS `dl` FROM `cache_desc` GROUP BY `cache_id`) AS `tbl` SET `caches`.`desc_languages`=`tbl`.`dl`, `caches`.`default_desclang`=PREFERED_LANG(`tbl`.`dl`, '&1') WHERE `caches`.`cache_id`=`tbl`.`cache_id`;
    SET nModified = ROW_COUNT() ;
- END;", strtoupper($lang . ',EN'));
+ END;", strtoupper($lang.',EN'));
 
 // update found, last_found, notfound and note of stat_cache_logs, stat_caches and stat_user
 sql_dropProcedure('sp_update_logstat');
@@ -808,7 +808,7 @@ 
                     SET @dont_update_listingdate=0;
                 END;",
                 $opt['logic']['waypoint_pool']['prefix'],
-                '^' . $opt['logic']['waypoint_pool']['prefix'] . '[' . $opt['logic']['waypoint_pool']['valid_chars'] . ']{1,}$');
+                '^'.$opt['logic']['waypoint_pool']['prefix'].'['.$opt['logic']['waypoint_pool']['valid_chars'].']{1,}$');
 
 sql_dropTrigger('cachesAfterInsert');
 sql("CREATE TRIGGER `cachesAfterInsert` AFTER INSERT ON `caches`

htdocs/doc/sql/stored-proc/maintain-153.inc.php

Spacing +3 added lines, -3 removed lines

@@ -204,7 +204,7 @@ 
             LIMIT 1;
         END IF;
      END;",
-    strtoupper($lang . ',EN')
+    strtoupper($lang.',EN')
 );
 
 // set caches.desc_languages of all caches, fill cache_desc_prefered and return number of modified rows
@@ -225,7 +225,7 @@ 
         
         SET nModified = ROW_COUNT();
      END;",
-    strtoupper($lang . ',EN')
+    strtoupper($lang.',EN')
 );
 
 // update found, last_found, notfound and note of stat_cache_logs, stat_caches and stat_user,
@@ -909,7 +909,7 @@ 
         SET @dont_update_listingdate=0;
      END;",
     $opt['logic']['waypoint_pool']['prefix'],
-    '^' . $opt['logic']['waypoint_pool']['prefix'] . '[' . $opt['logic']['waypoint_pool']['valid_chars'] . ']{1,}$'
+    '^'.$opt['logic']['waypoint_pool']['prefix'].'['.$opt['logic']['waypoint_pool']['valid_chars'].']{1,}$'
 );
 
 sql_dropTrigger('cachesAfterInsert');

htdocs/doc/sql/stored-proc/maintain.php

Spacing +8 added lines, -8 removed lines

@@ -8,8 +8,8 @@ 
  *  Load current stored procs and triggers into database.
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../../';
-require $opt['rootpath'] . 'lib2/cli.inc.php';
+$opt['rootpath'] = __DIR__.'/../../../';
+require $opt['rootpath'].'lib2/cli.inc.php';
 
 if ($opt['db']['maintenance_user'] == '') {
     die("ERROR: \$opt['db']['maintenance_user'] is not set in config2/settings.inc.php\n");
@@ -18,10 +18,10 @@ 
 // retrieve DB password
 if ($opt['db']['maintenance_password'] == '') {
     if (in_array('--flush', $argv)) {
-        echo "\nenter DB " . $opt['db']['maintenance_user'] . " password:\n";
+        echo "\nenter DB ".$opt['db']['maintenance_user']." password:\n";
         flush();
     } else {
-        echo 'enter DB ' . $opt['db']['maintenance_user'] . ' password: ';
+        echo 'enter DB '.$opt['db']['maintenance_user'].' password: ';
     }
 
     $fh = fopen('php://stdin', 'r');
@@ -44,13 +44,13 @@ 
 // include the requested maintain version file
 $dbsv = in_array('--dbsv', $argv);
 if ($dbsv) {
-    $versionfile = 'maintain-' . $argv[$dbsv + 1] . '.inc.php';
-    if (!file_exists(__DIR__ . '/' . $versionfile)) {
-        die($versionfile . " not found\n");
+    $versionfile = 'maintain-'.$argv[$dbsv + 1].'.inc.php';
+    if (!file_exists(__DIR__.'/'.$versionfile)) {
+        die($versionfile." not found\n");
     } else {
         require $versionfile;
     }
-    @unlink($opt['rootpath'] . 'cache2/dbsv-running');
+    @unlink($opt['rootpath'].'cache2/dbsv-running');
 } else {
     require 'maintain-current.inc.php';
 }

htdocs/articles.php

Spacing +10 added lines, -10 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 //get the article name to display
 $article = '';
@@ -23,20 +23,20 @@ 
     $tpl->redirect('index.php');
 } elseif (isset($_REQUEST['wiki'])) {
     $tpl->redirect(helppageurl($article));
-} elseif (!file_exists($opt['stylepath'] . '/articles/' . $language . '/' . $article . '.tpl')) {
+} elseif (!file_exists($opt['stylepath'].'/articles/'.$language.'/'.$article.'.tpl')) {
     // does article exist in default-language?
-    $file = $opt['stylepath'] . '/articles/' . $opt['template']['default']['article_locale'] . '/' . $article . '.tpl';
+    $file = $opt['stylepath'].'/articles/'.$opt['template']['default']['article_locale'].'/'.$article.'.tpl';
     if (file_exists($file)) {
         $language = $opt['template']['default']['article_locale'];
-    } elseif (file_exists($opt['stylepath'] . '/articles/EN/' . $article . '.tpl')) {
+    } elseif (file_exists($opt['stylepath'].'/articles/EN/'.$article.'.tpl')) {
         $language = 'EN';
     } else {
         // use any
         $language = false;
-        if ($hDir = opendir($opt['stylepath'] . '/articles/')) {
+        if ($hDir = opendir($opt['stylepath'].'/articles/')) {
             while ((($sFile = readdir($hDir)) !== false) && ($language === false)) {
-                if (($sFile != '.') && ($sFile != '..') && (is_dir($opt['stylepath'] . '/articles/' . $sFile))) {
-                    if (file_exists($opt['stylepath'] . '/articles/' . $sFile . '/' . $article . '.tpl')) {
+                if (($sFile != '.') && ($sFile != '..') && (is_dir($opt['stylepath'].'/articles/'.$sFile))) {
+                    if (file_exists($opt['stylepath'].'/articles/'.$sFile.'/'.$article.'.tpl')) {
                         $language = $sFile;
                     }
                 }
@@ -54,13 +54,13 @@ 
 $tpl->name = 'articles';
 
 $tpl->caching = true;
-$tpl->cache_id = 'articles|' . $language . '|' . $article;
+$tpl->cache_id = 'articles|'.$language.'|'.$article;
 $tpl->cache_lifetime = 43200;
 
 $tpl->menuitem = sql_value(
     "SELECT `id` FROM `sys_menu` WHERE `href`='&1' LIMIT 1",
     0,
-    'articles.php?page=' . urlencode($article)
+    'articles.php?page='.urlencode($article)
 );
 if ($tpl->menuitem == 0) {
     $tpl->redirect('index.php');
@@ -74,7 +74,7 @@ 
     /* prepare smarty vars for special pages ...
      */
     if ($article == 'cacheinfo') {
-        require_once $opt['rootpath'] . 'lib2/logic/attribute.class.php';
+        require_once $opt['rootpath'].'lib2/logic/attribute.class.php';
         $attributes = attribute::getSelectableAttrbutesListArray(true);
         $tpl->assign('attributes', $attributes);
     }