spip / SPIP

ecrire/inc/texte_mini.php

Spacing +27 added lines, -27 removed lines

@@ -44,13 +44,13 @@ 
 	// celle du texte) et public (spip_lang est la langue du texte)
 	$dir = _DIR_RESTREINT ? lang_dir() : lang_dir($GLOBALS['spip_lang']);
 
-	$p = 'puce' . (test_espace_prive() ? '_prive' : '');
+	$p = 'puce'.(test_espace_prive() ? '_prive' : '');
 	if ($dir == 'rtl') {
 		$p .= '_rtl';
 	}
 
 	if (!isset($GLOBALS[$p])) {
-		$GLOBALS[$p] = '<span class="spip-puce ' . $dir . '"><b>–</b></span>';
+		$GLOBALS[$p] = '<span class="spip-puce '.$dir.'"><b>–</b></span>';
 	}
 
 	return $GLOBALS[$p];
@@ -68,7 +68,7 @@ 
 }
 
 if (!defined('_BALISES_BLOCS_REGEXP')) {
-	define('_BALISES_BLOCS_REGEXP', ',</?(' . _BALISES_BLOCS . ')[>[:space:]],iS');
+	define('_BALISES_BLOCS_REGEXP', ',</?('._BALISES_BLOCS.')[>[:space:]],iS');
 }
 
 //
@@ -85,7 +85,7 @@ 
 
 	// Tester si on echappe en span ou en div
 	if (is_null($mode) or !in_array($mode, ['div', 'span'])) {
-		$mode = preg_match(',</?(' . _BALISES_BLOCS . ')[>[:space:]],iS', $rempl) ? 'div' : 'span';
+		$mode = preg_match(',</?('._BALISES_BLOCS.')[>[:space:]],iS', $rempl) ? 'div' : 'span';
 	}
 
 	// Decouper en morceaux, base64 a des probleme selon la taille de la pile
