Rename escapeTags to escapeHtml

rename function and update calls.

diff --git a/mod/admin.php b/mod/admin.php
index 873966b99944c657601161824b0b034a69087bc5..d1b761c9806acf66906716396cebbc7ca87828e2 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -2478,9 +2478,9 @@ function admin_page_viewlogs(App $a)
                                }
                                $seek = fseek($fp, 0 - $size, SEEK_END);
                                if ($seek === 0) {
-                                       $data = Strings::escapeTags(fread($fp, $size));
+                                       $data = Strings::escapeHtml(fread($fp, $size));
                                        while (!feof($fp)) {
-                                               $data .= Strings::escapeTags(fread($fp, 4096));
+                                               $data .= Strings::escapeHtml(fread($fp, 4096));
                                        }
                                }
                        }

diff --git a/mod/dirfind.php b/mod/dirfind.php
index 7ef217253e8dbd1663f335d3aab19c82724a628a..7b603a742755de70105354926424aca161a5cc2c 100644 (file)
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -126,8 +126,8 @@ function dirfind_content(App $a, $prefix = "") {
                                                (`url` LIKE '%s' OR `name` LIKE '%s' OR `location` LIKE '%s' OR
                                                `addr` LIKE '%s' OR `about` LIKE '%s' OR `keywords` LIKE '%s') $extra_sql",
                                        DBA::escape(Protocol::DFRN), DBA::escape($ostatus), DBA::escape($diaspora),
-                                       DBA::escape(Strings::escapeTags($search2)), DBA::escape(Strings::escapeTags($search2)), DBA::escape(Strings::escapeTags($search2)),
-                                       DBA::escape(Strings::escapeTags($search2)), DBA::escape(Strings::escapeTags($search2)), DBA::escape(Strings::escapeTags($search2)));
+                                       DBA::escape(Strings::escapeHtml($search2)), DBA::escape(Strings::escapeHtml($search2)), DBA::escape(Strings::escapeHtml($search2)),
+                                       DBA::escape(Strings::escapeHtml($search2)), DBA::escape(Strings::escapeHtml($search2)), DBA::escape(Strings::escapeHtml($search2)));
 
                        $results = q("SELECT `nurl`
                                        FROM `gcontact`
@@ -138,8 +138,8 @@ function dirfind_content(App $a, $prefix = "") {
                                                GROUP BY `nurl`
                                                ORDER BY `updated` DESC LIMIT %d, %d",
                                        DBA::escape(Protocol::DFRN), DBA::escape($ostatus), DBA::escape($diaspora),
-                                       DBA::escape(Strings::escapeTags($search2)), DBA::escape(Strings::escapeTags($search2)), DBA::escape(Strings::escapeTags($search2)),
-                                       DBA::escape(Strings::escapeTags($search2)), DBA::escape(Strings::escapeTags($search2)), DBA::escape(Strings::escapeTags($search2)),
+                                       DBA::escape(Strings::escapeHtml($search2)), DBA::escape(Strings::escapeHtml($search2)), DBA::escape(Strings::escapeHtml($search2)),
+                                       DBA::escape(Strings::escapeHtml($search2)), DBA::escape(Strings::escapeHtml($search2)), DBA::escape(Strings::escapeHtml($search2)),
                                        $pager->getStart(), $pager->getItemsPerPage());
                        $j = new stdClass();
                        $j->total = $count[0]["total"];

diff --git a/mod/events.php b/mod/events.php
index 540a5b1650abb6ce1cd31047c9bb175c12baca1e..f147e005459ab85f1b7c21710007c368a833254e 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -60,8 +60,8 @@ function events_post(App $a)
        $cid = !empty($_POST['cid']) ? intval($_POST['cid']) : 0;
        $uid = local_user();
 
-       $start_text  = Strings::escapeTags(defaults($_REQUEST, 'start_text', ''));
-       $finish_text = Strings::escapeTags(defaults($_REQUEST, 'finish_text', ''));
+       $start_text  = Strings::escapeHtml(defaults($_REQUEST, 'start_text', ''));
+       $finish_text = Strings::escapeHtml(defaults($_REQUEST, 'finish_text', ''));
 
        $adjust   = intval(defaults($_POST, 'adjust', 0));
        $nofinish = intval(defaults($_POST, 'nofinish', 0));
@@ -97,9 +97,9 @@ function events_post(App $a)
        // and we'll waste a bunch of time responding to it. Time that
        // could've been spent doing something else.
 
-       $summary  = Strings::escapeTags(trim(defaults($_POST, 'summary', '')));
-       $desc     = Strings::escapeTags(trim(defaults($_POST, 'desc', '')));
-       $location = Strings::escapeTags(trim(defaults($_POST, 'location', '')));
+       $summary  = Strings::escapeHtml(trim(defaults($_POST, 'summary', '')));
+       $desc     = Strings::escapeHtml(trim(defaults($_POST, 'desc', '')));
+       $location = Strings::escapeHtml(trim(defaults($_POST, 'location', '')));
        $type     = 'event';
 
        $action = ($event_id == '') ? 'new' : "event/" . $event_id;

diff --git a/mod/fsuggest.php b/mod/fsuggest.php
index 7768c8cf8c72906786c49185831c6d4accb75ed1..2195f455af56605e5ed3288ad74b02029f57c934 100644 (file)
--- a/mod/fsuggest.php
+++ b/mod/fsuggest.php
@@ -37,7 +37,7 @@ function fsuggest_post(App $a)
 
        $hash = Strings::getRandomHex();
 
-       $note = Strings::escapeTags(trim(defaults($_POST, 'note', '')));
+       $note = Strings::escapeHtml(trim(defaults($_POST, 'note', '')));
 
        if ($new_contact) {
                $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",

diff --git a/mod/item.php b/mod/item.php
index 193fa9ed9fba600b28674f3ee113b6547f9c80d5..0473c74c5234ed97cfc215a25cee1e5fbc117d51 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -205,7 +205,7 @@ function item_post(App $a) {
                $app               = $orig_post['app'];
                $categories        = $orig_post['file'];
                $title             = Strings::removeTags(trim($_REQUEST['title']));
-               $body              = Strings::escapeTags(trim($_REQUEST['body']));
+               $body              = Strings::escapeHtml(trim($_REQUEST['body']));
                $private           = $orig_post['private'];
                $pubmail_enabled   = $orig_post['pubmail'];
                $network           = $orig_post['network'];
@@ -241,7 +241,7 @@ function item_post(App $a) {
                $coord             = Strings::removeTags(trim(defaults($_REQUEST, 'coord'   , '')));
                $verb              = Strings::removeTags(trim(defaults($_REQUEST, 'verb'    , '')));
                $emailcc           = Strings::removeTags(trim(defaults($_REQUEST, 'emailcc' , '')));
-               $body              = Strings::escapeTags(trim(defaults($_REQUEST, 'body'    , '')));
+               $body              = Strings::escapeHtml(trim(defaults($_REQUEST, 'body'    , '')));
                $network           = Strings::removeTags(trim(defaults($_REQUEST, 'network' , Protocol::DFRN)));
                $guid              = System::createUUID();
 

diff --git a/mod/message.php b/mod/message.php
index e689c45021cb70f8aa8a44b7d5075b591e7f0562..3a9480f2f2bbc321a2d1d2f285b6e9b75cf62a54 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -61,7 +61,7 @@ function message_post(App $a)
 
        $replyto   = x($_REQUEST, 'replyto')   ? Strings::removeTags(trim($_REQUEST['replyto']))   : '';
        $subject   = x($_REQUEST, 'subject')   ? Strings::removeTags(trim($_REQUEST['subject']))   : '';
-       $body      = x($_REQUEST, 'body')      ? Strings::escapeTags(trim($_REQUEST['body'])) : '';
+       $body      = x($_REQUEST, 'body')      ? Strings::escapeHtml(trim($_REQUEST['body'])) : '';
        $recipient = x($_REQUEST, 'messageto') ? intval($_REQUEST['messageto'])       : 0;
 
        $ret = Mail::send($recipient, $body, $subject, $replyto);
@@ -254,7 +254,7 @@ function message_content(App $a)
                        '$preid' => $preid,
                        '$subject' => L10n::t('Subject:'),
                        '$subjtxt' => x($_REQUEST, 'subject') ? strip_tags($_REQUEST['subject']) : '',
-                       '$text' => x($_REQUEST, 'body') ? Strings::escapeTags(htmlspecialchars($_REQUEST['body'])) : '',
+                       '$text' => x($_REQUEST, 'body') ? Strings::escapeHtml(htmlspecialchars($_REQUEST['body'])) : '',
                        '$readonly' => '',
                        '$yourmessage' => L10n::t('Your message:'),
                        '$select' => $select,

diff --git a/mod/network.php b/mod/network.php
index 77e815fe1a194528cb1da2611e29084347c7c977..ff20f04d4ea1f189eabbc2de8efee1dc90249410 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -42,7 +42,7 @@ function network_init(App $a)
 
        Hook::add('head', __FILE__, 'network_infinite_scroll_head');
 
-       $search = (x($_GET, 'search') ? Strings::escapeTags($_GET['search']) : '');
+       $search = (x($_GET, 'search') ? Strings::escapeHtml($_GET['search']) : '');
 
        if (($search != '') && !empty($_GET['submit'])) {
                $a->internalRedirect('search?search=' . urlencode($search));
@@ -519,9 +519,9 @@ function networkThreadedView(App $a, $update, $parent)
                for ($x = 1; $x < $a->argc; $x ++) {
                        if (is_a_date_arg($a->argv[$x])) {
                                if ($datequery) {
-                                       $datequery2 = Strings::escapeTags($a->argv[$x]);
+                                       $datequery2 = Strings::escapeHtml($a->argv[$x]);
                                } else {
-                                       $datequery = Strings::escapeTags($a->argv[$x]);
+                                       $datequery = Strings::escapeHtml($a->argv[$x]);
                                        $_GET['order'] = 'post';
                                }
                        } elseif (intval($a->argv[$x])) {

diff --git a/mod/profile.php b/mod/profile.php
index f520ef94b7f191bb63e5b8c26fa057e995ab3d35..f17888368ad6413cc033eaa8b6974c3fbd79fb02 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -115,9 +115,9 @@ function profile_content(App $a, $update = 0)
                for ($x = 2; $x < $a->argc; $x ++) {
                        if (is_a_date_arg($a->argv[$x])) {
                                if ($datequery) {
-                                       $datequery2 = Strings::escapeTags($a->argv[$x]);
+                                       $datequery2 = Strings::escapeHtml($a->argv[$x]);
                                } else {
-                                       $datequery = Strings::escapeTags($a->argv[$x]);
+                                       $datequery = Strings::escapeHtml($a->argv[$x]);
                                }
                        } else {
                                $category = $a->argv[$x];

diff --git a/mod/profiles.php b/mod/profiles.php
index 00fdc6a29cc097a684fb06fdf244a62935be42dd..83febcc717f88ca19e697f4e81c46aadfe06fd47 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -208,7 +208,7 @@ function profiles_post(App $a) {
                        return;
                }
 
-               $dob = $_POST['dob'] ? Strings::escapeTags(trim($_POST['dob'])) : '0000-00-00';
+               $dob = $_POST['dob'] ? Strings::escapeHtml(trim($_POST['dob'])) : '0000-00-00';
 
                $y = substr($dob, 0, 4);
                if ((! ctype_digit($y)) || ($y < 1900)) {
@@ -323,19 +323,19 @@ function profiles_post(App $a) {
                $politic = Strings::removeTags(trim($_POST['politic']));
                $religion = Strings::removeTags(trim($_POST['religion']));
 
-               $likes = Strings::escapeTags(trim($_POST['likes']));
-               $dislikes = Strings::escapeTags(trim($_POST['dislikes']));
-
-               $about = Strings::escapeTags(trim($_POST['about']));
-               $interest = Strings::escapeTags(trim($_POST['interest']));
-               $contact = Strings::escapeTags(trim($_POST['contact']));
-               $music = Strings::escapeTags(trim($_POST['music']));
-               $book = Strings::escapeTags(trim($_POST['book']));
-               $tv = Strings::escapeTags(trim($_POST['tv']));
-               $film = Strings::escapeTags(trim($_POST['film']));
-               $romance = Strings::escapeTags(trim($_POST['romance']));
-               $work = Strings::escapeTags(trim($_POST['work']));
-               $education = Strings::escapeTags(trim($_POST['education']));
+               $likes = Strings::escapeHtml(trim($_POST['likes']));
+               $dislikes = Strings::escapeHtml(trim($_POST['dislikes']));
+
+               $about = Strings::escapeHtml(trim($_POST['about']));
+               $interest = Strings::escapeHtml(trim($_POST['interest']));
+               $contact = Strings::escapeHtml(trim($_POST['contact']));
+               $music = Strings::escapeHtml(trim($_POST['music']));
+               $book = Strings::escapeHtml(trim($_POST['book']));
+               $tv = Strings::escapeHtml(trim($_POST['tv']));
+               $film = Strings::escapeHtml(trim($_POST['film']));
+               $romance = Strings::escapeHtml(trim($_POST['romance']));
+               $work = Strings::escapeHtml(trim($_POST['work']));
+               $education = Strings::escapeHtml(trim($_POST['education']));
 
                $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
 

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index f2fb04442cc19711a67790a19a20772a4b868260..06b3720f730c12783b17d2ac6250bf1705ec56db 100644 (file)
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -21,7 +21,7 @@ function wallmessage_post(App $a) {
        }
 
        $subject   = ((x($_REQUEST,'subject'))   ? Strings::removeTags(trim($_REQUEST['subject']))   : '');
-       $body      = ((x($_REQUEST,'body'))      ? Strings::escapeTags(trim($_REQUEST['body'])) : '');
+       $body      = ((x($_REQUEST,'body'))      ? Strings::escapeHtml(trim($_REQUEST['body'])) : '');
 
        $recipient = (($a->argc > 1) ? Strings::removeTags($a->argv[1]) : '');
        if ((! $recipient) || (! $body)) {
@@ -132,7 +132,7 @@ function wallmessage_content(App $a) {
                '$recipname' => $user['username'],
                '$nickname' => $user['nickname'],
                '$subjtxt' => ((x($_REQUEST, 'subject')) ? strip_tags($_REQUEST['subject']) : ''),
-               '$text' => ((x($_REQUEST, 'body')) ? Strings::escapeTags(htmlspecialchars($_REQUEST['body'])) : ''),
+               '$text' => ((x($_REQUEST, 'body')) ? Strings::escapeHtml(htmlspecialchars($_REQUEST['body'])) : ''),
                '$readonly' => '',
                '$yourmessage' => L10n::t('Your message:'),
                '$parent' => '',

diff --git a/src/Model/Item.php b/src/Model/Item.php
index e12f6b6eedfc0b014512690be1bc2261ee0e804f..c088685e8df421ccdfff3c8a8e1b8e5494b3e6cf 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -3447,7 +3447,7 @@ class Item extends BaseObject
                                $filesubtype = 'unkn';
                        }
 
-                       $title = Strings::escapeTags(trim(!empty($mtch[4]) ? $mtch[4] : $mtch[1]));
+                       $title = Strings::escapeHtml(trim(!empty($mtch[4]) ? $mtch[4] : $mtch[1]));
                        $title .= ' ' . $mtch[2] . ' ' . L10n::t('bytes');
 
                        $icon = '<div class="attachtype icon s22 type-' . $filetype . ' subtype-' . $filesubtype . '"></div>';

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 30c05c889ad4f108f56fb62bfe69969715bd39b1..998787188006a978c00151ab2732c96d8871e619 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -214,14 +214,14 @@ class Contact extends BaseModule
 
                $fetch_further_information = intval(defaults($_POST, 'fetch_further_information', 0));
 
-               $ffi_keyword_blacklist = Strings::escapeTags(trim(defaults($_POST, 'ffi_keyword_blacklist', '')));
+               $ffi_keyword_blacklist = Strings::escapeHtml(trim(defaults($_POST, 'ffi_keyword_blacklist', '')));
 
                $priority = intval(defaults($_POST, 'poll', 0));
                if ($priority > 5 || $priority < 0) {
                        $priority = 0;
                }
 
-               $info = Strings::escapeTags(trim($_POST['info']));
+               $info = Strings::escapeHtml(trim($_POST['info']));
 
                $r = DBA::update('contact', [
                        'profile-id' => $profile_id,

diff --git a/src/Module/Hashtag.php b/src/Module/Hashtag.php
index b016b4da407ccf3dd3f5b0e40c9d8c0ca8062933..4d091835292e25f69da1ca972a80063c58d06b70 100644 (file)
--- a/src/Module/Hashtag.php
+++ b/src/Module/Hashtag.php
@@ -22,7 +22,7 @@ class Hashtag extends BaseModule
        {
                $result = [];
 
-               $t = Strings::escapeTags($_REQUEST['t']);
+               $t = Strings::escapeHtml($_REQUEST['t']);
                if (empty($t)) {
                        System::jsonExit($result);
                }

diff --git a/src/Util/Strings.php b/src/Util/Strings.php
index 5cb1fd6b3a9ac0df10cb7fa84209cb44c17d8a02..7acf1c9ef27d8ce8949a57d272ddf050985d4056 100644 (file)
--- a/src/Util/Strings.php
+++ b/src/Util/Strings.php
@@ -59,7 +59,7 @@ class Strings
      * 
      * @return string
      */
-    public static function escapeTags($string)
+    public static function escapeHtml($string)
     {
         return htmlspecialchars($string, ENT_COMPAT, 'UTF-8', false);
     }

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index f9ff0b1a6a6cf2802fe5669d163bc1ed1245b7b8..fcbcabd70994718940f9c27c5fc8f8f72c513efa 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -507,7 +507,7 @@ class OnePoll
                                                                Logger::log("Mail: can't fetch msg ".$msg_uid." for ".$mailconf['user']);
                                                                continue;
                                                        }
-                                                       $datarray['body'] = Strings::escapeTags($r['body']);
+                                                       $datarray['body'] = Strings::escapeHtml($r['body']);
                                                        $datarray['body'] = BBCode::limitBodySize($datarray['body']);
 
                                                        Logger::log("Mail: Importing ".$msg_uid." for ".$mailconf['user']);

diff --git a/tests/src/Util/StringsTest.php b/tests/src/Util/StringsTest.php
index 54a4bdd72748e5b970dd2a8c1b4cf2de2eff3b19..352fe3089b52f97e71102e756bc1f5ae7112e60f 100644 (file)
--- a/tests/src/Util/StringsTest.php
+++ b/tests/src/Util/StringsTest.php
@@ -69,12 +69,12 @@ class StringsTest extends TestCase
     /**
         * test, that tags are escaped
         */
-       public function testEscapeTags()
+       public function testEscapeHtml()
        {
                $invalidstring='<submit type="button" onclick="alert(\'failed!\');" />';
 
                $validstring = Strings::removeTags($invalidstring);
-               $escapedString = Strings::escapeTags($invalidstring);
+               $escapedString = Strings::escapeHtml($invalidstring);
 
                $this->assertEquals('[submit type="button" onclick="alert(\'failed!\');" /]', $validstring);
                $this->assertEquals(