OpencachingDeutschland / oc-server3

htdocs/util/notification/run_notify.php

Doc Comments +3 added lines

@@ -197,6 +197,9 @@
     return 0;
 }
 
+/**
+ * @param string $domain
+ */
 function is_existent_maildomain($domain)
 {
     $smtp_serverlist = [];

Spacing +17 added lines, -17 removed lines

@@ -10,15 +10,15 @@ 
  ***************************************************************************/
 
 // needs absolute rootpath because called as cronjob
-$rootpath = __DIR__ . '/../../';
+$rootpath = __DIR__.'/../../';
 
-require_once $rootpath . 'lib/clicompatbase.inc.php';
-require_once $rootpath . 'lib2/translate.class.php';
-require_once __DIR__ . '/settings.inc.php';
-require_once $rootpath . 'lib/consts.inc.php';
-require_once $rootpath . 'lib2/ProcessSync.class.php';
-require_once $rootpath . 'lib/logic.inc.php';
-require_once $rootpath . 'lib2/logic/geomath.class.php';
+require_once $rootpath.'lib/clicompatbase.inc.php';
+require_once $rootpath.'lib2/translate.class.php';
+require_once __DIR__.'/settings.inc.php';
+require_once $rootpath.'lib/consts.inc.php';
+require_once $rootpath.'lib2/ProcessSync.class.php';
+require_once $rootpath.'lib/logic.inc.php';
+require_once $rootpath.'lib2/logic/geomath.class.php';
 
 if (!cronjobs_enabled()) {
     exit;
@@ -86,7 +86,7 @@ 
     switch ($notify['type']) {
         case notify_new_cache: // Type: new cache
             $mailbody = fetch_email_template('notify_newcache', $notify['recp_lang'], $notify['recp_domain']);
-            $mailsubject = '[' . $maildomain . '] ' .
+            $mailsubject = '['.$maildomain.'] '.
                 $translate->t(
                     $notify['oconly'] ? 'New OConly cache:' : 'New cache:',
                     '',
@@ -95,13 +95,13 @@ 
                     '',
                     1,
                     $notify['recp_lang']
-                ) .
-                ' ' . $notify['cachename'];
+                ).
+                ' '.$notify['cachename'];
             break;
 
         case notify_new_oconly: // Type: new OConly flag
             $mailbody = fetch_email_template('notify_newoconly', $notify['recp_lang'], $notify['recp_domain']);
-            $mailsubject = '[' . $maildomain . '] ' .
+            $mailsubject = '['.$maildomain.'] '.
                 $translate->t(
                     'Cache was marked as OConly:',
                     '',
@@ -110,8 +110,8 @@ 
                     '',
                     1,
                     $notify['recp_lang']
-                ) .
-                ' ' . $notify['cachename'];
+                ).
+                ' '.$notify['cachename'];
             break;
 
         default:
@@ -175,7 +175,7 @@ 
         );
 
         /* begin send out everything that has to be sent */
-        $email_headers = 'From: "' . $mailfrom . '" <' . $mailfrom . '>';
+        $email_headers = 'From: "'.$mailfrom.'" <'.$mailfrom.'>';
 
         // send email
         if ($debug == true) {
@@ -188,11 +188,11 @@ 
             mb_send_mail($mailadr, $mailsubject, $mailbody, $email_headers);
         }
     } else {
-        echo "Unknown notification type: " . $notify['type'] . "<br />";
+        echo "Unknown notification type: ".$notify['type']."<br />";
     }
 
     // logentry($module, $eventid, $userid, $objectid1, $objectid2, $logtext, $details)
-    logentry('notify_newcache', 8, $notify['recid'], $notify['cache_id'], 0, 'Sending mail to ' . $mailadr, []);
+    logentry('notify_newcache', 8, $notify['recid'], $notify['cache_id'], 0, 'Sending mail to '.$mailadr, []);
 
     return 0;
 }

htdocs/util/watchlist/runwatch.php

Doc Comments +6 added lines

@@ -484,6 +484,9 @@ 
     );
 }
 
+/**
+ * @param string $watchtext
+ */
 function insert_maintenance_flags($rLog, $language, $watchtext)
 {
     global $translate;
@@ -510,6 +513,9 @@ 
     return mb_ereg_replace('{maintenance_flags}', $flagtext, $watchtext);
 }
 
