OpencachingDeutschland / oc-server3

htdocs/lib2/logic/cache.class.php

Spacing +11 added lines, -11 removed lines

@@ -8,8 +8,8 @@ 
  *   add/remove etc. is executed instantly
  ***************************************************************************/
 
-require_once __DIR__ . '/logtypes.inc.php';
-require_once __DIR__ . '/../../lib/cache.inc.php';
+require_once __DIR__.'/logtypes.inc.php';
+require_once __DIR__.'/../../lib/cache.inc.php';
 
 class cache
 {
@@ -283,7 +283,7 @@ 
         );
         if ($r = sql_fetch_assoc($rs)) {
             if ($r['listing_outdated'] == 2) {
-                $url = 'viewlogs.php?cacheid=' . $this->getCacheId() . '#log' . $r['id'];
+                $url = 'viewlogs.php?cacheid='.$this->getCacheId().'#log'.$r['id'];
             }
         }
         sql_free_result($rs);
@@ -473,7 +473,7 @@ 
                     `cache_logs`.`text` AS `text`,
                     `cache_logs`.`text_html` AS `texthtml`,
                     `cache_logs`.`picture`,
-                    ' . $delfields . ",
+                    ' . $delfields.",
                     `user`.`username` AS `username`,
                     IF(ISNULL(`cache_rating`.`cache_id`), 0, `cache_logs`.`type` IN (1,7)) AS `recommended`
              FROM $table AS `cache_logs`
@@ -483,7 +483,7 @@ 
                  ON `cache_logs`.`cache_id`=`cache_rating`.`cache_id`
                  AND `cache_logs`.`user_id`=`cache_rating`.`user_id`
                  AND `cache_logs`.`date`=`cache_rating`.`rating_date`
-             " . $addjoin . "
+             ".$addjoin."
              WHERE `cache_logs`.`cache_id`='&1'
              ORDER BY `cache_logs`.`order_date` DESC, `cache_logs`.`date_created` DESC, `id` DESC
              LIMIT &2, &3",
@@ -508,7 +508,7 @@ 
             );
             while ($rPicture = sql_fetch_assoc($rsPictures)) {
                 if (trim($rPicture['title']) == '') {
-                    $rPicture['title'] = $translate->t('Picture', '', '', 0) . ' ' . (count($pictures) + 1);
+                    $rPicture['title'] = $translate->t('Picture', '', '', 0).' '.(count($pictures) + 1);
                 }
                 $pictures[] = $rPicture;
             }
@@ -521,7 +521,7 @@ 
                 if (!$newcoord) {
                     $newcoord = $coords[$coordpos];
                 }
