Edit File by line

}

[500] Fix | Delete

// Four byte sequence:

[501] Fix | Delete

elseif (($value & 0xF8) === 0xF0)

[502] Fix | Delete

{

[503] Fix | Delete

$character = ($value & 0x07) << 18;

[504] Fix | Delete

$length = 4;

[505] Fix | Delete

$remaining = 3;

[506] Fix | Delete

}

[507] Fix | Delete

// Invalid byte:

[508] Fix | Delete

else

[509] Fix | Delete

{

[510] Fix | Delete

$valid = false;

[511] Fix | Delete

$length = 1;

[512] Fix | Delete

$remaining = 0;

[513] Fix | Delete

}

[514] Fix | Delete

[515] Fix | Delete

if ($remaining)

[516] Fix | Delete

{

[517] Fix | Delete

if ($position + $length <= $strlen)

[518] Fix | Delete

{

[519] Fix | Delete

for ($position++; $remaining; $position++)

[520] Fix | Delete

{

[521] Fix | Delete

$value = ord($string[$position]);

[522] Fix | Delete

[523] Fix | Delete

// Check that the byte is valid, then add it to the character:

[524] Fix | Delete

if (($value & 0xC0) === 0x80)

[525] Fix | Delete

{

[526] Fix | Delete

$character |= ($value & 0x3F) << (--$remaining * 6);

[527] Fix | Delete

}

[528] Fix | Delete

// If it is invalid, count the sequence as invalid and reprocess the current byte:

[529] Fix | Delete

else

[530] Fix | Delete

{

[531] Fix | Delete

$valid = false;

[532] Fix | Delete

$position--;

[533] Fix | Delete

break;

[534] Fix | Delete

}

[535] Fix | Delete

}

[536] Fix | Delete

}

[537] Fix | Delete

else

[538] Fix | Delete

{

[539] Fix | Delete

$position = $strlen - 1;

[540] Fix | Delete

$valid = false;

[541] Fix | Delete

}

[542] Fix | Delete

}

[543] Fix | Delete

[544] Fix | Delete

// Percent encode anything invalid or not in ucschar

[545] Fix | Delete

if (

[546] Fix | Delete

// Invalid sequences

[547] Fix | Delete

!$valid

[548] Fix | Delete

// Non-shortest form sequences are invalid

[549] Fix | Delete

|| $length > 1 && $character <= 0x7F

[550] Fix | Delete

|| $length > 2 && $character <= 0x7FF

[551] Fix | Delete

|| $length > 3 && $character <= 0xFFFF

[552] Fix | Delete

// Outside of range of ucschar codepoints

[553] Fix | Delete

// Noncharacters

[554] Fix | Delete

|| ($character & 0xFFFE) === 0xFFFE

[555] Fix | Delete

|| $character >= 0xFDD0 && $character <= 0xFDEF

[556] Fix | Delete

|| (

[557] Fix | Delete

// Everything else not in ucschar

[558] Fix | Delete

$character > 0xD7FF && $character < 0xF900

[559] Fix | Delete

|| $character < 0xA0

[560] Fix | Delete

|| $character > 0xEFFFD

[561] Fix | Delete

)

[562] Fix | Delete

&& (

[563] Fix | Delete

// Everything not in iprivate, if it applies

[564] Fix | Delete

!$iprivate

[565] Fix | Delete

|| $character < 0xE000

[566] Fix | Delete

|| $character > 0x10FFFD

[567] Fix | Delete

)

[568] Fix | Delete

)

[569] Fix | Delete

{

[570] Fix | Delete

// If we were a character, pretend we weren't, but rather an error.

[571] Fix | Delete

if ($valid)

[572] Fix | Delete

$position--;

[573] Fix | Delete

[574] Fix | Delete

for ($j = $start; $j <= $position; $j++)

[575] Fix | Delete

{

[576] Fix | Delete

$string = substr_replace($string, sprintf('%%%02X', ord($string[$j])), $j, 1);

[577] Fix | Delete

$j += 2;

[578] Fix | Delete

$position += 2;

[579] Fix | Delete

$strlen += 2;

[580] Fix | Delete

}

[581] Fix | Delete

}

[582] Fix | Delete

}

[583] Fix | Delete