@@ -120,7 +120,7 @@ 
 	) {
 		foreach ($matches as $m) {
 			if ($m[1] === 'code') {
-				$code = '<code' . $m[2] . '>' . spip_htmlspecialchars($m[3]) . '</code>';
+				$code = '<code'.$m[2].'>'.spip_htmlspecialchars($m[3]).'</code>';
 				$pre = str_replace($m[0], $code, $pre);
 			}
 		}
@@ -130,7 +130,7 @@ 
 
 // Echapper les <code>...</ code>
 function traiter_echap_code_dist($regs, $options = []) {
-	[, , $att, $corps] = $regs;
+	[,, $att, $corps] = $regs;
 	$echap = spip_htmlspecialchars($corps); // il ne faut pas passer dans entites_html, ne pas transformer les &#xxx; du code !
 
 	// ne pas mettre le <div...> s'il n'y a qu'une ligne
@@ -141,9 +141,9 @@ 
 		$echap = nl2br($echap);
 		$echap = "<div style='text-align: left;' "
 			. "class='spip_code' dir='ltr'><code$att>"
-			. $echap . '</code></div>';
+			. $echap.'</code></div>';
 	} else {
-		$echap = "<code$att class='spip_code' dir='ltr'>" . $echap . '</code>';
+		$echap = "<code$att class='spip_code' dir='ltr'>".$echap.'</code>';
 	}
 
 	$echap = str_replace("\t", '&nbsp; &nbsp; &nbsp; &nbsp; ', $echap);
@@ -220,11 +220,11 @@ 
 			else {
 				$callback_secure_prefix = ($callback_options['secure_prefix'] ?? '');
 				if (
-					function_exists($f = $callback_prefix . $callback_secure_prefix . 'traiter_echap_' . strtolower($regs[1]))
-					or function_exists($f = $f . '_dist')
+					function_exists($f = $callback_prefix.$callback_secure_prefix.'traiter_echap_'.strtolower($regs[1]))
+					or function_exists($f = $f.'_dist')
 					or ($callback_secure_prefix and (
-						function_exists($f = $callback_prefix . 'traiter_echap_' . strtolower($regs[1]))
-						or function_exists($f = $f . '_dist')
+						function_exists($f = $callback_prefix.'traiter_echap_'.strtolower($regs[1]))
+						or function_exists($f = $f.'_dist')
 					))
 				) {
 					$echap = $f($regs, $callback_options);
@@ -246,7 +246,7 @@ 
 	// dans une callback autonommee
 	if (strpos($preg ?: _PROTEGE_BLOCS, 'script') !== false) {
 		if (
-			strpos($letexte, '<' . '?') !== false and preg_match_all(
+			strpos($letexte, '<'.'?') !== false and preg_match_all(
 				',<[?].*($|[?]>),UisS',
 				$letexte,
 				$matches,
@@ -278,7 +278,7 @@ 
 			strpos($letexte, '<') !== false
 			and
 			preg_match_all(
-				',<(span|div)\sclass=[\'"]base64' . $source . '[\'"]\s(.*)>\s*</\1>,UmsS',
+				',<(span|div)\sclass=[\'"]base64'.$source.'[\'"]\s(.*)>\s*</\1>,UmsS',
 				$letexte,
 				$regs,
 				PREG_SET_ORDER
@@ -295,7 +295,7 @@ 
 					}
 				}
 				if ($at) {
-					$rempl = '<' . $reg[1] . '>' . $rempl . '</' . $reg[1] . '>';
+					$rempl = '<'.$reg[1].'>'.$rempl.'</'.$reg[1].'>';
 					foreach ($at as $attr => $a) {
 						$rempl = inserer_attribut($rempl, $attr, $a);
 					}
@@ -376,8 +376,8 @@ 
 	$texte = nettoyer_raccourcis_typo($texte);
 
 	// balises de sauts de ligne et paragraphe
-	$texte = preg_replace('/<p( [^>]*)?' . '>/', "\r", $texte);
-	$texte = preg_replace('/<br( [^>]*)?' . '>/', "\n", $texte);
+	$texte = preg_replace('/<p( [^>]*)?'.'>/', "\r", $texte);
+	$texte = preg_replace('/<br( [^>]*)?'.'>/', "\n", $texte);
 
 	// on repasse les doubles \n en \r que nettoyer_raccourcis_typo() a pu modifier
 	$texte = str_replace("\n\n", "\r", $texte);
@@ -385,7 +385,7 @@ 
 	// supprimer les tags
 	$texte = supprimer_tags($texte);
 	$texte = trim(str_replace("\n", ' ', $texte));
-	$texte .= "\n";  // marquer la fin
+	$texte .= "\n"; // marquer la fin
 
 	// corriger la longueur de coupe
 	// en fonction de la presence de caracteres utf
@@ -400,7 +400,7 @@ 
 	// couper au mot precedent
 	$long = spip_substr($texte, 0, max($taille - 4, 1));
 	$u = $GLOBALS['meta']['pcre_u'];
-	$court = preg_replace("/([^\s][\s]+)[^\s]*\n?$/" . $u, "\\1", $long);
+	$court = preg_replace("/([^\s][\s]+)[^\s]*\n?$/".$u, "\\1", $long);
 	if (is_null($suite)) {
 		$suite = (defined('_COUPER_SUITE') ? _COUPER_SUITE : '&nbsp;(...)');
 	}
@@ -410,7 +410,7 @@ 
 	if (spip_strlen($court) < max(0.75 * $taille, 2)) {
 		$points = '';
 		$long = spip_substr($texte, 0, $taille);
-		$texte = preg_replace("/([^\s][\s]+)[^\s]*\n?$/" . $u, "\\1", $long);
+		$texte = preg_replace("/([^\s][\s]+)[^\s]*\n?$/".$u, "\\1", $long);
 		// encore trop court ? couper au caractere
 		if (spip_strlen($texte) < 0.75 * $taille) {
 			$texte = $long;
@@ -429,7 +429,7 @@ 
 	// supprimer l'eventuelle entite finale mal coupee
 	$texte = preg_replace('/&#?[a-z0-9]*$/S', '', $texte);
 
-	return quote_amp(trim($texte)) . $points;
+	return quote_amp(trim($texte)).$points;
 }
 
 
@@ -441,16 +441,16 @@ 
 				define('_PROTEGE_JS_MODELES', creer_uniqid());
 			}
 			foreach ($r as $regs) {
-				$t = str_replace($regs[0], code_echappement($regs[0], 'javascript' . _PROTEGE_JS_MODELES), $t);
+				$t = str_replace($regs[0], code_echappement($regs[0], 'javascript'._PROTEGE_JS_MODELES), $t);
 			}
 		}
-		if (preg_match_all(',<\?php.*?($|\?' . '>),isS', $t, $r, PREG_SET_ORDER)) {
+		if (preg_match_all(',<\?php.*?($|\?'.'>),isS', $t, $r, PREG_SET_ORDER)) {
 			if (!defined('_PROTEGE_PHP_MODELES')) {
 				include_spip('inc/acces');
 				define('_PROTEGE_PHP_MODELES', creer_uniqid());
 			}
 			foreach ($r as $regs) {
-				$t = str_replace($regs[0], code_echappement($regs[0], 'php' . _PROTEGE_PHP_MODELES), $t);
+				$t = str_replace($regs[0], code_echappement($regs[0], 'php'._PROTEGE_PHP_MODELES), $t);
 			}
 		}
 	}
@@ -565,7 +565,7 @@ 
 			if (!empty($options['wrap_suspect'])) {
 				$texte = wrap($texte, $options['wrap_suspect']);
 			}
-			$texte = "<mark class='danger-js' title='" . attribut_html(_T('erreur_contenu_suspect')) . "'>⚠️</mark> " . $texte;
+			$texte = "<mark class='danger-js' title='".attribut_html(_T('erreur_contenu_suspect'))."'>⚠️</mark> ".$texte;
 		}
 		$texte = modele_retablir_raccourcis_echappes($texte, $markidmodeles);
 	}
@@ -677,11 +677,11 @@ 
  **/
 function supprime_img($letexte, $message = null) {
 	if ($message === null) {
-		$message = '(' . _T('img_indisponible') . ')';
+		$message = '('._T('img_indisponible').')';
 	}
 
 	return preg_replace(
-		',<(img|doc|emb)([0-9]+)(\|([^>]*))?' . '\s*/?' . '>,i',
+		',<(img|doc|emb)([0-9]+)(\|([^>]*))?'.'\s*/?'.'>,i',
 		$message,
 		$letexte
 	);

ecrire/inc/liens.php

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
 
 		$offset_pos = 0;
 		foreach ($liens as $l) {
-			$rempl = $markid . base64_encode($l['lien']) . '|@';
+			$rempl = $markid.base64_encode($l['lien']).'|@';
 			$texte = substr_replace($texte, $rempl, $l['pos'] + $offset_pos, $l['length']);
 			$offset_pos += strlen($rempl) - $l['length'];
 		}

ecrire/inc/idna_convert.class.php

Spacing +43 added lines, -46 removed lines

@@ -73,16 +73,16 @@ 
     protected $_lcount = 19;
     protected $_vcount = 21;
     protected $_tcount = 28;
-    protected $_ncount = 588;   // _vcount * _tcount
+    protected $_ncount = 588; // _vcount * _tcount
     protected $_scount = 11172; // _lcount * _tcount * _vcount
     protected $_error = false;
     protected static $_mb_string_overload = null;
     // See {@link set_paramter()} for details of how to change the following
     // settings from within your script / application
-    protected $_api_encoding = 'utf8';   // Default input charset is UTF-8
-    protected $_allow_overlong = false;  // Overlong UTF-8 encodings are forbidden
-    protected $_strict_mode = false;     // Behave strict or not
-    protected $_idn_version = 2003;      // Can be either 2003 (old, default) or 2008
+    protected $_api_encoding = 'utf8'; // Default input charset is UTF-8
+    protected $_allow_overlong = false; // Overlong UTF-8 encodings are forbidden
+    protected $_strict_mode = false; // Behave strict or not
+    protected $_idn_version = 2003; // Can be either 2003 (old, default) or 2008
 
 	protected $slast;
 
@@ -142,7 +142,7 @@ 
                             $this->_api_encoding = $v;
                             break;
                         default:
-                            $this->_error('Set Parameter: Unknown parameter ' . $v . ' for option ' . $k);
+                            $this->_error('Set Parameter: Unknown parameter '.$v.' for option '.$k);
                             return false;
                     }
                     break;
@@ -156,7 +156,7 @@ 
                     if (in_array($v, array('2003', '2008'))) {
                         $this->_idn_version = $v;
                     } else {
-                        $this->_error('Set Parameter: Unknown parameter ' . $v . ' for option ' . $k);
+                        $this->_error('Set Parameter: Unknown parameter '.$v.' for option '.$k);
                     }
                     break;
                 case 'encode_german_sz': // Deprecated
@@ -167,7 +167,7 @@ 
                     }
                     break;
                 default:
-                    $this->_error('Set Parameter: Unknown option ' . $k);
+                    $this->_error('Set Parameter: Unknown option '.$k);
                     return false;
             }
         }
@@ -190,7 +190,7 @@ 
                 case 'ucs4_array':
                     break;
                 default:
-                    $this->_error('Unknown encoding ' . $one_time_encoding);
+                    $this->_error('Unknown encoding '.$one_time_encoding);
                     return false;
             }
         }
