OpencachingDeutschland / oc-server3

htdocs/config2/settings-dist-common.inc.php

Spacing +19 added lines, -19 removed lines

@@ -15,11 +15,11 @@ 
  *   bin/dbsv-update.php will then migrate the tables' charset.
  */
 $opt['charset']['iconv'] = 'UTF-8'; // 'ISO-8859-1'; // use iconv compatible charset-name
-$opt['charset']['mysql'] = 'utf8';     // use mysql compatible charset-name
+$opt['charset']['mysql'] = 'utf8'; // use mysql compatible charset-name
 
 // handling of SQL and PHP errors
 $opt['db']['error']['display'] = false;
-$opt['db']['error']['mail'] = 'root';  // set '' to disable
+$opt['db']['error']['mail'] = 'root'; // set '' to disable
 
 // page title
 $opt['page']['title'] = 'OPENCACHING';
@@ -57,7 +57,7 @@ 
  * Additionally, the cookie domain (different vor lib1 and lib2) can be overwritten.
  * See examples for overriding in settings-sample.inc.php.
  */
-$opt['page']['meta']['keywords'] = 'Geocaching, Geocache, Cache, Schatzsuche, GPS, kostenlos, GPX, Koordinaten, Hobby, Natur';  // 5-10 keywords are recommended
+$opt['page']['meta']['keywords'] = 'Geocaching, Geocache, Cache, Schatzsuche, GPS, kostenlos, GPX, Koordinaten, Hobby, Natur'; // 5-10 keywords are recommended
 // see http://forum.opencaching.de/index.php?topic=3065.0
 // and http://forum.opencaching.de/index.php?topic=3065.0 regarding description
 $opt['page']['meta']['description'] = 'Opencaching.de ist das freie Portal für Geocaching, ein Schatzsuche-Spiel. Mittels GPS-Koordinaten sind Behälter oder Objekte zu finden.';
@@ -98,12 +98,12 @@ 
 // see also setting in lib/settings.inc.php!
 $opt['logic']['admin']['team_comments_only_for_reports'] = true;
 $opt['logic']['admin']['enable_listing_admins'] = false;
-$opt['logic']['admin']['listingadmin_notification'] = '';  // Email address(es), comma separated
+$opt['logic']['admin']['listingadmin_notification'] = ''; // Email address(es), comma separated
 
 /*
  * html purifier
  */