+/**
+ * @param string $domain
+ */
 function is_existent_maildomain($domain)
 {
     $smtp_serverlist = [];

Spacing +32 added lines, -32 removed lines

@@ -12,13 +12,13 @@ 
  ***************************************************************************/
 
 // needs absolute rootpath because called as cronjob
-$rootpath = __DIR__ . '/../../';
-require_once $rootpath . 'lib/clicompatbase.inc.php';
-require_once $rootpath . 'lib2/translate.class.php';
-require_once __DIR__ . '/settings.inc.php';
-require_once $rootpath . 'lib/consts.inc.php';
-require_once $rootpath . 'lib/logic.inc.php';
-require_once $rootpath . 'lib2/edithelper.inc.php';
+$rootpath = __DIR__.'/../../';
+require_once $rootpath.'lib/clicompatbase.inc.php';
+require_once $rootpath.'lib2/translate.class.php';
+require_once __DIR__.'/settings.inc.php';
+require_once $rootpath.'lib/consts.inc.php';
+require_once $rootpath.'lib/logic.inc.php';
+require_once $rootpath.'lib2/edithelper.inc.php';
 
 if (!cronjobs_enabled()) {
     exit;
@@ -51,7 +51,7 @@ 
     WHERE cache_logs.cache_id=caches.cache_id
     AND cache_logs.owner_notified=0"
 );
-for ($i = 0; $i < mysql_num_rows($rsNewLogs); $i ++) {
+for ($i = 0; $i < mysql_num_rows($rsNewLogs); $i++) {
     $rNewLog = sql_fetch_array($rsNewLogs);
 
     $rsNotified = sql(
@@ -102,7 +102,7 @@ 
     // See http://forum.opencaching.de/index.php?topic=3123.0 on AOL.
     if (sqlValue(
         "SELECT `email_problems` = 0 OR DATEDIFF(NOW(),`last_email_problem`) > 1+DATEDIFF(`last_email_problem`,`first_email_problem`)
-                        FROM `user` WHERE `user_id`='" . sql_escape($rcw['user_id']) . "'",
+                        FROM `user` WHERE `user_id`='" . sql_escape($rcw['user_id'])."'",
         1
     )) {
         process_log_watch($rcw['user_id'], $rcw['log_id']);
@@ -115,7 +115,7 @@ 
 
 /* begin send out everything that has to be sent */
 
-$email_headers = 'From: "' . $mailfrom . '" <' . $mailfrom . '>';
+$email_headers = 'From: "'.$mailfrom.'" <'.$mailfrom.'>';
 
 $rsUsers = sql(
     "SELECT
@@ -134,7 +134,7 @@ 
     WHERE `user`.`watchmail_nextmail`<NOW()",
     $opt['template']['default']['locale']
 );
-for ($i = 0; $i < mysql_num_rows($rsUsers); $i ++) {
+for ($i = 0; $i < mysql_num_rows($rsUsers); $i++) {
     $rUser = sql_fetch_array($rsUsers);
 
     if ($rUser['watchmail_nextmail'] != '0000-00-00 00:00:00') {
@@ -158,7 +158,7 @@ 
                 );
                 if (mysql_num_rows($rsWatchesOwner) > 0) {
                     $logtexts = '';
-                    for ($j = 0; $j < mysql_num_rows($rsWatchesOwner); $j ++) {
+                    for ($j = 0; $j < mysql_num_rows($rsWatchesOwner); $j++) {
                         $rWatch = sql_fetch_array($rsWatchesOwner);
                         $logtexts .= $rWatch['watchtext'];
                     }
@@ -183,7 +183,7 @@ 
                 );
                 if (mysql_num_rows($rsWatchesLog) > 0) {
                     $logtexts = '';
-                    for ($j = 0; $j < mysql_num_rows($rsWatchesLog); $j ++) {
+                    for ($j = 0; $j < mysql_num_rows($rsWatchesLog); $j++) {
                         $rWatch = sql_fetch_array($rsWatchesLog);
                         $logtexts .= $rWatch['watchtext'];
                     }
@@ -208,7 +208,7 @@ 
                 if ($mailadr != '') {
                     if (is_existent_maildomain(getToMailDomain($mailadr))) {
                         $language = $rUser['language'] ? $rUser['language'] : $opt['template']['default']['locale'];
-                        $mailsubject = '[' . $maildomain . '] ' . $translate->t(
+                        $mailsubject = '['.$maildomain.'] '.$translate->t(
                                 'Your watchlist of',
                                 '',
                                 basename(__FILE__),
@@ -216,11 +216,11 @@ 
                                 '',
                                 1,
                                 $language
-                            ) . ' ' . date($opt['locale'][$language]['format']['phpdate']);
+                            ).' '.date($opt['locale'][$language]['format']['phpdate']);
                         mb_send_mail($mailadr, $mailsubject, $mailbody, $email_headers);
 
                         // logentry($module, $eventid, $userid, $objectid1, $objectid2, $logtext, $details)
-                        logentry('watchlist', 2, $rUser['user_id'], 0, 0, 'Sending mail to ' . $mailadr, []);
+                        logentry('watchlist', 2, $rUser['user_id'], 0, 0, 'Sending mail to '.$mailadr, []);
                     }
                 }
 
@@ -319,7 +319,7 @@ 
 
     $logtext = html2plaintext($rLog['text'], $rLog['text_html'] == 0, EMAIL_LINEWRAP);
 
-    $language = sqlValue("SELECT `language` FROM `user` WHERE `user_id`='" . sql_escape($user_id) . "'", null);
+    $language = sqlValue("SELECT `language` FROM `user` WHERE `user_id`='".sql_escape($user_id)."'", null);
     if (!$language) {
         $language = $opt['template']['default']['locale'];
     }
@@ -329,7 +329,7 @@ 
         $dateformat = $opt['locale'][$language]['format']['phpdatetime'];
     }
 
-    $watchtext = '{date} ' . $translate->t(
+    $watchtext = '{date} '.$translate->t(
             '{user} has logged your cache "{cachename}":',
             '',
             basename(__FILE__),
@@ -337,7 +337,7 @@ 
             '',
             1,
             $language
-        ) . ' {action}{maintenance_flags}' . "\n" . '{shortlink_url}{wp_oc}' . "\n\n" . '{text}' . "\n\n\n\n";
+        ).' {action}{maintenance_flags}'."\n".'{shortlink_url}{wp_oc}'."\n\n".'{text}'."\n\n\n\n";
 
     $watchtext = mb_ereg_replace('{date}', date($dateformat, strtotime($rLog['logdate'])), $watchtext);
     $watchtext = mb_ereg_replace('{wp_oc}', $rLog['wp_oc'], $watchtext);
@@ -347,7 +347,7 @@ 
     $watchtext = mb_ereg_replace('{action}', get_logtype_name($rLog['type'], $language), $watchtext);
     $watchtext = insert_maintenance_flags($rLog, $language, $watchtext);
 
-    $domain = sqlValue("SELECT `domain` FROM `user` WHERE `user_id`='" . sql_escape($user_id) . "'", null);
+    $domain = sqlValue("SELECT `domain` FROM `user` WHERE `user_id`='".sql_escape($user_id)."'", null);
     $urls = get_site_urls($domain);
     if ($urls['shortlink_url']) {
         $watchtext = mb_ereg_replace("{shortlink_url}", $urls['shortlink_url'], $watchtext);
@@ -401,7 +401,7 @@ 
 
     $logtext = html2plaintext($rLog['text'], $rLog['text_html'] == 0, EMAIL_LINEWRAP);
 
-    $language = sqlValue("SELECT `language` FROM `user` WHERE `user_id`='" . sql_escape($user_id) . "'", null);
+    $language = sqlValue("SELECT `language` FROM `user` WHERE `user_id`='".sql_escape($user_id)."'", null);
     if (!$language) {
         $language = $opt['template']['default']['locale'];
     }
@@ -411,7 +411,7 @@ 
         $dateformat = $opt['locale'][$language]['format']['phpdatetime'];
     }
 
-    $watchtext = '{date} ' . $translate->t(
+    $watchtext = '{date} '.$translate->t(
             '{user} has logged the cache "{cachename}":',
             '',
             basename(__FILE__),
@@ -419,7 +419,7 @@ 
             '',
             1,
             $language
-        ) . ' {action}{maintenance_flags}' . "\n" . '{shortlink_url}{wp_oc}' . "\n{cachelists}\n" . '{text}' . "\n\n\n\n";
+        ).' {action}{maintenance_flags}'."\n".'{shortlink_url}{wp_oc}'."\n{cachelists}\n".'{text}'."\n\n\n\n";
 
     $watchtext = mb_ereg_replace('{date}', date($dateformat, strtotime($rLog['logdate'])), $watchtext);
     $watchtext = mb_ereg_replace('{wp_oc}', $rLog['wp_oc'], $watchtext);
@@ -451,7 +451,7 @@ 
                     '',
                     1,
                     $language
-                ) . ' ' . $cachelist_names[0] . "\n";
+                ).' '.$cachelist_names[0]."\n";
             break;
         default:
             $cachelists = $translate->t(
@@ -462,11 +462,11 @@ 
                     '',
                     1,
                     $language
-                ) . ' ' . implode(', ', $cachelist_names) . "\n";
+                ).' '.implode(', ', $cachelist_names)."\n";
     }
     $watchtext = mb_ereg_replace('{cachelists}', $cachelists, $watchtext);
 
-    $domain = sqlValue("SELECT `domain` FROM `user` WHERE `user_id`='" . sql_escape($user_id) . "'", null);
+    $domain = sqlValue("SELECT `domain` FROM `user` WHERE `user_id`='".sql_escape($user_id)."'", null);
     $urls = get_site_urls($domain);
     if ($urls['shortlink_url']) {
         $watchtext = mb_ereg_replace("{shortlink_url}", $urls['shortlink_url'], $watchtext);
@@ -557,7 +557,7 @@ 
     }
 
     if (file_exists($PidFile)) {
-        echo "Error: Pidfile (" . $PidFile . ") already present at " . __FILE__ . ":" . __LINE__ . "!\n";
+        echo "Error: Pidfile (".$PidFile.") already present at ".__FILE__.":".__LINE__."!\n";
 
         return false;
     } else {
@@ -567,7 +567,7 @@ 
 
             return true;
         } else {
-            echo "can't create Pidfile $PidFile at " . __FILE__ . ":" . __LINE__ . "!\n";
+            echo "can't create Pidfile $PidFile at ".__FILE__.":".__LINE__."!\n";
 
             return false;
         }
@@ -583,7 +583,7 @@ 
         $pid_daemon = fgets($pidfile, 20);
         fclose($pidfile);
 
-        $pid_daemon = (int) $pid_daemon;
+        $pid_daemon = (int)$pid_daemon;
 
         // process running?
         if (posix_kill($pid_daemon, 0)) {
@@ -592,7 +592,7 @@ 
             false;
         } else {
             // no, remove pid_file
-            echo "process not running, removing old pid_file (" . $PidFile . ")\n";
+            echo "process not running, removing old pid_file (".$PidFile.")\n";
             unlink($PidFile);
 
             return true;
@@ -614,10 +614,10 @@ 
             unlink($PidFile);
         }
     } else {
-        echo "Error: can't delete own pidfile (" . $PidFile . ") at " . __FILE__ . ":" . __LINE__ . "!\n";
+        echo "Error: can't delete own pidfile (".$PidFile.") at ".__FILE__.":".__LINE__."!\n";
     }
 
     if ($message) {
-        echo $message . "\n";
+        echo $message."\n";
     }
 }

htdocs/util2/cron/modules/geokrety.class.php

Doc Comments +32 added lines

@@ -61,6 +61,10 @@ 
 
     /* remove given file
      */
+
+    /**
+     * @param string $file
+     */
     public function removeXML($file)
     {
         @unlink($file);
@@ -68,6 +72,10 @@ 
 
     /* import the given XML file
      */
+
+    /**
+     * @param string $file
+     */
     public function importXML($file)
     {
         global $opt;
@@ -124,6 +132,9 @@ 
         setSysConfig('geokrety_lastupdate', date($opt['db']['dateformat'], strtotime($startupdate)));
     }
 
+    /**
+     * @param DOMNode $element
+     */
     public function importGeoKret($element)
     {
         global $opt;
@@ -204,6 +215,9 @@ 
     }
 
 
+    /**
+     * @param DOMNode $element
+     */
     public function importMove($element)
     {
         global $opt;
@@ -292,6 +306,9 @@ 
     }
 
 
+    /**
+     * @param integer $id
+     */
     public function checkGeoKretType($id, $name)
     {
         sql(
@@ -302,6 +319,9 @@ 
     }
 
 
+    /**
+     * @param integer $id
+     */
     public function checkUser($id, $name)
     {
         if ($id == 0) {
@@ -312,6 +332,9 @@ 
     }
 
 
+    /**
+     * @param integer $id
+     */
     public function checkMoveType($id, $name)
     {
         sql(
@@ -322,6 +345,9 @@ 
     }
 
 
+    /**
+     * @param string $element
+     */
     public function GetNodeValue(&$domnode, $element)
     {
         $subnode = $domnode->getElementsByTagName($element);
@@ -333,6 +359,12 @@ 
     }
 
 
+    /**
+     * @param string $element
+     * @param string $attr
+     *
+     * @return string
+     */
     public function GetNodeAttribute(&$domnode, $element, $attr)
     {
         $subnode = $domnode->getElementsByTagName($element);

Spacing +9 added lines, -9 removed lines

@@ -42,17 +42,17 @@ 
     {
         global $opt;
 
-        if (!@mkdir(__DIR__ . '/../../../cache2/geokrety')) {
+        if (!@mkdir(__DIR__.'/../../../cache2/geokrety')) {
             // die('can\'t create geogrety cache dir');
         }
-        $path = __DIR__ . '/../../../cache2/geokrety/import-' . date('Ymd-His') . '.xml';
+        $path = __DIR__.'/../../../cache2/geokrety/import-'.date('Ymd-His').'.xml';
 
         // Changed default-value for getSysConfig() from '2005-01-01 00:00:00' to 'NOW - 9d 12h'
         // to safely stay in api-limit, even when client and server are in different time zones.
         $modifiedsince = strtotime(
             getSysConfig('geokrety_lastupdate', date($opt['db']['dateformat'], time() - 60 * 60 * 24 * 9.5))
         );
-        if (!@copy('http://geokrety.org/export.php?modifiedsince=' . date('YmdHis', $modifiedsince - 1), $path)) {
+        if (!@copy('http://geokrety.org/export.php?modifiedsince='.date('YmdHis', $modifiedsince - 1), $path)) {
             return false;
         }
 
@@ -81,19 +81,19 @@ 
 
         $xr->read();
         if ($xr->nodeType != XMLReader::ELEMENT) {
-            echo 'error: First element expected, aborted' . "\n";
+            echo 'error: First element expected, aborted'."\n";
 
             return;
         }
         if ($xr->name != 'gkxml') {
-            echo 'error: First element not valid, aborted' . "\n";
+            echo 'error: First element not valid, aborted'."\n";
 
             return;
         }
 
         $startupdate = $xr->getAttribute('date');
         if ($startupdate == '') {
-            echo 'error: Date attribute not valid, aborted' . "\n";
+            echo 'error: Date attribute not valid, aborted'."\n";
 
             return;
         }
@@ -115,7 +115,7 @@ 
                         break;
                 }
 
-                $nRecordsCount ++;
+                $nRecordsCount++;
             }
         } while ($xr->next());
 
@@ -253,7 +253,7 @@ 
         $waypoints = $element->getElementsByTagName('waypoints');
         if ($waypoints->length > 0) {
             $wpItems = $waypoints->item(0)->getElementsByTagName('waypoint');
-            for ($i = 0; $i < $wpItems->length; $i ++) {
+            for ($i = 0; $i < $wpItems->length; $i++) {
                 $wp = mb_trim($wpItems->item($i)->nodeValue);
                 if ($wp != '') {
                     sql("INSERT INTO `gk_move_waypoint` (`id`, `wp`) VALUES ('&1', '&2')", $id, $wp);
@@ -285,7 +285,7 @@ 
                 WHERE `id`='&2' AND `wp`!=''",
                 $gkid,
                 $r['id']
-            );  // "late log" bugfix: replaced $id paramter by $r['id']
+            ); // "late log" bugfix: replaced $id paramter by $r['id']
         } else {
             // do nothing
         }

htdocs/util2/cron/modules/sitemaps.class.php

Doc Comments +3 added lines

@@ -61,6 +61,9 @@
         $this->ping_searchengine('http://www.bing.com/webmaster/ping.aspx?siteMap=' . $url);
     }
 
+    /**
+     * @param string $url
+     */
     public function ping_searchengine($url)
     {
         $curl = curl_init($url);

Spacing +9 added lines, -9 removed lines

@@ -50,15 +50,15 @@ 
         global $opt;
 
         $url = urlencode(
-            ($opt['page']['https']['mode'] == HTTPS_ENFORCED ? $opt['page']['absolute_https_url'] : $opt['page']['absolute_http_url']) . 'sitemap.xml'
+            ($opt['page']['https']['mode'] == HTTPS_ENFORCED ? $opt['page']['absolute_https_url'] : $opt['page']['absolute_http_url']).'sitemap.xml'
         );
 
-        $this->ping_searchengine('http://www.google.com/webmasters/tools/ping?sitemap=' . $url);
+        $this->ping_searchengine('http://www.google.com/webmasters/tools/ping?sitemap='.$url);
         $this->ping_searchengine(
-            'http://search.yahooapis.com/SiteExplorerService/V1/updateNotification?appid=USERID&url=' . $url
+            'http://search.yahooapis.com/SiteExplorerService/V1/updateNotification?appid=USERID&url='.$url
         );
-        $this->ping_searchengine('http://submissions.ask.com/ping?sitemap=' . $url);
-        $this->ping_searchengine('http://www.bing.com/webmaster/ping.aspx?siteMap=' . $url);
+        $this->ping_searchengine('http://submissions.ask.com/ping?sitemap='.$url);
+        $this->ping_searchengine('http://www.bing.com/webmaster/ping.aspx?siteMap='.$url);
     }
 
     public function ping_searchengine($url)
@@ -90,7 +90,7 @@ 
         $nCount = sql_value("SELECT COUNT(*) FROM `caches` WHERE `caches`.`status`=1", 0);
         $nIndex = 0;
         while ($nIndex < $nCount) {
-            $this->oSitemapXML->write('newcaches.php?startat=' . $nIndex, time(), 'always');
+            $this->oSitemapXML->write('newcaches.php?startat='.$nIndex, time(), 'always');
             $nIndex += 100;
         }
     }
@@ -99,7 +99,7 @@ 
     {
         $rs = sql("SELECT SQL_BUFFER_RESULT `user_id` FROM `user`");
         while ($r = sql_fetch_assoc($rs)) {
-            $this->oSitemapXML->write('viewprofile.php?userid=' . $r['user_id'], time() - 31 * 24 * 60 * 60);
+            $this->oSitemapXML->write('viewprofile.php?userid='.$r['user_id'], time() - 31 * 24 * 60 * 60);
         }
         sql_free_result($rs);
     }
@@ -110,7 +110,7 @@ 
             "SELECT SQL_BUFFER_RESULT MAX(`last_modified`) AS `d`, `cache_id` FROM `cache_logs` GROUP BY `cache_id`"
         );
         while ($r = sql_fetch_assoc($rs)) {
-            $this->oSitemapXML->write('viewlogs.php?cacheid=' . $r['cache_id'], strtotime($r['d']));
+            $this->oSitemapXML->write('viewlogs.php?cacheid='.$r['cache_id'], strtotime($r['d']));
         }
         sql_free_result($rs);
     }
@@ -142,7 +142,7 @@ 
                 $r['cache_id']
             );
             $this->oSitemapXML->write(
-                'viewcache.php?wp=' . $r['wp_oc'] . '&desclang=' . $r['language'],
+                'viewcache.php?wp='.$r['wp_oc'].'&desclang='.$r['language'],
                 strtotime($dLastMod)
             );
         }

htdocs/xml/ocxml11.php

Doc Comments +3 added lines

@@ -368,6 +368,9 @@
 /* end parameter reading */
 
 
+/**
+ * @param integer $sessionid
+ */
 function outputXmlFile($sessionid, $filenr, $bXmlDecl, $bOcXmlTag, $bDocType, $ziptype)
 {
     global $zip_basedir, $zip_wwwdir, $sDateformat, $sDateshort, $t1, $t2, $t3, $safemode_zip, $safemode_zip, $sCharset, $bAttrlist;

Spacing +167 added lines, -167 removed lines

@@ -16,12 +16,12 @@ 
 }
 
 $opt['rootpath'] = '../';
-require_once __DIR__ . '/../lib/common.inc.php';
-require_once __DIR__ . '/../lib2/charset.inc.php';
-require_once __DIR__ . '/../lib2/const.inc.php';
-require_once __DIR__ . '/../lib2/logic/data-license.inc.php';
-require_once __DIR__ . '/../lib2/logic/npas.inc.php';
-require_once __DIR__ .' /../lib2/logic/geomath.class.php';
+require_once __DIR__.'/../lib/common.inc.php';
+require_once __DIR__.'/../lib2/charset.inc.php';
+require_once __DIR__.'/../lib2/const.inc.php';
+require_once __DIR__.'/../lib2/logic/data-license.inc.php';
+require_once __DIR__.'/../lib2/logic/npas.inc.php';
+require_once __DIR__.' /../lib2/logic/geomath.class.php';
 
 if ($error == true) {
     echo 'Unable to connect to database';
@@ -105,7 +105,7 @@ 
     sql('DELETE FROM `xmlsession_data` WHERE `session_id`=&1', $r['id']);
 
     // delete files
-    $path = $zip_basedir . 'ocxml11/' . $r['id'];
+    $path = $zip_basedir.'ocxml11/'.$r['id'];
     if (is_dir($path)) {
         unlinkrecursiv($path);
     }
@@ -192,7 +192,7 @@ 
     if (isset($_REQUEST['country'])) {
         $country = $_REQUEST['country'];
 
-        if (sqlValue('SELECT COUNT(*) FROM `countries` WHERE `short`=\'' . sql_escape($country) . '\'', 0) != 1) {
+        if (sqlValue('SELECT COUNT(*) FROM `countries` WHERE `short`=\''.sql_escape($country).'\'', 0) != 1) {
             die('Unknown country');
         }
 
@@ -237,13 +237,13 @@ 
                 $selection['type'] = 3;
                 if (isset($_REQUEST['wp'])) {
                     $selection['cacheid'] = sqlValue(
-                        "SELECT `cache_id` FROM `caches` WHERE `wp_oc`='" . sql_escape($_REQUEST['wp']) . "'",
+                        "SELECT `cache_id` FROM `caches` WHERE `wp_oc`='".sql_escape($_REQUEST['wp'])."'",
                         0
                     );
                 } else {
                     if (isset($_REQUEST['uuid'])) {
                         $selection['cacheid'] = sqlValue(
-                            "SELECT `cache_id` FROM `caches` WHERE `uuid`='" . sql_escape($_REQUEST['uuid']) . "'",
+                            "SELECT `cache_id` FROM `caches` WHERE `uuid`='".sql_escape($_REQUEST['uuid'])."'",
                             0
                         );
                     } else {
@@ -302,23 +302,23 @@ 
         $xmloutput = '';
         if ($bXmlDecl == '1') {
             if ($sCharset == 'iso-8859-1') {
-                $xmloutput .= '<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>' . "\n";
+                $xmloutput .= '<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>'."\n";
             } else {
                 if ($sCharset == 'utf-8') {
-                    $xmloutput .= '<?xml version="1.0" encoding="utf-8" standalone="yes" ?>' . "\n";
+                    $xmloutput .= '<?xml version="1.0" encoding="utf-8" standalone="yes" ?>'."\n";
                 }
             }
         }
         if ($bOcXmlTag == '1') {
-            $xmloutput .= '<ocxmlsession>' . "\n";
+            $xmloutput .= '<ocxmlsession>'."\n";
         }
-        $xmloutput .= '  <sessionid>' . $sessionid . '</sessionid>' . "\n";
-        $xmloutput .= '  <records user="' . $recordcount['users'] .
-            '" cache="' . $recordcount['caches'] .
-            '" cachedesc="' . $recordcount['cachedescs'] .
-            '" cachelog="' . $recordcount['cachelogs'] .
-            '" picture="' . $recordcount['pictures'] .
-            '" removeobject="' . $recordcount['removedobjects'] . '" />' . "\n";
+        $xmloutput .= '  <sessionid>'.$sessionid.'</sessionid>'."\n";
+        $xmloutput .= '  <records user="'.$recordcount['users'].
+            '" cache="'.$recordcount['caches'].
+            '" cachedesc="'.$recordcount['cachedescs'].
+            '" cachelog="'.$recordcount['cachelogs'].
+            '" picture="'.$recordcount['pictures'].
+            '" removeobject="'.$recordcount['removedobjects'].'" />'."\n";
         if ($bOcXmlTag == '1') {
             $xmloutput .= '</ocxmlsession>';
         }
@@ -387,7 +387,7 @@ 
 
     $logtypes = [];
     $rs = sql('SELECT `id`, `de` FROM log_types');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $logtypes[$r['id']] = $r['de'];
     }
@@ -395,7 +395,7 @@ 
 
     $cachetypes = [];
     $rs = sql('SELECT `id`, `short`, `de` FROM cache_type');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $cachetypes[$r['id']]['de'] = $r['de'];
         $cachetypes[$r['id']]['short'] = $r['short'];
@@ -404,7 +404,7 @@ 
 
     $cachestatus = [];
     $rs = sql('SELECT `id`, `de` FROM cache_status');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $cachestatus[$r['id']]['de'] = $r['de'];
     }
@@ -412,7 +412,7 @@ 
 
     $counties = [];
     $rs = sql('SELECT `short`, `de` FROM countries');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $counties[$r['short']]['de'] = $r['de'];
     }
@@ -420,7 +420,7 @@ 
 
     $cachesizes = [];
     $rs = sql('SELECT `id`, `de` FROM cache_size');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $cachesizes[$r['id']]['de'] = $r['de'];
     }
@@ -428,7 +428,7 @@ 
 
     $languages = [];
     $rs = sql('SELECT `short`, `de` FROM languages');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $languages[$r['short']]['de'] = $r['de'];
     }
@@ -439,32 +439,32 @@ 
     $objecttypes['3'] = 'cachedesc';
     $objecttypes['1'] = 'cachelog';
     $objecttypes['6'] = 'picture';
-    $objecttypes['8'] = 'cachelist';    // not implemented yet
+    $objecttypes['8'] = 'cachelist'; // not implemented yet
 
     /* end now a few dynamically loaded constants */
 
     // temporäre Datei erstellen
-    if (!is_dir($zip_basedir . 'ocxml11/' . $sessionid)) {
-        mkdir($zip_basedir . 'ocxml11/' . $sessionid);
+    if (!is_dir($zip_basedir.'ocxml11/'.$sessionid)) {
+        mkdir($zip_basedir.'ocxml11/'.$sessionid);
     }
 
     $fileid = 1;
     while (file_exists(
-        $zip_basedir . 'ocxml11/' . $sessionid . '/' . $sessionid . '-' . $filenr . '-' . $fileid . '.xml'
+        $zip_basedir.'ocxml11/'.$sessionid.'/'.$sessionid.'-'.$filenr.'-'.$fileid.'.xml'
     )) {
-        $fileid ++;
+        $fileid++;
     }
 
-    $xmlfilename = $zip_basedir . 'ocxml11/' . $sessionid . '/' . $sessionid . '-' . $filenr . '-' . $fileid . '.xml';
+    $xmlfilename = $zip_basedir.'ocxml11/'.$sessionid.'/'.$sessionid.'-'.$filenr.'-'.$fileid.'.xml';
 
     $f = fopen($xmlfilename, 'w');
 
     if ($bXmlDecl == '1') {
         if ($sCharset == 'iso-8859-1') {
-            fwrite($f, '<?xml version="1.0" encoding="iso-8859-1" standalone="no" ?>' . "\n");
+            fwrite($f, '<?xml version="1.0" encoding="iso-8859-1" standalone="no" ?>'."\n");
         } else {
             if ($sCharset == 'utf-8') {
-                fwrite($f, '<?xml version="1.0" encoding="UTF-8" standalone="no" ?>' . "\n");
+                fwrite($f, '<?xml version="1.0" encoding="UTF-8" standalone="no" ?>'."\n");
             }
         }
     }
@@ -472,7 +472,7 @@ 
     if ($bDocType == '1') {
         fwrite(
             $f,
-            '<!DOCTYPE oc11xml PUBLIC "-//Opencaching Network//DTD OCXml V 1.' . ($ocxmlversion % 10) . '//EN" "http://www.opencaching.de/xml/ocxml' . $ocxmlversion . '.dtd">' . "\n"
+            '<!DOCTYPE oc11xml PUBLIC "-//Opencaching Network//DTD OCXml V 1.'.($ocxmlversion % 10).'//EN" "http://www.opencaching.de/xml/ocxml'.$ocxmlversion.'.dtd">'."\n"
         );
     }
     if ($bOcXmlTag == '1') {
@@ -480,30 +480,30 @@ 
         $r = sql_fetch_array($rs);
         fwrite(
             $f,
-            '<oc11xml version="1.' . ($ocxmlversion % 10) . '" date="' . date(
+            '<oc11xml version="1.'.($ocxmlversion % 10).'" date="'.date(
                 $sDateformat,
                 strtotime($r['date_created'])
-            ) . '" since="' . date($sDateformat, strtotime($r['modified_since'])) . '">' . "\n"
+            ).'" since="'.date($sDateformat, strtotime($r['modified_since'])).'">'."\n"
         );
         mysql_free_result($rs);
     }
 
     if ($bAttrlist == '1') {
         $rs = sql("SELECT SQL_BUFFER_RESULT `id`, `name`, `icon_large`, `icon_no`, `icon_undef` FROM `cache_attrib`");
-        fwrite($f, $t1 . '<attrlist>' . "\n");
+        fwrite($f, $t1.'<attrlist>'."\n");
         while ($r = sql_fetch_assoc($rs)) {
             fwrite(
                 $f,
-                $t2 . '<attr id="' . $r['id'] . '" icon_large="' . xmlentities(
-                    $opt['page']['default_absolute_url'] . $r['icon_large']
-                ) . '" icon_no="' . xmlentities(
-                    $opt['page']['default_absolute_url'] . $r['icon_no']
-                ) . '" icon_undef="' . xmlentities(
-                    $opt['page']['default_absolute_url'] . $r['icon_undef']
-                ) . '">' . xmlcdata($r['name']) . '</attr>' . "\n"
+                $t2.'<attr id="'.$r['id'].'" icon_large="'.xmlentities(
+                    $opt['page']['default_absolute_url'].$r['icon_large']
+                ).'" icon_no="'.xmlentities(
+                    $opt['page']['default_absolute_url'].$r['icon_no']
+                ).'" icon_undef="'.xmlentities(
+                    $opt['page']['default_absolute_url'].$r['icon_undef']
+                ).'">'.xmlcdata($r['name']).'</attr>'."\n"
             );
         }
-        fwrite($f, $t1 . '</attrlist>' . "\n");
+        fwrite($f, $t1.'</attrlist>'."\n");
         sql_free_result($rs);
     }
 
@@ -511,18 +511,18 @@ 
         'SELECT SQL_BUFFER_RESULT `user`.`user_id` `id`, `user`.`node` `node`, `user`.`uuid` `uuid`, `user`.`username` `username`, `user`.`pmr_flag` `pmr_flag`, `user`.`date_created` `date_created`, `user`.`last_modified` `last_modified` FROM `tmpxml_users`, `user` WHERE `tmpxml_users`.`id`=`user`.`user_id`'
     );
     while ($r = sql_fetch_array($rs)) {
-        fwrite($f, $t1 . '<user>' . "\n");
+        fwrite($f, $t1.'<user>'."\n");
 
-        fwrite($f, $t2 . '<id id="' . $r['id'] . '" node="' . $r['node'] . '">' . $r['uuid'] . '</id>' . "\n");
-        fwrite($f, $t2 . '<username>' . xmlcdata($r['username']) . '</username>' . "\n");
-        fwrite($f, $t2 . '<pmr>' . (($r['pmr_flag'] == 0) ? '0' : '1') . '</pmr>' . "\n");
-        fwrite($f, $t2 . '<datecreated>' . date($sDateformat, strtotime($r['date_created'])) . '</datecreated>' . "\n");
+        fwrite($f, $t2.'<id id="'.$r['id'].'" node="'.$r['node'].'">'.$r['uuid'].'</id>'."\n");
+        fwrite($f, $t2.'<username>'.xmlcdata($r['username']).'</username>'."\n");
+        fwrite($f, $t2.'<pmr>'.(($r['pmr_flag'] == 0) ? '0' : '1').'</pmr>'."\n");
+        fwrite($f, $t2.'<datecreated>'.date($sDateformat, strtotime($r['date_created'])).'</datecreated>'."\n");
         fwrite(
             $f,
-            $t2 . '<lastmodified>' . date($sDateformat, strtotime($r['last_modified'])) . '</lastmodified>' . "\n"
+            $t2.'<lastmodified>'.date($sDateformat, strtotime($r['last_modified'])).'</lastmodified>'."\n"
         );
 
-        fwrite($f, $t1 . '</user>' . "\n");
+        fwrite($f, $t1.'</user>'."\n");
     }
     mysql_free_result($rs);
 
@@ -551,8 +551,8 @@ 
         }   // return as micro in old interface version
 
         if ($ocxmlversion >= 15) {
-            $statusflags = ' needs_maintenance="' . $r['needs_maintenance'] . '" listing_outdated="' . $r['listing_outdated'] . '"';
-            $gccom2 = ' gccom2="' . xmlentities($r['wp_gc_maintained']) . '"';
+            $statusflags = ' needs_maintenance="'.$r['needs_maintenance'].'" listing_outdated="'.$r['listing_outdated'].'"';
+            $gccom2 = ' gccom2="'.xmlentities($r['wp_gc_maintained']).'"';
             $nccom = '';
         } else {
             $statusflags = '';
@@ -560,74 +560,74 @@ 
             $nccom = ' nccom=""';
         }
 
-        fwrite($f, $t1 . '<cache>' . "\n");
+        fwrite($f, $t1.'<cache>'."\n");
 
-        fwrite($f, $t2 . '<id id="' . $r['id'] . '" node="' . $r['node'] . '">' . $r['uuid'] . '</id>' . "\n");
+        fwrite($f, $t2.'<id id="'.$r['id'].'" node="'.$r['node'].'">'.$r['uuid'].'</id>'."\n");
         fwrite(
             $f,
-            $t2 . '<userid id="' . $r['user_id'] . '" uuid="' . $r['useruuid'] . '">' . xmlcdata(
+            $t2.'<userid id="'.$r['user_id'].'" uuid="'.$r['useruuid'].'">'.xmlcdata(
                 $r['username']
-            ) . '</userid>' . "\n"
+            ).'</userid>'."\n"
         );
-        fwrite($f, $t2 . '<name>' . xmlcdata(($bAllowView ? $r['name'] : '')) . '</name>' . "\n");
+        fwrite($f, $t2.'<name>'.xmlcdata(($bAllowView ? $r['name'] : '')).'</name>'."\n");
         fwrite(
             $f,
-            $t2 . '<longitude>' . sprintf('%01.5f', ($bAllowView ? $r['longitude'] : 0)) . '</longitude>' . "\n"
+            $t2.'<longitude>'.sprintf('%01.5f', ($bAllowView ? $r['longitude'] : 0)).'</longitude>'."\n"
         );
-        fwrite($f, $t2 . '<latitude>' . sprintf('%01.5f', ($bAllowView ? $r['latitude'] : 0)) . '</latitude>' . "\n");
+        fwrite($f, $t2.'<latitude>'.sprintf('%01.5f', ($bAllowView ? $r['latitude'] : 0)).'</latitude>'."\n");
         fwrite(
             $f,
-            $t2 . '<type id="' . $r['type'] . '" short="' . xmlentities(
+            $t2.'<type id="'.$r['type'].'" short="'.xmlentities(
                 $cachetypes[$r['type']]['short']
-            ) . '">' . xmlcdata($cachetypes[$r['type']]['de']) . '</type>' . "\n"
+            ).'">'.xmlcdata($cachetypes[$r['type']]['de']).'</type>'."\n"
         );
         fwrite(
             $f,
-            $t2 . '<status id="' . $r['status'] . '"' . $statusflags . '>' . xmlcdata(
+            $t2.'<status id="'.$r['status'].'"'.$statusflags.'>'.xmlcdata(
                 $cachestatus[$r['status']]['de']
-            ) . '</status>' . "\n"
+            ).'</status>'."\n"
         );
         fwrite(
             $f,
-            $t2 . '<country id="' . $r['country'] . '">' . xmlcdata(
+            $t2.'<country id="'.$r['country'].'">'.xmlcdata(
                 $counties[$r['country']]['de']
-            ) . '</country>' . "\n"
+            ).'</country>'."\n"
         );
-        fwrite($f, $t2 . '<size id="' . $r['size'] . '">' . xmlcdata($cachesizes[$r['size']]['de']) . '</size>' . "\n");
-        fwrite($f, $t2 . '<desclanguages>' . $r['desclanguages'] . '</desclanguages>' . "\n");
-        fwrite($f, $t2 . '<difficulty>' . sprintf('%01.1f', $r['difficulty'] / 2) . '</difficulty>' . "\n");
-        fwrite($f, $t2 . '<terrain>' . sprintf('%01.1f', $r['terrain'] / 2) . '</terrain>' . "\n");
-        fwrite($f, $t2 . '<rating waylength="' . $r['way_length'] . '" needtime="' . $r['search_time'] . '" />' . "\n");
+        fwrite($f, $t2.'<size id="'.$r['size'].'">'.xmlcdata($cachesizes[$r['size']]['de']).'</size>'."\n");
+        fwrite($f, $t2.'<desclanguages>'.$r['desclanguages'].'</desclanguages>'."\n");
+        fwrite($f, $t2.'<difficulty>'.sprintf('%01.1f', $r['difficulty'] / 2).'</difficulty>'."\n");
+        fwrite($f, $t2.'<terrain>'.sprintf('%01.1f', $r['terrain'] / 2).'</terrain>'."\n");
+        fwrite($f, $t2.'<rating waylength="'.$r['way_length'].'" needtime="'.$r['search_time'].'" />'."\n");
         fwrite(
             $f,
-            $t2 . '<waypoints oc="' . xmlentities($r['wp_oc']) . '" gccom="' . xmlentities(
+            $t2.'<waypoints oc="'.xmlentities($r['wp_oc']).'" gccom="'.xmlentities(
                 $r['wp_gc']
-            ) . '"' . $gccom2 . $nccom . ' />' . "\n"
+            ).'"'.$gccom2.$nccom.' />'."\n"
         );
-        fwrite($f, $t2 . '<datehidden>' . date($sDateformat, strtotime($r['date_hidden'])) . '</datehidden>' . "\n");
+        fwrite($f, $t2.'<datehidden>'.date($sDateformat, strtotime($r['date_hidden'])).'</datehidden>'."\n");
         if ($ocxmlversion >= 12) {
-            $pd = ' ispublishdate="' . $r['is_publishdate'] . '"';
+            $pd = ' ispublishdate="'.$r['is_publishdate'].'"';
         } else {
             $pd = "";
         }
         fwrite(
             $f,
-            $t2 . '<datecreated' . $pd . '>' . date(
+            $t2.'<datecreated'.$pd.'>'.date(
                 $sDateformat,
                 strtotime($r['date_created'])
-            ) . '</datecreated>' . "\n"
+            ).'</datecreated>'."\n"
         );
         fwrite(
             $f,
-            $t2 . '<lastmodified>' . date($sDateformat, strtotime($r['last_modified'])) . '</lastmodified>' . "\n"
+            $t2.'<lastmodified>'.date($sDateformat, strtotime($r['last_modified'])).'</lastmodified>'."\n"
         );
         if ($ocxmlversion >= 14) {
             fwrite(
                 $f,
-                $t2 . '<listing_lastmodified>' . date(
+                $t2.'<listing_lastmodified>'.date(
                     $sDateformat,
                     strtotime($r['listing_last_modified'])
-                ) . '</listing_lastmodified>' . "\n"
+                ).'</listing_lastmodified>'."\n"
             );
         }
 
@@ -638,16 +638,16 @@ 
                               WHERE `caches_attributes`.`cache_id`='&1'",
             $r['id']
         );
-        fwrite($f, $t2 . '<attributes>' . "\n");
+        fwrite($f, $t2.'<attributes>'."\n");
         while ($rAttribute = sql_fetch_assoc($rsAttributes)) {
             fwrite(
                 $f,
-                $t3 . '<attribute id="' . ($rAttribute['id'] + 0) . '">' . xmlcdata(
+                $t3.'<attribute id="'.($rAttribute['id'] + 0).'">'.xmlcdata(
                     $rAttribute['name']
-                ) . '</attribute>' . "\n"
+                ).'</attribute>'."\n"
             );
         }
-        fwrite($f, $t2 . '</attributes>' . "\n");
+        fwrite($f, $t2.'</attributes>'."\n");
         sql_free_result($rsAttributes);
 
         if ($ocxmlversion >= 13) {
@@ -662,23 +662,23 @@ 
                               ORDER BY `coordinates`.`id` ASC",
                 $r['id']
             );
-            fwrite($f, $t2 . '<wpts>' . "\n");
+            fwrite($f, $t2.'<wpts>'."\n");
             while ($rWaypoint = sql_fetch_assoc($rsWaypoints)) {
                 fwrite(
                     $f,
-                    $t3 . '<wpt id="' . ($rWaypoint['id'] + 0) . '" type="' . ($rWaypoint['type'] + 0) . '" typename="' . xmlentities(
+                    $t3.'<wpt id="'.($rWaypoint['id'] + 0).'" type="'.($rWaypoint['type'] + 0).'" typename="'.xmlentities(
                         $rWaypoint['type_name']
-                    ) . '" longitude="' . sprintf('%01.5f', $rWaypoint['longitude']) . '" latitude="' . sprintf(
+                    ).'" longitude="'.sprintf('%01.5f', $rWaypoint['longitude']).'" latitude="'.sprintf(
                         '%01.5f',
                         $rWaypoint['latitude']
-                    ) . '">' . xmlcdata($rWaypoint['description']) . '</wpt>' . "\n"
+                    ).'">'.xmlcdata($rWaypoint['description']).'</wpt>'."\n"
                 );
             }
-            fwrite($f, $t2 . '</wpts>' . "\n");
+            fwrite($f, $t2.'</wpts>'."\n");
             sql_free_result($rsWaypoints);
         }
 
