Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-18 18:23:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Move methods to new Util/Strings class"

Browse source 
This reverts commit 97fcf23371.
This commit is contained in:
Adam Magness 2018-11-05 07:31:45 -05:00
parent 9e51be7554
commit 186cd1d415
2 changed files with 44 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/Util/Strings.php
View file

@ -1,51 +0,0 @@
<?php
/**
* @file src/Util/Strings.php
*/
namespace Friendica\Util;
/**
* @brief This class contains methods to modify/transform strings.
*/
class Strings
{
/**
* escape text ($str) for XML transport
* @param string $str
* @return string Escaped text.
*/
public static function escape($str)
{
$buffer = htmlspecialchars($str, ENT_QUOTES, "UTF-8");
$buffer = trim($buffer);
return $buffer;
}
/**
* undo an escape
* @param string $s xml escaped text
* @return string unescaped text
*/
public static function unescape($s)
{
$ret = htmlspecialchars_decode($s, ENT_QUOTES);
return $ret;
}
/**
* apply escape() to all values of array $val, recursively
* @param array $val
* @return array
*/
public static function arrayEscape($val)
{
if (is_bool($val)) {
return $val?"true":"false";
} elseif (is_array($val)) {
return array_map('XML::arrayEscape', $val);
}
return self::escape((string) $val);
}
}

50
src/Util/XML.php
View file

@ -5,7 +5,6 @@
namespace Friendica\Util;
use Friendica\Core\Logger;
use Friendica\Util\Strings;
use DOMXPath;
use SimpleXMLElement;
@ -37,7 +36,7 @@ class XML
$root = new SimpleXMLElement("<".$key."/>");
self::fromArray($value, $root, $remove_header, $namespaces, false);
} else {
$root = new SimpleXMLElement("<".$key.">".Strings::escape($value)."</".$key.">");
$root = new SimpleXMLElement("<".$key.">".self::escape($value)."</".$key.">");
}
$dom = dom_import_simplexml($root)->ownerDocument;
@ -105,7 +104,7 @@ class XML
}
if (!is_array($value)) {
$element = $xml->addChild($key, Strings::escape($value), $namespace);
$element = $xml->addChild($key, self::escape($value), $namespace);
} elseif (is_array($value)) {
$element = $xml->addChild($key, null, $namespace);
self::fromArray($value, $element, $remove_header, $namespaces, false);
@ -124,7 +123,7 @@ class XML
public static function copy(&$source, &$target, $elementname)
{
if (count($source->children()) == 0) {
$target->addChild($elementname, Strings::escape($source));
$target->addChild($elementname, self::escape($source));
} else {
$child = $target->addChild($elementname);
foreach ($source->children() as $childfield => $childentry) {
@ -145,11 +144,11 @@ class XML
*/
public static function createElement($doc, $element, $value = "", $attributes = [])
{
$element = $doc->createElement($element, Strings::escape($value));
$element = $doc->createElement($element, self::escape($value));
foreach ($attributes as $key => $value) {
$attribute = $doc->createAttribute($key);
$attribute->value = Strings::escape($value);
$attribute->value = self::escape($value);
$element->appendChild($attribute);
}
return $element;
@ -463,4 +462,43 @@ class XML
return $first_item->attributes;
}
/**
* escape text ($str) for XML transport
* @param string $str
* @return string Escaped text.
*/
public static function escape($str)
{
$buffer = htmlspecialchars($str, ENT_QUOTES, "UTF-8");
$buffer = trim($buffer);
return $buffer;
}
/**
* undo an escape
* @param string $s xml escaped text
* @return string unescaped text
*/
public static function unescape($s)
{
$ret = htmlspecialchars_decode($s, ENT_QUOTES);
return $ret;
}
/**
* apply escape() to all values of array $val, recursively
* @param array $val
* @return array
*/
public static function arrayEscape($val)
{
if (is_bool($val)) {
return $val?"true":"false";
} elseif (is_array($val)) {
return array_map('XML::arrayEscape', $val);
}
return self::escape((string) $val);
}
}