OpencachingDeutschland / oc-server3

htdocs/lib/settings-sample-dev.inc.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
 // database names
 $dbname = 'opencaching';
-$tmpdbname = 'octmp';   // empty db with CREATE and DROP privileges
+$tmpdbname = 'octmp'; // empty db with CREATE and DROP privileges
 
 // common developer system settings
 require 'settings-dev.inc.php';

local/ocxml11client/xml2array.inc.php

Spacing +3 added lines, -3 removed lines

@@ -16,14 +16,14 @@
 
     public function push_pos(&$pos)
     {
-        $this->stack[count($this->stack)] =& $pos;
-        $this->stack_ref =& $pos;
+        $this->stack[count($this->stack)] = & $pos;
+        $this->stack_ref = & $pos;
     }
 
     public function pop_pos()
     {
         unset($this->stack[count($this->stack) - 1]);
-        $this->stack_ref =& $this->stack[count($this->stack) - 1];
+        $this->stack_ref = & $this->stack[count($this->stack) - 1];
     }
 
     public function parse($strInputXML)

htdocs/adminuser.php

Spacing +4 added lines, -4 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'adminuser';
 $tpl->menuitem = MNU_ADMIN_USER;
@@ -51,7 +51,7 @@ 
     // send a new confirmation
     $user->sendRegistrationCode();
 
-    $tpl->redirect('adminuser.php?action=searchuser&msg=sendcodecommit&username=' . urlencode($user->getUsername()));
+    $tpl->redirect('adminuser.php?action=searchuser&msg=sendcodecommit&username='.urlencode($user->getUsername()));
 }
 
 function formAction()
@@ -97,8 +97,8 @@ 
         $user->addEmailProblem($datalicense);
     }
 
-    $tpl->redirect('adminuser.php?action=searchuser&username=' . urlencode($username) .
-        '&success=' . ($disduelicense + $disable));
+    $tpl->redirect('adminuser.php?action=searchuser&username='.urlencode($username).
+        '&success='.($disduelicense + $disable));
 }
 
 function searchUser()

htdocs/login.php

Spacing +6 added lines, -6 removed lines

@@ -6,7 +6,7 @@ 
  ***************************************************************************/
 
 $disable_verifyemail = true;
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'login';
 $tpl->menuitem = MNU_LOGIN;
@@ -28,7 +28,7 @@ 
     $target = 'myhome.php';
 }
 
-$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';   // Ocprop
+$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : ''; // Ocprop
 
 if ($action == 'cookieverify') {
     // we should be logged in ... check if cookie is set ...
@@ -39,7 +39,7 @@ 
             $tpl->redirect($target);
         }
     } else {
-        if (!isset($_COOKIE[$opt['session']['cookiename'] . 'data'])) {
+        if (!isset($_COOKIE[$opt['session']['cookiename'].'data'])) {
             $tpl->error(ERROR_NO_COOKIES);
         } else {
             $tpl->redirect($target);
@@ -58,13 +58,13 @@ 
         $tpl->error(ERROR_ALREADY_LOGGEDIN);
     }
 
-    $username = isset($_POST['email']) ? $_POST['email'] : '';  // Ocprop
-    $password = isset($_POST['password']) ? $_POST['password'] : '';  // Ocprop
+    $username = isset($_POST['email']) ? $_POST['email'] : ''; // Ocprop
+    $password = isset($_POST['password']) ? $_POST['password'] : ''; // Ocprop
 
     $retval = $login->try_login($username, $password, null);
     $password = '';
     if ($retval == LOGIN_OK) {
-        $tpl->redirect('login.php?action=cookieverify&target=' . urlencode($target));
+        $tpl->redirect('login.php?action=cookieverify&target='.urlencode($target));
     }
 
     $tpl->assign('username', $username);

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