-        fwrite($f, $t1 . '</cache>' . "\n");
+        fwrite($f, $t1.'</cache>'."\n");
     }
     mysql_free_result($rs);
 
@@ -698,18 +698,18 @@ 
     while ($r = sql_fetch_array($rs)) {
         $bAllowView = ($r['allow_user_view'] == 1);
 
-        fwrite($f, $t1 . '<cachedesc>' . "\n");
+        fwrite($f, $t1.'<cachedesc>'."\n");
 
-        fwrite($f, $t2 . '<id id="' . $r['id'] . '" node="' . $r['node'] . '">' . $r['uuid'] . '</id>' . "\n");
-        fwrite($f, $t2 . '<cacheid id="' . $r['cache_id'] . '">' . $r['cacheuuid'] . '</cacheid>' . "\n");
+        fwrite($f, $t2.'<id id="'.$r['id'].'" node="'.$r['node'].'">'.$r['uuid'].'</id>'."\n");
+        fwrite($f, $t2.'<cacheid id="'.$r['cache_id'].'">'.$r['cacheuuid'].'</cacheid>'."\n");
 
         fwrite(
             $f,
-            $t2 . '<language id="' . $r['language'] . '">' . xmlcdata(
+            $t2.'<language id="'.$r['language'].'">'.xmlcdata(
                 $languages[$r['language']]['de']
-            ) . '</language>' . "\n"
+            ).'</language>'."\n"
         );
-        fwrite($f, $t2 . '<shortdesc>' . xmlcdata(($bAllowView ? $r['short_desc'] : '')) . '</shortdesc>' . "\n");
+        fwrite($f, $t2.'<shortdesc>'.xmlcdata(($bAllowView ? $r['short_desc'] : '')).'</shortdesc>'."\n");
 
         $desc = $r['desc'];
         if ($r['desc_html'] == 0) {
@@ -728,10 +728,10 @@ 
             true
         );
         if ($bLicense) {
-            fwrite($f, $t2 . '<license>' . xmlcdata($disclaimer) . '</license>' . "\n");
+            fwrite($f, $t2.'<license>'.xmlcdata($disclaimer).'</license>'."\n");
         } else {
             if ($disclaimer != "") {
-                $desc .= "<p><em>" . $disclaimer . "</em></p>";
+                $desc .= "<p><em>".$disclaimer."</em></p>";
             }
         }
 
@@ -739,21 +739,21 @@ 
 
         fwrite(
             $f,
-            $t2 . '<desc html="' . (($r['desc_html'] == 1) ? '1' : '0') . '">' . xmlcdata(
+            $t2.'<desc html="'.(($r['desc_html'] == 1) ? '1' : '0').'">'.xmlcdata(
                 ($bAllowView ? $desc : '')
-            ) . '</desc>' . "\n"
+            ).'</desc>'."\n"
         );
 
         $r['hint'] = mb_ereg_replace('<br />', '', $r['hint']);
         $r['hint'] = html_entity_decode($r['hint'], ENT_COMPAT, 'UTF-8');
 
-        fwrite($f, $t2 . '<hint>' . xmlcdata(($bAllowView ? $r['hint'] : '')) . '</hint>' . "\n");
+        fwrite($f, $t2.'<hint>'.xmlcdata(($bAllowView ? $r['hint'] : '')).'</hint>'."\n");
         fwrite(
             $f,
-            $t2 . '<lastmodified>' . date($sDateformat, strtotime($r['last_modified'])) . '</lastmodified>' . "\n"
+            $t2.'<lastmodified>'.date($sDateformat, strtotime($r['last_modified'])).'</lastmodified>'."\n"
         );
 
-        fwrite($f, $t1 . '</cachedesc>' . "\n");
+        fwrite($f, $t1.'</cachedesc>'."\n");
     }
     mysql_free_result($rs);
 