[584] Fix | Delete

return $string;

[585] Fix | Delete

}

[586] Fix | Delete

[587] Fix | Delete

/**

[588] Fix | Delete

* Callback function for preg_replace_callback.

[589] Fix | Delete

[590] Fix | Delete

* Removes sequences of percent encoded bytes that represent UTF-8

[591] Fix | Delete

* encoded characters in iunreserved

[592] Fix | Delete

[593] Fix | Delete

* @param array $match PCRE match

[594] Fix | Delete

* @return string Replacement

[595] Fix | Delete

[596] Fix | Delete

protected function remove_iunreserved_percent_encoded($match)

[597] Fix | Delete

{

[598] Fix | Delete

// As we just have valid percent encoded sequences we can just explode

[599] Fix | Delete

// and ignore the first member of the returned array (an empty string).

[600] Fix | Delete

$bytes = explode('%', $match[0]);

[601] Fix | Delete

[602] Fix | Delete

// Initialize the new string (this is what will be returned) and that

[603] Fix | Delete

// there are no bytes remaining in the current sequence (unsurprising

[604] Fix | Delete

// at the first byte!).

[605] Fix | Delete

$string = '';

[606] Fix | Delete

$remaining = 0;

[607] Fix | Delete

[608] Fix | Delete

// Loop over each and every byte, and set $value to its value

[609] Fix | Delete

for ($i = 1, $len = count($bytes); $i < $len; $i++)

[610] Fix | Delete

{

[611] Fix | Delete

$value = hexdec($bytes[$i]);

[612] Fix | Delete

[613] Fix | Delete

// If we're the first byte of sequence:

[614] Fix | Delete

if (!$remaining)

[615] Fix | Delete

{

[616] Fix | Delete

// Start position

[617] Fix | Delete

$start = $i;

[618] Fix | Delete

[619] Fix | Delete

// By default we are valid

[620] Fix | Delete

$valid = true;

[621] Fix | Delete

[622] Fix | Delete

// One byte sequence:

[623] Fix | Delete

if ($value <= 0x7F)

[624] Fix | Delete

{

[625] Fix | Delete

$character = $value;

[626] Fix | Delete

$length = 1;

[627] Fix | Delete

}

[628] Fix | Delete

// Two byte sequence:

[629] Fix | Delete

elseif (($value & 0xE0) === 0xC0)

[630] Fix | Delete

{

[631] Fix | Delete

$character = ($value & 0x1F) << 6;

[632] Fix | Delete

$length = 2;

[633] Fix | Delete

$remaining = 1;

[634] Fix | Delete

}

[635] Fix | Delete

// Three byte sequence:

[636] Fix | Delete

elseif (($value & 0xF0) === 0xE0)

[637] Fix | Delete

{

[638] Fix | Delete

$character = ($value & 0x0F) << 12;

[639] Fix | Delete

$length = 3;

[640] Fix | Delete

$remaining = 2;

[641] Fix | Delete

}

[642] Fix | Delete

// Four byte sequence:

[643] Fix | Delete

elseif (($value & 0xF8) === 0xF0)

[644] Fix | Delete

{

[645] Fix | Delete

$character = ($value & 0x07) << 18;

[646] Fix | Delete

$length = 4;

[647] Fix | Delete

$remaining = 3;

[648] Fix | Delete

}

[649] Fix | Delete

// Invalid byte:

[650] Fix | Delete

else

[651] Fix | Delete

{

[652] Fix | Delete

$valid = false;

[653] Fix | Delete

$remaining = 0;

[654] Fix | Delete

}

[655] Fix | Delete

}

[656] Fix | Delete

// Continuation byte:

[657] Fix | Delete

else

[658] Fix | Delete

{

[659] Fix | Delete

// Check that the byte is valid, then add it to the character:

[660] Fix | Delete

if (($value & 0xC0) === 0x80)

[661] Fix | Delete

{

[662] Fix | Delete

$remaining--;

[663] Fix | Delete

$character |= ($value & 0x3F) << ($remaining * 6);

[664] Fix | Delete

}

[665] Fix | Delete

// If it is invalid, count the sequence as invalid and reprocess the current byte as the start of a sequence:

[666] Fix | Delete

else

[667] Fix | Delete

{

[668] Fix | Delete

$valid = false;

[669] Fix | Delete

$remaining = 0;

[670] Fix | Delete

$i--;

[671] Fix | Delete

}

[672] Fix | Delete

}

[673] Fix | Delete

[674] Fix | Delete

// If we've reached the end of the current byte sequence, append it to Unicode::$data

[675] Fix | Delete

if (!$remaining)

[676] Fix | Delete

{

[677] Fix | Delete

// Percent encode anything invalid or not in iunreserved

[678] Fix | Delete

if (

[679] Fix | Delete

// Invalid sequences

[680] Fix | Delete

!$valid

[681] Fix | Delete

// Non-shortest form sequences are invalid

[682] Fix | Delete

|| $length > 1 && $character <= 0x7F

[683] Fix | Delete

|| $length > 2 && $character <= 0x7FF

[684] Fix | Delete

|| $length > 3 && $character <= 0xFFFF

[685] Fix | Delete

// Outside of range of iunreserved codepoints

[686] Fix | Delete

|| $character < 0x2D

[687] Fix | Delete

|| $character > 0xEFFFD

[688] Fix | Delete

// Noncharacters

[689] Fix | Delete

|| ($character & 0xFFFE) === 0xFFFE

[690] Fix | Delete

|| $character >= 0xFDD0 && $character <= 0xFDEF

[691] Fix | Delete

// Everything else not in iunreserved (this is all BMP)

[692] Fix | Delete

|| $character === 0x2F

[693] Fix | Delete

|| $character > 0x39 && $character < 0x41

[694] Fix | Delete

|| $character > 0x5A && $character < 0x61

[695] Fix | Delete

|| $character > 0x7A && $character < 0x7E

[696] Fix | Delete

|| $character > 0x7E && $character < 0xA0

[697] Fix | Delete

|| $character > 0xD7FF && $character < 0xF900

[698] Fix | Delete

)

[699] Fix | Delete

{

[700] Fix | Delete

for ($j = $start; $j <= $i; $j++)

[701] Fix | Delete

{

[702] Fix | Delete

$string .= '%' . strtoupper($bytes[$j]);

[703] Fix | Delete

}

[704] Fix | Delete

}

[705] Fix | Delete

else

[706] Fix | Delete

{

[707] Fix | Delete

for ($j = $start; $j <= $i; $j++)

[708] Fix | Delete

{

[709] Fix | Delete

$string .= chr(hexdec($bytes[$j]));

[710] Fix | Delete

}

[711] Fix | Delete

}

[712] Fix | Delete

}

[713] Fix | Delete

}

[714] Fix | Delete

[715] Fix | Delete

// If we have any bytes left over they are invalid (i.e., we are

[716] Fix | Delete

// mid-way through a multi-byte sequence)

[717] Fix | Delete

if ($remaining)

[718] Fix | Delete

{

[719] Fix | Delete

for ($j = $start; $j < $len; $j++)

[720] Fix | Delete

{

[721] Fix | Delete

$string .= '%' . strtoupper($bytes[$j]);

[722] Fix | Delete

}

[723] Fix | Delete

}

[724] Fix | Delete

[725] Fix | Delete

return $string;

[726] Fix | Delete

}

[727] Fix | Delete

[728] Fix | Delete

protected function scheme_normalization()

[729] Fix | Delete

{

[730] Fix | Delete

if (isset($this->normalization[$this->scheme]['iuserinfo']) && $this->iuserinfo === $this->normalization[$this->scheme]['iuserinfo'])

[731] Fix | Delete

{

[732] Fix | Delete

$this->iuserinfo = null;

[733] Fix | Delete

}

[734] Fix | Delete

if (isset($this->normalization[$this->scheme]['ihost']) && $this->ihost === $this->normalization[$this->scheme]['ihost'])

[735] Fix | Delete

{

[736] Fix | Delete

$this->ihost = null;

[737] Fix | Delete

}

[738] Fix | Delete

if (isset($this->normalization[$this->scheme]['port']) && $this->port === $this->normalization[$this->scheme]['port'])

[739] Fix | Delete

{

[740] Fix | Delete

$this->port = null;

[741] Fix | Delete

}

[742] Fix | Delete

if (isset($this->normalization[$this->scheme]['ipath']) && $this->ipath === $this->normalization[$this->scheme]['ipath'])

[743] Fix | Delete

{

[744] Fix | Delete

$this->ipath = '';

[745] Fix | Delete

}

[746] Fix | Delete

if (isset($this->normalization[$this->scheme]['iquery']) && $this->iquery === $this->normalization[$this->scheme]['iquery'])

[747] Fix | Delete

{

[748] Fix | Delete

$this->iquery = null;

[749] Fix | Delete

}

[750] Fix | Delete

if (isset($this->normalization[$this->scheme]['ifragment']) && $this->ifragment === $this->normalization[$this->scheme]['ifragment'])

[751] Fix | Delete

{

[752] Fix | Delete

$this->ifragment = null;

[753] Fix | Delete

}

[754] Fix | Delete

}

[755] Fix | Delete

[756] Fix | Delete

/**

[757] Fix | Delete

* Check if the object represents a valid IRI. This needs to be done on each

[758] Fix | Delete

* call as some things change depending on another part of the IRI.

[759] Fix | Delete

[760] Fix | Delete

* @return bool

[761] Fix | Delete

[762] Fix | Delete

public function is_valid()

[763] Fix | Delete

{

[764] Fix | Delete

if ($this->ipath === '') return true;

[765] Fix | Delete

[766] Fix | Delete

$isauthority = $this->iuserinfo !== null || $this->ihost !== null ||

[767] Fix | Delete

$this->port !== null;

[768] Fix | Delete

if ($isauthority && $this->ipath[0] === '/') return true;

[769] Fix | Delete

[770] Fix | Delete

if (!$isauthority && (substr($this->ipath, 0, 2) === '//')) return false;

[771] Fix | Delete

[772] Fix | Delete

// Relative urls cannot have a colon in the first path segment (and the

[773] Fix | Delete

// slashes themselves are not included so skip the first character).

[774] Fix | Delete

if (!$this->scheme && !$isauthority &&

[775] Fix | Delete

strpos($this->ipath, ':') !== false &&

[776] Fix | Delete

strpos($this->ipath, '/', 1) !== false &&

[777] Fix | Delete

strpos($this->ipath, ':') < strpos($this->ipath, '/', 1)) return false;

[778] Fix | Delete

[779] Fix | Delete

return true;

[780] Fix | Delete

}

[781] Fix | Delete

[782] Fix | Delete

/**

[783] Fix | Delete

* Set the entire IRI. Returns true on success, false on failure (if there

[784] Fix | Delete

* are any invalid characters).

[785] Fix | Delete

[786] Fix | Delete

* @param string $iri

[787] Fix | Delete

* @return bool

[788] Fix | Delete

[789] Fix | Delete

public function set_iri($iri, $clear_cache = false)

[790] Fix | Delete

{

[791] Fix | Delete

static $cache;

[792] Fix | Delete

if ($clear_cache)

[793] Fix | Delete

{

[794] Fix | Delete

$cache = null;

[795] Fix | Delete

return;

[796] Fix | Delete

}

[797] Fix | Delete

if (!$cache)

[798] Fix | Delete

{

[799] Fix | Delete

$cache = array();

[800] Fix | Delete

}

[801] Fix | Delete

[802] Fix | Delete

if ($iri === null)

[803] Fix | Delete

{

[804] Fix | Delete

return true;

[805] Fix | Delete

}

[806] Fix | Delete

elseif (isset($cache[$iri]))

[807] Fix | Delete

{

[808] Fix | Delete

list($this->scheme,

[809] Fix | Delete

$this->iuserinfo,

[810] Fix | Delete

$this->ihost,

[811] Fix | Delete

$this->port,

[812] Fix | Delete

$this->ipath,

[813] Fix | Delete

$this->iquery,

[814] Fix | Delete

$this->ifragment,

[815] Fix | Delete

$return) = $cache[$iri];

[816] Fix | Delete

return $return;

[817] Fix | Delete

}

[818] Fix | Delete

[819] Fix | Delete

$parsed = $this->parse_iri((string) $iri);

[820] Fix | Delete

if (!$parsed)

[821] Fix | Delete

{

[822] Fix | Delete

return false;

[823] Fix | Delete

}

[824] Fix | Delete

[825] Fix | Delete

$return = $this->set_scheme($parsed['scheme'])

[826] Fix | Delete

&& $this->set_authority($parsed['authority'])

[827] Fix | Delete

&& $this->set_path($parsed['path'])

[828] Fix | Delete

&& $this->set_query($parsed['query'])

[829] Fix | Delete

&& $this->set_fragment($parsed['fragment']);

[830] Fix | Delete

[831] Fix | Delete

$cache[$iri] = array($this->scheme,

[832] Fix | Delete

$this->iuserinfo,

[833] Fix | Delete

$this->ihost,

[834] Fix | Delete

$this->port,

[835] Fix | Delete

$this->ipath,

[836] Fix | Delete

$this->iquery,

[837] Fix | Delete

$this->ifragment,

[838] Fix | Delete

$return);

[839] Fix | Delete

return $return;

[840] Fix | Delete

}

[841] Fix | Delete

[842] Fix | Delete

/**

[843] Fix | Delete

* Set the scheme. Returns true on success, false on failure (if there are

[844] Fix | Delete

* any invalid characters).

[845] Fix | Delete

[846] Fix | Delete

* @param string $scheme

[847] Fix | Delete

* @return bool

[848] Fix | Delete

[849] Fix | Delete

public function set_scheme($scheme)

[850] Fix | Delete

{

[851] Fix | Delete

if ($scheme === null)

[852] Fix | Delete

{

[853] Fix | Delete

$this->scheme = null;

[854] Fix | Delete

}

[855] Fix | Delete

elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme))

[856] Fix | Delete

{

[857] Fix | Delete

$this->scheme = null;

[858] Fix | Delete

return false;

[859] Fix | Delete

}

[860] Fix | Delete

else

[861] Fix | Delete

{

[862] Fix | Delete

$this->scheme = strtolower($scheme);

[863] Fix | Delete

}

[864] Fix | Delete

return true;

[865] Fix | Delete

}

[866] Fix | Delete

[867] Fix | Delete

/**

[868] Fix | Delete

* Set the authority. Returns true on success, false on failure (if there are

[869] Fix | Delete

* any invalid characters).

[870] Fix | Delete

[871] Fix | Delete

* @param string $authority

[872] Fix | Delete

* @return bool

[873] Fix | Delete

[874] Fix | Delete

public function set_authority($authority, $clear_cache = false)

[875] Fix | Delete

{

[876] Fix | Delete

static $cache;

[877] Fix | Delete

if ($clear_cache)

[878] Fix | Delete

{

[879] Fix | Delete

$cache = null;

[880] Fix | Delete

return;

[881] Fix | Delete

}

[882] Fix | Delete

if (!$cache)

[883] Fix | Delete

$cache = array();

[884] Fix | Delete

[885] Fix | Delete

if ($authority === null)

[886] Fix | Delete

{

[887] Fix | Delete

$this->iuserinfo = null;

[888] Fix | Delete

$this->ihost = null;

[889] Fix | Delete

$this->port = null;

[890] Fix | Delete

return true;

[891] Fix | Delete

}

[892] Fix | Delete

elseif (isset($cache[$authority]))

[893] Fix | Delete

{

[894] Fix | Delete

list($this->iuserinfo,

[895] Fix | Delete

$this->ihost,

[896] Fix | Delete

$this->port,

[897] Fix | Delete

$return) = $cache[$authority];

[898] Fix | Delete

[899] Fix | Delete

return $return;

[900] Fix | Delete

}

[901] Fix | Delete

[902] Fix | Delete

$remaining = $authority;

[903] Fix | Delete

if (($iuserinfo_end = strrpos($remaining, '@')) !== false)

[904] Fix | Delete

{

[905] Fix | Delete

$iuserinfo = substr($remaining, 0, $iuserinfo_end);

[906] Fix | Delete

$remaining = substr($remaining, $iuserinfo_end + 1);

[907] Fix | Delete

}

[908] Fix | Delete

else

[909] Fix | Delete

{

[910] Fix | Delete

$iuserinfo = null;

[911] Fix | Delete

}

[912] Fix | Delete

if (($port_start = strpos($remaining, ':', strpos($remaining, ']'))) !== false)

[913] Fix | Delete

{

[914] Fix | Delete

if (($port = substr($remaining, $port_start + 1)) === false)

[915] Fix | Delete

{

[916] Fix | Delete

$port = null;

[917] Fix | Delete

}

[918] Fix | Delete

$remaining = substr($remaining, 0, $port_start);

[919] Fix | Delete

}

[920] Fix | Delete

else

[921] Fix | Delete

{

[922] Fix | Delete

$port = null;

[923] Fix | Delete

}

[924] Fix | Delete

[925] Fix | Delete

$return = $this->set_userinfo($iuserinfo) &&

[926] Fix | Delete

$this->set_host($remaining) &&

[927] Fix | Delete

$this->set_port($port);

[928] Fix | Delete

[929] Fix | Delete

$cache[$authority] = array($this->iuserinfo,

[930] Fix | Delete

$this->ihost,

[931] Fix | Delete

$this->port,

[932] Fix | Delete

$return);

[933] Fix | Delete

[934] Fix | Delete

return $return;

[935] Fix | Delete

}

[936] Fix | Delete

[937] Fix | Delete

/**

[938] Fix | Delete

* Set the iuserinfo.

[939] Fix | Delete

[940] Fix | Delete

* @param string $iuserinfo

[941] Fix | Delete

* @return bool

[942] Fix | Delete

[943] Fix | Delete

public function set_userinfo($iuserinfo)

[944] Fix | Delete

{

[945] Fix | Delete

if ($iuserinfo === null)

[946] Fix | Delete

{

[947] Fix | Delete

$this->iuserinfo = null;

[948] Fix | Delete

}

[949] Fix | Delete

else

[950] Fix | Delete

{

[951] Fix | Delete

$this->iuserinfo = $this->replace_invalid_with_pct_encoding($iuserinfo, '!$&\'()*+,;=:');

[952] Fix | Delete

$this->scheme_normalization();

[953] Fix | Delete

}

[954] Fix | Delete

[955] Fix | Delete

return true;

[956] Fix | Delete

}

[957] Fix | Delete

[958] Fix | Delete

/**

[959] Fix | Delete

* Set the ihost. Returns true on success, false on failure (if there are

[960] Fix | Delete

* any invalid characters).

[961] Fix | Delete

[962] Fix | Delete

* @param string $ihost

[963] Fix | Delete

* @return bool

[964] Fix | Delete

[965] Fix | Delete

public function set_host($ihost)

[966] Fix | Delete

{

[967] Fix | Delete

if ($ihost === null)

[968] Fix | Delete

{

[969] Fix | Delete

$this->ihost = null;

[970] Fix | Delete

return true;

[971] Fix | Delete

}

[972] Fix | Delete

elseif (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']')

[973] Fix | Delete

{

[974] Fix | Delete

if (SimplePie_Net_IPv6::check_ipv6(substr($ihost, 1, -1)))

[975] Fix | Delete

{

[976] Fix | Delete

$this->ihost = '[' . SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)) . ']';

[977] Fix | Delete

}

[978] Fix | Delete

else

[979] Fix | Delete

{

[980] Fix | Delete

$this->ihost = null;

[981] Fix | Delete

return false;

[982] Fix | Delete

}

[983] Fix | Delete

}

[984] Fix | Delete

else

[985] Fix | Delete

{

[986] Fix | Delete

$ihost = $this->replace_invalid_with_pct_encoding($ihost, '!$&\'()*+,;=');

[987] Fix | Delete

[988] Fix | Delete

// Lowercase, but ignore pct-encoded sections (as they should

[989] Fix | Delete

// remain uppercase). This must be done after the previous step

[990] Fix | Delete

// as that can add unescaped characters.

[991] Fix | Delete

$position = 0;

[992] Fix | Delete

$strlen = strlen($ihost);

[993] Fix | Delete

while (($position += strcspn($ihost, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ%', $position)) < $strlen)

[994] Fix | Delete

{

[995] Fix | Delete

if ($ihost[$position] === '%')

[996] Fix | Delete

{

[997] Fix | Delete

$position += 3;

[998] Fix | Delete

}

[999] Fix | Delete

123