-$opt['html_purifier']['cache_path'] = dirname(__FILE__) . '/../cache2/html_purifier/';
+$opt['html_purifier']['cache_path'] = dirname(__FILE__).'/../cache2/html_purifier/';
 
 /*
  * CMS links for external pages
@@ -178,9 +178,9 @@ 
         $primary_httpsdefault = $opt['page']['https']['is_default'];
     }
     if ($primary_httpsdefault) {
-        $opt['page']['default_primary_url'] = 'https' . strstr($primary_site_url, '://');
+        $opt['page']['default_primary_url'] = 'https'.strstr($primary_site_url, '://');
     } else {
-        $opt['page']['default_primary_url'] = 'http' . strstr($primary_site_url, '://');
+        $opt['page']['default_primary_url'] = 'http'.strstr($primary_site_url, '://');
     }
 
     // 2. create settings for the current domain
@@ -191,7 +191,7 @@ 
     if (isset($opt['domain'][$current_domain]['url'])) {
         $current_site_url = $opt['domain'][$current_domain]['url'];
     } else {
-        $current_site_url = 'x://' . $current_domain . parse_url($primary_site_url, PHP_URL_PATH);
+        $current_site_url = 'x://'.$current_domain.parse_url($primary_site_url, PHP_URL_PATH);
     }
     if (substr($current_site_url, - 1, 1) != '/') {
         $current_site_url .= '/';
@@ -203,8 +203,8 @@ 
     }
 
     $adr = strstr($current_site_url, '://');
-    $opt['page']['absolute_http_url'] = 'http' . $adr;
-    $opt['page']['absolute_https_url'] = 'https' . $adr;
+    $opt['page']['absolute_http_url'] = 'http'.$adr;
+    $opt['page']['absolute_https_url'] = 'https'.$adr;
     $opt['page']['https']['active'] = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off');
 
     if ($opt['page']['https']['active']) {
@@ -235,19 +235,19 @@ 
         $opt['page']['default_primary_shortlink_url'] = false;
     } else {
         if ($primary_httpsdefault) {
-            $opt['page']['default_primary_shortlink_url'] = 'https://' . $primary_shortlink_domain . '/';
+            $opt['page']['default_primary_shortlink_url'] = 'https://'.$primary_shortlink_domain.'/';
         } else {
-            $opt['page']['default_primary_shortlink_url'] = 'http://' . $primary_shortlink_domain . '/';
+            $opt['page']['default_primary_shortlink_url'] = 'http://'.$primary_shortlink_domain.'/';
         }
 
         if (isset($opt['domain'][$current_domain]['shortlink_domain']) && $opt['domain'][$current_domain]['shortlink_domain']) {
-            $opt['page']['shortlink_url'] = $opt['page']['protocol'] . '://' . $opt['domain'][$current_domain]['shortlink_domain'] . '/';
-            $opt['page']['default_shortlink_url'] = $opt['page']['default_protocol'] . '://' . $opt['domain'][$current_domain]['shortlink_domain'] . '/';
+            $opt['page']['shortlink_url'] = $opt['page']['protocol'].'://'.$opt['domain'][$current_domain]['shortlink_domain'].'/';
+            $opt['page']['default_shortlink_url'] = $opt['page']['default_protocol'].'://'.$opt['domain'][$current_domain]['shortlink_domain'].'/';
         } else {
             if ($current_domain == $primary_domain) {
                 $opt['page']['default_shortlink_url'] = $opt['page']['default_primary_shortlink_url'];
                 $opt['page']['shortlink_url'] =
-                    $opt['page']['protocol'] . strstr($opt['page']['default_shortlink_url'], '://');
+                    $opt['page']['protocol'].strstr($opt['page']['default_shortlink_url'], '://');
             } else {
                 $opt['page']['shortlink_url'] = false;
                 $opt['page']['default_shortlink_url'] = false;
@@ -258,16 +258,16 @@ 
     // 4. set location of uploaded images
 
     if (!isset($opt['logic']['pictures']['dir'])) {
-        $opt['logic']['pictures']['dir'] = dirname(__FILE__) . '/../images/uploads';
+        $opt['logic']['pictures']['dir'] = dirname(__FILE__).'/../images/uploads';
     }  // Ocprop, OKAPI !
     if (!isset($opt['logic']['pictures']['url'])) {
-        $opt['logic']['pictures']['url'] = $opt['page']['default_primary_url'] . 'images/uploads';
+        $opt['logic']['pictures']['url'] = $opt['page']['default_primary_url'].'images/uploads';
     }
     if (!isset($opt['logic']['pictures']['thumb_dir'])) {
-        $opt['logic']['pictures']['thumb_dir'] = $opt['logic']['pictures']['dir'] . '/thumbs';
+        $opt['logic']['pictures']['thumb_dir'] = $opt['logic']['pictures']['dir'].'/thumbs';
     }
     if (!isset($opt['logic']['pictures']['thumb_url'])) {
-        $opt['logic']['pictures']['thumb_url'] = $opt['logic']['pictures']['url'] . '/thumbs';
+        $opt['logic']['pictures']['thumb_url'] = $opt['logic']['pictures']['url'].'/thumbs';
     }
 }
 

htdocs/map2.php

Spacing +60 added lines, -60 removed lines

@@ -9,7 +9,7 @@ 
 
 $build_map_towns_menu = true;
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 /* because the map does access some private info like
  * ignored caches, we need to verify the login data
@@ -67,7 +67,7 @@ 
                        WHERE option_id=6 AND user_id='&1'", true, $login->userid))
 ) {
     $fullscreen = true;
-    $tpl->popup = true;        // disables page header and -frame
+    $tpl->popup = true; // disables page header and -frame
     $tpl->popupmargin = false;
 } else {
     $fullscreen = false;
@@ -133,7 +133,7 @@ 
     $tpl->error($translate->t('There is no google maps key registered for this domain.', '', '', 0));
 }
 
-$tpl->add_header_javascript($opt['page']['protocol'] . '://maps.googleapis.com/maps/api/js?sensor=false&key=' . urlencode($sGMKey) . '&language=' . strtolower($opt['template']['locale']));
+$tpl->add_header_javascript($opt['page']['protocol'].'://maps.googleapis.com/maps/api/js?sensor=false&key='.urlencode($sGMKey).'&language='.strtolower($opt['template']['locale']));
 // https is supported by google, but may make problems in some environments,
 // e.g. does not work with MSIE 7 on WinXP
 $tpl->add_header_javascript('resource2/misc/map/dragzoom_packed.js');
@@ -279,7 +279,7 @@ 
     global $login;
 
     $rsCache = sql_slave(
-        "SELECT " . geomath::getSqlDistanceFormula($nLon, $nLat, $nDistance) . " AS `distance`,
+        "SELECT ".geomath::getSqlDistanceFormula($nLon, $nLat, $nDistance)." AS `distance`,
                                   `caches`.`wp_oc`
                              FROM `caches`
                        INNER JOIN `cache_status` ON `caches`.`status`=`cache_status`.`id`
@@ -389,42 +389,42 @@ 
     $wphandler = new HandlerChildWp();
     $waypoints = $wphandler->getChildWps($rCache['cache_id'], true);
 
-    echo '<caches>' . "\n";
+    echo '<caches>'."\n";
     echo '  <cache ';
-    echo 'name="' . xmlentities($rCache['name']) . '" ';
-    echo 'wpoc="' . xmlentities($rCache['wp_oc']) . '" ';
-    echo 'coords="' . $rCache['longitude'] . ',' . $rCache['latitude'] . '" ';
-    echo 'inactive="' . xmlentities($rCache['inactive']) . '" ';
-    echo 'status_text="' . xmlentities($rCache['statustext']) . '" ';
-    echo 'type_id="' . xmlentities($rCache['type_id']) . '" ';
-    echo 'type_text="' . xmlentities($rCache['type_text']) . '" ';
-    echo 'size="' . xmlentities($rCache['size']) . '" ';
-    echo 'difficulty="' . xmlentities($rCache['difficulty'] / 2) . '" ';
-    echo 'terrain="' . xmlentities($rCache['terrain'] / 2) . '" ';
-    echo 'listed_since="' . xmlentities(strftime($opt['locale'][$opt['template']['locale']]['format']['date'], strtotime($rCache['date_created']))) . '" ';
-    echo 'is_publishdate="' . xmlentities($rCache['is_publishdate']) . '" ';
-    echo 'toprating="' . xmlentities($rCache['toprating']) . '" ';
-    echo 'geokreties="' . xmlentities($nGeokretyCount) . '" ';
-    echo 'found="' . xmlentities(($nFoundCount > 0) ? 1 : 0) . '" ';
-    echo 'notfound="' . xmlentities(($nNotFoundCount > 0) ? 1 : 0) . '" ';
-    echo 'attended="' . xmlentities(($nAttendedCount > 0) ? 1 : 0) . '" ';
-    echo 'oconly="' . xmlentities($rCache['oconly']) . '" ';
-    echo 'owner="' . xmlentities($rCache['owner']) . '" ';
-    echo 'username="' . xmlentities($rCache['username']) . '" ';
-    echo 'userid="' . xmlentities($rCache['user_id']) . '" ';
-    echo 'picurl="' . xmlentities($rCache['picurl']) . '" ';
-    echo 'pictitle="' . xmlentities(trim($rCache['pictitle'])) . '" >\n';
+    echo 'name="'.xmlentities($rCache['name']).'" ';
+    echo 'wpoc="'.xmlentities($rCache['wp_oc']).'" ';
+    echo 'coords="'.$rCache['longitude'].','.$rCache['latitude'].'" ';
+    echo 'inactive="'.xmlentities($rCache['inactive']).'" ';
+    echo 'status_text="'.xmlentities($rCache['statustext']).'" ';
+    echo 'type_id="'.xmlentities($rCache['type_id']).'" ';
+    echo 'type_text="'.xmlentities($rCache['type_text']).'" ';
+    echo 'size="'.xmlentities($rCache['size']).'" ';
+    echo 'difficulty="'.xmlentities($rCache['difficulty'] / 2).'" ';
+    echo 'terrain="'.xmlentities($rCache['terrain'] / 2).'" ';
+    echo 'listed_since="'.xmlentities(strftime($opt['locale'][$opt['template']['locale']]['format']['date'], strtotime($rCache['date_created']))).'" ';
+    echo 'is_publishdate="'.xmlentities($rCache['is_publishdate']).'" ';
+    echo 'toprating="'.xmlentities($rCache['toprating']).'" ';
+    echo 'geokreties="'.xmlentities($nGeokretyCount).'" ';
+    echo 'found="'.xmlentities(($nFoundCount > 0) ? 1 : 0).'" ';
+    echo 'notfound="'.xmlentities(($nNotFoundCount > 0) ? 1 : 0).'" ';
+    echo 'attended="'.xmlentities(($nAttendedCount > 0) ? 1 : 0).'" ';
+    echo 'oconly="'.xmlentities($rCache['oconly']).'" ';
+    echo 'owner="'.xmlentities($rCache['owner']).'" ';
+    echo 'username="'.xmlentities($rCache['username']).'" ';
+    echo 'userid="'.xmlentities($rCache['user_id']).'" ';
+    echo 'picurl="'.xmlentities($rCache['picurl']).'" ';
+    echo 'pictitle="'.xmlentities(trim($rCache['pictitle'])).'" >\n';
 
     foreach ($waypoints as $waypoint) {
         echo '    <wpt ';
-        echo 'typeid="' . xmlentities($waypoint['type']) . '" ';
-        echo 'typename="' . xmlentities($waypoint['name']) . '" ';
-        echo 'typepreposition="' . xmlentities($waypoint['preposition']) . '" ';
-        echo 'image="' . xmlentities($waypoint['image']) . '" ';
+        echo 'typeid="'.xmlentities($waypoint['type']).'" ';
+        echo 'typename="'.xmlentities($waypoint['name']).'" ';
+        echo 'typepreposition="'.xmlentities($waypoint['preposition']).'" ';
+        echo 'image="'.xmlentities($waypoint['image']).'" ';
         echo 'imagewidth="38" imageheight="38" ';
-        echo 'latitude="' . xmlentities($waypoint['latitude']) . '" ';
-        echo 'longitude="' . xmlentities($waypoint['longitude']) . '" ';
-        echo 'description="' . xmlentities(mb_ereg_replace('\r\n', '<br />', htmlentities(trim($waypoint['description']), ENT_NOQUOTES, 'UTF-8'))) . '" />\n';
+        echo 'latitude="'.xmlentities($waypoint['latitude']).'" ';
+        echo 'longitude="'.xmlentities($waypoint['longitude']).'" ';
+        echo 'description="'.xmlentities(mb_ereg_replace('\r\n', '<br />', htmlentities(trim($waypoint['description']), ENT_NOQUOTES, 'UTF-8'))).'" />\n';
     }
 
     echo '  </cache>\n';
@@ -438,9 +438,9 @@ 
 {
     global $login, $opt;
 
-    echo '<caches>' . "\n";
+    echo '<caches>'."\n";
     $rs = sql_slave(
-        "SELECT " . geomath::getSqlDistanceFormula($nLon, $nLat, 0) . " AS `distance`,
+        "SELECT ".geomath::getSqlDistanceFormula($nLon, $nLat, 0)." AS `distance`,
                           `caches`.`name`, `caches`.`wp_oc`
                      FROM `map2_data`
                INNER JOIN `caches` ON `map2_data`.`cache_id`=`caches`.`cache_id`
@@ -449,30 +449,30 @@ 
                       AND (`cache_status`.`allow_user_view`=1 OR `caches`.`user_id`='&3')
                       AND `map2_data`.`result_id`='&2'
                            ORDER BY `distance` ASC LIMIT 30",
-        '%' . $sName . '%',
+        '%'.$sName.'%',
         $nResultId,
         $login->userid
     );
     $caches_found = 0;
     while ($r = sql_fetch_assoc($rs)) {
-        echo '<cache name="' . xmlentities($r['name']) . '" wpoc="' . xmlentities($r['wp_oc']) . '" />' . "\n";
-        ++ $caches_found;
+        echo '<cache name="'.xmlentities($r['name']).'" wpoc="'.xmlentities($r['wp_oc']).'" />'."\n";
+        ++$caches_found;
     }
     sql_free_result($rs);
 
     if (!$caches_found && preg_match('/^[^\s[:punct:]]{2,}\.[^\s[:punct:]]{2,}\.[^\s[:punct:]]{2,}$/', $sName)) {
-        $result = @file_get_contents('http://api.what3words.com/w3w?key=' . $opt['lib']['w3w']['apikey']
-            . '&string=' . urlencode($sName));
+        $result = @file_get_contents('http://api.what3words.com/w3w?key='.$opt['lib']['w3w']['apikey']
+            . '&string='.urlencode($sName));
         if ($result) {
             $json = json_decode($result, true);
             if (!is_null($json['words']) && !is_null($json['position']) && count($json['position']) == 2) {
-                echo '<coord name="' . xmlentities(implode('.', $json['words'])) .
-                    '" latitude="' . xmlentities($json["position"][0]) .
-                    '" longitude="' . xmlentities($json["position"][1]) . '" />' . "\n";
+                echo '<coord name="'.xmlentities(implode('.', $json['words'])).
+                    '" latitude="'.xmlentities($json["position"][0]).
+                    '" longitude="'.xmlentities($json["position"][1]).'" />'."\n";
             }
         }
     }
-    echo '</caches>' . "\n";
+    echo '</caches>'."\n";
 
     exit;
 }
@@ -495,7 +495,7 @@ 
         "SELECT `slave_id`
         FROM `map2_result`
         WHERE `result_id`='&1' AND DATE_ADD(`date_created`, INTERVAL '&2' SECOND)>NOW()",
-        - 2,
+        -2,
         $nResultId,
         $opt['map']['maxcacheage']
     );
@@ -561,8 +561,8 @@ 
     $bMaxRecordReached = ($nRecordCount > $maxrecords);
 
     // output data
-    echo '<searchresult count="' . xmlentities($nRecordCount) . '" available="1"' .
-        ' maxrecordreached="' . ($bMaxRecordReached ? '1' : '0') . '">' . "\n";
+    echo '<searchresult count="'.xmlentities($nRecordCount).'" available="1"'.
+        ' maxrecordreached="'.($bMaxRecordReached ? '1' : '0').'">'."\n";
 
     if (!$bMaxRecordReached) {
         $namequery = ($cachenames ? ", `caches`.`name` AS `cachename`" : "");
@@ -577,7 +577,7 @@ 
                             IF(`found_logs`.`id` IS NULL, 0, 1) AS `found`,
                             IF(`found_logs`.`id` IS NULL AND `notfound_logs`.`id` IS NOT NULL, 1, 0) AS `notfound`,
                             IF(`caches_attributes`.`attrib_id` IS NULL, 0, 1) AS `oconly`" .
-            $namequery . "
+            $namequery."
                        FROM `map2_data`
                  INNER JOIN `caches` ON `map2_data`.`cache_id`=`caches`.`cache_id`
                  INNER JOIN `user` ON `user`.`user_id`=`caches`.`user_id`
@@ -624,19 +624,19 @@ 
                 echo
                     '<c d="'
                     . xmlentities(
-                        $r['wp_oc'] . '/' . round($r['longitude'], 5) . '/' .
-                        round($r['latitude'], 5) . '/' . $r['type'] . '/' . $flags
-                    ) . '"'
-                    . (isset($r['cachename']) ? ' n="' . xmlentities($r['cachename']) . '"' : '')
+                        $r['wp_oc'].'/'.round($r['longitude'], 5).'/'.
+                        round($r['latitude'], 5).'/'.$r['type'].'/'.$flags
+                    ).'"'
+                    . (isset($r['cachename']) ? ' n="'.xmlentities($r['cachename']).'"' : '')
                     . ' />';
             } else {
                 echo
-                    '<cache wp="' . xmlentities($r['wp_oc']) . '"' .
-                    ' lon="' . xmlentities(round($r['longitude'], 5)) . '"' .
-                    ' lat="' . xmlentities(round($r['latitude'], 5)) . '"' .
-                    ' type="' . xmlentities($r['type']) . '"' .
-                    (isset($r['cachename']) ? ' n="' . xmlentities($r['cachename']) . '"' : '') .
-                    ' f="' . xmlentities($flags) . '" />' . "\n";
+                    '<cache wp="'.xmlentities($r['wp_oc']).'"'.
+                    ' lon="'.xmlentities(round($r['longitude'], 5)).'"'.
+                    ' lat="'.xmlentities(round($r['latitude'], 5)).'"'.
+                    ' type="'.xmlentities($r['type']).'"'.
+                    (isset($r['cachename']) ? ' n="'.xmlentities($r['cachename']).'"' : '').
+                    ' f="'.xmlentities($flags).'" />'."\n";
             }
         }
         sql_free_result($rs);

local/ocxml11client/index.php

Spacing +56 added lines, -56 removed lines

@@ -27,12 +27,12 @@ 
  * - Test mit aktuellem OC.de-Stand
  ***************************************************************************/
 
