Merge pull request #1202 from annando/escapeTags

"escapeTags" is removed from the addons

diff --git a/buffer/buffer.php b/buffer/buffer.php
index 61582feb8c6e039f95ea0c6a2d4faec109c95730..1f50aa303fc1e250eafd188a11ae7995c5f8245a 100644 (file)
--- a/buffer/buffer.php
+++ b/buffer/buffer.php
@@ -17,7 +17,6 @@ use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Util\Proxy as ProxyUtils;
-use Friendica\Util\Strings;
 
 function buffer_install()
 {
@@ -74,8 +73,8 @@ function buffer_addon_admin(App $a, &$o)
 
 function buffer_addon_admin_post(App $a)
 {
-       $client_id     = (!empty($_POST['client_id'])     ? Strings::escapeTags(trim($_POST['client_id']))     : '');
-       $client_secret = (!empty($_POST['client_secret']) ? Strings::escapeTags(trim($_POST['client_secret'])) : '');
+       $client_id     = trim($_POST['client_id'] ?? '');
+       $client_secret = trim($_POST['client_secret'] ?? '');
 
        DI::config()->set('buffer', 'client_id'    , $client_id);
        DI::config()->set('buffer', 'client_secret', $client_secret);

diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index cf65bcc14733337877b5cea22c6e73cadc936907..25460def53345d30db416e0e3b8190fce1b5852c 100644 (file)
--- a/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@ -66,9 +66,9 @@ function forumdirectory_content(App $a)
        Nav::setSelected('directory');
 
        if (!empty($forumdirectory_search)) {
-               $search = Strings::escapeTags(trim($forumdirectory_search));
+               $search = trim($forumdirectory_search);
        } else {
-               $search = (!empty($_GET['search']) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
+               $search = (!empty($_GET['search']) ? trim(rawurldecode($_GET['search'])) : '');
        }
 
        $gdirpath = '';

diff --git a/geocoordinates/geocoordinates.php b/geocoordinates/geocoordinates.php
index 83767918aa7612f860be4c975e6f3dd71e26d381..d3f06fdbcdba18aabb6ca6521b9017b58f49824f 100644 (file)
--- a/geocoordinates/geocoordinates.php
+++ b/geocoordinates/geocoordinates.php
@@ -10,7 +10,6 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Util\Strings;
 
 function geocoordinates_install()
 {
@@ -91,9 +90,9 @@ function geocoordinates_addon_admin(&$a, &$o)
 
 function geocoordinates_addon_admin_post(&$a)
 {
-       $api_key  = (!empty($_POST['api_key']) ? Strings::escapeTags(trim($_POST['api_key']))   : '');
+       $api_key  = trim($_POST['api_key'] ?? '');
        DI::config()->set('geocoordinates', 'api_key', $api_key);
 
-       $language  = (!empty($_POST['language']) ? Strings::escapeTags(trim($_POST['language']))   : '');
+       $language  = trim($_POST['language'] ?? '');
        DI::config()->set('geocoordinates', 'language', $language);
 }

diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index 1b6c8e092012e90f017dda2c7dc9b7dc42af8155..b49e7e94adeb299504ccb6468fb32342d8014eab 100644 (file)
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -108,8 +108,8 @@ function gravatar_addon_admin (&$a, &$o) {
 function gravatar_addon_admin_post (&$a) {
        BaseModule::checkFormSecurityToken('gravatarsave');
 
-       $default_avatar = (!empty($_POST['avatar']) ? Strings::escapeTags(trim($_POST['avatar'])) : 'identicon');
-       $rating = (!empty($_POST['rating']) ? Strings::escapeTags(trim($_POST['rating'])) : 'g');
+       $default_avatar = trim($_POST['avatar'] ?? 'identicon');
+       $rating = trim($_POST['rating'] ?? 'g');
        DI::config()->set('gravatar', 'default_avatar', $default_avatar);
        DI::config()->set('gravatar', 'rating', $rating);
 }

diff --git a/impressum/impressum.php b/impressum/impressum.php
index 26fec48bd862113e8dbe99c4d6f4449af69cff57..3409f33b8250ce8addc302a118f1344065eab43f 100644 (file)
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -14,7 +14,6 @@ use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileLoader;
 use Friendica\Util\Proxy as ProxyUtils;
-use Friendica\Util\Strings;
 
 function impressum_install() {
        Hook::register('load_config', 'addon/impressum/impressum.php', 'impressum_load_config');
@@ -79,12 +78,12 @@ function impressum_show($a,&$b) {
 }
 
 function impressum_addon_admin_post (&$a) {
-    $owner = (!empty($_POST['owner']) ? Strings::escapeTags(trim($_POST['owner'])) : '');
-    $ownerprofile = (!empty($_POST['ownerprofile']) ? Strings::escapeTags(trim($_POST['ownerprofile'])) : '');
-    $postal = (!empty($_POST['postal']) ? (trim($_POST['postal'])) : '');
-    $notes = (!empty($_POST['notes']) ? (trim($_POST['notes'])) : '');
-    $email = (!empty($_POST['email']) ? Strings::escapeTags(trim($_POST['email'])) : '');
-    $footer_text = (!empty($_POST['footer_text']) ? (trim($_POST['footer_text'])) : '');
+    $owner = trim($_POST['owner'] ?? '');
+    $ownerprofile = trim($_POST['ownerprofile'] ?? '');
+    $postal = trim($_POST['postal'] ?? '');
+    $notes = trim($_POST['notes'] ?? '');
+    $email = trim($_POST['email'] ?? '');
+    $footer_text = trim($_POST['footer_text'] ?? '');
     DI::config()->set('impressum','owner',strip_tags($owner));
     DI::config()->set('impressum','ownerprofile',strip_tags($ownerprofile));
     DI::config()->set('impressum','postal',strip_tags($postal));

diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index 5e31ea9dd2da816c1cb17a7f198786adb2cdc11c..2458f52b955ad78474997c447121645672125285 100644 (file)
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -13,7 +13,6 @@ use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileLoader;
-use Friendica\Util\Strings;
 
 /**
  * Installs the addon hook
@@ -90,6 +89,6 @@ function libravatar_addon_admin(&$a, &$o)
  */
 function libravatar_addon_admin_post(&$a)
 {
-       $default_avatar = (!empty($_POST['avatar']) ? Strings::escapeTags(trim($_POST['avatar'])) : 'identicon');
+       $default_avatar = trim($_POST['avatar'] ?? 'identicon');
        DI::config()->set('libravatar', 'default_avatar', $default_avatar);
 }

diff --git a/newmemberwidget/newmemberwidget.php b/newmemberwidget/newmemberwidget.php
index a040ec31ed7b4b45144de0bdab43cbcef3651191..398b908cb976eae6afcfe2b1114d23cae4b16a2c 100644 (file)
--- a/newmemberwidget/newmemberwidget.php
+++ b/newmemberwidget/newmemberwidget.php
@@ -11,7 +11,6 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Util\Strings;
 
 function newmemberwidget_install()
 {
@@ -49,7 +48,7 @@ function newmemberwidget_network_mod_init ($a, $b)
 function newmemberwidget_addon_admin_post(&$a)
 {
        $ft = (!empty($_POST['freetext']) ? trim($_POST['freetext']) : "");
-       $lsn = (!empty($_POST['localsupportname']) ? Strings::escapeTags(trim($_POST['localsupportname'])) : "");
+       $lsn = trim($_POST['localsupportname'] ?? '');
        $gs = intval($_POST['linkglobalsupport']);
        $ls = intval($_POST['linklocalsupport']);
        DI::config()->set('newmemberwidget', 'freetext',           trim($ft));

diff --git a/piwik/piwik.php b/piwik/piwik.php
index 071fd337372e318aedd6566b23ae1fdf6dbf5fbd..8c4f91df556a826757b6cd6527cec9ec5bfaae26 100644 (file)
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -36,7 +36,6 @@ use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileLoader;
-use Friendica\Util\Strings;
 
 function piwik_install() {
        Hook::register('load_config', 'addon/piwik/piwik.php', 'piwik_load_config');
@@ -102,10 +101,10 @@ function piwik_addon_admin (&$a, &$o) {
        ]);
 }
 function piwik_addon_admin_post (&$a) {
-       $url = (!empty($_POST['baseurl']) ? Strings::escapeTags(trim($_POST['baseurl'])) : '');
-       $id = (!empty($_POST['siteid']) ? trim($_POST['siteid']) : '');
-       $optout = (!empty($_POST['optout']) ? trim($_POST['optout']) : '');
-       $async = (!empty($_POST['async']) ? trim($_POST['async']) : '');
+       $url = trim($_POST['baseurl'] ?? '');
+       $id = trim($_POST['siteid'] ?? '');
+       $optout = trim($_POST['optout'] ?? '');
+       $async = trim($_POST['async'] ?? '');
        DI::config()->set('piwik', 'baseurl', $url);
        DI::config()->set('piwik', 'siteid', $id);
        DI::config()->set('piwik', 'optout', $optout);

diff --git a/public_server/public_server.php b/public_server/public_server.php
index 0c37098107f5d1c83cb1e3992552a4dfa0de3459..70aaacee84d63dd64b1007af40ca70eed043e759 100644 (file)
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -17,7 +17,6 @@ use Friendica\Model\Notification;
 use Friendica\Model\User;
 use Friendica\Core\Config\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Strings;
 
 function public_server_install()
 {
@@ -126,12 +125,12 @@ function public_server_login($a, $b)
 function public_server_addon_admin_post(&$a)
 {
        BaseModule::checkFormSecurityTokenRedirectOnError('/admin/addons/publicserver', 'publicserver');
-       $expiredays = (!empty($_POST['expiredays']) ? Strings::escapeTags(trim($_POST['expiredays'])) : '');
-       $expireposts = (!empty($_POST['expireposts']) ? Strings::escapeTags(trim($_POST['expireposts'])) : '');
-       $nologin = (!empty($_POST['nologin']) ? Strings::escapeTags(trim($_POST['nologin'])) : '');
-       $flagusers = (!empty($_POST['flagusers']) ? Strings::escapeTags(trim($_POST['flagusers'])) : '');
-       $flagposts = (!empty($_POST['flagposts']) ? Strings::escapeTags(trim($_POST['flagposts'])) : '');
-       $flagpostsexpire = (!empty($_POST['flagpostsexpire']) ? Strings::escapeTags(trim($_POST['flagpostsexpire'])) : '');
+       $expiredays = trim($_POST['expiredays'] ?? '');
+       $expireposts = trim($_POST['expireposts'] ?? '');
+       $nologin = trim($_POST['nologin'] ?? '');
+       $flagusers = trim($_POST['flagusers'] ?? '');
+       $flagposts = trim($_POST['flagposts'] ?? '');
+       $flagpostsexpire = trim($_POST['flagpostsexpire'] ?? '');
        DI::config()->set('public_server', 'expiredays', $expiredays);
        DI::config()->set('public_server', 'expireposts', $expireposts);
        DI::config()->set('public_server', 'nologin', $nologin);

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 0359d95380a2cf28d458df9908ebc577a062525f..f92de89ff7524fdef023636191874ecf36d7ae1e 100644 (file)
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -18,7 +18,6 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Post;
 use Friendica\Model\Tag;
-use Friendica\Util\Strings;
 
 function tumblr_install()
 {
@@ -76,8 +75,8 @@ function tumblr_addon_admin(App $a, &$o)
 
 function tumblr_addon_admin_post(App $a)
 {
-       $consumer_key    =       (!empty($_POST['consumer_key'])      ? Strings::escapeTags(trim($_POST['consumer_key']))   : '');
-       $consumer_secret =       (!empty($_POST['consumer_secret'])   ? Strings::escapeTags(trim($_POST['consumer_secret'])): '');
+       $consumer_key    = trim($_POST['consumer_key'] ?? : '');
+       $consumer_secret = trim($_POST['consumer_secret'] ?? '');
 
        DI::config()->set('tumblr', 'consumer_key',$consumer_key);
        DI::config()->set('tumblr', 'consumer_secret',$consumer_secret);

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 6f53b2e4f7e426ee35df28d0fcf42890672b8611..9811a06abb1b84de86b1c6e94c067b4548b0ac2e 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -791,8 +791,8 @@ function twitter_post_hook(App $a, array &$b)
 
 function twitter_addon_admin_post(App $a)
 {
-       $consumerkey    = !empty($_POST['consumerkey'])    ? Strings::escapeTags(trim($_POST['consumerkey']))    : '';
-       $consumersecret = !empty($_POST['consumersecret']) ? Strings::escapeTags(trim($_POST['consumersecret'])) : '';
+       $consumerkey    = trim($_POST['consumerkey'] ?? : '');
+       $consumersecret = trim($_POST['consumersecret'] ?? '');
        DI::config()->set('twitter', 'consumerkey', $consumerkey);
        DI::config()->set('twitter', 'consumersecret', $consumersecret);
 }

diff --git a/webrtc/webrtc.php b/webrtc/webrtc.php
index 0dcc7c195eace34be679c1420eb887124eba34e9..29c7fc8fe053c4d5c8a5658ebd82ad2a4b0c123d 100644 (file)
--- a/webrtc/webrtc.php
+++ b/webrtc/webrtc.php
@@ -9,7 +9,6 @@
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Util\Strings;
 
 function webrtc_install() {
         Hook::register('app_menu', 'addon/webrtc/webrtc.php', 'webrtc_app_menu');
@@ -27,7 +26,7 @@ function webrtc_addon_admin (&$a, &$o) {
        ]);
 }
 function webrtc_addon_admin_post (&$a) {
-        $url = (!empty($_POST['webrtcurl']) ? Strings::escapeTags(trim($_POST['webrtcurl'])) : '');
+        $url = trim($_POST['webrtcurl'] ?? '');
            DI::config()->set('webrtc', 'webrtcurl', $url);
 }