OpencachingDeutschland / oc-server3

htdocs/lib2/Net/IDNA2/Exception/Nameprep.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-require_once __DIR__ . '/../Exception.php';
+require_once __DIR__.'/../Exception.php';
 // adjusted path for OC distribution
 
 class Net_IDNA2_Exception_Nameprep extends Net_IDNA2_Exception

htdocs/lib2/ProcessSync.class.php

Spacing +8 added lines, -8 removed lines

@@ -16,7 +16,7 @@ 
     public function __construct($name)
     {
         global $opt;
-        $this->pidfile_path = $opt['rootpath'] . "cache2/$name.pid";
+        $this->pidfile_path = $opt['rootpath']."cache2/$name.pid";
     }
 
 
@@ -29,7 +29,7 @@ 
         }
 
         if (file_exists($this->pidfile_path)) {
-            echo "Error: Pidfile (" . $this->pidfile_path . ") already present\n";
+            echo "Error: Pidfile (".$this->pidfile_path.") already present\n";
 
             return false;
         } else {
@@ -39,7 +39,7 @@ 
 
                 return true;
             } else {
-                echo "can't create Pidfile " . $this->pidfile_path . "\n";
+                echo "can't create Pidfile ".$this->pidfile_path."\n";
 
                 return false;
             }
@@ -59,19 +59,19 @@ 
 
             // bad PID file, e.g. due to system malfunction while creating the file?
             if ($pid_daemon <= 0) {
-                echo "removing bad pid_file (" . $this->pidfile_path . ")\n";
+                echo "removing bad pid_file (".$this->pidfile_path.")\n";
                 unlink($this->pidfile_path);
 
                 return false;
             } // process running?
             elseif (posix_kill($pid_daemon, 0)) {
                 // yes, good bye
-                echo "Error: process for " . $this->pidfile_path . " is already running with pid=$pid_daemon\n";
+                echo "Error: process for ".$this->pidfile_path." is already running with pid=$pid_daemon\n";
 
                 return false;
             } else {
                 // no, remove pid_file
-                echo "process not running, removing old pid_file (" . $this->pidfile_path . ")\n";
+                echo "process not running, removing old pid_file (".$this->pidfile_path.")\n";
                 unlink($this->pidfile_path);
 
                 return true;
@@ -93,11 +93,11 @@ 
                 unlink($this->pidfile_path);
             }
         } else {
-            echo "Error: can't delete own pidfile (" . $this->pidfile_path . ")\n";
+            echo "Error: can't delete own pidfile (".$this->pidfile_path.")\n";
         }
 
         if ($message) {
-            echo $message . "\n";
+            echo $message."\n";
         }
     }
 

htdocs/lib2/web.inc.php

Spacing +7 added lines, -7 removed lines

@@ -19,23 +19,23 @@ 
 }
 
 // chicken-egg problem ...
-require_once $opt['rootpath'] . 'lib2/const.inc.php';
+require_once $opt['rootpath'].'lib2/const.inc.php';
 
 // do all output in HTML format
 $opt['gui'] = GUI_HTML;
 
 // include the main library
-require_once $opt['rootpath'] . 'lib2/common.inc.php';
+require_once $opt['rootpath'].'lib2/common.inc.php';
 
 // enforce http or https?
 if ($opt['page']['https']['mode'] == HTTPS_DISABLED) {
     if ($opt['page']['https']['active']) {
-        $tpl->redirect('http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']);
+        $tpl->redirect('http://'.$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']);
     }
     $opt['page']['force_https_login'] = false;
 } elseif ($opt['page']['https']['mode'] == HTTPS_ENFORCED) {
     if (!$opt['page']['https']['active']) {
-        $tpl->redirect('https://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']);
+        $tpl->redirect('https://'.$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']);
     }
     $opt['page']['force_https_login'] = true;
 }
@@ -83,7 +83,7 @@ 
     if (substr($helppage, 0, 1) == "!") {
         substr($helppage, 1);
     } elseif ($helppage != "" && isset($opt['locale'][$help_locale]['helpwiki'])) {
-        return $opt['locale'][$help_locale]['helpwiki'] . str_replace(' ', '_', $helppage);
+        return $opt['locale'][$help_locale]['helpwiki'].str_replace(' ', '_', $helppage);
     } else {
         return "";
     }
@@ -98,8 +98,8 @@ 
         return "";
     } else {
         $imgtitle = $translate->t($title, '', basename(__FILE__), __LINE__);
-        $imgtitle = "alt='" . $imgtitle . "' title='" . $imgtitle . "'";
+        $imgtitle = "alt='".$imgtitle."' title='".$imgtitle."'";
 
-        return "<a class='nooutline' href='" . $helpurl . "' " . $imgtitle . " target='_blank'>";
+        return "<a class='nooutline' href='".$helpurl."' ".$imgtitle." target='_blank'>";
     }
 }

htdocs/cachelist.php