@@ -208,7 +208,7 @@ 
             [$email_pref, $input] = explode('@', $input, 2);
             $arr = explode('.', $input);
             foreach ($arr as $k => $v) {
-                if (preg_match('!^' . preg_quote($this->_punycode_prefix, '!') . '!', $v)) {
+                if (preg_match('!^'.preg_quote($this->_punycode_prefix, '!').'!', $v)) {
                     $conv = $this->_decode($v);
                     if ($conv) {
                         $arr[$k] = $conv;
@@ -218,7 +218,7 @@ 
             $input = join('.', $arr);
             $arr = explode('.', $email_pref);
             foreach ($arr as $k => $v) {
-                if (preg_match('!^' . preg_quote($this->_punycode_prefix, '!') . '!', $v)) {
+                if (preg_match('!^'.preg_quote($this->_punycode_prefix, '!').'!', $v)) {
                     $conv = $this->_decode($v);
                     if ($conv) {
                         $arr[$k] = $conv;
@@ -226,7 +226,7 @@ 
                 }
             }
             $email_pref = join('.', $arr);
-            $return = $email_pref . '@' . $input;
+            $return = $email_pref.'@'.$input;
         } elseif (preg_match('![:\./]!', $input)) { // Or a complete domain name (with or without paths / parameters)
             // No no in strict mode
             if ($this->_strict_mode) {
@@ -243,13 +243,13 @@ 
                     }
                 }
                 $parsed['host'] = join('.', $arr);
-                $return = (empty($parsed['scheme']) ? '' : $parsed['scheme'] . (strtolower($parsed['scheme']) == 'mailto' ? ':' : '://')).
-                        (empty($parsed['user']) ? '' : $parsed['user'] . (empty($parsed['pass']) ? '' : ':' . $parsed['pass']) . '@').
+                $return = (empty($parsed['scheme']) ? '' : $parsed['scheme'].(strtolower($parsed['scheme']) == 'mailto' ? ':' : '://')).
+                        (empty($parsed['user']) ? '' : $parsed['user'].(empty($parsed['pass']) ? '' : ':'.$parsed['pass']).'@').
                         $parsed['host'].
-                        (empty($parsed['port']) ? '' : ':' . $parsed['port']).
+                        (empty($parsed['port']) ? '' : ':'.$parsed['port']).
                         (empty($parsed['path']) ? '' : $parsed['path']).
-                        (empty($parsed['query']) ? '' : '?' . $parsed['query']).
-                        (empty($parsed['fragment']) ? '' : '#' . $parsed['fragment']);
+                        (empty($parsed['query']) ? '' : '?'.$parsed['query']).
+                        (empty($parsed['fragment']) ? '' : '#'.$parsed['fragment']);
             } else { // parse_url seems to have failed, try without it
                 $arr = explode('.', $input);
                 foreach ($arr as $k => $v) {
@@ -267,8 +267,8 @@ 
         // 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 ?: $this->_api_encoding) {
-            case 'utf8':        return $return; // break;
-            case 'ucs4_string': return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));  // break;
+            case 'utf8' : return $return; // break;
+            case 'ucs4_string': return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return)); // break;
             case 'ucs4_array':  return $this->_utf8_to_ucs4($return); // break;
             default:            $this->_error('Unsupported output format'); return false;
         }
@@ -285,15 +285,14 @@ 
         // Forcing conversion of input to UCS4 array
         // If one time encoding is given, use this, else the objects property
         switch ($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);
             case 'ucs4_array':
                 break;
             default:
-                $this->_error('Unsupported input format: ' . ($one_time_encoding ?: $this->_api_encoding));
+                $this->_error('Unsupported input format: '.($one_time_encoding ?: $this->_api_encoding));
                 return false;
         }
 