@@ -794,7 +794,7 @@ 
         }
 
         if ($ocxmlversion >= 13) {
-            $teamcomment = ' teamcomment="' . $r['oc_team_comment'] . '"';
+            $teamcomment = ' teamcomment="'.$r['oc_team_comment'].'"';
         } else {
             $teamcomment = '';
             if ($r['type'] > 8) {
@@ -803,51 +803,51 @@ 
         }
 
         if ($ocxmlversion >= 15) {
-            $statusflags = ' needs_maintenance="' . $r['needs_maintenance'] . '" listing_outdated="' . $r['listing_outdated'] . '"';
+            $statusflags = ' needs_maintenance="'.$r['needs_maintenance'].'" listing_outdated="'.$r['listing_outdated'].'"';
         } else {
             $statusflags = '';
         }
 
-        fwrite($f, $t1 . '<cachelog>' . "\n");
-        fwrite($f, $t2 . '<id id="' . $r['id'] . '" node="' . $r['node'] . '">' . $r['uuid'] . '</id>' . "\n");
-        fwrite($f, $t2 . '<cacheid id="' . $r['cache_id'] . '">' . $r['cacheuuid'] . '</cacheid>' . "\n");
+        fwrite($f, $t1.'<cachelog>'."\n");
+        fwrite($f, $t2.'<id id="'.$r['id'].'" node="'.$r['node'].'">'.$r['uuid'].'</id>'."\n");
+        fwrite($f, $t2.'<cacheid id="'.$r['cache_id'].'">'.$r['cacheuuid'].'</cacheid>'."\n");
         fwrite(
             $f,
-            $t2 . '<userid id="' . $r['user_id'] . '" uuid="' . $r['useruuid'] . '">' . xmlcdata(
+            $t2.'<userid id="'.$r['user_id'].'" uuid="'.$r['useruuid'].'">'.xmlcdata(
                 $r['username']
-            ) . '</userid>' . "\n"
+            ).'</userid>'."\n"
         );
         fwrite(
             $f,
-            $t2 . '<logtype id="' . $r['type'] . '" recommended="' . $r['recommended'] . '"' . $teamcomment . $statusflags . '>' . xmlcdata(
+            $t2.'<logtype id="'.$r['type'].'" recommended="'.$r['recommended'].'"'.$teamcomment.$statusflags.'>'.xmlcdata(
                 $logtypes[$r['type']]
-            ) . '</logtype>' . "\n"
+            ).'</logtype>'."\n"
         );
         fwrite(
             $f,
-            $t2 . '<date>' . date(
+            $t2.'<date>'.date(
                 $ocxmlversion >= 13 ? $sDateformat : $sDateshort,
                 strtotime($r['date'])
-            ) . '</date>' . "\n"
+            ).'</date>'."\n"
         );
         fwrite(
             $f,
-            $t2 . '<text html="' . $r['text_html'] . '">' . xmlcdata(
+            $t2.'<text html="'.$r['text_html'].'">'.xmlcdata(
                 ($bAllowView ? $r['text'] : '')
-            ) . '</text>' . "\n"
+            ).'</text>'."\n"
         );
-        fwrite($f, $t2 . '<datecreated>' . date($sDateformat, strtotime($r['date_created'])) . '</datecreated>' . "\n");
+        fwrite($f, $t2.'<datecreated>'.date($sDateformat, strtotime($r['date_created'])).'</datecreated>'."\n");
         fwrite(
             $f,
-            $t2 . '<lastmodified>' . date($sDateformat, strtotime($r['last_modified'])) . '</lastmodified>' . "\n"
+            $t2.'<lastmodified>'.date($sDateformat, strtotime($r['last_modified'])).'</lastmodified>'."\n"
         );
         if ($ocxmlversion >= 14) {
             fwrite(
                 $f,
-                $t2 . '<log_lastmodified>' . date(
+                $t2.'<log_lastmodified>'.date(
                     $sDateformat,
                     strtotime($r['log_last_modified'])
-                ) . '</log_lastmodified>' . "\n"
+                ).'</log_lastmodified>'."\n"
             );
         }
 
@@ -862,10 +862,10 @@ 
                 false,
                 true
             );