-                ++ $coordpos;
+                ++$coordpos;
             }
             if ($newcoord) {
                 $distance = geomath::calcDistance(
@@ -554,7 +554,7 @@ 
             $original = count($coords) - 1;
             $lastlogdate = $logs[count($logs) - 1]['order_date'];
             while ($original > 0 && $coords[$original - 1]['date'] < $lastlogdate) {
-                -- $original;
+                --$original;
             }
             $coord = new coordinate($coords[$original]['latitude'], $coords[$original]['longitude']);
             $logs[] = [
@@ -676,9 +676,9 @@ 
             $login->userid,
             $this->nCacheId,
             0,
-            'Cache ' . sql_escape($this->nCacheId) . ' has changed the owner from userid ' . sql_escape(
+            'Cache '.sql_escape($this->nCacheId).' has changed the owner from userid '.sql_escape(
                 $this->getUserId()
-            ) . ' to ' . sql_escape($userId) . ' by ' . sql_escape($login->userid)
+            ).' to '.sql_escape($userId).' by '.sql_escape($login->userid)
         );
         // Adoptions now are recorded by trigger in cache_adoptions table.
         // Recording adoptions in 'logentries' may be discarded after ensuring that the
@@ -955,7 +955,7 @@ 
             $logTypes[$i]['selected'] = ($logtype == $defaultLogType) ? true : false;
             $logTypes[$i]['name'] = $logtypeNames[$logtype];
             $logTypes[$i]['id'] = $logtype;
-            $i ++;
+            $i++;
         }
 
         // return

htdocs/lib2/logic/useroptions.class.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
  *
  ***************************************************************************/
 
-require_once __DIR__ . '/const.inc.php';
+require_once __DIR__.'/const.inc.php';
 
 class useroptions
 {
@@ -150,7 +150,7 @@ 
             $this->nOptions[$pId]['option_value'] = $pValue;
 
             return true;
-        } elseif (preg_match("/" . $this->nOptions[$pId]['check_regex'] . "/", $pValue) || strlen($pValue) == 0) {
+        } elseif (preg_match("/".$this->nOptions[$pId]['check_regex']."/", $pValue) || strlen($pValue) == 0) {
             $this->nOptions[$pId]['option_value'] = $pValue;
 
             return true;

htdocs/lib2/logic/picture.class.php

Spacing +14 added lines, -14 removed lines

@@ -8,7 +8,7 @@ 
  *   add/remove etc. is executed instantly
  ***************************************************************************/
 
-require_once __DIR__ . '/const.inc.php';
+require_once __DIR__.'/const.inc.php';
 
 class picture
 {
@@ -95,7 +95,7 @@ 
 
         $sExtension = mb_strtolower(substr($sFilename, strrpos($sFilename, '.') + 1));
 
-        if (strpos(';' . $opt['logic']['pictures']['extensions'] . ';', ';' . $sExtension . ';') !== false) {
+        if (strpos(';'.$opt['logic']['pictures']['extensions'].';', ';'.$sExtension.';') !== false) {
             return true;
         } else {
             return false;
@@ -118,7 +118,7 @@ 
 
         $sUUID = $this->getUUID();
 
-        $this->setUrl($opt['logic']['pictures']['url'] . $sUUID . '.' . $sExtension);
+        $this->setUrl($opt['logic']['pictures']['url'].$sUUID.'.'.$sExtension);
         //$this->setThumbUrl($opt['logic']['pictures']['thumb_url'] . substr($sUUID, 0, 1) . '/' . substr($sUUID, 1, 1) . '/' . $sUUID . '.' . $sExtension);
 
         $this->bFilenamesSet = true;
@@ -158,8 +158,8 @@ 
             $archive = true;
         }
 
-        sql("SET @archive_picop=" . ($archive ? "TRUE" : "FALSE"));
-        sql_slave("SET @archive_picop=" . ($archive ? "TRUE" : "FALSE"));
+        sql("SET @archive_picop=".($archive ? "TRUE" : "FALSE"));
+        sql_slave("SET @archive_picop=".($archive ? "TRUE" : "FALSE"));
 
         sql("SET @original_picid='&1'", $original_id);
         sql_slave("SET @original_picid='&1'", $original_id);
@@ -271,7 +271,7 @@ 
         $url = $this->getUrl();
         $fna = mb_split('\\/', $url);
 
-        return $opt['logic']['pictures']['dir'] . end($fna);
+        return $opt['logic']['pictures']['dir'].end($fna);
     }
 
     public function getThumbFilename()
@@ -289,7 +289,7 @@ 
         $dir1 = mb_strtoupper(mb_substr($filename, 0, 1));
         $dir2 = mb_strtoupper(mb_substr($filename, 1, 1));
 
-        return $opt['logic']['pictures']['thumb_dir'] . $dir1 . '/' . $dir2 . '/' . $filename;
+        return $opt['logic']['pictures']['thumb_dir'].$dir1.'/'.$dir2.'/'.$filename;
     }
 
     public function getLogId()
@@ -435,9 +435,9 @@ 
                 return false;
             } else {
                 // restore picture file
-                $this->setUrl($original_url);        // set the url, so that we can
-                $filename = $this->getFilename();    // .. retreive the file path+name
-                $this->setFilenames($filename);      // now set url(s) from the new uuid
+                $this->setUrl($original_url); // set the url, so that we can
+                $filename = $this->getFilename(); // .. retreive the file path+name
+                $this->setFilenames($filename); // now set url(s) from the new uuid
                 try {
                     rename($this->deleted_filename($filename), $this->getFilename());
                 } catch (Exception $e) {
@@ -514,7 +514,7 @@ 
         $fna[count($fna) - 2] = 'deleted';
         $dp = "";
         foreach ($fna as $fp) {
-            $dp .= "/" . $fp;
+            $dp .= "/".$fp;
         }
 
         return substr($dp, 1);
@@ -538,13 +538,13 @@ 
     public function getPageLink()
     {
         if ($this->getObjectType() == OBJECT_CACHELOG) {
-            $pl = 'viewcache.php?cacheid=' . urlencode($this->getCacheId());
+            $pl = 'viewcache.php?cacheid='.urlencode($this->getCacheId());
             if (!$this->isVisibleOnCachePage()) {
                 $pl .= "&log=A";
             }
-            $pl .= "#log" . urlencode($this->getLogId());
+            $pl .= "#log".urlencode($this->getLogId());
         } elseif ($this->getObjectType() == OBJECT_CACHE) {
-            $pl = 'editcache.php?cacheid=' . urlencode($this->getCacheId()) . '#pictures';
+            $pl = 'editcache.php?cacheid='.urlencode($this->getCacheId()).'#pictures';
         } else {
             $pl = false;
         }

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',