@@ -382,13 +381,13 @@ 
             }
         }
         $parsed['host'] = join('.', $arr);
-        $return = (empty($parsed['scheme']) ? '' : $parsed['scheme'] . (strtolower($parsed['scheme']) == 'mailto' ? ':' : '://')).
-                (empty($parsed['user']) ? '' : $parsed['user'] . (empty($parsed['pass']) ? '' : ':' . $parsed['pass']) . '@').
+        $return = (empty($parsed['scheme']) ? '' : $parsed['scheme'].(strtolower($parsed['scheme']) == 'mailto' ? ':' : '://')).
+                (empty($parsed['user']) ? '' : $parsed['user'].(empty($parsed['pass']) ? '' : ':'.$parsed['pass']).'@').
                 $parsed['host'].
-                (empty($parsed['port']) ? '' : ':' . $parsed['port']).
+                (empty($parsed['port']) ? '' : ':'.$parsed['port']).
                 (empty($parsed['path']) ? '' : $parsed['path']).
-                (empty($parsed['query']) ? '' : '?' . $parsed['query']).
-                (empty($parsed['fragment']) ? '' : '#' . $parsed['fragment']);
+                (empty($parsed['query']) ? '' : '?'.$parsed['query']).
+                (empty($parsed['fragment']) ? '' : '#'.$parsed['fragment']);
         return $return;
     }
 
