OpencachingDeutschland / oc-server3

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

htdocs/activation.php

Spacing +3 added lines, -5 removed lines

@@ -6,7 +6,7 @@ 
  ***************************************************************************/
 
 $disable_verifyemail = true;
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'activation';
 $tpl->menuitem = MNU_START_REGISTER_ACTIVATION;
@@ -14,10 +14,8 @@ 
 // We use short param codes 'u' and 'c' to generate short-enough activation
 // url that will not be wrapped in plain-text emails.
 
-$code = isset($_REQUEST['code']) ? trim($_REQUEST['code']) :
-    (isset($_REQUEST['c']) ? trim($_REQUEST['c']) : '');
-$email = isset($_REQUEST['email']) ? trim($_REQUEST['email']) :
-    (isset($_REQUEST['e']) ? trim($_REQUEST['e']) : '');
+$code = isset($_REQUEST['code']) ? trim($_REQUEST['code']) : (isset($_REQUEST['c']) ? trim($_REQUEST['c']) : '');
+$email = isset($_REQUEST['email']) ? trim($_REQUEST['email']) : (isset($_REQUEST['e']) ? trim($_REQUEST['e']) : '');
 
 $tpl->assign('errorEMail', false);
 $tpl->assign('errorCode', false);

htdocs/addtolist.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 = 'addtolist';
 $tpl->menuitem = MNU_CACHES_ADDTOLIST;
@@ -22,7 +22,7 @@ 
 $tpl->assign('cacheid', $cacheid);
 
 if (isset($_REQUEST['cancel'])) {
-    $tpl->redirect('viewcache.php?cacheid=' . $cacheid);
+    $tpl->redirect('viewcache.php?cacheid='.$cacheid);
 }
 
 $newlist_name = isset($_REQUEST['newlist_name']) ? trim($_REQUEST['newlist_name']) : false;
@@ -44,14 +44,14 @@ 
                     $cachelist->watch(true);
                 }
             }
-            $tpl->redirect('viewcache.php?cacheid=' . $cacheid);
+            $tpl->redirect('viewcache.php?cacheid='.$cacheid);
         }
     } else {
         $cachelist = new cachelist($listid);
         if ($cachelist->exist()) {
             $cachelist->addCacheByID($cacheid);
         }
-        $tpl->redirect('viewcache.php?cacheid=' . $cacheid);
+        $tpl->redirect('viewcache.php?cacheid='.$cacheid);
     }
 }
 

htdocs/newlogs.php

Spacing +17 added lines, -17 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $add_where = '';
 $newLogsPerCountry = $opt['logic']['new_logs_per_country'];
@@ -30,9 +30,9 @@ 
     $country = false;
     $exclude_country = '*';
     $include_country = '%';
-    $add_where = "AND `caches`.`user_id`='" . sql_escape($ownerid) . "' ";
+    $add_where = "AND `caches`.`user_id`='".sql_escape($ownerid)."' ";
     if (!$show_own_logs) {
-        $add_where .= "AND `cache_logs`.`user_id`<>'" . sql_escape($login->userid) . "' ";
+        $add_where .= "AND `cache_logs`.`user_id`<>'".sql_escape($login->userid)."' ";
     }
     $tpl->caching = false;
     $logcount = 100;
@@ -49,7 +49,7 @@ 
     $country = false;
     $exclude_country = '*';
     $include_country = '%';
-    $add_where = "AND `cache_logs`.`user_id`='" . sql_escape($userid) . "' ";
+    $add_where = "AND `cache_logs`.`user_id`='".sql_escape($userid)."' ";
     $tpl->caching = false;
     $logcount = 100;
     $paging = true;
@@ -69,7 +69,7 @@ 
     $tpl->cache_lifetime = 900;
     $tpl->cache_id = $exclude_country;
     $logcount = 250;