-            fwrite($f, $t2 . '<license>' . xmlcdata($disclaimer) . '</license>' . "\n");
+            fwrite($f, $t2.'<license>'.xmlcdata($disclaimer).'</license>'."\n");
         }
 
-        fwrite($f, $t1 . '</cachelog>' . "\n");
+        fwrite($f, $t1.'</cachelog>'."\n");
     }
     mysql_free_result($rs);
 
@@ -895,30 +895,30 @@ 
     while ($r = sql_fetch_array($rs)) {
         $bAllowView = ($r['auv'] == 1);
 
-        fwrite($f, $t1 . '<picture>' . "\n");
-        fwrite($f, $t2 . '<id id="' . $r['id'] . '" node="' . $r['node'] . '">' . $r['uuid'] . '</id>' . "\n");
-        fwrite($f, $t2 . '<url>' . xmlcdata(($bAllowView ? $r['url'] : '')) . '</url>' . "\n");
-        fwrite($f, $t2 . '<title>' . xmlcdata(($bAllowView ? $r['title'] : '')) . '</title>' . "\n");
+        fwrite($f, $t1.'<picture>'."\n");
+        fwrite($f, $t2.'<id id="'.$r['id'].'" node="'.$r['node'].'">'.$r['uuid'].'</id>'."\n");
+        fwrite($f, $t2.'<url>'.xmlcdata(($bAllowView ? $r['url'] : '')).'</url>'."\n");
+        fwrite($f, $t2.'<title>'.xmlcdata(($bAllowView ? $r['title'] : '')).'</title>'."\n");
         fwrite(
             $f,
-            $t2 . '<object id="' . $r['object_id'] . '" type="' . $r['object_type'] . '" typename="' . xmlentities(
+            $t2.'<object id="'.$r['object_id'].'" type="'.$r['object_type'].'" typename="'.xmlentities(
                 $objecttypes[$r['object_type']]
-            ) . '">' . object_id2uuid($r['object_id'], $r['object_type']) . '</object>' . "\n"
+            ).'">'.object_id2uuid($r['object_id'], $r['object_type']).'</object>'."\n"
         );
         if ($ocxmlversion >= 13) {
             fwrite(
                 $f,
-                $t2 . '<picattr spoiler="' . $r['spoiler'] . '" display="' . $r['display'] . '" preview="' . $r['mappreview'] . '" />' . "\n"
+                $t2.'<picattr spoiler="'.$r['spoiler'].'" display="'.$r['display'].'" preview="'.$r['mappreview'].'" />'."\n"
             );
         } else {
-            fwrite($f, $t2 . '<attributes spoiler="' . $r['spoiler'] . '" display="' . $r['display'] . '" />' . "\n");
+            fwrite($f, $t2.'<attributes spoiler="'.$r['spoiler'].'" display="'.$r['display'].'" />'."\n");
         }
-        fwrite($f, $t2 . '<datecreated>' . date($sDateformat, strtotime($r['date_created'])) . '</datecreated>' . "\n");
+        fwrite($f, $t2.'<datecreated>'.date($sDateformat, strtotime($r['date_created'])).'</datecreated>'."\n");
         fwrite(
             $f,
-            $t2 . '<lastmodified>' . date($sDateformat, strtotime($r['last_modified'])) . '</lastmodified>' . "\n"
+            $t2.'<lastmodified>'.date($sDateformat, strtotime($r['last_modified'])).'</lastmodified>'."\n"
         );
-        fwrite($f, $t2 . '<position>' . $r['seq'] . '</position>' . "\n");
+        fwrite($f, $t2.'<position>'.$r['seq'].'</position>'."\n");
 
         if ($bLicense) {
             $lang = ($sLanguage != "" ? $sLanguage : $r['language']);
@@ -931,10 +931,10 @@ 
                 false,
                 true
             );
-            fwrite($f, $t2 . '<license>' . xmlcdata($disclaimer) . '</license>' . "\n");
+            fwrite($f, $t2.'<license>'.xmlcdata($disclaimer).'</license>'."\n");
         }
 