@@ -411,11 +410,11 @@ 
     {
         $decoded = array();
         // find the Punycode prefix
-        if (!preg_match('!^' . preg_quote($this->_punycode_prefix, '!') . '!', $encoded)) {
+        if (!preg_match('!^'.preg_quote($this->_punycode_prefix, '!').'!', $encoded)) {
             $this->_error('This is not a punycode string');
             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) {
             $this->_error('The given encoded string was empty');
@@ -441,8 +440,7 @@ 
             for ($old_idx = $idx, $w = 1, $k = $this->_base; 1; $k += $this->_base) {
                 $digit = $this->_decode_digit($encoded[$enco_idx++]);
                 $idx += $digit * $w;
-                $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 ($digit < $t) {
                     break;
                 }
@@ -515,7 +513,7 @@ 
             return $encoded; // All codepoints were basic ones
         }
         // 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) {
             $encoded .= '-';
@@ -542,8 +540,7 @@ 
                     $delta++;
                 } elseif ($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;
                         }
@@ -630,12 +627,12 @@ 
             }
             // Try to find prohibited input
             if (in_array($v, self::$NP['prohibit']) || in_array($v, self::$NP['general_prohibited'])) {
-                $this->_error('NAMEPREP: Prohibited input U+' . sprintf('%08X', $v));
+                $this->_error('NAMEPREP: Prohibited input U+'.sprintf('%08X', $v));
                 return false;
             }
             foreach (self::$NP['prohibit_ranges'] as $range) {
                 if ($range[0] <= $v && $v <= $range[1]) {
-                    $this->_error('NAMEPREP: Prohibited input U+' . sprintf('%08X', $v));
+                    $this->_error('NAMEPREP: Prohibited input U+'.sprintf('%08X', $v));
                     return false;
                 }
             }
@@ -873,7 +870,7 @@ 
                 $output[$out_len] = $v;
                 ++$out_len;
                 if ('add' == $mode) {
-                    $this->_error('Conversion from UTF-8 to UCS-4 failed: malformed input at byte ' . $k);
+                    $this->_error('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
                     return false;
                 }
                 continue;
@@ -898,7 +895,7 @@ 
                     $next_byte = 4;
                     $v = ($v - 252) << 30;
                 } else {
-                    $this->_error('This might be UTF-8, but I don\'t understand it at byte ' . $k);
+                    $this->_error('This might be UTF-8, but I don\'t understand it at byte '.$k);
                     return false;
                 }
                 if ('add' == $mode) {
@@ -911,7 +908,7 @@ 
                 if (!$this->_allow_overlong && $test == 'range') {
                     $test = 'none';
                     if (($v < 0xA0 && $start_byte == 0xE0) || ($v < 0x90 && $start_byte == 0xF0) || ($v > 0x8F && $start_byte == 0xF4)) {
-                        $this->_error('Bogus UTF-8 character detected (out of legal range) at byte ' . $k);
+                        $this->_error('Bogus UTF-8 character detected (out of legal range) at byte '.$k);
                         return false;
                     }
                 }
@@ -920,7 +917,7 @@ 
                     $output[($out_len - 1)] += $v;
                     --$next_byte;
                 } else {
-                    $this->_error('Conversion from UTF-8 to UCS-4 failed: malformed input at byte ' . $k);
+                    $this->_error('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
                     return false;
                 }
                 if ($next_byte < 0) {
@@ -944,13 +941,13 @@ 
             if ($v < 128) { // 7bit are transferred literally
                 $output .= chr($v);
             } elseif ($v < (1 << 11)) { // 2 bytes
-                $output .= chr(192 + ($v >> 6)) . chr(128 + ($v & 63));
+                $output .= chr(192 + ($v >> 6)).chr(128 + ($v & 63));
             } elseif ($v < (1 << 16)) { // 3 bytes
-                $output .= chr(224 + ($v >> 12)) . chr(128 + (($v >> 6) & 63)) . chr(128 + ($v & 63));
+                $output .= chr(224 + ($v >> 12)).chr(128 + (($v >> 6) & 63)).chr(128 + ($v & 63));
             } elseif ($v < (1 << 21)) { // 4 bytes
-                $output .= chr(240 + ($v >> 18)) . chr(128 + (($v >> 12) & 63)) . chr(128 + (($v >> 6) & 63)) . chr(128 + ($v & 63));
+                $output .= chr(240 + ($v >> 18)).chr(128 + (($v >> 12) & 63)).chr(128 + (($v >> 6) & 63)).chr(128 + ($v & 63));
             } else {
-                $this->_error('Conversion from UCS-4 to UTF-8 failed: malformed input at byte ' . $k);
+                $this->_error('Conversion from UCS-4 to UTF-8 failed: malformed input at byte '.$k);
                 return false;
             }
         }
@@ -969,7 +966,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 .= chr(($v >> 24) & 255) . chr(($v >> 16) & 255) . chr(($v >> 8) & 255) . chr($v & 255);
+            $output .= chr(($v >> 24) & 255).chr(($v >> 16) & 255).chr(($v >> 8) & 255).chr($v & 255);
         }
         return $output;
     }
@@ -999,7 +996,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;
     }