-    $paging = false;  // paging would have poor performance for all logs
+    $paging = false; // paging would have poor performance for all logs
     $orderByDate = $logselection == 3 ? "{fromtable}.`order_date` DESC, " : "";
 } else {
     // latest logs for all countries or for one country
@@ -88,7 +88,7 @@ 
     $tpl->cache_lifetime = 300;
     $tpl->cache_id = $country;
     $logcount = 250;
-    $paging = false;  // paging would have poor performance for all logs
+    $paging = false; // paging would have poor performance for all logs
     $orderByDate = $logselection == 3 ? "{fromtable}.`order_date` DESC, " : "";
     $optimize_for_latest_logs = ($country == '' || $country == $opt['page']['main_country']);
 }
@@ -101,7 +101,7 @@ 
 if ($logselection == 1) {
     $add_where .= "AND DATEDIFF(NOW(), {fromtable}.`date`) < 30 ";
 }
-$tpl->cache_id .= "|" . $logselection;
+$tpl->cache_id .= "|".$logselection;
 
 $tpl->change_country_inpage = true;
 
@@ -121,7 +121,7 @@ 
                 `needs_maintenance`, `listing_outdated`, `order_date`
              FROM `cache_logs`
              ORDER BY `date_created` DESC
-             LIMIT " . (4 * $logcount) . ")"
+             LIMIT " . (4 * $logcount).")"
         );
         $fromtable = '`&loglist0`';
     } else {
@@ -132,16 +132,16 @@ 
     sql_temp_table_slave('loglist');
     sql_slave(
         "CREATE TEMPORARY TABLE &loglist (`id` INT(11) PRIMARY KEY)
-        SELECT " . ($paging ? "SQL_CALC_FOUND_ROWS" : "") . " " . $fromtable . ".`id`
-        FROM " . $fromtable . "
-        INNER JOIN `caches` ON " . $fromtable . ".`cache_id`=`caches`.`cache_id`
+        SELECT " . ($paging ? "SQL_CALC_FOUND_ROWS" : "")." ".$fromtable.".`id`
+        FROM " . $fromtable."
+        INNER JOIN `caches` ON " . $fromtable.".`cache_id`=`caches`.`cache_id`
         INNER JOIN `cache_status` ON `caches`.`status`=`cache_status`.`id`
-        INNER JOIN `user` ON " . $fromtable . ".`user_id`=`user`.`user_id`
+        INNER JOIN `user` ON " . $fromtable.".`user_id`=`user`.`user_id`
         WHERE `cache_status`.`allow_user_view`=1
         AND `caches`.`country` LIKE '&1'
         AND `caches`.`country`<>'&2'
-        " . $add_where . "
-        ORDER BY " . str_replace("{fromtable}", $fromtable, $orderByDate) . $fromtable . ".`date_created` DESC
+        " . $add_where."
+        ORDER BY " . str_replace("{fromtable}", $fromtable, $orderByDate).$fromtable.".`date_created` DESC
         LIMIT &3, &4",
         $include_country,
         $exclude_country,
@@ -202,7 +202,7 @@ 
             ON `caches_attributes`.`cache_id`=`caches`.`cache_id`
             AND `caches_attributes`.`attrib_id`=6
         WHERE IFNULL(`cache_logs_restored`.`restored_by`,0)=0
-        ORDER BY " . $orderByCountry . str_replace("{fromtable}", "`cache_logs`", $orderByDate) . "`cache_logs`.`date_created` DESC",
+        ORDER BY " . $orderByCountry.str_replace("{fromtable}", "`cache_logs`", $orderByDate)."`cache_logs`.`date_created` DESC",
         $opt['template']['locale']
     );
 
@@ -247,7 +247,7 @@ 
             }
             sql_free_result($rsPic);
         }
-        $pics --;
+        $pics--;
 
         $rLog['first'] = false;
         if (isset($caches_logged)) {
@@ -301,7 +301,7 @@ 
 
     $tpl->assign('paging', $paging);
     if ($paging) {
-        $pager = new pager($_SERVER["SCRIPT_NAME"] . '?startat={offset}' . $urlparams);
+        $pager = new pager($_SERVER["SCRIPT_NAME"].'?startat={offset}'.$urlparams);
         $pager->make_from_offset($startat, $total_logs, $logcount);
     }
 }