-        fwrite($f, $t1 . '</picture>' . "\n");
+        fwrite($f, $t1.'</picture>'."\n");
     }
     mysql_free_result($rs);
 
@@ -944,31 +944,31 @@ 
                                    FROM `tmpxml_removedobjects`, `removed_objects` WHERE `removed_objects`.`id`=`tmpxml_removedobjects`.`id`'
     );
     while ($r = sql_fetch_array($rs)) {
-        fwrite($f, $t1 . '<removedobject>' . "\n");
-        fwrite($f, $t2 . '<id id="' . $r['id'] . '" node="' . $r['node'] . '" />' . "\n");
+        fwrite($f, $t1.'<removedobject>'."\n");
+        fwrite($f, $t2.'<id id="'.$r['id'].'" node="'.$r['node'].'" />'."\n");
         fwrite(
             $f,
-            $t2 . '<object id="' . $r['localid'] . '" type="' . $r['type'] . '" typename="' . xmlentities(
+            $t2.'<object id="'.$r['localid'].'" type="'.$r['type'].'" typename="'.xmlentities(
                 $objecttypes[$r['type']]
-            ) . '">' . $r['uuid'] . '</object>' . "\n"
+            ).'">'.$r['uuid'].'</object>'."\n"
         );
-        fwrite($f, $t2 . '<removeddate>' . date($sDateformat, strtotime($r['removed_date'])) . '</removeddate>' . "\n");
-        fwrite($f, $t1 . '</removedobject>' . "\n");
+        fwrite($f, $t2.'<removeddate>'.date($sDateformat, strtotime($r['removed_date'])).'</removeddate>'."\n");
+        fwrite($f, $t1.'</removedobject>'."\n");
     }
     mysql_free_result($rs);
 
     if ($bOcXmlTag == '1') {
-        fwrite($f, '</oc11xml>' . "\n");
+        fwrite($f, '</oc11xml>'."\n");
     }
 
     fclose($f);
 
