Replace x() by !empty() or defaults()

- Remove extraneous parentheses around !empty()

diff --git a/blogger/blogger.php b/blogger/blogger.php
index 84594f42d0bc79305b250f253df9fdef1ba40ccd..3faba1ca745ac7a91bde6dc265a5187797196079 100644 (file)
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -165,7 +165,7 @@ function blogger_post_local(App $a, array &$b)
 
        $bl_post   = intval(PConfig::get(local_user(), 'blogger', 'post'));
 
-       $bl_enable = (($bl_post && x($_REQUEST, 'blogger_enable')) ? intval($_REQUEST['blogger_enable']) : 0);
+       $bl_enable = (($bl_post && !empty($_REQUEST['blogger_enable'])) ? intval($_REQUEST['blogger_enable']) : 0);
 
        if ($b['api_source'] && intval(PConfig::get(local_user(), 'blogger', 'post_by_default'))) {
                $bl_enable = 1;

diff --git a/buffer/buffer.php b/buffer/buffer.php
index 7a62756a24c2e327ab42714a7bc1f29aacfe16d5..385bdd5bb32fce27cbe9f54977c895098aae60a8 100644 (file)
--- a/buffer/buffer.php
+++ b/buffer/buffer.php
@@ -86,8 +86,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     = (!empty($_POST['client_id'])     ? Strings::escapeTags(trim($_POST['client_id']))     : '');
+       $client_secret = (!empty($_POST['client_secret']) ? Strings::escapeTags(trim($_POST['client_secret'])) : '');
 
        Config::set('buffer', 'client_id'    , $client_id);
        Config::set('buffer', 'client_secret', $client_secret);

diff --git a/curweather/curweather.php b/curweather/curweather.php
index 85fd4a6033ebbfcb440e87fba7ec3ccb854b0de0..9d4d42e747b506c90d9a745408dbd27ab1425329 100644 (file)
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -118,7 +118,7 @@ function curweather_network_mod_init(App $a, &$b)
        $rpt = PConfig::get(local_user(), 'curweather', 'curweather_loc');
 
        // Set the language to the browsers language or default and use metric units
-       $lang = (!empty($_SESSION['language']) ? $_SESSION['language'] : Config::get('system', 'language'));
+       $lang = defaults($_SESSION, 'language', Config::get('system', 'language'));
        $units = PConfig::get( local_user(), 'curweather', 'curweather_units');
        $appid = Config::get('curweather', 'appid');
        $cachetime = intval(Config::get('curweather', 'cachetime'));

diff --git a/diaspora/Diaspora_Connection.php b/diaspora/Diaspora_Connection.php
index 8b8811ece5352c0f661aae6d0dc24b5ccaaeb618..67bc63df0bff8c7786d34133f2a2a3df95ceb489 100644 (file)
--- a/diaspora/Diaspora_Connection.php
+++ b/diaspora/Diaspora_Connection.php
@@ -136,7 +136,7 @@ class Diaspora_Connection {
                } elseif (!empty($m[1])) {
                        $token = $m[1];
                }
-               return (!empty($token)) ? $token : false;
+               return !empty($token) ? $token : false;
        }
 
        private function readJsonResponse($response) {
@@ -165,14 +165,14 @@ class Diaspora_Connection {
                $this->doHttpRequest('/bookmarklet');
                $m = [];
                preg_match('/"aspects"\:(\[.+?\])/', $this->last_http_result->response, $m);
-               return (!empty($m[1])) ? json_decode($m[1]) : false;
+               return !empty($m[1]) ? json_decode($m[1]) : false;
        }
 
        public function getServices() {
                $this->doHttpRequest('/bookmarklet');
                $m = [];
                preg_match('/"configured_services"\:(\[.+?\])/', $this->last_http_result->response, $m);
-               return (!empty($m[1])) ? json_decode($m[1]) : false;
+               return !empty($m[1]) ? json_decode($m[1]) : false;
        }
 
        public function getNotifications($notification_type = '', $show = '') {

diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index 66fa1b72dd876bdbc876195da44f50330f1a4fbe..b36b2774ebd22e343bf98805102c34208843d5b3 100644 (file)
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -286,7 +286,7 @@ function diaspora_post_local(App $a, array &$b)
 
        $diaspora_post   = intval(PConfig::get(local_user(),'diaspora','post'));
 
-       $diaspora_enable = (($diaspora_post && x($_REQUEST,'diaspora_enable')) ? intval($_REQUEST['diaspora_enable']) : 0);
+       $diaspora_enable = (($diaspora_post && !empty($_REQUEST['diaspora_enable'])) ? intval($_REQUEST['diaspora_enable']) : 0);
 
        if ($b['api_source'] && intval(PConfig::get(local_user(),'diaspora','post_by_default'))) {
                $diaspora_enable = 1;

diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 28ae2d974f0fbc364971bc5a6e7f49581efee357..cceb3ca0949873ce634073c1c30fedd869a2c932 100644 (file)
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -137,7 +137,7 @@ function dwpost_post_local(App $a, array &$b)
 
        $dw_post = intval(PConfig::get(local_user(),'dwpost','post'));
 
-       $dw_enable = (($dw_post && x($_REQUEST,'dwpost_enable')) ? intval($_REQUEST['dwpost_enable']) : 0);
+       $dw_enable = (($dw_post && !empty($_REQUEST['dwpost_enable'])) ? intval($_REQUEST['dwpost_enable']) : 0);
 
        if ($b['api_source'] && intval(PConfig::get(local_user(),'dwpost','post_by_default'))) {
                $dw_enable = 1;

diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index a901015f28db17af11011558ff8ca2cbd61c3a6e..0e2f0fe30377cf4fe1759c541ccba58f7990b8d6 100644 (file)
--- a/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@ -75,7 +75,7 @@ function forumdirectory_content(App $a)
        if (!empty($a->data['search'])) {
                $search = Strings::escapeTags(trim($a->data['search']));
        } else {
-               $search = ((!empty($_GET['search'])) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
+               $search = (!empty($_GET['search']) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
        }
 
        $tpl = Renderer::getMarkupTemplate('directory_header.tpl');

diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index f2b0f1fcdc6fceb76f2bca76b28a157392e90d78..e0ede735decbb0a03e9674b95776338b1872581d 100644 (file)
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -30,7 +30,7 @@ function fromapp_uninstall()
 
 function fromapp_settings_post($a, $post)
 {
-       if (!local_user() || (! x($_POST, 'fromapp-submit'))) {
+       if (!local_user() || empty($_POST['fromapp-submit'])) {
                return;
        }
 

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 860438d88afaed02126f90b68d2000c3ed91fcef..35f90ac06fdf85f7b0fa28d45a48ea5b276a0c4d 100644 (file)
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -89,9 +89,9 @@ function fromgplus_addon_settings_post(&$a,&$b) {
 
        if (!empty($_POST['fromgplus-submit'])) {
                PConfig::set(local_user(),'fromgplus','account',trim($_POST['fromgplus-account']));
-               $enable = (x($_POST,'fromgplus-enable') ? intval($_POST['fromgplus-enable']) : 0);
+               $enable = (!empty($_POST['fromgplus-enable']) ? intval($_POST['fromgplus-enable']) : 0);
                PConfig::set(local_user(),'fromgplus','enable', $enable);
-               $keywords = (x($_POST, 'fromgplus-keywords') ? intval($_POST['fromgplus-keywords']) : 0);
+               $keywords = (!empty($_POST['fromgplus-keywords']) ? intval($_POST['fromgplus-keywords']) : 0);
                PConfig::set(local_user(),'fromgplus', 'keywords', $keywords);
 
                if (!$enable)
@@ -113,7 +113,7 @@ function fromgplus_addon_admin(&$a, &$o)
 
 function fromgplus_addon_admin_post(&$a)
 {
-       $key = ((x($_POST, 'key')) ? trim($_POST['key']) : '');
+       $key = (!empty($_POST['key']) ? trim($_POST['key']) : '');
        Config::set('fromgplus', 'key', $key);
        info(L10n::t('Settings updated.'). EOL);
 }

diff --git a/geocoordinates/geocoordinates.php b/geocoordinates/geocoordinates.php
index 58c5a30c7f5ac56282b330de9f636ae9c3af16a0..abb33abb6c5b225b8eee51846e5f20e3af85bf47 100644 (file)
--- a/geocoordinates/geocoordinates.php
+++ b/geocoordinates/geocoordinates.php
@@ -100,10 +100,10 @@ function geocoordinates_addon_admin(&$a, &$o)
 
 function geocoordinates_addon_admin_post(&$a)
 {
-       $api_key  = ((x($_POST, 'api_key')) ? Strings::escapeTags(trim($_POST['api_key']))   : '');
+       $api_key  = (!empty($_POST['api_key']) ? Strings::escapeTags(trim($_POST['api_key']))   : '');
        Config::set('geocoordinates', 'api_key', $api_key);
 
-       $language  = ((x($_POST, 'language')) ? Strings::escapeTags(trim($_POST['language']))   : '');
+       $language  = (!empty($_POST['language']) ? Strings::escapeTags(trim($_POST['language']))   : '');
        Config::set('geocoordinates', 'language', $language);
        info(L10n::t('Settings updated.'). EOL);
 }

diff --git a/geonames/geonames.php b/geonames/geonames.php
index 552ecf5963eb69cd36a8a46c3021093673ff0157..91a466fc5b57ea015d0e6dd6328eadf28369ef58 100644 (file)
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -150,7 +150,7 @@ function geonames_post_hook($a, &$item) {
  */
 
 function geonames_addon_admin_post($a,$post) {
-       if(! local_user() || (! x($_POST,'geonames-submit')))
+       if(! local_user() || empty($_POST['geonames-submit']))
                return;
        PConfig::set(local_user(),'geonames','enable',intval($_POST['geonames']));
 

diff --git a/gnot/gnot.php b/gnot/gnot.php
index 3cab85393c127647aba4bdc9f4a2cd90620fbc26..f3a50705f5586c0f232ee63a1871bde90617af2b 100644 (file)
--- a/gnot/gnot.php
+++ b/gnot/gnot.php
@@ -44,7 +44,7 @@ function gnot_uninstall() {
  */
 
 function gnot_settings_post($a,$post) {
-       if(! local_user() || (! x($_POST,'gnot-submit')))
+       if(! local_user() || empty($_POST['gnot-submit']))
                return;
 
        PConfig::set(local_user(),'gnot','enable',intval($_POST['gnot']));

diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index 68105554bd7dc008b6e6c8d2edea5c7019d86693..fea062705072adb19b84a162fcc39c3ce6c8b7b4 100644 (file)
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -122,8 +122,8 @@ function gravatar_addon_admin (&$a, &$o) {
 function gravatar_addon_admin_post (&$a) {
        BaseModule::checkFormSecurityToken('gravatarsave');
 
-       $default_avatar = ((x($_POST, 'avatar')) ? Strings::escapeTags(trim($_POST['avatar'])) : 'identicon');
-       $rating = ((x($_POST, 'rating')) ? Strings::escapeTags(trim($_POST['rating'])) : 'g');
+       $default_avatar = (!empty($_POST['avatar']) ? Strings::escapeTags(trim($_POST['avatar'])) : 'identicon');
+       $rating = (!empty($_POST['rating']) ? Strings::escapeTags(trim($_POST['rating'])) : 'g');
        Config::set('gravatar', 'default_avatar', $default_avatar);
        Config::set('gravatar', 'rating', $rating);
        info(L10n::t('Gravatar settings updated.') .EOL);

diff --git a/group_text/group_text.php b/group_text/group_text.php
index 76bb03fdf536e4da0c0a2696859161f7e6f5719d..cf56dbecd76e302f6287a6b3a32b1d2f8288b8e9 100644 (file)
--- a/group_text/group_text.php
+++ b/group_text/group_text.php
@@ -40,7 +40,7 @@ function group_text_uninstall() {
  */
 
 function group_text_settings_post($a,$post) {
-       if(! local_user() || (! x($_POST,'group_text-submit')))
+       if(! local_user() || empty($_POST['group_text-submit']))
                return;
        PConfig::set(local_user(),'system','groupedit_image_limit',intval($_POST['group_text']));
 

diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index fd5700488422a26f40a91c7aea945667f80950d7..50fa119c9a3a87fce429319b9abd6cbaa8a8cf62 100644 (file)
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -90,7 +90,7 @@ function ifttt_settings(App $a, &$s)
 
 function ifttt_settings_post()
 {
-       if (x($_POST, 'ifttt-submit') && isset($_POST['ifttt-rekey'])) {
+       if (!empty($_POST['ifttt-submit']) && isset($_POST['ifttt-rekey'])) {
                PConfig::delete(local_user(), 'ifttt', 'key');
        }
 }

diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index d2a3071eb742a5ef600d1b83e9c3fb4d6f2410da..dcb8f4bf872eb8ac6c9258ded3881ee33832fc97 100644 (file)
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -108,7 +108,7 @@ function ijpost_settings(&$a, &$s)
 
 function ijpost_settings_post(&$a, &$b)
 {
-       if (x($_POST, 'ijpost-submit')) {
+       if (!empty($_POST['ijpost-submit'])) {
                PConfig::set(local_user(), 'ijpost', 'post', intval($_POST['ijpost']));
                PConfig::set(local_user(), 'ijpost', 'post_by_default', intval($_POST['ij_bydefault']));
                PConfig::set(local_user(), 'ijpost', 'ij_username', trim($_POST['ij_username']));
@@ -134,7 +134,7 @@ function ijpost_post_local(&$a, &$b)
 
        $ij_post   = intval(PConfig::get(local_user(), 'ijpost', 'post'));
 
-       $ij_enable = (($ij_post && x($_REQUEST, 'ijpost_enable')) ? intval($_REQUEST['ijpost_enable']) : 0);
+       $ij_enable = (($ij_post && !empty($_REQUEST['ijpost_enable'])) ? intval($_REQUEST['ijpost_enable']) : 0);
 
        if ($b['api_source'] && intval(PConfig::get(local_user(), 'ijpost', 'post_by_default'))) {
                $ij_enable = 1;

diff --git a/impressum/impressum.php b/impressum/impressum.php
index 6300efca3d8ee3b043006447b17ccb067a0460a2..c5a1c98dbe7a91eaa0be627d7f783bf3cd0efa56 100644 (file)
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -87,12 +87,12 @@ function impressum_show($a,&$b) {
 }
 
 function impressum_addon_admin_post (&$a) {
-    $owner = ((x($_POST, 'owner')) ? Strings::escapeTags(trim($_POST['owner'])) : '');
-    $ownerprofile = ((x($_POST, 'ownerprofile')) ? Strings::escapeTags(trim($_POST['ownerprofile'])) : '');
-    $postal = ((x($_POST, 'postal')) ? (trim($_POST['postal'])) : '');
-    $notes = ((x($_POST, 'notes')) ? (trim($_POST['notes'])) : '');
-    $email = ((x($_POST, 'email')) ? Strings::escapeTags(trim($_POST['email'])) : '');
-    $footer_text = ((x($_POST, 'footer_text')) ? (trim($_POST['footer_text'])) : '');
+    $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'])) : '');
     Config::set('impressum','owner',strip_tags($owner));
     Config::set('impressum','ownerprofile',strip_tags($ownerprofile));
     Config::set('impressum','postal',strip_tags($postal));

diff --git a/irc/irc.php b/irc/irc.php
index 4804fb6f8d33cd4c53ea71387fadacb12f022efb..2677dc756b10123435c8ed83d36102f3161b0e64 100644 (file)
--- a/irc/irc.php
+++ b/irc/irc.php
@@ -109,7 +109,7 @@ function irc_content(&$a) {
        if($autochans)
                $channels = $autochans;
        else
-               $channels = ((x($_GET,'channels')) ? $_GET['channels'] : 'friendica');
+               $channels = defaults($_GET, 'channels', 'friendica');
 
 /* add the chatroom frame and some html */
   $o .= <<< EOT

diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index d4f0ec1eada10332a83895041c503860738ad857..2203c9bfd14c45dbb64594d1f6e5d34882699528 100644 (file)
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -183,7 +183,7 @@ function js_upload_post_file(&$a,&$b) {
 function js_upload_post_end(&$a,&$b) {
 
 Logger::log('upload_post_end');
-       if(x($a->data,'upload_jsonresponse')) {
+       if(!empty($a->data['upload_jsonresponse'])) {
                echo $a->data['upload_jsonresponse'];
                killme();
        }

diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php
index 8cc8f69771aff933142b092f6507d70538f799e7..512ac840a3eed46b3db22a10e7cac08b8264cd6d 100644 (file)
--- a/langfilter/langfilter.php
+++ b/langfilter/langfilter.php
@@ -79,7 +79,7 @@ function langfilter_addon_settings_post(App $a, &$b)
 
        if (!empty($_POST['langfilter-settings-submit'])) {
                PConfig::set(local_user(), 'langfilter', 'languages', trim($_POST['langfilter_languages']));
-               $enable = (x($_POST, 'langfilter_enable') ? intval($_POST['langfilter_enable']) : 0);
+               $enable = (!empty($_POST['langfilter_enable']) ? intval($_POST['langfilter_enable']) : 0);
                $disable = 1 - $enable;
                PConfig::set(local_user(), 'langfilter', 'disable', $disable);
                $minconfidence = 0 + $_POST['langfilter_minconfidence'];

diff --git a/libertree/libertree.php b/libertree/libertree.php
index 34fcd7989b296a50e0f3d06435e200b7fe80a96f..d5aa97e5a866a243625f538f0e8a92d37e34b106 100644 (file)
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -111,7 +111,7 @@ function libertree_settings(&$a,&$s) {
 
 function libertree_settings_post(&$a,&$b) {
 
-       if(x($_POST,'libertree-submit')) {
+       if(!empty($_POST['libertree-submit'])) {
 
                PConfig::set(local_user(),'libertree','post',intval($_POST['libertree']));
                PConfig::set(local_user(),'libertree','post_by_default',intval($_POST['libertree_bydefault']));
@@ -155,7 +155,7 @@ function libertree_post_local(&$a,&$b) {
 
        $ltree_post   = intval(PConfig::get(local_user(),'libertree','post'));
 
-       $ltree_enable = (($ltree_post && x($_REQUEST,'libertree_enable')) ? intval($_REQUEST['libertree_enable']) : 0);
+       $ltree_enable = (($ltree_post && !empty($_REQUEST['libertree_enable'])) ? intval($_REQUEST['libertree_enable']) : 0);
 
        if ($b['api_source'] && intval(PConfig::get(local_user(),'libertree','post_by_default'))) {
                $ltree_enable = 1;

diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index 09f31c5b91575f18d1502c0233b1b96e89a1220c..d6ccb7185dcdbf4b5a8ad16b033c0fd1ad303916 100644 (file)
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -125,7 +125,7 @@ function libravatar_addon_admin_post(&$a)
 {
        BaseModule::checkFormSecurityToken('libravatarrsave');
 
-       $default_avatar = ((x($_POST, 'avatar')) ? Strings::escapeTags(trim($_POST['avatar'])) : 'identicon');
+       $default_avatar = (!empty($_POST['avatar']) ? Strings::escapeTags(trim($_POST['avatar'])) : 'identicon');
        Config::set('libravatar', 'default_avatar', $default_avatar);
        info(L10n::t('Libravatar settings updated.') .EOL);
 }

diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index c60af03c77dc7af5bd9420e90e88db60ed839442..dc0c0fd6089406c0cf31eecafe547df300fa9a36 100644 (file)
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -105,7 +105,7 @@ function ljpost_settings(&$a,&$s) {
 
 function ljpost_settings_post(&$a,&$b) {
 
-       if(x($_POST,'ljpost-submit')) {
+       if(!empty($_POST['ljpost-submit'])) {
 
                PConfig::set(local_user(),'ljpost','post',intval($_POST['ljpost']));
                PConfig::set(local_user(),'ljpost','post_by_default',intval($_POST['lj_bydefault']));
@@ -131,7 +131,7 @@ function ljpost_post_local(&$a,&$b) {
 
     $lj_post   = intval(PConfig::get(local_user(),'ljpost','post'));
 
-       $lj_enable = (($lj_post && x($_REQUEST,'ljpost_enable')) ? intval($_REQUEST['ljpost_enable']) : 0);
+       $lj_enable = (($lj_post && !empty($_REQUEST['ljpost_enable'])) ? intval($_REQUEST['ljpost_enable']) : 0);
 
        if($b['api_source'] && intval(PConfig::get(local_user(),'ljpost','post_by_default')))
                $lj_enable = 1;

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 1d2a4917db8d206b6579a1bb3495b6e9505c50f4..6b693f6c0676b6903ee6f15ce0497e36162a9ffd 100644 (file)
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -86,7 +86,7 @@ function mailstream_addon_admin(&$a,&$o) {
 }
 
 function mailstream_addon_admin_post ($a) {
-       if (x($_POST, 'frommail')) {
+       if (!empty($_POST['frommail'])) {
                Config::set('mailstream', 'frommail', $_POST['frommail']);
        }
 }

diff --git a/newmemberwidget/newmemberwidget.php b/newmemberwidget/newmemberwidget.php
index 8ecbaaa9a312bdf66315dc24901b3a7c22af1324..4c0cfc3bc7f4d55896c061c539d194cb8312788d 100644 (file)
--- a/newmemberwidget/newmemberwidget.php
+++ b/newmemberwidget/newmemberwidget.php
@@ -54,8 +54,8 @@ function newmemberwidget_network_mod_init ($a, $b)
 
 function newmemberwidget_addon_admin_post(&$a)
 {
-       $ft = ((x($_POST, 'freetext')) ? trim($_POST['freetext']) : "");
-       $lsn = ((x($_POST, 'localsupportname')) ? Strings::escapeTags(trim($_POST['localsupportname'])) : "");
+       $ft = (!empty($_POST['freetext']) ? trim($_POST['freetext']) : "");
+       $lsn = (!empty($_POST['localsupportname']) ? Strings::escapeTags(trim($_POST['localsupportname'])) : "");
        $gs = intval($_POST['linkglobalsupport']);
        $ls = intval($_POST['linklocalsupport']);
        Config::set('newmemberwidget', 'freetext',           trim($ft));

diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index ea6712f15f57edade9eaf2bd5a7be4d947701aec..51c426cc5d9e7558856796fafef254b3560f1a9f 100644 (file)
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -54,7 +54,7 @@ function notifyall_post(App $a)
                $sender_name = '"' . L10n::t('%1$s, %2$s Administrator', Config::get('config', 'admin_name'), $sitename) . '"';
        }
 
-       if (! x(Config::get('config', 'sender_email'))) {
+       if (!Config::get('config', 'sender_email')) {
                $sender_email = 'noreply@' . $a->getHostName();
        } else {
                $sender_email = Config::get('config', 'sender_email');

diff --git a/notimeline/notimeline.php b/notimeline/notimeline.php
index 6f747ca96730eedbda7ea227002905160900794a..adba95c5c7a1d04b1d206c6dc619c58da0bc288d 100644 (file)
--- a/notimeline/notimeline.php
+++ b/notimeline/notimeline.php
@@ -25,7 +25,7 @@ function notimeline_uninstall()
 
 function notimeline_settings_post($a, $post)
 {
-       if (!local_user() || (!x($_POST, 'notimeline-submit'))) {
+       if (!local_user() || empty($_POST['notimeline-submit'])) {
                return;
        }
 

diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index 77d172cecea8ade75af8e69e36c46b8c81f204bc..9836a056ddc801375ef79427f8f47c166e641011 100644 (file)
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -103,7 +103,7 @@ function nsfw_addon_settings_post(&$a, &$b)
 
        if (!empty($_POST['nsfw-submit'])) {
                PConfig::set(local_user(), 'nsfw', 'words', trim($_POST['nsfw-words']));
-               $enable = (x($_POST, 'nsfw-enable') ? intval($_POST['nsfw-enable']) : 0);
+               $enable = (!empty($_POST['nsfw-enable']) ? intval($_POST['nsfw-enable']) : 0);
                $disable = 1 - $enable;
                PConfig::set(local_user(), 'nsfw', 'disable', $disable);
                info(L10n::t('NSFW Settings saved.') . EOL);

diff --git a/numfriends/numfriends.php b/numfriends/numfriends.php
index 9e22b0ea36e1ead79ea20193dd64501bf88e1faf..5bdc264c9ae77b9b9197c048766124433c28ccd7 100644 (file)
--- a/numfriends/numfriends.php
+++ b/numfriends/numfriends.php
@@ -37,7 +37,7 @@ function numfriends_uninstall() {
  *
  */
 function numfriends_settings_post($a,$post) {
-       if(! local_user() || (! x($_POST,'numfriends-submit')))
+       if(! local_user() || empty($_POST['numfriends-submit']))
                return;
 
        PConfig::set(local_user(),'system','display_friend_count',intval($_POST['numfriends']));

diff --git a/piwik/piwik.php b/piwik/piwik.php
index d96eba09f6a2fa213c40ae38662c0604212c1b31..3e3144fbcdd2cd91bb7f85ce341544aa2fdde63c 100644 (file)
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -108,10 +108,10 @@ function piwik_addon_admin (&$a, &$o) {
        ]);
 }
 function piwik_addon_admin_post (&$a) {
-       $url = ((x($_POST, 'baseurl')) ? Strings::escapeTags(trim($_POST['baseurl'])) : '');
-       $id = ((x($_POST, 'siteid')) ? trim($_POST['siteid']) : '');
-       $optout = ((x($_POST, 'optout')) ? trim($_POST['optout']) : '');
-       $async = ((x($_POST, 'async')) ? trim($_POST['async']) : '');
+       $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']) : '');
        Config::set('piwik', 'baseurl', $url);
        Config::set('piwik', 'siteid', $id);
        Config::set('piwik', 'optout', $optout);

diff --git a/public_server/public_server.php b/public_server/public_server.php
index ba7f2a64587978174a133149e41723ba9db09745..7e09806effab488d74a9a91aedb742e3a4b799ea 100644 (file)
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -124,8 +124,8 @@ function public_server_cron($a, $b)
 
 function public_server_enotify(&$a, &$b)
 {
-       if (x($b, 'params') && $b['params']['type'] == NOTIFY_SYSTEM
-               && x($b['params'], 'system_type') && $b['params']['system_type'] === 'public_server_expire') {
+       if (!empty($b['params']) && $b['params']['type'] == NOTIFY_SYSTEM
+               && !empty($b['params']['system_type']) && $b['params']['system_type'] === 'public_server_expire') {
                $b['itemlink'] = $a->getBaseURL();
                $b['epreamble'] = $b['preamble'] = L10n::t('Your account on %s will expire in a few days.', Config::get('system', 'sitename'));
                $b['subject'] = L10n::t('Your Friendica account is about to expire.');
@@ -148,12 +148,12 @@ function public_server_login($a, $b)
 function public_server_addon_admin_post(&$a)
 {
        BaseModule::checkFormSecurityTokenRedirectOnError('/admin/addons/publicserver', 'publicserver');
-       $expiredays = (x($_POST, 'expiredays') ? Strings::escapeTags(trim($_POST['expiredays'])) : '');
-       $expireposts = (x($_POST, 'expireposts') ? Strings::escapeTags(trim($_POST['expireposts'])) : '');
-       $nologin = (x($_POST, 'nologin') ? Strings::escapeTags(trim($_POST['nologin'])) : '');
-       $flagusers = (x($_POST, 'flagusers') ? Strings::escapeTags(trim($_POST['flagusers'])) : '');
-       $flagposts = (x($_POST, 'flagposts') ? Strings::escapeTags(trim($_POST['flagposts'])) : '');
-       $flagpostsexpire = (x($_POST, 'flagpostsexpire') ? Strings::escapeTags(trim($_POST['flagpostsexpire'])) : '');
+       $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'])) : '');
        Config::set('public_server', 'expiredays', $expiredays);
        Config::set('public_server', 'expireposts', $expireposts);
        Config::set('public_server', 'nologin', $nologin);

diff --git a/remote_permissions/remote_permissions.php b/remote_permissions/remote_permissions.php
index d08b40c9f60382be34a66244b2a1bb7954039c0c..623d4172a2d72ba2b8efeba8879f7032cd625577 100644 (file)
--- a/remote_permissions/remote_permissions.php
+++ b/remote_permissions/remote_permissions.php
@@ -58,7 +58,7 @@ function remote_permissions_settings(&$a,&$o) {
 }
 
 function remote_permissions_settings_post($a,$post) {
-       if(! local_user() || (! x($_POST,'remote-perms-submit')))
+       if(! local_user() || empty($_POST['remote-perms-submit']))
                return;
 
        PConfig::set(local_user(),'remote_perms','show',intval($_POST['remote-perms']));
@@ -207,7 +207,7 @@ function remote_permissions_addon_admin(&$a, &$o){
 }
 
 function remote_permissions_addon_admin_post(&$a){
-       $choice =       ((x($_POST,'remotepermschoice'))                ? Strings::escapeTags(trim($_POST['remotepermschoice']))        : '');
+       $choice =       (!empty($_POST['remotepermschoice'])            ? Strings::escapeTags(trim($_POST['remotepermschoice']))        : '');
        Config::set('remote_perms','global',($choice == 1 ? 1 : 0));
        info(L10n::t('Settings updated.'). EOL);
 }

diff --git a/securemail/securemail.php b/securemail/securemail.php
index 90251788cd64cc9a2a49da68988e150db9b0da84..10a2b298a7bc35f7ce4d34158ecc395295fc21ae 100644 (file)
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -92,7 +92,7 @@ function securemail_settings_post(App &$a, array &$b){
 
     if ($_POST['securemail-submit']) {
         PConfig::set(local_user(), 'securemail', 'pkey', trim($_POST['securemail-pkey']));
-        $enable = ((x($_POST, 'securemail-enable')) ? 1 : 0);
+        $enable = (!empty($_POST['securemail-enable']) ? 1 : 0);
         PConfig::set(local_user(), 'securemail', 'enable', $enable);
         info(L10n::t('Secure Mail Settings saved.') . EOL);
 
@@ -150,7 +150,7 @@ function securemail_settings_post(App &$a, array &$b){
  * @see App
  */
 function securemail_emailer_send_prepare(App &$a, array &$b) {
-    if (!x($b, 'uid')) {
+    if (empty($b['uid'])) {
         return;
     }
 
@@ -164,7 +164,7 @@ function securemail_emailer_send_prepare(App &$a, array &$b) {
     $public_key_ascii = PConfig::get($uid, 'securemail', 'pkey');
 
     preg_match('/-----BEGIN ([A-Za-z ]+)-----/', $public_key_ascii, $matches);
-    $marker = (empty($matches[1])) ? 'MESSAGE' : $matches[1];
+    $marker = empty($matches[1]) ? 'MESSAGE' : $matches[1];
     $public_key = OpenPGP::unarmor($public_key_ascii, $marker);
 
     $key = OpenPGP_Message::parse($public_key);

diff --git a/showmore/showmore.php b/showmore/showmore.php
index b46fe7400663d5fcc075d05b71095eb2a4ae790d..a7b5979b8a219c0b634444ab2843eff22779a5f7 100644 (file)
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -71,7 +71,7 @@ function showmore_addon_settings_post(&$a, &$b)
 
        if (!empty($_POST['showmore-submit'])) {
                PConfig::set(local_user(), 'showmore', 'chars', trim($_POST['showmore-chars']));
-               $enable = (x($_POST, 'showmore-enable') ? intval($_POST['showmore-enable']) : 0);
+               $enable = (!empty($_POST['showmore-enable']) ? intval($_POST['showmore-enable']) : 0);
                $disable = 1-$enable;
                PConfig::set(local_user(), 'showmore', 'disable', $disable);
                info(L10n::t('Show More Settings saved.') . EOL);

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 7fc6d4d35078fa4d4dae2f2df76703c5a736ed14..0c4da5d2fb3b213dc1514cbd804c91dbed56bd6b 100644 (file)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -123,7 +123,7 @@ function statusnet_settings_post(App $a, $post)
                return;
        }
        // don't check GNU Social settings if GNU Social submit button is not clicked
-       if (!x($_POST, 'statusnet-submit')) {
+       if (empty($_POST['statusnet-submit'])) {
                return;
        }
 
@@ -447,7 +447,7 @@ function statusnet_post_local(App $a, &$b)
        }
 
        $statusnet_post = PConfig::get(local_user(), 'statusnet', 'post');
-       $statusnet_enable = (($statusnet_post && x($_REQUEST, 'statusnet_enable')) ? intval($_REQUEST['statusnet_enable']) : 0);
+       $statusnet_enable = (($statusnet_post && !empty($_REQUEST['statusnet_enable'])) ? intval($_REQUEST['statusnet_enable']) : 0);
 
        // if API is used, default to the chosen settings
        if ($b['api_source'] && intval(PConfig::get(local_user(), 'statusnet', 'post_by_default'))) {
@@ -667,12 +667,12 @@ function statusnet_addon_admin_post(App $a)
                }
                $secret = trim($_POST['secret'][$id]);
                $key = trim($_POST['key'][$id]);
-               //$applicationname = ((x($_POST, 'applicationname')) ? Strings::escapeTags(trim($_POST['applicationname'][$id])):'');
+               //$applicationname = (!empty($_POST['applicationname']) ? Strings::escapeTags(trim($_POST['applicationname'][$id])):'');
                if ($sitename != "" &&
                        $apiurl != "" &&
                        $secret != "" &&
                        $key != "" &&
-                       !x($_POST['delete'][$id])) {
+                       empty($_POST['delete'][$id])) {
 
                        $sites[] = [
                                'sitename' => $sitename,

diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 4da5959b0867c51dfed1ba6e06f79297ab89d90e..6daf136e19fd09a08970772b613a64b96da833e8 100644 (file)
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -97,8 +97,8 @@ function testdrive_cron($a,$b) {
 }
 
 function testdrive_enotify(&$a, &$b) {
-    if (x($b, 'params') && $b['params']['type'] == NOTIFY_SYSTEM
-               && x($b['params'], 'system_type') && $b['params']['system_type'] === 'testdrive_expire') {
+    if (!empty($b['params']) && $b['params']['type'] == NOTIFY_SYSTEM
+               && !empty($b['params']['system_type']) && $b['params']['system_type'] === 'testdrive_expire') {
         $b['itemlink'] = $a->getBaseURL();
         $b['epreamble'] = $b['preamble'] = L10n::t('Your account on %s will expire in a few days.', Config::get('system', 'sitename'));
         $b['subject'] = L10n::t('Your Friendica test account is about to expire.');

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 83bdcf6ef30dee4a547ba6d809b13d86e1759e7f..2d4bd1a3be0b7fd1a4bbbb3519cfb6b734346afb 100644 (file)
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -86,8 +86,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    =       (!empty($_POST['consumer_key'])      ? Strings::escapeTags(trim($_POST['consumer_key']))   : '');
+       $consumer_secret =       (!empty($_POST['consumer_secret'])   ? Strings::escapeTags(trim($_POST['consumer_secret'])): '');
 
        Config::set('tumblr', 'consumer_key',$consumer_key);
        Config::set('tumblr', 'consumer_secret',$consumer_secret);

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 2dbc1a2eeaccac4d124c4ab6a724fadf8b6e7222..00342e82a9985a9a2c1abc0d9ca37d4b622cd286 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -446,7 +446,7 @@ function twitter_post_local(App $a, array &$b)
        }
 
        $twitter_post = intval(PConfig::get(local_user(), 'twitter', 'post'));
-       $twitter_enable = (($twitter_post && x($_REQUEST, 'twitter_enable')) ? intval($_REQUEST['twitter_enable']) : 0);
+       $twitter_enable = (($twitter_post && !empty($_REQUEST['twitter_enable'])) ? intval($_REQUEST['twitter_enable']) : 0);
 
        // if API is used, default to the chosen settings
        if ($b['api_source'] && intval(PConfig::get(local_user(), 'twitter', 'post_by_default'))) {
@@ -703,8 +703,8 @@ function twitter_post_hook(App $a, array &$b)
 
 function twitter_addon_admin_post(App $a)
 {
-       $consumerkey    = x($_POST, 'consumerkey')    ? Strings::escapeTags(trim($_POST['consumerkey']))    : '';
-       $consumersecret = x($_POST, 'consumersecret') ? Strings::escapeTags(trim($_POST['consumersecret'])) : '';
+       $consumerkey    = !empty($_POST['consumerkey'])    ? Strings::escapeTags(trim($_POST['consumerkey']))    : '';
+       $consumersecret = !empty($_POST['consumersecret']) ? Strings::escapeTags(trim($_POST['consumersecret'])) : '';
        Config::set('twitter', 'consumerkey', $consumerkey);
        Config::set('twitter', 'consumersecret', $consumersecret);
        info(L10n::t('Settings updated.') . EOL);

diff --git a/webrtc/webrtc.php b/webrtc/webrtc.php
index d122870e1c6158b57cb3ca29fb1facc4388f0ecd..61bacfcd46bf2681e98591d53a46df1ea2637046 100644 (file)
--- a/webrtc/webrtc.php
+++ b/webrtc/webrtc.php
@@ -33,7 +33,7 @@ function webrtc_addon_admin (&$a, &$o) {
        ]);
 }
 function webrtc_addon_admin_post (&$a) {
-        $url = ((x($_POST, 'webrtcurl')) ? Strings::escapeTags(trim($_POST['webrtcurl'])) : '');
+        $url = (!empty($_POST['webrtcurl']) ? Strings::escapeTags(trim($_POST['webrtcurl'])) : '');
            Config::set('webrtc', 'webrtcurl', $url);
            info(L10n::t('Settings updated.'). EOL);
 }

diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php
index 5ae0c3f3f79db714598510c7829ad3e9cc0869ac..a6c9aa9b271ef848e7c75c2f45d910f2a38d6375 100644 (file)
--- a/windowsphonepush/windowsphonepush.php
+++ b/windowsphonepush/windowsphonepush.php
@@ -82,7 +82,7 @@ function windowsphonepush_module()
  */
 function windowsphonepush_settings_post($a, $post)
 {
-       if (!local_user() || (!x($_POST, 'windowsphonepush-submit'))) {
+       if (!local_user() || empty($_POST['windowsphonepush-submit'])) {
                return;
        }
        $enable = intval($_POST['windowsphonepush']);

diff --git a/wppost/wppost.php b/wppost/wppost.php
index 018e86c4e1f57e42032f546372900518b25eab55..1cc27976aeec35f6e12125476839075528045582 100644 (file)
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -147,7 +147,7 @@ function wppost_settings(&$a,&$s) {
 
 function wppost_settings_post(&$a,&$b) {
 
-       if(x($_POST,'wppost-submit')) {
+       if(!empty($_POST['wppost-submit'])) {
 
                PConfig::set(local_user(),'wppost','post',intval($_POST['wppost']));
                PConfig::set(local_user(),'wppost','post_by_default',intval($_POST['wp_bydefault']));
@@ -198,7 +198,7 @@ function wppost_post_local(&$a, &$b) {
 
        $wp_post   = intval(PConfig::get(local_user(),'wppost','post'));
 
-       $wp_enable = (($wp_post && x($_REQUEST,'wppost_enable')) ? intval($_REQUEST['wppost_enable']) : 0);
+       $wp_enable = (($wp_post && !empty($_REQUEST['wppost_enable'])) ? intval($_REQUEST['wppost_enable']) : 0);
 
        if ($b['api_source'] && intval(PConfig::get(local_user(),'wppost','post_by_default'))) {
                $wp_enable = 1;

diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php
index 1342c26c0a55a308962ba46516af6c24b4ec9191..51ad2c90dcad776cfe78a27350613aa1ea1b6cca 100644 (file)
--- a/xmpp/xmpp.php
+++ b/xmpp/xmpp.php
@@ -117,8 +117,8 @@ function xmpp_addon_admin(App $a, &$o)
 
 function xmpp_addon_admin_post()
 {
-       $bosh_proxy = ((!empty($_POST['bosh_proxy'])) ? trim($_POST['bosh_proxy']) : '');
-       $central_userbase = ((!empty($_POST['central_userbase'])) ? intval($_POST['central_userbase']) : false);
+       $bosh_proxy = (!empty($_POST['bosh_proxy']) ? trim($_POST['bosh_proxy']) : '');
+       $central_userbase = (!empty($_POST['central_userbase']) ? intval($_POST['central_userbase']) : false);
 
        Config::set('xmpp', 'bosh_proxy', $bosh_proxy);
        Config::set('xmpp', 'central_userbase', $central_userbase);