Spacing +4 added lines, -4 removed lines

@@ -7,7 +7,7 @@ 
  *  Shortcut for cachelist search
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $id = isset($_REQUEST['id']) ? $_REQUEST['id'] + 0 : 0;
 $password = isset($_REQUEST['key']) ? $_REQUEST['key'] : '';
@@ -33,9 +33,9 @@ 
         }
     }
 
-    $tpl->redirect("search.php?searchto=searchbylist&listid=" . $id .
-        ($password != "" ? "&listkey=" . urlencode($password) : "") .
-        "&showresult=1&f_disabled=0&f_inactive=0&f_ignored=1&sort=byname" . $invalid_waypoints);
+    $tpl->redirect("search.php?searchto=searchbylist&listid=".$id.
+        ($password != "" ? "&listkey=".urlencode($password) : "").
+        "&showresult=1&f_disabled=0&f_inactive=0&f_ignored=1&sort=byname".$invalid_waypoints);
 } else {
     $tpl->redirect("cachelists.php");
 }

htdocs/mystatpic.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once __DIR__ . '/./lib2/web.inc.php';
+require_once __DIR__.'/./lib2/web.inc.php';
 
 $tpl->name = 'mystatpic';
 $tpl->menuitem = MNU_MYPROFILE_DATA_STATPIC;

htdocs/query.php

Spacing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'query';
 $tpl->menuitem = MNU_MYPROFILE_QUERIES;
@@ -72,7 +72,7 @@ 
     if ($submit == true) {
         $options = sql_value("SELECT `options` FROM `queries` WHERE `id`='&1'", false, $queryid);
         if (!$options) {
-            $tpl->error(ERROR_UNKNOWN);   // query does not exist
+            $tpl->error(ERROR_UNKNOWN); // query does not exist
         } elseif ($sortby || $sortorder || $creationdate) {
             $oa = unserialize($options);
             if ($sortby) {

htdocs/myprofile.php

Spacing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'myprofile';
 $tpl->menuitem = MNU_MYPROFILE_DATA;
@@ -19,7 +19,7 @@ 
 
 if ($login->userid == 0) {
     if ($action == 'change' || $action == 'changeemail') {
-        $tpl->redirect('login.php?target=' . urlencode('myprofile.php?action=change'));
+        $tpl->redirect('login.php?target='.urlencode('myprofile.php?action=change'));
     } else {
         $tpl->redirect('login.php?target=myprofile.php');
     }

htdocs/ignore.php

Spacing +3 added lines, -3 removed lines

@@ -5,11 +5,11 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $cache_id = isset($_GET['cacheid']) ? $_GET['cacheid'] + 0 : 0;
 $action = isset($_GET['action']) ? $_GET['action'] : '';
-$target = isset($_GET['target']) ? $_GET['target'] : 'viewcache.php?cacheid=' . $cache_id;
+$target = isset($_GET['target']) ? $_GET['target'] : 'viewcache.php?cacheid='.$cache_id;
 
 $login->verify();
 
@@ -41,7 +41,7 @@ 
 $map_result_id = sql_value(
     "SELECT `result_id`
      FROM `map2_result`
-     WHERE INSTR(sqlquery,\"`user_id`='" . sql_escape($login->userid) . "'\")
+     WHERE INSTR(sqlquery,\"`user_id`='" . sql_escape($login->userid)."'\")
      LIMIT 1",
     0
 );

htdocs/mailto.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 = 'mailto';
 $tpl->menuitem = MNU_USER_MAILTO;
 
 $login->verify();
 if ($login->userid == 0) {
-    $tpl->redirect('login.php?target=' . urlencode($tpl->target));
+    $tpl->redirect('login.php?target='.urlencode($tpl->target));
 }
 
 $userid = isset($_REQUEST['userid']) ? $_REQUEST['userid'] + 0 : 0;
@@ -36,7 +36,7 @@ 
     $wp = $_REQUEST['wp'];
     $cachename = trim(sql_value("SELECT `name` FROM `caches` WHERE `wp_oc`='&1'", '', $wp));
     if ($cachename) {
-        $subject = $translate->t('Your geocache', '', 0, 0) . ' "' . $cachename . '" (' . $wp . ')';
+        $subject = $translate->t('Your geocache', '', 0, 0).' "'.$cachename.'" ('.$wp.')';
     }
 } elseif (isset($_REQUEST['reportid']) && $login->admin) {
     $rs = sql(
@@ -47,7 +47,7 @@ 
         $_REQUEST['reportid']
     );
     if ($r = sql_fetch_assoc($rs)) {
-        $subject = $translate->t('Your geocache report for', '', 0, 0) . ' ' . $r['wp_oc'] . ' (' . $r['name'] . ')';
+        $subject = $translate->t('Your geocache report for', '', 0, 0).' '.$r['wp_oc'].' ('.$r['name'].')';
     }
     sql_free_result($rs);
 }