-    $rel_xmlfile = 'ocxml11/' . $sessionid . '/' . $sessionid . '-' . $filenr . '-' . $fileid . '.xml';
-    $rel_zipfile = 'ocxml11/' . $sessionid . '/' . $sessionid . '-' . $filenr . '-' . $fileid;
+    $rel_xmlfile = 'ocxml11/'.$sessionid.'/'.$sessionid.'-'.$filenr.'-'.$fileid.'.xml';
+    $rel_zipfile = 'ocxml11/'.$sessionid.'/'.$sessionid.'-'.$filenr.'-'.$fileid;
 
     // zippen und url-redirect
     if ($ziptype == '0') {
-        tpl_redirect($zip_wwwdir . $rel_xmlfile);
+        tpl_redirect($zip_wwwdir.$rel_xmlfile);
         exit;
     } else {
         if ($ziptype == 'zip') {
@@ -986,17 +986,17 @@ 
         }
     }
 
-    $call = $safemode_zip . ' --type=' . escapeshellcmd($ziptype) . ' --src=' . escapeshellcmd(
+    $call = $safemode_zip.' --type='.escapeshellcmd($ziptype).' --src='.escapeshellcmd(
             $rel_xmlfile
-        ) . ' --dst=' . escapeshellcmd($rel_zipfile);
+        ).' --dst='.escapeshellcmd($rel_zipfile);
     system($call);
 
     // datei vorhanden?
-    if (!file_exists($zip_basedir . $rel_zipfile)) {
+    if (!file_exists($zip_basedir.$rel_zipfile)) {
         die('all ok, but zip failed - internal server error');
     }
 
-    tpl_redirect($zip_wwwdir . $rel_zipfile);
+    tpl_redirect($zip_wwwdir.$rel_zipfile);
 
     exit;
 }
@@ -1048,7 +1048,7 @@ 
             }
             sql(
                 "INSERT INTO xmlsession_data (`session_id`, `object_type`, `object_id`)
-                 SELECT &1, 2, `cache_id` FROM `caches` WHERE " . $wherefield . " >= '&2' AND `status`!=5",
+                 SELECT &1, 2, `cache_id` FROM `caches` WHERE " . $wherefield." >= '&2' AND `status`!=5",
                 $sessionid,
                 $sModifiedSince
             );
@@ -1137,31 +1137,31 @@ 
                         'longitude',
                         'latitude',
                         'cache_coordinates'
-                    ) . ' `distance` ';
+                    ).' `distance` ';
                 $sql .= 'FROM `caches`, `cache_coordinates` WHERE ';
                 $sql .= '`cache_coordinates`.`cache_id`=`caches`.`cache_id`';
                 $sql .= ' AND `caches`.`status`!=5';
