OpencachingDeutschland / oc-server3

htdocs/mylists.php

Spacing +6 added lines, -6 removed lines

@@ -5,15 +5,15 @@ 
  *  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 = 'mylists';
 $tpl->menuitem = MNU_MYPROFILE_LISTS;
 
 $login->verify();
 if ($login->userid == 0) {
-    $tpl->redirect('login.php?target=' . urlencode($tpl->target));
+    $tpl->redirect('login.php?target='.urlencode($tpl->target));
 }
 $user = new user($login->userid);
 
@@ -152,14 +152,14 @@ 
 
 // redirect to list search output after editing a list from the search output page
 if ($fromsearch && !$switchDescMode && !$name_error && isset($_REQUEST['listid'])) {
-    $iwp = ($invalid_waypoints ? '&invalidwp=' . urlencode($invalid_waypoints) : '');
-    $tpl->redirect('cachelist.php?id=' . ($_REQUEST['listid'] + 0) . $iwp);
+    $iwp = ($invalid_waypoints ? '&invalidwp='.urlencode($invalid_waypoints) : '');
+    $tpl->redirect('cachelist.php?id='.($_REQUEST['listid'] + 0).$iwp);
 }
 
 // prepare editor and editing
 if ($descMode == 3) {
     $tpl->add_header_javascript('resource2/tinymce/tiny_mce_gzip.js');
-    $tpl->add_header_javascript('resource2/tinymce/config/list.js.php?lang=' . strtolower($opt['template']['locale']));
+    $tpl->add_header_javascript('resource2/tinymce/config/list.js.php?lang='.strtolower($opt['template']['locale']));
 }
 $tpl->add_header_javascript(editorJsPath());
 if ($edit_list) {

htdocs/lib2/cookie.class.php

Spacing +5 added lines, -5 removed lines

@@ -24,9 +24,9 @@ 
             if (isset($_REQUEST['SESSION']) && $_REQUEST['SESSION'] != '') {
                 $this->init_session();
             }
-        } elseif (isset($_COOKIE[$opt['session']['cookiename'] . 'data'])) {
+        } elseif (isset($_COOKIE[$opt['session']['cookiename'].'data'])) {
             //get the cookievars-array
-            $decoded = base64_decode($_COOKIE[$opt['session']['cookiename'] . 'data']);
+            $decoded = base64_decode($_COOKIE[$opt['session']['cookiename'].'data']);
 
             if ($decoded !== false) {
                 $this->values = @unserialize($decoded);
@@ -51,7 +51,7 @@ 
 
             if ($opt['session']['check_referer']) {
                 if (isset($_SERVER['REFERER'])) {
-                    if (strtolower(substr('http' + strstr($_SERVER['REFERER'], '://'), 0, strlen($opt['page']['absolute_http_url']))) != strtolower($opt['page']['absolute_http_url'])) {
+                    if (strtolower(substr('http' +strstr($_SERVER['REFERER'], '://'), 0, strlen($opt['page']['absolute_http_url']))) != strtolower($opt['page']['absolute_http_url'])) {
                         $this->createNewSession();
                     }
                 }
@@ -168,7 +168,7 @@ 
             if ($this->changed == true) {
                 if (count($this->values) == 0) {
                     setcookie(
-                        $opt['session']['cookiename'] . 'data',
+                        $opt['session']['cookiename'].'data',
                         false,
                         time() + 31536000,
                         $opt['session']['path'],
@@ -177,7 +177,7 @@ 
                     );
                 } else {
                     setcookie(
-                        $opt['session']['cookiename'] . 'data',
+                        $opt['session']['cookiename'].'data',
                         base64_encode(serialize($this->values)),
                         time() + 31536000,
                         $opt['session']['path'],

htdocs/lib2/charset.inc.php

Spacing +6 added lines, -6 removed lines

@@ -9,9 +9,9 @@ 
 
 
 // replacement table for Unicode 0x100 to 0x1FF
-$utf_xlatin = "A a A a A a C c C c C c C c D d D d E e E e E e E e E e G g G g " .
-    "G g G g H h H h I i I i I i I i I i IJijJ j K k K L l L l L l L " .
-    "l L l N n N n N n n n n O o O o Ö ö OEoeR r R r R r S s S s S s " .
+$utf_xlatin = "A a A a A a C c C c C c C c D d D d E e E e E e E e E e G g G g ".
+    "G g G g H h H h I i I i I i I i I i IJijJ j K k K L l L l L l L ".
+    "l L l N n N n N n n n n O o O o Ö ö OEoeR r R r R r S s S s S s ".
     "S s T t T t T t U u U u U u U u Ü ü U u W w Y y Y Z z Z z Z z   ";
 
 // replacement table for Unicode 0x2000 to 0x203F
@@ -28,11 +28,11 @@ 
     $result = "";
 
     while ($pos < strlen($s)) {
-        $c1 = ord($s[$pos ++]);
+        $c1 = ord($s[$pos++]);
         if ($c1 < 0xC0) {
             $result .= chr($c1);
         } elseif ($pos < strlen($s)) {
-            $c2 = ord($s[$pos ++]);
+            $c2 = ord($s[$pos++]);
             if ($c1 < 0xE0) {
                 $code = 0x40 * ($c1 & 0x1F) + ($c2 & 0x3F);
                 if ($code < 0x100) {
@@ -46,7 +46,7 @@ 
                     $result .= "?";
                 }
             } elseif ($pos < strlen($s)) {
-                $c3 = ord($s[$pos ++]);
+                $c3 = ord($s[$pos++]);
                 $code = 0x1000 * ($c1 & 0x0F) + 0x40 * ($c2 & 0x3F) + ($c3 & 0x3F);
                 switch ($code) {
                     case 0x2026:

htdocs/lib2/const.inc.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  *  Constant definitions
  ***************************************************************************/
 
-require_once __DIR__ . '/../lib/consts-common.inc.php';
+require_once __DIR__.'/../lib/consts-common.inc.php';
 
 define('DEBUG_NO', 0);
 define('DEBUG_DEVELOPER', 1);

htdocs/lib2/translationHandler.class.php

Spacing +20 added lines, -20 removed lines

@@ -32,20 +32,20 @@ 
             return;
         }
 
-        if (!is_dir($opt['rootpath'] . 'cache2/translate/' . $language_lower)) {
-            mkdir($opt['rootpath'] . 'cache2/translate/' . $language_lower);
+        if (!is_dir($opt['rootpath'].'cache2/translate/'.$language_lower)) {
+            mkdir($opt['rootpath'].'cache2/translate/'.$language_lower);
         }
-        if (!is_dir($opt['rootpath'] . 'cache2/translate/' . $language_lower . '/LC_MESSAGES')) {
-            mkdir($opt['rootpath'] . 'cache2/translate/' . $language_lower . '/LC_MESSAGES');
+        if (!is_dir($opt['rootpath'].'cache2/translate/'.$language_lower.'/LC_MESSAGES')) {
+            mkdir($opt['rootpath'].'cache2/translate/'.$language_lower.'/LC_MESSAGES');
         }
 
-        $f = fopen($opt['rootpath'] . 'cache2/translate/' . $language_lower . '/LC_MESSAGES/messages.po', 'w');
+        $f = fopen($opt['rootpath'].'cache2/translate/'.$language_lower.'/LC_MESSAGES/messages.po', 'w');
 
-        fwrite($f, 'msgid ""' . "\n");
-        fwrite($f, 'msgstr ""' . "\n");
-        fwrite($f, '"MIME-Version: 1.0\n"' . "\n");
-        fwrite($f, '"Content-Type: text/plain; charset=UTF-8\n"' . "\n");
-        fwrite($f, '"Content-Transfer-Encoding: 8bit\n"' . "\n");
+        fwrite($f, 'msgid ""'."\n");
+        fwrite($f, 'msgstr ""'."\n");
+        fwrite($f, '"MIME-Version: 1.0\n"'."\n");
+        fwrite($f, '"Content-Type: text/plain; charset=UTF-8\n"'."\n");
+        fwrite($f, '"Content-Transfer-Encoding: 8bit\n"'."\n");
         fwrite($f, "\n");
 
         // English texts in sys_trans_text are more up-to-date than the original translation
@@ -66,10 +66,10 @@ 
         );
 
         $variables = array();
-        $this->loadNodeTextFile($variables, $opt['logic']['node']['id'] . '.txt', $language_lower);
+        $this->loadNodeTextFile($variables, $opt['logic']['node']['id'].'.txt', $language_lower);
         $this->loadNodeTextFile(
             $variables,
-            $opt['logic']['node']['id'] . '-' . $language_lower . '.txt',
+            $opt['logic']['node']['id'].'-'.$language_lower.'.txt',
             $language_lower
         );
 
@@ -78,8 +78,8 @@ 
             if ($trans !== null && $trans != $r['text']) {
                 $trans = $this->substitueVariables($variables, $language_lower, $trans);
 
-                fwrite($f, 'msgid "' . $this->escape_text($r['text']) . '"' . "\n");
-                fwrite($f, 'msgstr "' . $this->escape_text($trans) . '"' . "\n");
+                fwrite($f, 'msgid "'.$this->escape_text($r['text']).'"'."\n");
+                fwrite($f, 'msgstr "'.$this->escape_text($trans).'"'."\n");
                 fwrite($f, "\n");
             }
         }
@@ -89,10 +89,10 @@ 
 
         try {
             exec(
-                'msgfmt -o ' . escapeshellcmd(
-                    $opt['rootpath'] . 'cache2/translate/' . $language_lower . '/LC_MESSAGES/messages.mo'
-                ) . ' ' . escapeshellcmd(
-                    $opt['rootpath'] . 'cache2/translate/' . $language_lower . '/LC_MESSAGES/messages.po'
+                'msgfmt -o '.escapeshellcmd(
+                    $opt['rootpath'].'cache2/translate/'.$language_lower.'/LC_MESSAGES/messages.mo'
+                ).' '.escapeshellcmd(
+                    $opt['rootpath'].'cache2/translate/'.$language_lower.'/LC_MESSAGES/messages.po'
                 )
             );
         } catch (Exception $e) {
@@ -189,7 +189,7 @@ 
             sqlf(
                 "INSERT IGNORE INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('&1', '&2', 0)",
                 $lastId,
-                'table:' . $table . ';field=' . $fname
+                'table:'.$table.';field='.$fname
             );
         }
         sql_free_result($rs);
@@ -211,7 +211,7 @@ 
         // generic load
         global $opt;
 
-        $filename = $opt['rootpath'] . '/config2/nodetext/' . $file;
+        $filename = $opt['rootpath'].'/config2/nodetext/'.$file;
         if (file_exists($filename)) {
             $fhandle = fopen($filename, 'r');
 

htdocs/lib2/translateAccess.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once __DIR__ . '/logic/const.inc.php';
+require_once __DIR__.'/logic/const.inc.php';
 
 class translateAccess
 {

htdocs/lib2/common.inc.php

Spacing +23 added lines, -23 removed lines

@@ -10,7 +10,7 @@ 
  *  TODO: accept-language des Browser auswerten
  ***************************************************************************/
 
-require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 function __autoload($class_name)
 {
@@ -20,8 +20,8 @@ 
         return;
     }
 
-    $file1 = $opt['rootpath'] . 'lib2/' . $class_name . '.class.php';
-    $file2 = $opt['rootpath'] . 'lib2/logic/' . $class_name . '.class.php';
+    $file1 = $opt['rootpath'].'lib2/'.$class_name.'.class.php';
+    $file2 = $opt['rootpath'].'lib2/logic/'.$class_name.'.class.php';
     if (file_exists($file1)) {
         require_once $file1;
     } elseif (file_exists($file2)) {
@@ -43,9 +43,9 @@ 
 mb_regex_encoding('UTF-8');
 
 // set options
-require_once $opt['rootpath'] . 'config2/settings-dist.inc.php';
-require_once $opt['rootpath'] . 'config2/settings.inc.php';
-require_once $opt['rootpath'] . 'config2/verify-settings.inc.php';
+require_once $opt['rootpath'].'config2/settings-dist.inc.php';
+require_once $opt['rootpath'].'config2/settings.inc.php';
+require_once $opt['rootpath'].'config2/verify-settings.inc.php';
 
 foreach ($opt['page']['banned_user_agents'] as $ua) {
     if (strpos($useragent, $ua) !== false) {
@@ -69,10 +69,10 @@ 
     }
 }
 
-require_once $opt['rootpath'] . 'lib2/errorhandler.inc.php';
+require_once $opt['rootpath'].'lib2/errorhandler.inc.php';
 configure_php();
 
-require $opt['rootpath'] . 'lib2/cookie.class.php';
+require $opt['rootpath'].'lib2/cookie.class.php';
 normalize_settings();
 set_language();
 set_usercountry();
@@ -85,30 +85,30 @@ 
         $opt['template']['style'] = $opt['template']['default']['style'];
     }
 
-    if (!is_dir($opt['rootpath'] . 'templates2/' . $opt['template']['style'])) {
+    if (!is_dir($opt['rootpath'].'templates2/'.$opt['template']['style'])) {
         $opt['template']['style'] = $opt['template']['default']['style'];
     }
 } else {
     $opt['template']['style'] = $opt['template']['default']['style'];
 }
-$opt['stylepath'] = $opt['rootpath'] . 'templates2/' . $opt['template']['style'] . '/';
+$opt['stylepath'] = $opt['rootpath'].'templates2/'.$opt['template']['style'].'/';
 
 check_useragent();
 
 /* setup smarty
  *
  */
-require $opt['rootpath'] . 'lib2/OcSmarty.class.php';
+require $opt['rootpath'].'lib2/OcSmarty.class.php';
 $tpl = new OcSmarty();
 
 // include all we need
-require_once $opt['rootpath'] . 'lib2/logic/const.inc.php';
-require_once $opt['rootpath'] . 'lib2/error.inc.php';
-require_once $opt['rootpath'] . 'lib2/util.inc.php';
-require_once $opt['rootpath'] . 'lib2/db.inc.php';
-require_once $opt['rootpath'] . 'lib2/login.class.php';
-require_once $opt['rootpath'] . 'lib2/menu.class.php';
-require_once $opt['rootpath'] . 'lib2/logic/labels.inc.php';
+require_once $opt['rootpath'].'lib2/logic/const.inc.php';
+require_once $opt['rootpath'].'lib2/error.inc.php';
+require_once $opt['rootpath'].'lib2/util.inc.php';
+require_once $opt['rootpath'].'lib2/db.inc.php';
+require_once $opt['rootpath'].'lib2/login.class.php';
+require_once $opt['rootpath'].'lib2/menu.class.php';
+require_once $opt['rootpath'].'lib2/logic/labels.inc.php';
 // require_once $opt['rootpath'] . 'lib2/throttle.inc.php';
 
 // apply post configuration
@@ -123,7 +123,7 @@ 
     $login->userid > 0 &&
     sql_value("SELECT `email_problems` FROM `user` WHERE `user_id`='&1'", 0, $login->userid) != 0
 ) {
-    header("Location: verifyemail.php?page=" . basename($_SERVER['REQUEST_URI']));
+    header("Location: verifyemail.php?page=".basename($_SERVER['REQUEST_URI']));
     exit;
 }
 
@@ -148,7 +148,7 @@ 
     }
 
     if (isset($opt['logic']['cachemaps']['wmsurl']) && strstr($opt['logic']['cachemaps']['wmsurl'], '://')) {
-        $opt['logic']['cachemaps']['wmsurl'] = $opt['page']['protocol'] . strstr(
+        $opt['logic']['cachemaps']['wmsurl'] = $opt['page']['protocol'].strstr(
                 $opt['logic']['cachemaps']['wmsurl'],
                 '://'
             );
@@ -236,7 +236,7 @@ 
         $cookie->set('locale', $opt['template']['locale'], $opt['template']['default']['locale']);
     }
 
-    bindtextdomain('messages', $opt['rootpath'] . 'cache2/translate');
+    bindtextdomain('messages', $opt['rootpath'].'cache2/translate');
     set_php_locale();
     textdomain('messages');
 }
@@ -277,13 +277,13 @@ 
     if (strtolower(substr($url, 0, strlen($opt['page']['absolute_http_url']))) == $opt['page']['absolute_http_url']
         && $opt['page']['https']['active']
     ) {
-        return 'https' . strstr($url, '://');
+        return 'https'.strstr($url, '://');
     } elseif (strtolower(
             substr($url, 0, strlen($opt['page']['absolute_https_url']))
         ) == $opt['page']['absolute_https_url']
         && !$opt['page']['https']['active']
     ) {
-        return 'http' . strstr($url, '://');
+        return 'http'.strstr($url, '://');
     } else {
         return $url;
     }

htdocs/lib2/smiley.inc.php

Spacing +2 added lines, -2 removed lines

@@ -90,8 +90,8 @@
 
     $smiley_a = array();
     for ($n = 0; $n < count($smiley['file']); ++ $n) {
-        $smiley['image'][$n] = '<img src="' . $opt['template']['smiley'] . $smiley['file'][$n] . '" alt="' . $smiley['text'][$n] . '" border="0" width="18px" height="18px" />';
-        $smiley['spaced_image'][$n] = ' ' . $smiley['image'][$n] . ' ';
+        $smiley['image'][$n] = '<img src="'.$opt['template']['smiley'].$smiley['file'][$n].'" alt="'.$smiley['text'][$n].'" border="0" width="18px" height="18px" />';
+        $smiley['spaced_image'][$n] = ' '.$smiley['image'][$n].' ';
         $smiley_a[] = [
             'text' => $smiley['text'][$n],
             'file' => $smiley['file'][$n],

htdocs/lib2/search/search.kml.inc.php

Spacing +6 added lines, -6 removed lines

@@ -21,7 +21,7 @@ 
     $kmlLine =
         '
 <Placemark>
-  <description><![CDATA[' . $t_by . ' {username}<br><br><a href="' . $opt['page']['default_absolute_url'] . 'viewcache.php?cacheid={cacheid}">' . $t_showdesc . '</a><br>&nbsp;<br><table cellspacing="0" cellpadding="0" border="0"><tr><td>{typeimgurl} </td><td>' . $t_type . ' {type}<br>' . $t_size . ' {size}</td></tr><tr><td colspan="2">' . $t_difficulty . '<br>' . $t_terrain . '</td></tr></table>]]></description>
+  <description><![CDATA[' . $t_by.' {username}<br><br><a href="'.$opt['page']['default_absolute_url'].'viewcache.php?cacheid={cacheid}">'.$t_showdesc.'</a><br>&nbsp;<br><table cellspacing="0" cellpadding="0" border="0"><tr><td>{typeimgurl} </td><td>'.$t_type.' {type}<br>'.$t_size.' {size}</td></tr><tr><td colspan="2">'.$t_difficulty.'<br>'.$t_terrain.'</td></tr></table>]]></description>
   <name>{name}{archivedflag}</name>
   <LookAt>
     <longitude>{lon}</longitude>
@@ -34,7 +34,7 @@ 
   <Point>
     <coordinates>{lon},{lat},0</coordinates>
   </Point>
-  <Snippet>D: {difficulty}/T: {terrain} {size}  ' . $t_by . ' {username}</Snippet>
+  <Snippet>D: {difficulty}/T: {terrain} {size}  ' . $t_by.' {username}</Snippet>
 </Placemark>
 ';
 
@@ -93,7 +93,7 @@ 
 
     while ($r = sql_fetch_array($rs)) {
         $thisline = $kmlLine;
-        $typeimgurl = '<img src="{urlbase}resource2/' . $style . '/images/cacheicon/' . $r['icon_large'] . '" alt="' . $r['typedesc'] . '" title="' . $r['typedesc'] . '" />';
+        $typeimgurl = '<img src="{urlbase}resource2/'.$style.'/images/cacheicon/'.$r['icon_large'].'" alt="'.$r['typedesc'].'" title="'.$r['typedesc'].'" />';
 
         $thisline = mb_ereg_replace('{icon}', $r['kml_name'], $thisline);
         $thisline = mb_ereg_replace('{typeimgurl}', $typeimgurl, $thisline);
@@ -111,11 +111,11 @@ 
 
         if (($r['status'] == 2) || ($r['status'] == 3) || ($r['status'] == 6)) {
             if ($r['status'] == 2) {
-                $thisline = mb_ereg_replace('{archivedflag}', ' (' . $state_temporarily_na . ')', $thisline);
+                $thisline = mb_ereg_replace('{archivedflag}', ' ('.$state_temporarily_na.')', $thisline);
             } elseif ($r['status'] == 3) {
-                $thisline = mb_ereg_replace('{archivedflag}', ' (' . $state_archived . ')', $thisline);
+                $thisline = mb_ereg_replace('{archivedflag}', ' ('.$state_archived.')', $thisline);
             } else {
-                $thisline = mb_ereg_replace('{archivedflag}', ' (' . $state_locked . ')', $thisline);
+                $thisline = mb_ereg_replace('{archivedflag}', ' ('.$state_locked.')', $thisline);
             }
         } else {
             $thisline = mb_ereg_replace('{archivedflag}', '', $thisline);