OpencachingDeutschland / oc-server3

htdocs/lib2/logic/logtypes.inc.php

Spacing +12 added lines, -12 removed lines

@@ -28,7 +28,7 @@ 
          FROM `log_types`
          LEFT JOIN `sys_trans_text`
              ON `sys_trans_text`.`trans_id` = `log_types`.`trans_id`
-             AND `sys_trans_text`.`lang`='" . sql_escape($locale) . "'"
+             AND `sys_trans_text`.`lang`='" . sql_escape($locale)."'"
     );
     while ($r = sql_fetch_array($rs)) {
         $log_types[$r['id']] = $r['type_name'];
@@ -91,28 +91,28 @@ 
 
     $allowed_logtypes = array();
     if ($owner || $admin_report || $admin_locked) {
-        $allowed_logtypes[] = 3;   // note
+        $allowed_logtypes[] = 3; // note
     }
     if (($owner && $statuslogs) || $admin_report) {
         if ($cache_status != 5 && (($cache_status != 4 && $cache_status != 7) || $admin_report)) {
-            $allowed_logtypes[] = 10;  // ready for search
-            $allowed_logtypes[] = 11;  // temporarily not available
-            $allowed_logtypes[] = 9;   // archived
-            $allowed_logtypes[] = 13;  // locked
+            $allowed_logtypes[] = 10; // ready for search
+            $allowed_logtypes[] = 11; // temporarily not available
+            $allowed_logtypes[] = 9; // archived
+            $allowed_logtypes[] = 13; // locked
         }
         if ($admin_report || $old_logtype == 14) {
             $allowed_logtypes[] = 14;
         }  // locked, invisible
     }
     if ($cache_type == 6) { // event
-        $allowed_logtypes[] = 8;   // will attend
-        $allowed_logtypes[] = 7;   // attended
+        $allowed_logtypes[] = 8; // will attend
+        $allowed_logtypes[] = 7; // attended
     } else {
-        $allowed_logtypes[] = 1;   // found
-        $allowed_logtypes[] = 2;   // not found
+        $allowed_logtypes[] = 1; // found
+        $allowed_logtypes[] = 2; // not found
     }
     if (!($owner || $admin_report || $admin_locked)) {
-        $allowed_logtypes[] = 3;   // note
+        $allowed_logtypes[] = 3; // note
     }
 
     // always allow to keep the existing logtype when the log is edited by an admin
@@ -151,7 +151,7 @@ 
             } elseif (!$opt['logic']['admin']['team_comments_only_for_reports'] || admin_has_open_report($cache_id)) {
                 // allowed for report processing by admins
                 $allowed = true;
-            } elseif ($login->hasAdminPriv(ADMIN_USER) && in_array($rCache['status'], [6,7])) {
+            } elseif ($login->hasAdminPriv(ADMIN_USER) && in_array($rCache['status'], [6, 7])) {
                 // allowed for admins && locked caches, see http://forum.opencaching.de/index.php?topic=3102.msg39517#msg39517
                 $allowed = true;
             } else {

htdocs/lib2/logic/sitemapxml.class.php

Spacing +13 added lines, -13 removed lines

@@ -12,7 +12,7 @@ 
 {
     public $sDefaultChangeFreq = 'monthly';
     public $nMaxFileSize = 9961472; // max file size, 10MB by specification
-    public $nMaxUrlCount = 50000;   // max number of URLs per file, 50000 by specification
+    public $nMaxUrlCount = 50000; // max number of URLs per file, 50000 by specification
 
     public $sPath = '';
     public $sDomain = '';
@@ -34,12 +34,12 @@ 
         $this->sPath = $sPath;
         $this->sDomain = $sDomain;
 
-        $this->oIndexFile = fopen($sPath . 'sitemap.xml', 'w');
+        $this->oIndexFile = fopen($sPath.'sitemap.xml', 'w');
         if ($this->oIndexFile === false) {
             return false;
         }
 
-        fwrite($this->oIndexFile, '<?xml version="1.0" encoding="UTF-8"?>' . "\n");
+        fwrite($this->oIndexFile, '<?xml version="1.0" encoding="UTF-8"?>'."\n");
         fwrite($this->oIndexFile, '<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">');
     }
 
@@ -53,10 +53,10 @@ 
         }
 
         $sXML = '<url>';
