OpencachingDeutschland / oc-server3

htdocs/util2/geokrety/check-waypoints.php

Spacing +5 added lines, -5 removed lines

@@ -10,8 +10,8 @@ 
  *  Data import functions are in util2/cron/modules/geokrety.class.php.
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../';
-require_once $opt['rootpath'] . 'lib2/cli.inc.php';
+$opt['rootpath'] = __DIR__.'/../../';
+require_once $opt['rootpath'].'lib2/cli.inc.php';
 
 $itemwps = [];
 
@@ -63,12 +63,12 @@ 
                     $wp
                 ) == 0
             ) {
-                echo "item " . $itemid . ": " . $wp . " is missing in gk_move_waypoint\n";
+                echo "item ".$itemid.": ".$wp." is missing in gk_move_waypoint\n";
             } else {
-                echo "item " . $itemid . ": " . $wp . " is not the current wp in gk_move_waypoint\n";
+                echo "item ".$itemid.": ".$wp." is not the current wp in gk_move_waypoint\n";
             }
         } elseif (isset($flags['movewp']) && !isset($flags['itemwp'])) {
-            echo "item " . $itemid . ": " . $wp . " is missing in gk_item_waypoint\n";
+            echo "item ".$itemid.": ".$wp." is missing in gk_item_waypoint\n";
         }
     }
 }

htdocs/util2/geokrety/save-gkstate.php

Spacing +12 added lines, -12 removed lines

@@ -8,23 +8,23 @@ 
  *  creates backups of gk_ tables and initializes archive directory.
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../';
-require_once $opt['rootpath'] . 'lib2/cli.inc.php';
+$opt['rootpath'] = __DIR__.'/../../';
+require_once $opt['rootpath'].'lib2/cli.inc.php';
 
 if (count($argv) != 2 || ($argv[1] != 'init' && $argv[1] != 'discard')) {
-    die("\n" .
-        "Please verify that runcron.php is disabled in crontab;\n" .
-        "then run this script with\n" .
-        "\n" .
-        "   php save-gkstate.php init      to initialize or reset GK archive\n" .
-        "   php save-gkstate.php discard   to discard GK archive\n" .
-        "\n" .
-        "Don't forget to re-enable cronjobs afterwards!\n" .
+    die("\n".
+        "Please verify that runcron.php is disabled in crontab;\n".
+        "then run this script with\n".
+        "\n".
+        "   php save-gkstate.php init      to initialize or reset GK archive\n".
+        "   php save-gkstate.php discard   to discard GK archive\n".
+        "\n".
+        "Don't forget to re-enable cronjobs afterwards!\n".
         "\n");
 }
 
 if ($opt['cron']['geokrety']['xml_archive'] != ($argv[1] == 'init')) {
-    die("Error: Geokrety XML archiving is " . ($opt['cron']['geokrety']['xml_archive'] ? 'enabled' : 'disabled') . " in settings\n");
+    die("Error: Geokrety XML archiving is ".($opt['cron']['geokrety']['xml_archive'] ? 'enabled' : 'disabled')." in settings\n");
 }
 
 echo "deleting old archive if exists\n";
@@ -35,7 +35,7 @@ 
 sql("DROP TABLE IF EXISTS _backup_gk_move_waypoint");
 sql("DROP TABLE IF EXISTS _backup_gk_user");
 
-foreach (glob($opt['rootpath'] . "cache2/geokrety/import-*.xml") as $f) {
+foreach (glob($opt['rootpath']."cache2/geokrety/import-*.xml") as $f) {
     unlink($f);
 }
 

htdocs/util2/cache_repairnames/repairnames.php

Spacing +3 added lines, -3 removed lines

@@ -10,14 +10,14 @@
  *  version 9 on, as newcache.php and editcache.php now trim the names.
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../';
-require __DIR__ . '/../../lib2/cli.inc.php';
+$opt['rootpath'] = __DIR__.'/../../';
+require __DIR__.'/../../lib2/cli.inc.php';
 
 $rs = sql("SELECT `cache_id`, `name` FROM `caches` WHERE `name`<'\"' ORDER BY `name` ASC");
 while ($r = sql_fetch_array($rs)) {
     $name = trim($r['name']);
     if ($name != $r['name'] && $name != "") {
-        echo "ID " . $r['cache_id'] . ": trimmed cache name to '" . $name . "'\n";
+        echo "ID ".$r['cache_id'].": trimmed cache name to '".$name."'\n";
         sql("UPDATE `caches` SET `name`='&1' WHERE `cache_id`=&2", $name, $r['cache_id']);
     }
 }

htdocs/childwp.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
 use Oc\Libse\ChildWp\ControllerChildWp;
 use Oc\Libse\ChildWp\HandlerChildWp;
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'childwp';
 $tpl->menuitem = MNU_CACHES_HIDE;
@@ -34,7 +34,7 @@ 
 }
 
 if ($redirect) {
-    $tpl->redirect('editcache.php?cacheid=' . $presenter->getCacheId());
+    $tpl->redirect('editcache.php?cacheid='.$presenter->getCacheId());
 }
 
 $presenter->prepare($tpl);

htdocs/newcachesrest.php

Spacing +3 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 = 'newcachesrest';
 $tpl->menuitem = MNU_START_NEWCACHES;
@@ -14,8 +14,7 @@ 
 $tpl->caching = true;
 $tpl->cache_lifetime = 3600;
 
-$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] :
-    (isset($_REQUEST['country']) ? $_REQUEST['country'] : $opt['page']['main_country']);
+$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] : (isset($_REQUEST['country']) ? $_REQUEST['country'] : $opt['page']['main_country']);
 
 if (!$tpl->is_cached()) {
     $newCaches = array();
@@ -27,7 +26,7 @@ 
         FROM `caches`
         INNER JOIN `cache_status` ON `caches`.`status`=`cache_status`.`id`
         WHERE `cache_status`.`allow_user_view`=1
-        AND `country`!='" . sql_escape($country) . "'
+        AND `country`!='" . sql_escape($country)."'
         ORDER BY `date_created` DESC LIMIT 200"
     );
 

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