-$rootpath = __DIR__ . '/../../htdocs/';
+$rootpath = __DIR__.'/../../htdocs/';
 
 // chdir to proper directory (needed for cronjobs)
 chdir(substr(realpath($_SERVER['PHP_SELF']), 0, strrpos(realpath($_SERVER['PHP_SELF']), '/')));
 
-require_once $rootpath . 'lib/clicompatbase.inc.php';
+require_once $rootpath.'lib/clicompatbase.inc.php';
 require_once 'xml2array.inc.php';
 require_once 'settings.php';
 
@@ -67,16 +67,16 @@ 
     $nFileNr = 0;
     $rs = sql('SELECT `id`, `url` FROM `pictures` WHERE `local`=0');
     while ($r = sql_fetch_array($rs)) {
-        $nFileNr ++;
+        $nFileNr++;
         $fileparts = mb_split('/', $r['url']);
         $filename = $fileparts[count($fileparts) - 1];
 
-        echo 'Downloading file ' . $nFileNr . ' of ' . $rCount['c'] . ': ' . $filename . "\n";
+        echo 'Downloading file '.$nFileNr.' of '.$rCount['c'].': '.$filename."\n";
 
         $success = true;
-        if (!file_exists($opt['pictures']['directory'] . $filename)) {
-            if (!@copy($r['url'], $opt['pictures']['directory'] . $filename)) {
-                echo 'error: Download nicht erfolgreich' . "\n";
+        if (!file_exists($opt['pictures']['directory'].$filename)) {
+            if (!@copy($r['url'], $opt['pictures']['directory'].$filename)) {
+                echo 'error: Download nicht erfolgreich'."\n";
                 $success = false;
             }
         }
@@ -84,7 +84,7 @@ 
         if ($success == true) {
             sql(
                 "UPDATE `pictures` SET `local`=1, `url`='&1' WHERE `id`='&2'",
-                $opt['pictures']['url'] . $filename,
+                $opt['pictures']['url'].$filename,
                 $r['id']
             );
         }
@@ -196,7 +196,7 @@ 
 
     if ($opt['session'] == 1) {
         // records abfragen
-        $sessionfile = $opt['tmpdir'] . 'session.xml';
+        $sessionfile = $opt['tmpdir'].'session.xml';
         if (file_exists($sessionfile)) {
             unlink($sessionfile);
         }
@@ -215,21 +215,21 @@ 
         $recordscount += $session['OCXMLSESSION']['RECORDS']['PICTURE'];
         $recordscount += $session['OCXMLSESSION']['RECORDS']['REMOVEOBJECT'];
 
-        echo 'Abruf seit ' . $lastUpdate . "\n";
+        echo 'Abruf seit '.$lastUpdate."\n";
         echo "------------------------\n";
-        echo 'Session-Id: ' . $sessionid . "\n";
-        echo 'User: ' . $session['OCXMLSESSION']['RECORDS']['USER'] . "\n";
-        echo 'Cache: ' . $session['OCXMLSESSION']['RECORDS']['CACHE'] . "\n";
-        echo 'Cachdesc: ' . $session['OCXMLSESSION']['RECORDS']['CACHEDESC'] . "\n";
-        echo 'Cachelog: ' . $session['OCXMLSESSION']['RECORDS']['CACHELOG'] . "\n";
-        echo 'Picture: ' . $session['OCXMLSESSION']['RECORDS']['PICTURE'] . "\n";
-        echo 'Removedobject: ' . $session['OCXMLSESSION']['RECORDS']['REMOVEOBJECT'] . "\n";
+        echo 'Session-Id: '.$sessionid."\n";
+        echo 'User: '.$session['OCXMLSESSION']['RECORDS']['USER']."\n";
+        echo 'Cache: '.$session['OCXMLSESSION']['RECORDS']['CACHE']."\n";
+        echo 'Cachdesc: '.$session['OCXMLSESSION']['RECORDS']['CACHEDESC']."\n";
+        echo 'Cachelog: '.$session['OCXMLSESSION']['RECORDS']['CACHELOG']."\n";
+        echo 'Picture: '.$session['OCXMLSESSION']['RECORDS']['PICTURE']."\n";
+        echo 'Removedobject: '.$session['OCXMLSESSION']['RECORDS']['REMOVEOBJECT']."\n";
         echo "------------------------\n";
-        echo 'Summe: ' . $recordscount . "\n";
+        echo 'Summe: '.$recordscount."\n";
 
         $filescount = ($recordscount + (500 - $recordscount % 500)) / 500;
 
-        echo 'Anzahl der Pakete: ' . $filescount . "\n";
+        echo 'Anzahl der Pakete: '.$filescount."\n";
         echo "\n";
 
         if ($recordscount == 0) {
@@ -237,20 +237,20 @@ 
             exit;
         }
 
-        for ($i = 1; $i <= $filescount; $i ++) {
-            echo "Download Paket: " . $i . ' von ' . $filescount . "\n";
+        for ($i = 1; $i <= $filescount; $i++) {
+            echo "Download Paket: ".$i.' von '.$filescount."\n";
 
             $fileurl = $opt['url_getsession'];
             $fileurl = mb_ereg_replace('{sessionid}', $sessionid, $fileurl);
             $fileurl = mb_ereg_replace('{file}', $i, $fileurl);
             $fileurl = mb_ereg_replace('{zip}', $opt['zip'], $fileurl);
-            $target = $opt['tmpdir'] . $sessionid . '-' . sprintf('%04d', $i) . $fileext;
+            $target = $opt['tmpdir'].$sessionid.'-'.sprintf('%04d', $i).$fileext;
 
             copy($fileurl, $target);
         }
     } else {
-        echo 'Download ...' . "\n";
-        $target = $opt['tmpdir'] . date('YmdHis') . $fileext;
+        echo 'Download ...'."\n";
+        $target = $opt['tmpdir'].date('YmdHis').$fileext;
         copy($url, $target);
     }
 }
@@ -262,24 +262,24 @@ 
     // alle zips entpacken
     $hDir = opendir($opt['tmpdir']);
     while (false !== ($file = readdir($hDir))) {
-        if (is_file($opt['tmpdir'] . $file)) {
+        if (is_file($opt['tmpdir'].$file)) {
             $bCopy = false;
             if (mb_substr($file, mb_strrpos($file, '.')) == '.zip') {
-                echo 'Unzipping file ' . $file . "\n";
+                echo 'Unzipping file '.$file."\n";
                 system(
-                    $opt['unzip'] . ' --type=zip --src="' . $opt['rel_tmpdir'] . '/' . $file . '" --dst="' . $opt['rel_tmpdir'] . '"'
+                    $opt['unzip'].' --type=zip --src="'.$opt['rel_tmpdir'].'/'.$file.'" --dst="'.$opt['rel_tmpdir'].'"'
                 );
             } else {
                 if (mb_substr($file, mb_strrpos($file, '.')) == '.gz') {
-                    echo 'Unzipping file ' . $file . "\n";
+                    echo 'Unzipping file '.$file."\n";
                     system(
-                        $opt['unzip'] . ' --type=gzip --src="' . $opt['rel_tmpdir'] . '/' . $file . '" --dst="' . $opt['rel_tmpdir'] . '"'
+                        $opt['unzip'].' --type=gzip --src="'.$opt['rel_tmpdir'].'/'.$file.'" --dst="'.$opt['rel_tmpdir'].'"'
                     );
                 } else {
                     if (mb_substr($file, mb_strrpos($file, '.')) == '.bz2') {
-                        echo 'Unzipping file ' . $file . "\n";
+                        echo 'Unzipping file '.$file."\n";
                         system(
-                            $opt['unzip'] . ' --type=bzip2 --src="' . $opt['rel_tmpdir'] . '/' . $file . '" --dst="' . $opt['rel_tmpdir'] . '"'
+                            $opt['unzip'].' --type=bzip2 --src="'.$opt['rel_tmpdir'].'/'.$file.'" --dst="'.$opt['rel_tmpdir'].'"'
                         );
                     } else {
                         if (mb_substr($file, mb_strrpos($file, '.')) == '.xml') {
@@ -291,16 +291,16 @@ 
 
             // und jetzt die gezippte Datei verschieben
             $archivdir = $opt['archivdir'];
-            $archivdir .= $opt['curdb'] . '/';
+            $archivdir .= $opt['curdb'].'/';
 
             if (!is_dir($archivdir)) {
                 mkdir($archivdir);
             }
 
             if ($bCopy == true) {
-                copy($opt['tmpdir'] . $file, $archivdir . '/' . $file);
+                copy($opt['tmpdir'].$file, $archivdir.'/'.$file);
             } else {
-                rename($opt['tmpdir'] . $file, $archivdir . '/' . $file);
+                rename($opt['tmpdir'].$file, $archivdir.'/'.$file);
             }
         }
     }
@@ -315,9 +315,9 @@ 
 
     $hDir = opendir($opt['tmpdir']);
     while (false !== ($file = readdir($hDir))) {
-        if (is_file($opt['tmpdir'] . $file)) {
+        if (is_file($opt['tmpdir'].$file)) {
             if ($file != '.cvsignore') {
-                $files[] = $opt['tmpdir'] . $file;
+                $files[] = $opt['tmpdir'].$file;
             }
         }
     }
@@ -331,7 +331,7 @@ 
 
 function importxmlfile($file)
 {
-    echo 'Importing file ' . $file . "\n";
+    echo 'Importing file '.$file."\n";
 
     $xmlReader = new xmlReader();
     $xmlReader->open($file);
@@ -411,11 +411,11 @@ 
                             if ($sSubElement != '') {
                                 // vorheriges element zuerst schlißen
                                 $sSubElement = '';
-                                $nRecursionLevel --;
+                                $nRecursionLevel--;
                             }
 
                             $sSubElement = mb_strtoupper($xmlReader->name);
-                            $nRecursionLevel ++;
+                            $nRecursionLevel++;
 
                             // attribute auslesen
                             if ($xmlReader->moveToFirstAttribute()) {
@@ -432,7 +432,7 @@ 
                         } else {
                             if ($xmlReader->nodeType == XMLReader::END_ELEMENT) {
                                 $sSubElement = '';
-                                $nRecursionLevel --;
+                                $nRecursionLevel--;
                             }
                         }
                     }
@@ -459,7 +459,7 @@ 
                     ImportRemovedObjectArray($node['REMOVEDOBJECT']);
                     break;
                 default:
-                    echo 'Unknown Element "' . $xmlReader->name . '", skipping' . "\n";
+                    echo 'Unknown Element "'.$xmlReader->name.'", skipping'."\n";
                     break;
             }
         }
@@ -481,9 +481,9 @@ 
 
     $hDir = opendir($opt['tmpdir']);
     while (false !== ($file = readdir($hDir))) {
-        if (is_file($opt['tmpdir'] . $file)) {
+        if (is_file($opt['tmpdir'].$file)) {
             if ($file != '.cvsignore') {
-                unlink($opt['tmpdir'] . $file);
+                unlink($opt['tmpdir'].$file);
             }
         }
     }
@@ -501,14 +501,14 @@ 
         // andere DB connecten?
         if (mb_substr($arg, 0, 5) == '--db=') {
             if (!is_numeric(mb_substr($arg, 5))) {
-                die('invalid alternative DB' . "\n");
+                die('invalid alternative DB'."\n");
             }
 
             $nDb = mb_substr($arg, 5);
 
             if ($nDb != 0) {
                 if (!isset($opt['db'][$nDb])) {
-                    die('invalid alternative DB' . "\n");
+                    die('invalid alternative DB'."\n");
                 }
 
                 mysql_close($dblink);
@@ -517,7 +517,7 @@ 
                     sql("SET NAMES 'utf8'");
                     sql('USE `&1`', $opt['db'][1]['name']);
                 } else {
-                    die('Connect to alternative DB failed' . "\n");
+                    die('Connect to alternative DB failed'."\n");
                 }
 
                 $opt['curdb'] = $nDb;
@@ -531,7 +531,7 @@ 
             sql("SET NAMES 'utf8'");
             sql('USE `&1`', $dbname);
         } else {
-            die('Connect to alternative DB failed' . "\n");
+            die('Connect to alternative DB failed'."\n");
         }
     }
 }
@@ -544,7 +544,7 @@ 
         !isset($r['USERNAME']['__DATA']) ||
         !isset($r['LASTMODIFIED']['__DATA'])
     ) {
-        echo 'warn: ImportUserArray required element not defined' . "\n";
+        echo 'warn: ImportUserArray required element not defined'."\n";
 
         return;
     }
@@ -637,7 +637,7 @@ 
         !isset($r['DATECREATED']['__DATA']) ||
         !isset($r['LASTMODIFIED']['__DATA'])
     ) {
-        echo 'warn: ImportCacheArray required element not defined' . "\n";
+        echo 'warn: ImportCacheArray required element not defined'."\n";
 
         return;
     }
@@ -807,7 +807,7 @@ 
         !isset($r['LANGUAGE']['__ATTR']['ID']) ||
         !isset($r['LASTMODIFIED']['__DATA'])
     ) {
-        echo 'error: ImportCacheDescArray required element not defined' . "\n";
+        echo 'error: ImportCacheDescArray required element not defined'."\n";
 
         return;
     }
@@ -964,7 +964,7 @@ 
         !isset($r['DATECREATED']['__DATA']) ||
         !isset($r['LASTMODIFIED']['__DATA'])
     ) {
-        echo 'error: ImportCachelogArray required element not defined' . "\n";
+        echo 'error: ImportCachelogArray required element not defined'."\n";
 
         return;
     }
@@ -995,7 +995,7 @@ 
 
     // logtype gültig?
     if (sqlValue(
-        "SELECT COUNT(*) FROM `log_types` WHERE `id`='" . sql_escape($r['LOGTYPE']['__ATTR']['ID']) . "'",
+        "SELECT COUNT(*) FROM `log_types` WHERE `id`='".sql_escape($r['LOGTYPE']['__ATTR']['ID'])."'",
         0
     ) == 0) {
         importError('cachelog', $r['ID']['__DATA'], $r, 'Logtype not valid, skipping');
@@ -1068,7 +1068,7 @@ 
         !isset($r['DATECREATED']['__DATA']) ||
         !isset($r['LASTMODIFIED']['__DATA'])
     ) {
-        echo 'error: ImportPictureArray required element not defined ' . "\n";
+        echo 'error: ImportPictureArray required element not defined '."\n";
 
         return;
     }
@@ -1169,7 +1169,7 @@ 
         !isset($r['OBJECT']['__DATA']) ||
         !isset($r['REMOVEDDATE']['__DATA'])
     ) {
-        echo 'error: ImportRemovedObjectArray required element not defined' . "\n";
+        echo 'error: ImportRemovedObjectArray required element not defined'."\n";
 
         return;
     }
@@ -1281,12 +1281,12 @@ 
 
 function importError($recordtype, $uuid, $r, $info)
 {
-    echo 'error: ' . $recordtype . ' (' . $uuid . '): ' . $info . "\n";
+    echo 'error: '.$recordtype.' ('.$uuid.'): '.$info."\n";
 }
 
 function importWarn($recordtype, $uuid, $r, $info)
 {
-    echo 'warn: ' . $recordtype . ' (' . $uuid . '): ' . $info . "\n";
+    echo 'warn: '.$recordtype.' ('.$uuid.'): '.$info."\n";
 }
 
 function restorevalues()

local/devel/strip_private_data.php

Spacing +7 added lines, -7 removed lines

@@ -9,15 +9,15 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../htdocs/';
-require $opt['rootpath'] . 'lib2/cli.inc.php';
+$opt['rootpath'] = __DIR__.'/../../htdocs/';
+require $opt['rootpath'].'lib2/cli.inc.php';
 
 if (!($opt['debug'] & DEBUG_DEVELOPER)) {
     die("This script deletes lot of data and must be run only on development systems.\n");
 }
 if ($argc != 2 || $argv[1] != 'go') {
     die(
-        "This script deletes lot of data. Make sure that you really want to dos this,\n" .
+        "This script deletes lot of data. Make sure that you really want to dos this,\n".
         "and confirm it by adding the parameter 'go'.\n"
     );
 }
@@ -63,11 +63,11 @@ 
 echo "clearing user data\n";
 sql('TRUNCATE `cache_adoption`');
 sql('TRUNCATE `cache_ignore`');
-sql('DELETE FROM `cache_lists` WHERE `is_public`<2');  // trigger deletes dependent data
+sql('DELETE FROM `cache_lists` WHERE `is_public`<2'); // trigger deletes dependent data
 sql('TRUNCATE `cache_list_bookmarks`');
 sql('TRUNCATE `cache_list_watches`');
 sql('TRUNCATE `cache_watches`');
-sql('DELETE FROM `coordinates` WHERE `type`=2');   // personal cache notes and coords
+sql('DELETE FROM `coordinates` WHERE `type`=2'); // personal cache notes and coords
 sql('TRUNCATE `queries`');
 sql('TRUNCATE `user_options`');
 sql(
@@ -132,10 +132,10 @@ 
 
 echo "clearing other nonpublic data\n";
 sql('TRUNCATE `news`');
-$rs = sql("SHOW TABLES WHERE `Tables_in_" . $opt['db']['placeholder']['db'] . "` LIKE '\_%'");
+$rs = sql("SHOW TABLES WHERE `Tables_in_".$opt['db']['placeholder']['db']."` LIKE '\_%'");
 $tables = sql_fetch_column($rs);
 foreach ($tables as $table) {
-    sql('DROP TABLE ' . $table);
+    sql('DROP TABLE '.$table);
 }
 
 echo "done.\n";