-        $sXML .= '<loc>' . xmlentities($this->sDomain . $sFile) . '</loc>';
-        $sXML .= '<lastmod>' . xmlentities(date('c', $dLastMod)) . '</lastmod>';
-        $sXML .= '<changefreq>' . xmlentities($sChangeFreq) . '</changefreq>';
-        $sXML .= '<priority>' . xmlentities($nPriority) . '</priority>';
+        $sXML .= '<loc>'.xmlentities($this->sDomain.$sFile).'</loc>';
+        $sXML .= '<lastmod>'.xmlentities(date('c', $dLastMod)).'</lastmod>';
+        $sXML .= '<changefreq>'.xmlentities($sChangeFreq).'</changefreq>';
+        $sXML .= '<priority>'.xmlentities($nPriority).'</priority>';
         $sXML .= '</url>';
 
         $this->writeInternal($sXML);
@@ -75,13 +75,13 @@ 
 
         // open new XML file?
         if ($this->oSitemapFile === false) {
-            $this->nSitemapIndex ++;
-            $sFilename = 'sitemap-' . $this->nSitemapIndex . '.xml.gz';
-            $this->oSitemapFile = gzopen($this->sPath . $sFilename, 'wb');
+            $this->nSitemapIndex++;
+            $sFilename = 'sitemap-'.$this->nSitemapIndex.'.xml.gz';
+            $this->oSitemapFile = gzopen($this->sPath.$sFilename, 'wb');
 
-            fwrite($this->oIndexFile, '<sitemap><loc>' . xmlentities($this->sDomain . $sFilename) . '</loc><lastmod>' . xmlentities(date('c')) . '</lastmod></sitemap>');
+            fwrite($this->oIndexFile, '<sitemap><loc>'.xmlentities($this->sDomain.$sFilename).'</loc><lastmod>'.xmlentities(date('c')).'</lastmod></sitemap>');
 
-            gzwrite($this->oSitemapFile, '<?xml version="1.0" encoding="UTF-8"?>' . "\n");
+            gzwrite($this->oSitemapFile, '<?xml version="1.0" encoding="UTF-8"?>'."\n");
             gzwrite($this->oSitemapFile, '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">');
             // includes end of xml-tag
             $this->nWrittenSize = 108;
@@ -91,7 +91,7 @@ 
         // write string to XML
         gzwrite($this->oSitemapFile, $str);
         $this->nWrittenSize += strlen($str);
-        $this->nWrittenCount ++;
+        $this->nWrittenCount++;
     }
 
     public function close()

htdocs/lib2/cli.inc.php

Spacing +3 added lines, -3 removed lines

@@ -19,14 +19,14 @@
 }
 
 // chicken-egg problem ...
-require_once $opt['rootpath'] . 'lib2/const.inc.php';
+require_once $opt['rootpath'].'lib2/const.inc.php';
 
 // do all output in text format
 $opt['gui'] = GUI_TEXT;
 
 // include the main library
