OpencachingDeutschland / oc-server3

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

htdocs/lib2/Net/IDNA2.php

Spacing +49 added lines, -53 removed lines

@@ -23,8 +23,8 @@ 
 //
 
 // }}}
-require_once __DIR__ . '/IDNA2/Exception.php';
-require_once __DIR__ . '/IDNA2/Exception/Nameprep.php';
+require_once __DIR__.'/IDNA2/Exception.php';
+require_once __DIR__.'/IDNA2/Exception/Nameprep.php';
 // adjusted paths for OC distribution
 
 /**
@@ -272,16 +272,16 @@ 
      * @access private
      */
     private static $_np_prohibit_ranges = array(
-        array(0x80,     0x9F    ),
-        array(0x2060,   0x206F  ),
-        array(0x1D173,  0x1D17A ),
-        array(0xE000,   0xF8FF  ),
-        array(0xF0000,  0xFFFFD ),
+        array(0x80, 0x9F),
+        array(0x2060, 0x206F),
+        array(0x1D173, 0x1D17A),
+        array(0xE000, 0xF8FF),
+        array(0xF0000, 0xFFFFD),
         array(0x100000, 0x10FFFD),
-        array(0xFDD0,   0xFDEF  ),
-        array(0xD800,   0xDFFF  ),
-        array(0x2FF0,   0x2FFB  ),
-        array(0xE0020,  0xE007F )
+        array(0xFDD0, 0xFDEF),
+        array(0xD800, 0xDFFF),
+        array(0x2FF0, 0x2FFB),
+        array(0xE0020, 0xE007F)
     );
 
     /**
@@ -2328,8 +2328,7 @@ 
         // Forcing conversion of input to UCS4 array
         // If one time encoding is given, use this, else the objects property
         switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
-        case 'utf8':
-            $decoded = $this->_utf8_to_ucs4($decoded);
+        case 'utf8' : $decoded = $this->_utf8_to_ucs4($decoded);
             break;
         case 'ucs4_string':
             $decoded = $this->_ucs4_string_to_ucs4($decoded);
@@ -2349,7 +2348,7 @@ 
 
         foreach ($decoded as $k => $v) {
             // Make sure to use just the plain dot
-            switch($v) {
+            switch ($v) {
             case 0x3002:
             case 0xFF0E:
             case 0xFF61:
@@ -2370,11 +2369,11 @@ 
                 // Skip first char
                 if ($k) {
                     $encoded = '';
-                    $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                    $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k) - $last_begin)));
                     if ($encoded) {
                         $output .= $encoded;
                     } else {
-                        $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                        $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k) - $last_begin)));
                     }
                     $output .= chr($decoded[$k]);
                 }
@@ -2385,11 +2384,11 @@ 
         if ($last_begin) {
             $inp_len = sizeof($decoded);
             $encoded = '';
-            $encoded = $this->_encode(array_slice($decoded, $last_begin, (($inp_len)-$last_begin)));
+            $encoded = $this->_encode(array_slice($decoded, $last_begin, (($inp_len) - $last_begin)));
             if ($encoded) {
                 $output .= $encoded;
             } else {
-                $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($inp_len)-$last_begin)));
+                $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($inp_len) - $last_begin)));
             }
             return $output;
         }
@@ -2440,7 +2439,7 @@ 
                 $conv = $this->_decode($v);
                 if ($conv) $arr[$k] = $conv;
             }
-            $return = $email_pref . '@' . join('.', $arr);
+            $return = $email_pref.'@'.join('.', $arr);
         } elseif (preg_match('![:\./]!', $input)) { // Or a complete domain name (with or without paths / parameters)
             // No no in strict mode
             if ($this->_strict_mode) {
@@ -2473,8 +2472,7 @@ 
         // The output is UTF-8 by default, other output formats need conversion here
         // If one time encoding is given, use this, else the objects property
         switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
-        case 'utf8':
-            return $return;
+        case 'utf8' : return $return;
             break;
         case 'ucs4_string':
             return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
@@ -2507,20 +2505,20 @@ 
         if (!empty($parts_arr['user'])) {
             $ret_url .= $parts_arr['user'];
             if (!empty($parts_arr['pass'])) {
-                $ret_url .= ':' . $parts_arr['pass'];
+                $ret_url .= ':'.$parts_arr['pass'];
             }
             $ret_url .= '@';
         }
         $ret_url .= $parts_arr['host'];
         if (!empty($parts_arr['port'])) {
-            $ret_url .= ':' . $parts_arr['port'];
+            $ret_url .= ':'.$parts_arr['port'];
         }
         $ret_url .= $parts_arr['path'];
         if (!empty($parts_arr['query'])) {
-            $ret_url .= '?' . $parts_arr['query'];
+            $ret_url .= '?'.$parts_arr['query'];
         }
         if (!empty($parts_arr['fragment'])) {
-            $ret_url .= '#' . $parts_arr['fragment'];
+            $ret_url .= '#'.$parts_arr['fragment'];
         }
         return $ret_url;
     }
@@ -2598,7 +2596,7 @@ 
         }
 
         // Start with the prefix; copy it to output
-        $encoded = $this->_punycode_prefix . $encoded;
+        $encoded = $this->_punycode_prefix.$encoded;
 
         // If we have basic code points in output, add an hyphen to the end
         if ($codecount) {
@@ -2629,9 +2627,8 @@ 
                     $delta++;
                 } else if ($decoded[$i] == $cur_code) {
                     for ($q = $delta, $k = $this->_base; 1; $k += $this->_base) {
-                        $t = ($k <= $bias)?
-                            $this->_tmin :
-                            (($k >= $bias + $this->_tmax)? $this->_tmax : $k - $bias);
+                        $t = ($k <= $bias) ?
+                            $this->_tmin : (($k >= $bias + $this->_tmax) ? $this->_tmax : $k - $bias);
 
                         if ($q < $t) {
                             break;
@@ -2668,11 +2665,11 @@ 
     private function _decode($encoded)
     {
         // We do need to find the Punycode prefix
-        if (!preg_match('!^' . preg_quote($this->_punycode_prefix, '!') . '!', $encoded)) {
+        if (!preg_match('!^'.preg_quote($this->_punycode_prefix, '!').'!', $encoded)) {
             return false;
         }
 
-        $encode_test = preg_replace('!^' . preg_quote($this->_punycode_prefix, '!') . '!', '', $encoded);
+        $encode_test = preg_replace('!^'.preg_quote($this->_punycode_prefix, '!').'!', '', $encoded);
 
         // If nothing left after removing the prefix, it is hopeless
         if (!$encode_test) {
@@ -2699,14 +2696,13 @@ 
         $idx      = 0;
         $char     = $this->_initial_n;
 
-        for ($enco_idx = ($delim_pos)? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len) {
-            for ($old_idx = $idx, $w = 1, $k = $this->_base; 1 ; $k += $this->_base) {
+        for ($enco_idx = ($delim_pos) ? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len) {
+            for ($old_idx = $idx, $w = 1, $k = $this->_base; 1; $k += $this->_base) {
                 $digit = $this->_decodeDigit($encoded{$enco_idx++});
                 $idx += $digit * $w;
 
                 $t = ($k <= $bias) ?
-                    $this->_tmin :
-                    (($k >= $bias + $this->_tmax)? $this->_tmax : ($k - $bias));
+                    $this->_tmin : (($k >= $bias + $this->_tmax) ? $this->_tmax : ($k - $bias));
 
                 if ($digit < $t) {
                     break;
@@ -2717,7 +2713,7 @@ 
 
             $bias      = $this->_adapt($idx - $old_idx, $deco_len + 1, $is_first);
             $is_first  = false;
-            $char     += (int) ($idx / ($deco_len + 1));
+            $char     += (int)($idx / ($deco_len + 1));
             $idx      %= ($deco_len + 1);
 
             if ($deco_len > 0) {
@@ -2745,14 +2741,14 @@ 
      */
     private function _adapt($delta, $npoints, $is_first)
     {
-        $delta = (int) ($is_first ? ($delta / $this->_damp) : ($delta / 2));
-        $delta += (int) ($delta / $npoints);
+        $delta = (int)($is_first ? ($delta / $this->_damp) : ($delta / 2));
+        $delta += (int)($delta / $npoints);
 
         for ($k = 0; $delta > (($this->_base - $this->_tmin) * $this->_tmax) / 2; $k += $this->_base) {
-            $delta = (int) ($delta / ($this->_base - $this->_tmin));
+            $delta = (int)($delta / ($this->_base - $this->_tmin));
         }
 
-        return (int) ($k + ($this->_base - $this->_tmin + 1) * $delta / ($delta + $this->_skew));
+        return (int)($k + ($this->_base - $this->_tmin + 1) * $delta / ($delta + $this->_skew));
     }
 
     /**
@@ -2779,7 +2775,7 @@ 
     private function _decodeDigit($cp)
     {
         $cp = ord($cp);
-        return ($cp - 48 < 10)? $cp - 22 : (($cp - 65 < 26)? $cp - 65 : (($cp - 97 < 26)? $cp - 97 : $this->_base));
+        return ($cp - 48 < 10) ? $cp - 22 : (($cp - 65 < 26) ? $cp - 65 : (($cp - 97 < 26) ? $cp - 97 : $this->_base));
     }
 
     /**
@@ -2807,12 +2803,12 @@ 
 
             // Try to find prohibited input
             if (in_array($v, self::$_np_prohibit) || in_array($v, self::$_general_prohibited)) {
-                throw new Net_IDNA2_Exception_Nameprep('Prohibited input U+' . sprintf('%08X', $v));
+                throw new Net_IDNA2_Exception_Nameprep('Prohibited input U+'.sprintf('%08X', $v));
             }
 
             foreach (self::$_np_prohibit_ranges as $range) {
                 if ($range[0] <= $v && $v <= $range[1]) {
-                    throw new Net_IDNA2_Exception_Nameprep('Prohibited input U+' . sprintf('%08X', $v));
+                    throw new Net_IDNA2_Exception_Nameprep('Prohibited input U+'.sprintf('%08X', $v));
                 }
             }
 
@@ -2862,7 +2858,7 @@ 
                     // Rewind the for loop by one, since there can be more possible compositions
                     $i--;
                     $out_len--;
-                    $last_class = ($i == $last_starter)? 0 : $this->_getCombiningClass($output[$i - 1]);
+                    $last_class = ($i == $last_starter) ? 0 : $this->_getCombiningClass($output[$i - 1]);
 
                     continue;
                 }
@@ -2899,7 +2895,7 @@ 
 
         $result   = array();
         $T        = $this->_tbase + $sindex % $this->_tcount;
-        $result[] = (int)($this->_lbase +  $sindex / $this->_ncount);
+        $result[] = (int)($this->_lbase + $sindex / $this->_ncount);
         $result[] = (int)($this->_vbase + ($sindex % $this->_ncount) / $this->_tcount);
 
         if ($T != $this->_tbase) {
@@ -2985,7 +2981,7 @@ 
      */
     private function _getCombiningClass($char)
     {
-        return isset(self::$_np_norm_combcls[$char])? self::$_np_norm_combcls[$char] : 0;
+        return isset(self::$_np_norm_combcls[$char]) ? self::$_np_norm_combcls[$char] : 0;
     }
 
     /**
@@ -3146,7 +3142,7 @@ 
                     throw new UnexpectedValueException('This might be UTF-8, but I don\'t understand it at byte '.$k);
                 }
                 if ('add' == $mode) {
-                    $output[$out_len] = (int) $v;
+                    $output[$out_len] = (int)$v;
                     ++$out_len;
                     continue;
                 }
@@ -3205,14 +3201,14 @@ 
                 // 4 bytes
                 $output .= chr(240 + ($v >> 18))
                     . chr(128 + (($v >> 12) & 63))
-                    . chr(128 + (($v >>  6) & 63))
+                    . chr(128 + (($v >> 6) & 63))
                     . chr(128 + ($v & 63));
             } else if ($v < 1 << 26) {
                 // 5 bytes
                 $output .= chr(248 + ($v >> 24))
                     . chr(128 + (($v >> 18) & 63))
                     . chr(128 + (($v >> 12) & 63))
-                    . chr(128 + (($v >>  6) & 63))
+                    . chr(128 + (($v >> 6) & 63))
                     . chr(128 + ($v & 63));
             } else if ($v < 1 << 31) {
                 // 6 bytes
@@ -3220,7 +3216,7 @@ 
                     . chr(128 + (($v >> 24) & 63))
                     . chr(128 + (($v >> 18) & 63))
                     . chr(128 + (($v >> 12) & 63))
-                    . chr(128 + (($v >>  6) & 63))
+                    . chr(128 + (($v >> 6) & 63))
                     . chr(128 + ($v & 63));
             } else {
                 throw new UnexpectedValueException('Conversion from UCS-4 to UTF-8 failed: malformed input');
@@ -3245,7 +3241,7 @@ 
         // Take array values and split output to 4 bytes per value
         // The bit mask is 255, which reads &11111111
         foreach ($input as $v) {
-            $output .= ($v & (255 << 24) >> 24) . ($v & (255 << 16) >> 16) . ($v & (255 << 8) >> 8) . ($v & 255);
+            $output .= ($v & (255 << 24) >> 24).($v & (255 << 16) >> 16).($v & (255 << 8) >> 8).($v & 255);
         }
         return $output;
     }
@@ -3280,7 +3276,7 @@ 
                 $out_len++;
                 $output[$out_len] = 0;
             }
-            $output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4) ) );
+            $output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4)));
         }
         return $output;
     }
@@ -3331,7 +3327,7 @@ 
         $return = '';
 
         for ($i = $w; $i > -1; $i--) {
-            $return .= ($octet & (1 << $i))? '1' : '0';
+            $return .= ($octet & (1 << $i)) ? '1' : '0';
         }
 
         return $return;