-                $sql .= ' AND `cache_coordinates`.`latitude` > ' . geomath::getMinLat(
+                $sql .= ' AND `cache_coordinates`.`latitude` > '.geomath::getMinLat(
                         $selection['lon'],
                         $selection['lat'],
                         $selection['distance']
                     );
-                $sql .= ' AND `cache_coordinates`.`latitude` < ' . geomath::getMaxLat(
+                $sql .= ' AND `cache_coordinates`.`latitude` < '.geomath::getMaxLat(
                         $selection['lon'],
                         $selection['lat'],
                         $selection['distance']
                     );
-                $sql .= ' AND `cache_coordinates`.`longitude` >' . geomath::getMinLon(
+                $sql .= ' AND `cache_coordinates`.`longitude` >'.geomath::getMinLon(
                         $selection['lon'],
                         $selection['lat'],
                         $selection['distance']
                     );
-                $sql .= ' AND `cache_coordinates`.`longitude` < ' . geomath::getMaxLon(
+                $sql .= ' AND `cache_coordinates`.`longitude` < '.geomath::getMaxLon(
                         $selection['lon'],
                         $selection['lat'],
                         $selection['distance']
                     );
-                $sql .= ' HAVING `distance` < ' . ($selection['distance'] + 0);
+                $sql .= ' HAVING `distance` < '.($selection['distance'] + 0);
 
                 sql($sql);
             } else {
@@ -1300,7 +1300,7 @@ 
 //    echo $startat . ' ' . $endat . '<br><br>';
 //    echo '<table>';
 //    echo '<tr><td>sql-start</td><td>sql-count</td><td>count</td><td>begin</td><td>end</td></tr>';
-    for ($i = 0; $i < 6; $i ++) {
+    for ($i = 0; $i < 6; $i++) {
         if (($startat >= $recordnr[$i]) && ($startat + 500 < $recordnr[$i + 1])) {
             if ($recordnr[$i + 1] - $startat > 500) {
                 $limits[$i] = ['start' => $startat - $recordnr[$i], 'count' => 500];
@@ -1403,7 +1403,7 @@ 
         $str = output_convert($str);
         $str = mb_ereg_replace(']]>', ']] >', $str);
 
-        return '<![CDATA[' . filterevilchars($str) . ']]>';
+        return '<![CDATA['.filterevilchars($str).']]>';
     } else {
         return xmlentities($str);
     }
@@ -1422,7 +1422,7 @@ 
     $from[4] = '\'';
     $to[4] = '&apos;';
 
-    for ($i = 0; $i <= 4; $i ++) {
+    for ($i = 0; $i <= 4; $i++) {
         $str = mb_ereg_replace($from[$i], $to[$i], $str);
     }
 
@@ -1501,13 +1501,13 @@ 
 
     $hDir = opendir($path);
     if ($hDir === false) {
-        ++ $notunlinked;
+        ++$notunlinked;
     } else {
         while (false !== ($file = readdir($hDir))) {
             if (($file != '.') && ($file != '..')) {
-                if (is_dir($path . $file)) {
-                    if (unlinkrecursiv($path . $file . '/') == false) {
-                        $notunlinked ++;
+                if (is_dir($path.$file)) {
+                    if (unlinkrecursiv($path.$file.'/') == false) {
+                        $notunlinked++;
                     }
                 } else {
                     if ((mb_substr($file, - 4) == '.zip') ||
@@ -1515,9 +1515,9 @@ 
                         (mb_substr($file, - 4) == '.bz2') ||
                         (mb_substr($file, - 4) == '.xml')
                     ) {
-                        @unlink($path . $file);
+                        @unlink($path.$file);
                     } else {
-                        $notunlinked ++;
+                        $notunlinked++;
                     }
                 }
             }

Braces +2 added lines, -1 removed lines

@@ -27,7 +27,8 @@
     $for_cachedesc,
     $html,
     $twolines = false
-) {
+)
+{
     global $opt, $translate;
 
     $ltext = "";

local/devel/find_unicode_boms.php

Doc Comments +3 added lines

@@ -39,6 +39,9 @@
 }
 
 
+/**
+ * @param string $path
+ */
 function testforbom($path)
 {
     $filestart = file_get_contents($path, false, null, 0, 2);

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
  *  Searches for Unicode byte order marks in code and template files
  ***************************************************************************/
 
-chdir(__DIR__ . '/../../htdocs');
+chdir(__DIR__.'/../../htdocs');
 require_once 'lib2/cli.inc.php';
 
 
@@ -25,7 +25,7 @@ 
     $hDir = opendir($dir);
     if ($hDir !== false) {
         while (($file = readdir($hDir)) !== false) {
-            $path = $dir . '/' . $file;
+            $path = $dir.'/'.$file;
             if (is_dir($path) && substr($file, 0, 1) !== '.' && $subdirs) {
                 scan($path, $subdirs);
             } else {

local/ocxml11client/index.php

Doc Comments +8 added lines

@@ -1281,11 +1281,19 @@
     }
 }
 
+/**
+ * @param string $recordtype
+ * @param string $info
+ */
 function importError($recordtype, $uuid, $r, $info)
 {
     echo 'error: ' . $recordtype . ' (' . $uuid . '): ' . $info . "\n";
 }
 
+/**
+ * @param string $recordtype
+ * @param string $info
+ */
 function importWarn($recordtype, $uuid, $r, $info)
 {
     echo 'warn: ' . $recordtype . ' (' . $uuid . '): ' . $info . "\n";

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;
     }
@@ -808,7 +808,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;
     }
@@ -965,7 +965,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;
     }
@@ -996,7 +996,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
     ) {
@@ -1070,7 +1070,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;
     }
@@ -1171,7 +1171,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;
     }
@@ -1283,12 +1283,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/ocxml11client/xml2array.inc.php

Doc Comments +3 added lines

@@ -26,6 +26,9 @@
         $this->stack_ref =& $this->stack[count($this->stack) - 1];
     }
 
+    /**
+     * @param false|string $strInputXML
+     */
     public function parse($strInputXML)
     {
 

Spacing +3 added lines, -3 removed lines

@@ -16,14 +16,14 @@
 
     public function push_pos(&$pos)
     {
-        $this->stack[count($this->stack)] =& $pos;
-        $this->stack_ref =& $pos;
+        $this->stack[count($this->stack)] = & $pos;
+        $this->stack_ref = & $pos;
     }
 
     public function pop_pos()
     {
         unset($this->stack[count($this->stack) - 1]);
-        $this->stack_ref =& $this->stack[count($this->stack) - 1];
+        $this->stack_ref = & $this->stack[count($this->stack) - 1];
     }
 
     public function parse($strInputXML)

htdocs/editdesc.php

Braces +14 added lines, -7 removed lines

@@ -19,9 +19,12 @@ 
     require $stylepath . '/editdesc.inc.php';
 
     // check for old-style parameters
-    if (isset($_REQUEST['cacheid']) && isset($_REQUEST['desclang']) && !isset($_REQUEST['descid']))  // Ocprop
+    if (isset($_REQUEST['cacheid']) && isset($_REQUEST['desclang']) && !isset($_REQUEST['descid'])) {
+        // Ocprop
     {
-        $cache_id = $_REQUEST['cacheid'];  // Ocprop
+        $cache_id = $_REQUEST['cacheid'];
+    }
+    // Ocprop
         $desc_lang = $_REQUEST['desclang'];  // Ocprop
 
         $rs = sql("SELECT `id` FROM `cache_desc` WHERE `cache_id`='&1' AND `language`='&2'", $cache_id, $desc_lang);
@@ -87,10 +90,13 @@ 
                 $show_all_langs = false;
 
                 //save to DB?
-                if (isset($_POST['post']))  // Ocprop
+                if (isset($_POST['post'])) {
+                    // Ocprop
                 {
                     //here we read all used information from the form if submitted
-                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;  // Ocprop
+                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;
+                }
+                // Ocprop
 
                     // fuer alte Versionen von OCProp
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -147,7 +153,8 @@ 
 
                     $desc = processEditorInput($oldDescMode, $descMode, $desc);
 
-                    if (isset($_POST['submitform']))  // Ocprop
+                    if (isset($_POST['submitform'])) {
+                        // Ocprop
                     {
                         // prüfen, ob sprache nicht schon vorhanden
                         $rs = sql(
@@ -160,6 +167,7 @@ 
                             $descid,
                             $desclang
                         );
+                    }
                         $r = sql_fetch_array($rs);
                         if ($r['count'] > 0) {
                             tpl_errorMsg('editdesc', $error_desc_exists);
@@ -224,8 +232,7 @@ 
 
                     if ($oldDescMode == 0) {
                         $desc = processEditorInput($oldDescMode, $descMode, $desc_record['desc']);
-                    }
-                    else {
+                    } else {
                         $desc = $desc_record['desc'];
                     }
                 }

Spacing +18 added lines, -18 removed lines

@@ -9,20 +9,20 @@ 
  *  Unicode Reminder メモ
  *****************************************************************************/
 
-require_once __DIR__ . '/lib/consts.inc.php';
+require_once __DIR__.'/lib/consts.inc.php';
 $opt['gui'] = GUI_HTML;
-require_once __DIR__ . '/lib/common.inc.php';
-require_once __DIR__ . '/lib2/edithelper.inc.php';
+require_once __DIR__.'/lib/common.inc.php';
+require_once __DIR__.'/lib2/edithelper.inc.php';
 
 // Preprocessing
 if ($error == false) {
-    require $stylepath . '/editdesc.inc.php';
+    require $stylepath.'/editdesc.inc.php';
 
     // check for old-style parameters
     if (isset($_REQUEST['cacheid']) && isset($_REQUEST['desclang']) && !isset($_REQUEST['descid']))  // Ocprop
     {
-        $cache_id = $_REQUEST['cacheid'];  // Ocprop
-        $desc_lang = $_REQUEST['desclang'];  // Ocprop
+        $cache_id = $_REQUEST['cacheid']; // Ocprop
+        $desc_lang = $_REQUEST['desclang']; // Ocprop
 
         $rs = sql("SELECT `id` FROM `cache_desc` WHERE `cache_id`='&1' AND `language`='&2'", $cache_id, $desc_lang);
         if (mysql_num_rows($rs) == 1) {
@@ -43,7 +43,7 @@ 
         $tplname = 'login';
 
         tpl_set_var('username', '');
-        tpl_set_var('target', htmlspecialchars('editdesc.php?descid=' . urlencode($descid), ENT_COMPAT, 'UTF-8'));
+        tpl_set_var('target', htmlspecialchars('editdesc.php?descid='.urlencode($descid), ENT_COMPAT, 'UTF-8'));
         tpl_set_var('message_start', "");
         tpl_set_var('message_end', "");
         tpl_set_var('message', $login_required);
@@ -90,7 +90,7 @@ 
                 if (isset($_POST['post']))  // Ocprop
                 {
                     //here we read all used information from the form if submitted
-                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;  // Ocprop
+                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1; // Ocprop
 
                     // fuer alte Versionen von OCProp
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -123,7 +123,7 @@ 
                         $oldDescMode = $descMode;
                     }
 
-                    $short_desc = $_POST['short_desc'];  // Ocprop
+                    $short_desc = $_POST['short_desc']; // Ocprop
                     $hint = htmlspecialchars($_POST['hints'], ENT_COMPAT, 'UTF-8');
                     $desclang = $_POST['desclang'];
                     $show_all_langs = isset($_POST['show_all_langs_value']) ? $_POST['show_all_langs_value'] : 0;
@@ -138,7 +138,7 @@ 
                     }
 
                     // Text from textarea
-                    $desc = $_POST['desc'];  // Ocprop
+                    $desc = $_POST['desc']; // Ocprop
 
                     // fuer alte Versionen von OCProp
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -207,7 +207,7 @@ 
                         db_slave_exclude();
 
                         // redirect to cachepage
-                        tpl_redirect('editcache.php?cacheid=' . urlencode($desc_record['cache_id']));
+                        tpl_redirect('editcache.php?cacheid='.urlencode($desc_record['cache_id']));
                         exit;
                     } elseif (isset($_POST['show_all_langs'])) {
                         $show_all_langs = true;
@@ -277,7 +277,7 @@ 
                     ($show_all_langs == true) ? 1 : 0);
                 while ($rLanguage = sql_fetch_assoc($rsLanguages)) {
                     $sSelected = ($rLanguage['short'] == $desc_lang) ? ' selected="selected"' : '';
-                    $languages .= '<option value="' . $rLanguage['short'] . '"' . $sSelected . '>' . htmlspecialchars($rLanguage['name'], ENT_COMPAT, 'UTF-8') . '</option>' . "\n";
+                    $languages .= '<option value="'.$rLanguage['short'].'"'.$sSelected.'>'.htmlspecialchars($rLanguage['name'], ENT_COMPAT, 'UTF-8').'</option>'."\n";
                 }
                 sql_free_result($rsLanguages);
 
@@ -297,20 +297,20 @@ 
                 tpl_set_var('desclang', htmlspecialchars($desc_lang, ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('desclang_name', htmlspecialchars(db_LanguageFromShort($desc_lang), ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('cachename', htmlspecialchars($desc_record['name'], ENT_COMPAT, 'UTF-8'));
-                tpl_set_var('reset', $reset);  // obsolete
+                tpl_set_var('reset', $reset); // obsolete
                 tpl_set_var('submit', $submit);
 
                 // Text / normal HTML / HTML editor
                 tpl_set_var('use_tinymce', ($desc_htmledit == 1) ? 1 : 0);
 
-                $headers = tpl_get_var('htmlheaders') . "\n";
+                $headers = tpl_get_var('htmlheaders')."\n";
                 if (($desc_html == 1) && ($desc_htmledit == 1)) {
                     // TinyMCE
-                    $headers = tpl_get_var('htmlheaders') . "\n";
-                    $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/tiny_mce_gzip.js"></script>' . "\n";
-                    $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/config/desc.js.php?cacheid=' . ($desc_record['cache_id'] + 0) . '&lang=' . strtolower($locale) . '"></script>' . "\n";
+                    $headers = tpl_get_var('htmlheaders')."\n";
+                    $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/tiny_mce_gzip.js"></script>'."\n";
+                    $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/config/desc.js.php?cacheid='.($desc_record['cache_id'] + 0).'&lang='.strtolower($locale).'"></script>'."\n";
                 }
-                $headers .= '<script language="javascript" type="text/javascript" src="' . editorJsPath() . '"></script>' . "\n";
+                $headers .= '<script language="javascript" type="text/javascript" src="'.editorJsPath().'"></script>'."\n";
                 tpl_set_var('htmlheaders', $headers);
             } else {
                 // @todo: not the owner