-require_once $opt['rootpath'] . 'lib2/common.inc.php';
-require_once $opt['rootpath'] . 'lib2/cli.class.php';
+require_once $opt['rootpath'].'lib2/common.inc.php';
+require_once $opt['rootpath'].'lib2/cli.class.php';
 
 if (($opt['debug'] & DEBUG_OUTOFSERVICE) == DEBUG_OUTOFSERVICE) {
     $cli->debug('exit because DEBUG_OUTOFSERVICE is set');

htdocs/lib2/mail.class.php

Spacing +11 added lines, -11 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once __DIR__. '/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 class mail extends Smarty
 {
@@ -29,11 +29,11 @@ 
 
         global $opt;
 
-        $this->template_dir = $opt['rootpath'] . 'templates2/mail/';
-        $this->compile_dir = $opt['rootpath'] . 'cache2/smarty/compiled/';
+        $this->template_dir = $opt['rootpath'].'templates2/mail/';
+        $this->compile_dir = $opt['rootpath'].'cache2/smarty/compiled/';
         $this->plugins_dir = [
             'plugins',
-            __DIR__ . '/../src/Oc/SmartyPlugins'
+            __DIR__.'/../src/Oc/SmartyPlugins'
         ];
 
         // disable caching ...
@@ -54,7 +54,7 @@ 
     {
         global $opt;
 
-        return 'mail|' . $opt['template']['locale'] . '|' . $this->compile_id;
+        return 'mail|'.$opt['template']['locale'].'|'.$this->compile_id;
     }
 
     public function assign_rs($name, $rs)
@@ -70,7 +70,7 @@ 
     {
         global $tpl, $opt;
 
-        if (!$this->template_exists($this->name . '.tpl')) {
+        if (!$this->template_exists($this->name.'.tpl')) {
             $tpl->error(ERROR_MAIL_TEMPLATE_NOT_FOUND);
         }
         $this->assign('template', $this->name);
@@ -100,7 +100,7 @@ 
             set_php_locale();
         }
 
-        $body = $this->fetch($this->main_template . '.tpl', '', $this->get_compile_id());
+        $body = $this->fetch($this->main_template.'.tpl', '', $this->get_compile_id());
 
         if ($this->recipient_locale != $sender_locale) {
             $opt['template']['locale'] = $sender_locale;
@@ -115,19 +115,19 @@ 
         }
 
         $aAddHeaders = array();
-        $aAddHeaders[] = 'From: "' . $this->from . '" <' . $this->from . '>';
+        $aAddHeaders[] = 'From: "'.$this->from.'" <'.$this->from.'>';
 
         if ($this->replyTo !== null) {
-            $aAddHeaders[] = 'Reply-To: ' . $this->replyTo;
+            $aAddHeaders[] = 'Reply-To: '.$this->replyTo;
         }
 
         if ($this->returnPath !== null) {
-            $aAddHeaders[] = 'Return-Path: ' . $this->returnPath;
+            $aAddHeaders[] = 'Return-Path: '.$this->returnPath;
         }
 
         $mailheaders = implode("\n", array_merge($aAddHeaders, $this->headers));
 
-        return mb_send_mail($this->to, $opt['mail']['subject'] . $this->subject, $body, $mailheaders);
+        return mb_send_mail($this->to, $opt['mail']['subject'].$this->subject, $body, $mailheaders);
     }
 
     public static function is_existent_maildomain($domain)

htdocs/lib2/rss.class.php

Spacing +13 added lines, -13 removed lines

@@ -42,7 +42,7 @@ 
     public function getPubDate()
     {
         if (empty($this->pubDate)) {
-            return date("d.m.y H:i:s") . "GMT";
+            return date("d.m.y H:i:s")."GMT";
         } else {
             return $this->pubDate;
         }
@@ -57,11 +57,11 @@ 
     {
         $out = $this->header();
         $out .= "<channel>\n";
-        $out .= "<title>" . $this->title . "</title>\n";
-        $out .= "<link>" . $this->link . "</link>\n";
-        $out .= "<description>" . $this->description . "</description>\n";
-        $out .= "<language>" . $this->language . "</language>\n";
-        $out .= "<pubDate>" . $this->getPubDate() . "</pubDate>\n";
+        $out .= "<title>".$this->title."</title>\n";
+        $out .= "<link>".$this->link."</link>\n";
+        $out .= "<description>".$this->description."</description>\n";
+        $out .= "<language>".$this->language."</language>\n";
+        $out .= "<pubDate>".$this->getPubDate()."</pubDate>\n";
 
         foreach ($this->tags as $key => $val) {
             $out .= "<$key>$val</$key>\n";
@@ -88,8 +88,8 @@ 
 
     public function header()
     {
-        $out = '<?xml version="1.0" encoding="utf-8"?>' . "\n";
-        $out .= '<rss version="2.0">' . "\n";
+        $out = '<?xml version="1.0" encoding="utf-8"?>'."\n";
+        $out .= '<rss version="2.0">'."\n";
 
         return $out;
     }
@@ -141,10 +141,10 @@ 
     public function out()
     {
         $out = "<item>\n";
-        $out .= "<title>" . $this->title . "</title>\n";
-        $out .= "<link>" . $this->link . "</link>\n";
-        $out .= "<description>" . $this->description . "</description>\n";
-        $out .= "<pubDate>" . $this->getPubDate() . "</pubDate>\n";
+        $out .= "<title>".$this->title."</title>\n";
+        $out .= "<link>".$this->link."</link>\n";
+        $out .= "<description>".$this->description."</description>\n";
+        $out .= "<pubDate>".$this->getPubDate()."</pubDate>\n";
 
         if ($this->attachment != "") {
             $out .= "<enclosure url='{$this->attachment}' length='{$this->length}' type='{$this->mimetype}' />";
@@ -153,7 +153,7 @@ 
         if (empty($this->guid)) {
             $this->guid = $this->link;
         }
-        $out .= "<guid>" . $this->guid . "</guid>\n";
+        $out .= "<guid>".$this->guid."</guid>\n";
 
         foreach ($this->tags as $key => $val) {
             $out .= "<$key>$val</$key\n>";

htdocs/lib2/OcHTMLPurifier.class.php

Spacing +5 added lines, -5 removed lines

@@ -5,8 +5,8 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once __DIR__ . '/../vendor/autoload.php';
-require_once __DIR__ . '/Net/IDNA2.php';
+require_once __DIR__.'/../vendor/autoload.php';
+require_once __DIR__.'/Net/IDNA2.php';
 
 // !! THIS CODE IS ALSO USED IN OKAPI !!
 // Any changes must be tested with OKAPI services/logs/submit method.
@@ -50,8 +50,8 @@ 
         $config->set('Attr.IDPrefix', 'custom_');
 
         // enable 'display' and 'visibility' styles for mystery descriptions
-        $config->set('CSS.AllowTricky', true);                // + display, visibility, overflow
-        $config->set('CSS.ForbiddenProperties', 'overflow');  // - overflow
+        $config->set('CSS.AllowTricky', true); // + display, visibility, overflow
+        $config->set('CSS.ForbiddenProperties', 'overflow'); // - overflow
 
         // prepare additional definitions
         $def = $config->getHTMLDefinition(true);
@@ -65,7 +65,7 @@ 
         ); //  HTML5 attribs currently not supported by TinyMCE
         $def->addElement('legend', 'Inline', 'Flow', 'Common');
         $def->addElement('q', 'Inline', 'Inline', 'Common', ['cite' => 'URI']);
-        $def->addElement('strike', 'Inline', 'Inline', 'Common');   // -> wird in CSS umgewandelt
+        $def->addElement('strike', 'Inline', 'Inline', 'Common'); // -> wird in CSS umgewandelt
         $def->addElement(
             'area',
             'Inline',

htdocs/lib2/errorhandler.inc.php

Spacing +12 added lines, -12 removed lines

@@ -39,7 +39,7 @@ 
             $errmsg = "";
         }
 
-        require __DIR__ . '/../html/error.php';
+        require __DIR__.'/../html/error.php';
         exit;
     }
 }
@@ -67,8 +67,8 @@ 
     ) {
         $error_handled = true;
 
-        $error = "(" . $error['type'] . ") " . $error['message'] .
-            " at line " . $error['line'] . " of " . $error['file'];
+        $error = "(".$error['type'].") ".$error['message'].
+            " at line ".$error['line']." of ".$error['file'];
         php_errormail($error);
 
         $errtitle = "PHP-Fehler";
@@ -77,7 +77,7 @@ 
             $errmsg = $error;
         }
 
-        require __DIR__ . '/../html/error.php';
+        require __DIR__.'/../html/error.php';
     }
 }
 
@@ -94,7 +94,7 @@ 
     global $opt, $sql_errormail, $absolute_server_URI;
 
     $sendMail = true;
-    $subject = '[' . $opt['page']['domain'] . '] PHP error';
+    $subject = '['.$opt['page']['domain'].'] PHP error';
 
     if (isset($opt['db']['error']['mail']) && $opt['db']['error']['mail'] != '') {
         $sendMail = mb_send_mail($opt['db']['error']['mail'], $subject, $errmsg);
@@ -114,10 +114,10 @@ 
 function admin_errormail($to, $errortype, $message, $headers)
 {
     global $opt;
-    $errorlog_dir = $opt['rootpath'] . 'var/errorlog';
-    $errorlog_path = $errorlog_dir . "/errorlog-" . date("Y-m-d");
+    $errorlog_dir = $opt['rootpath'].'var/errorlog';
+    $errorlog_path = $errorlog_dir."/errorlog-".date("Y-m-d");
 
-    $error_mail_limit = 32768;    // send max 32 KB = ca. 5-20 errors per day/logfile
+    $error_mail_limit = 32768; // send max 32 KB = ca. 5-20 errors per day/logfile
 
     // All errors which may happen here are ignored, to avoid error recursions.
 
@@ -125,7 +125,7 @@ 
         @mkdir($errorlog_dir);
     }
     $old_logsize = @filesize($errorlog_path) + 0;
-    $msg = date("Y-m-d H:i:s.u") . " " . $errortype . "\n" . $message . "\n" .
+    $msg = date("Y-m-d H:i:s.u")." ".$errortype."\n".$message."\n".
         "-------------------------------------------------------------------------\n\n";
     try {
         error_log(
@@ -143,9 +143,9 @@ 
     if ($old_logsize < $error_mail_limit && $new_logsize >= $error_mail_limit) {
         mb_send_mail(
             $to,
-            "too many " . $errortype,
-            "Errors/Warnings are recorded in " . $errorlog_path . ".\n" .
-            "Email Reporting is DISABLED for today now. Please check the logfile\n" .
+            "too many ".$errortype,
+            "Errors/Warnings are recorded in ".$errorlog_path.".\n".
+            "Email Reporting is DISABLED for today now. Please check the logfile\n".
             "and RENAME or delete it when done, so that logging is re-enabled.",
             $headers
         );

htdocs/lib2/util.inc.php

Spacing +5 added lines, -5 removed lines

@@ -229,7 +229,7 @@ 
 
     while ($nCurPos < mb_strlen($str)) {
         $nNextSep = mb_strlen($str);
-        for ($nSepPos = 0; $nSepPos < mb_strlen($sep); $nSepPos ++) {
+        for ($nSepPos = 0; $nSepPos < mb_strlen($sep); $nSepPos++) {
             $nThisPos = mb_strpos($str, mb_substr($sep, $nSepPos, 1), $nCurPos);
             if ($nThisPos !== false) {
                 if ($nNextSep > $nThisPos) {
@@ -308,9 +308,9 @@ 
         $retval = 'E ';
     }
 
-    $retval = $retval . sprintf("%03d", floor($lon)) . '° ';
+    $retval = $retval.sprintf("%03d", floor($lon)).'° ';
     $lon = $lon - floor($lon);
-    $retval = $retval . sprintf("%06.3f", round($lon * 60, 3)) . '\'';
+    $retval = $retval.sprintf("%06.3f", round($lon * 60, 3)).'\'';
 
     return $retval;
 }
@@ -325,9 +325,9 @@ 
         $retval = 'N ';
     }
 
-    $retval = $retval . sprintf("%02d", floor($lat)) . '° ';
+    $retval = $retval.sprintf("%02d", floor($lat)).'° ';
     $lat = $lat - floor($lat);
-    $retval = $retval . sprintf("%06.3f", round($lat * 60, 3)) . '\'';
+    $retval = $retval.sprintf("%06.3f", round($lat * 60, 3)).'\'';
 
     return $retval;
 }

htdocs/lib2/ss_zip.class.php

Spacing +11 added lines, -11 removed lines

@@ -143,9 +143,9 @@ 
 
         }
         $fnl = strlen($filename);
-        $fh = "\x14\x00";    // ver needed to extract
-        $fh .= "\x00\x00";    // gen purpose bit flag
-        $fh .= "\x08\x00";    // compression method
+        $fh = "\x14\x00"; // ver needed to extract
+        $fh .= "\x00\x00"; // gen purpose bit flag
+        $fh .= "\x08\x00"; // compression method
         $fh .= "\x00\x00\x00\x00"; // last mod time and date
         $fh .= pack(
             "V3v2",
@@ -159,7 +159,7 @@ 
 
         //local file header
         $lfh = "PK\x03\x04";
-        $lfh .= $fh . $filename;
+        $lfh .= $fh.$filename;
         $zipdata = $lfh;
         $zipdata .= $gzdata;
         $zipdata .= pack("V3", $crc, $gzsize, $datasize);
@@ -170,16 +170,16 @@ 
                 "va*v3V2",
                 0,
                 $fh,
-                0,        // file comment length
-                0,        // disk number start
-                0,        // internal file attributes
-                $attr,    // external file attributes - 'archive/directory' bit set
+                0, // file comment length
+                0, // disk number start
+                0, // internal file attributes
+                $attr, // external file attributes - 'archive/directory' bit set
                 $this->offset
-            ) . $filename;
+            ).$filename;
 
         $this->offset += 42 + $fnl + $gzsize;
         $this->cdir[] = $cdir;
-        $this->cnt ++;
+        $this->cnt++;
         $this->idx = $this->cnt - 1;
     }
 
@@ -228,7 +228,7 @@ 
                 $cdsl, // size of central dir
                 $zdsl, // offset to start of central dir
                 0
-            );              // .zip file comment length
+            ); // .zip file comment length
         return $this->zipfile;
     }