From 458981f75cff2427976c9abc787eadf8e9e6267f Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 30 Nov 2018 09:06:22 -0500 Subject: [PATCH] Replace x() by isset(), !empty() or defaults() - Remove extraneous parentheses around empty() calls - Remove duplicate calls to intval(), count() or strlen() after empty() - Replace ternary operators outputting binary value with empty() return value - Rewrite defaults() without x() --- boot.php | 41 +- doc/themes.md | 10 +- include/api.php | 221 ++++--- include/conversation.php | 36 +- mod/admin.php | 599 +++++++++--------- mod/api.php | 4 +- mod/cal.php | 16 +- mod/common.php | 2 +- mod/contactgroup.php | 2 +- mod/crepair.php | 2 +- mod/delegate.php | 6 +- mod/dfrn_confirm.php | 6 +- mod/dfrn_notify.php | 26 +- mod/dfrn_poll.php | 37 +- mod/dfrn_request.php | 48 +- mod/directory.php | 26 +- mod/dirfind.php | 2 +- mod/display.php | 4 +- mod/fbrowser.php | 4 +- mod/friendica.php | 4 +- mod/hcard.php | 14 +- mod/home.php | 4 +- mod/item.php | 6 +- mod/like.php | 2 +- mod/localtime.php | 2 +- mod/manage.php | 10 +- mod/message.php | 12 +- mod/modexp.php | 2 +- mod/network.php | 56 +- mod/noscrape.php | 2 +- mod/oexchange.php | 8 +- mod/openid.php | 2 +- mod/parse_url.php | 4 +- mod/photos.php | 12 +- mod/ping.php | 8 +- mod/poco.php | 12 +- mod/poke.php | 6 +- mod/profile.php | 2 +- mod/profiles.php | 2 +- mod/pubsubhubbub.php | 2 +- mod/redir.php | 2 +- mod/register.php | 20 +- mod/removeme.php | 6 +- mod/search.php | 28 +- mod/settings.php | 132 ++-- mod/starred.php | 2 +- mod/subthread.php | 2 +- mod/suggest.php | 2 +- mod/tagger.php | 2 +- mod/tagrm.php | 2 +- mod/uimport.php | 4 +- mod/wall_attach.php | 10 +- mod/wall_upload.php | 12 +- mod/wallmessage.php | 8 +- mod/webfinger.php | 2 +- spec/dfrn2_contact_request.svg | 4 +- src/App.php | 4 +- src/Content/Nav.php | 4 +- src/Content/OEmbed.php | 6 +- src/Content/Text/BBCode.php | 24 +- src/Content/Text/HTML.php | 4 +- src/Core/Authentication.php | 2 +- src/Core/Console/AutomaticInstallation.php | 12 +- src/Core/NotificationsManager.php | 4 +- src/Core/Session/DatabaseSessionHandler.php | 2 +- src/Core/UserImport.php | 2 +- src/Database/DBStructure.php | 2 +- src/Model/Contact.php | 13 +- src/Model/FileTag.php | 4 +- src/Model/Group.php | 4 +- src/Model/Item.php | 18 +- src/Model/Photo.php | 2 +- src/Model/Profile.php | 36 +- src/Model/User.php | 8 +- src/Module/Contact.php | 2 +- src/Module/Feed.php | 4 +- src/Module/Login.php | 14 +- src/Module/Magic.php | 8 +- src/Network/Probe.php | 4 +- src/Object/Post.php | 6 +- src/Protocol/DFRN.php | 8 +- src/Protocol/PortableContact.php | 2 +- src/Render/FriendicaSmarty.php | 2 +- src/Render/FriendicaSmartyEngine.php | 2 +- src/Util/Emailer.php | 2 +- src/Util/Network.php | 12 +- src/Util/Temporal.php | 2 +- src/Worker/OnePoll.php | 2 +- .../AutomaticInstallationConsoleTest.php | 2 +- view/php/default.php | 14 +- view/php/minimal.php | 6 +- view/php/none.php | 2 +- view/theme/duepuntozero/style.php | 2 +- view/theme/frio/php/PHPColors/Color.php | 2 +- view/theme/frio/php/default.php | 16 +- view/theme/frio/php/frio_boot.php | 2 +- view/theme/frio/php/standard.php | 12 +- view/theme/frio/style.php | 2 +- view/theme/frio/theme.php | 2 +- view/theme/smoothly/php/default.php | 20 +- view/theme/vier/theme.php | 5 +- 101 files changed, 896 insertions(+), 914 deletions(-) diff --git a/boot.php b/boot.php index f3d1f6f64..9d72863cc 100644 --- a/boot.php +++ b/boot.php @@ -341,12 +341,13 @@ function get_app() /** * @brief Multi-purpose function to check variable state. * - * Usage: x($var) or $x($array, 'key') + * Usage: x($var) or x($array, 'key') * * returns false if variable/key is not set * if variable is set, returns 1 if has 'non-zero' value, otherwise returns 0. * e.g. x('') or x(0) returns 0; * + * @deprecated since version 2018.12 * @param string|array $s variable to check * @param string $k key inside the array to check * @@ -383,13 +384,12 @@ function x($s, $k = null) * - defaults($var, $default) * - defaults($array, 'key', $default) * + * @param array $args * @brief Returns a defaut value if the provided variable or array key is falsy - * @see x() * @return mixed */ -function defaults() { - $args = func_get_args(); - +function defaults(...$args) +{ if (count($args) < 2) { throw new BadFunctionCallException('defaults() requires at least 2 parameters'); } @@ -400,16 +400,15 @@ function defaults() { throw new BadFunctionCallException('defaults($arr, $key, $def) $key is null'); } - $default = array_pop($args); + // The default value always is the last argument + $return = array_pop($args); - if (call_user_func_array('x', $args)) { - if (count($args) === 1) { - $return = $args[0]; - } else { - $return = $args[0][$args[1]]; - } - } else { - $return = $default; + if (count($args) == 2 && is_array($args[0]) && !empty($args[0][$args[1]])) { + $return = $args[0][$args[1]]; + } + + if (count($args) == 1 && !empty($args[0])) { + $return = $args[0]; } return $return; @@ -446,15 +445,15 @@ function public_contact() { static $public_contact_id = false; - if (!$public_contact_id && x($_SESSION, 'authenticated')) { - if (x($_SESSION, 'my_address')) { + if (!$public_contact_id && !empty($_SESSION['authenticated'])) { + if (!empty($_SESSION['my_address'])) { // Local user $public_contact_id = intval(Contact::getIdForURL($_SESSION['my_address'], 0, true)); - } elseif (x($_SESSION, 'visitor_home')) { + } elseif (!empty($_SESSION['visitor_home'])) { // Remote user $public_contact_id = intval(Contact::getIdForURL($_SESSION['visitor_home'], 0, true)); } - } elseif (!x($_SESSION, 'authenticated')) { + } elseif (empty($_SESSION['authenticated'])) { $public_contact_id = false; } @@ -479,7 +478,7 @@ function remote_user() return false; } - if (x($_SESSION, 'authenticated') && x($_SESSION, 'visitor_id')) { + if (!empty($_SESSION['authenticated']) && !empty($_SESSION['visitor_id'])) { return intval($_SESSION['visitor_id']); } return false; @@ -499,7 +498,7 @@ function notice($s) } $a = get_app(); - if (!x($_SESSION, 'sysmsg')) { + if (empty($_SESSION['sysmsg'])) { $_SESSION['sysmsg'] = []; } if ($a->interactive) { @@ -522,7 +521,7 @@ function info($s) return; } - if (!x($_SESSION, 'sysmsg_info')) { + if (empty($_SESSION['sysmsg_info'])) { $_SESSION['sysmsg_info'] = []; } if ($a->interactive) { diff --git a/doc/themes.md b/doc/themes.md index d0d74a92c..d2e4c59be 100644 --- a/doc/themes.md +++ b/doc/themes.md @@ -181,13 +181,13 @@ Next take the default.php file found in the /view direcotry and exchange the asi So the central part of the file now looks like this: - - -
+ + +
- -
+ +
Finally we need a style.css file, inheriting the definitions from the parent theme and containing out changes for the new theme. diff --git a/include/api.php b/include/api.php index f4d7c5f5a..34352910c 100644 --- a/include/api.php +++ b/include/api.php @@ -68,7 +68,7 @@ $called_api = []; */ function api_user() { - if (x($_SESSION, 'allow_api')) { + if (!empty($_SESSION['allow_api'])) { return local_user(); } @@ -186,8 +186,8 @@ function api_login(App $a) } // workaround for HTTP-auth in CGI mode - if (x($_SERVER, 'REDIRECT_REMOTE_USER')) { - $userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6)) ; + if (!empty($_SERVER['REDIRECT_REMOTE_USER'])) { + $userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6)); if (strlen($userpass)) { list($name, $password) = explode(':', $userpass); $_SERVER['PHP_AUTH_USER'] = $name; @@ -195,7 +195,7 @@ function api_login(App $a) } } - if (!x($_SERVER, 'PHP_AUTH_USER')) { + if (empty($_SERVER['PHP_AUTH_USER'])) { Logger::log('API_login: ' . print_r($_SERVER, true), Logger::DEBUG); header('WWW-Authenticate: Basic realm="Friendica"'); throw new UnauthorizedException("This API requires login"); @@ -396,7 +396,7 @@ function api_call(App $a) case "json": header("Content-Type: application/json"); $json = json_encode(end($return)); - if (x($_GET, 'callback')) { + if (!empty($_GET['callback'])) { $json = $_GET['callback'] . "(" . $json . ")"; } $return = $json; @@ -550,7 +550,7 @@ function api_get_user(App $a, $contact_id = null) } } - if (is_null($user) && x($_GET, 'user_id')) { + if (is_null($user) && !empty($_GET['user_id'])) { $user = DBA::escape(api_unique_id_to_nurl($_GET['user_id'])); if ($user == "") { @@ -563,7 +563,7 @@ function api_get_user(App $a, $contact_id = null) $extra_query .= "AND `contact`.`uid`=" . intval(api_user()); } } - if (is_null($user) && x($_GET, 'screen_name')) { + if (is_null($user) && !empty($_GET['screen_name'])) { $user = DBA::escape($_GET['screen_name']); $extra_query = "AND `contact`.`nick` = '%s' "; if (api_user() !== false) { @@ -571,7 +571,7 @@ function api_get_user(App $a, $contact_id = null) } } - if (is_null($user) && x($_GET, 'profileurl')) { + if (is_null($user) && !empty($_GET['profileurl'])) { $user = DBA::escape(Strings::normaliseLink($_GET['profileurl'])); $extra_query = "AND `contact`.`nurl` = '%s' "; if (api_user() !== false) { @@ -980,7 +980,7 @@ function api_account_verify_credentials($type) unset($_REQUEST["screen_name"]); unset($_GET["screen_name"]); - $skip_status = (x($_REQUEST, 'skip_status')?$_REQUEST['skip_status'] : false); + $skip_status = defaults($_REQUEST, 'skip_status', false); $user_info = api_get_user($a); @@ -1014,10 +1014,10 @@ api_register_func('api/account/verify_credentials', 'api_account_verify_credenti */ function requestdata($k) { - if (x($_POST, $k)) { + if (!empty($_POST[$k])) { return $_POST[$k]; } - if (x($_GET, $k)) { + if (!empty($_GET[$k])) { return $_GET[$k]; } return null; @@ -1172,7 +1172,7 @@ function api_statuses_update($type) } } - if (x($_FILES, 'media')) { + if (!empty($_FILES['media'])) { // upload the image if we have one $picture = wall_upload_post($a, false); if (is_array($picture)) { @@ -1199,7 +1199,7 @@ function api_statuses_update($type) $_REQUEST['api_source'] = true; - if (!x($_REQUEST, "source")) { + if (empty($_REQUEST['source'])) { $_REQUEST["source"] = api_source(); } @@ -1231,7 +1231,7 @@ function api_media_upload() api_get_user($a); - if (!x($_FILES, 'media')) { + if (empty($_FILES['media'])) { // Output error throw new BadRequestException("No media."); } @@ -1445,7 +1445,7 @@ function api_users_search($type) $userlist = []; - if (x($_GET, 'q')) { + if (!empty($_GET['q'])) { $r = q("SELECT id FROM `contact` WHERE `uid` = 0 AND `name` = '%s'", DBA::escape($_GET["q"])); if (!DBA::isResult($r)) { @@ -1530,21 +1530,21 @@ function api_search($type) $data = []; - if (!x($_REQUEST, 'q')) { + if (empty($_REQUEST['q'])) { throw new BadRequestException("q parameter is required."); } - if (x($_REQUEST, 'rpp')) { + if (!empty($_REQUEST['rpp'])) { $count = $_REQUEST['rpp']; - } elseif (x($_REQUEST, 'count')) { + } elseif (!empty($_REQUEST['count'])) { $count = $_REQUEST['count']; } else { $count = 15; } - $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0); - $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0); - $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] - 1 : 0); + $since_id = defaults($_REQUEST, 'since_id', 0); + $max_id = defaults($_REQUEST, 'max_id', 0); + $page = (!empty($_REQUEST['page']) ? $_REQUEST['page'] - 1 : 0); $start = $page * $count; @@ -1598,16 +1598,15 @@ function api_statuses_home_timeline($type) // get last network messages // params - $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20); - $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] - 1 : 0); + $count = defaults($_REQUEST, 'count', 20); + $page = (!empty($_REQUEST['page']) ? $_REQUEST['page'] - 1 : 0); if ($page < 0) { $page = 0; } - $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0); - $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0); - //$since_id = 0;//$since_id = (x($_REQUEST, 'since_id')?$_REQUEST['since_id'] : 0); - $exclude_replies = (x($_REQUEST, 'exclude_replies') ? 1 : 0); - $conversation_id = (x($_REQUEST, 'conversation_id') ? $_REQUEST['conversation_id'] : 0); + $since_id = defaults($_REQUEST, 'since_id', 0); + $max_id = defaults($_REQUEST, 'max_id', 0); + $exclude_replies = !empty($_REQUEST['exclude_replies']); + $conversation_id = defaults($_REQUEST, 'conversation_id', 0); $start = $page * $count; @@ -1618,7 +1617,7 @@ function api_statuses_home_timeline($type) $condition[0] .= " AND `item`.`id` <= ?"; $condition[] = $max_id; } - if ($exclude_replies > 0) { + if ($exclude_replies) { $condition[0] .= ' AND `item`.`parent` = `item`.`id`'; } if ($conversation_id > 0) { @@ -1681,19 +1680,17 @@ function api_statuses_public_timeline($type) // get last network messages // params - $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20); - $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0); + $count = defaults($_REQUEST, 'count', 20); + $page = (!empty($_REQUEST['page']) ? $_REQUEST['page'] -1 : 0); if ($page < 0) { $page = 0; } - $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0); - $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0); - //$since_id = 0;//$since_id = (x($_REQUEST, 'since_id')?$_REQUEST['since_id'] : 0); - $exclude_replies = (x($_REQUEST, 'exclude_replies') ? 1 : 0); - $conversation_id = (x($_REQUEST, 'conversation_id') ? $_REQUEST['conversation_id'] : 0); + $since_id = defaults($_REQUEST, 'since_id', 0); + $max_id = defaults($_REQUEST, 'max_id', 0); + $exclude_replies = (!empty($_REQUEST['exclude_replies']) ? 1 : 0); + $conversation_id = defaults($_REQUEST, 'conversation_id', 0); $start = $page * $count; - $sql_extra = ''; if ($exclude_replies && !$conversation_id) { $condition = ["`gravity` IN (?, ?) AND `iid` > ? AND NOT `private` AND `wall` AND NOT `user`.`hidewall`", @@ -1762,12 +1759,12 @@ function api_statuses_networkpublic_timeline($type) throw new ForbiddenException(); } - $since_id = x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0; - $max_id = x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0; + $since_id = defaults($_REQUEST, 'since_id', 0); + $max_id = defaults($_REQUEST, 'max_id', 0); // pagination - $count = x($_REQUEST, 'count') ? $_REQUEST['count'] : 20; - $page = x($_REQUEST, 'page') ? $_REQUEST['page'] : 1; + $count = defaults($_REQUEST, 'count', 20); + $page = defaults($_REQUEST, 'page', 1); if ($page < 1) { $page = 1; } @@ -2001,7 +1998,7 @@ function api_statuses_repeat($type) $_REQUEST['profile_uid'] = api_user(); $_REQUEST['api_source'] = true; - if (!x($_REQUEST, "source")) { + if (empty($_REQUEST['source'])) { $_REQUEST["source"] = api_source(); } @@ -2150,14 +2147,14 @@ function api_statuses_user_timeline($type) Logger::DEBUG ); - $since_id = x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0; - $max_id = x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0; - $exclude_replies = x($_REQUEST, 'exclude_replies') ? 1 : 0; - $conversation_id = x($_REQUEST, 'conversation_id') ? $_REQUEST['conversation_id'] : 0; + $since_id = defaults($_REQUEST, 'since_id', 0); + $max_id = defaults($_REQUEST, 'max_id', 0); + $exclude_replies = !empty($_REQUEST['exclude_replies']); + $conversation_id = defaults($_REQUEST, 'conversation_id', 0); // pagination - $count = x($_REQUEST, 'count') ? $_REQUEST['count'] : 20; - $page = x($_REQUEST, 'page') ? $_REQUEST['page'] : 1; + $count = defaults($_REQUEST, 'count', 20); + $page = defaults($_REQUEST, 'page', 1); if ($page < 1) { $page = 1; } @@ -2170,7 +2167,7 @@ function api_statuses_user_timeline($type) $condition[0] .= ' AND `item`.`wall` '; } - if ($exclude_replies > 0) { + if ($exclude_replies) { $condition[0] .= ' AND `item`.`parent` = `item`.`id`'; } @@ -2309,10 +2306,10 @@ function api_favorites($type) $ret = []; } else { // params - $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0); - $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0); - $count = (x($_GET, 'count') ? $_GET['count'] : 20); - $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0); + $since_id = defaults($_REQUEST, 'since_id', 0); + $max_id = defaults($_REQUEST, 'max_id', 0); + $count = defaults($_GET, 'count', 20); + $page = (!empty($_REQUEST['page']) ? $_REQUEST['page'] -1 : 0); if ($page < 0) { $page = 0; } @@ -2390,7 +2387,7 @@ function api_format_messages($item, $recipient, $sender) } //don't send title to regular StatusNET requests to avoid confusing these apps - if (x($_GET, 'getText')) { + if (!empty($_GET['getText'])) { $ret['title'] = $item['title']; if ($_GET['getText'] == 'html') { $ret['text'] = BBCode::convert($item['body'], false); @@ -2400,7 +2397,7 @@ function api_format_messages($item, $recipient, $sender) } else { $ret['text'] = $item['title'] . "\n" . HTML::toPlaintext(BBCode::convert(api_clean_plain_items($item['body']), false, 2, true), 0); } - if (x($_GET, 'getUserObjects') && $_GET['getUserObjects'] == 'false') { + if (!empty($_GET['getUserObjects']) && $_GET['getUserObjects'] == 'false') { unset($ret['sender']); unset($ret['recipient']); } @@ -2530,7 +2527,7 @@ function api_get_attachments(&$body) */ function api_get_entitities(&$text, $bbcode) { - $include_entities = strtolower(x($_REQUEST, 'include_entities') ? $_REQUEST['include_entities'] : "false"); + $include_entities = strtolower(defaults($_REQUEST, 'include_entities', "false")); if ($include_entities != "true") { preg_match_all("/\[img](.*?)\[\/img\]/ism", $bbcode, $images); @@ -3119,15 +3116,15 @@ function api_lists_statuses($type) } // params - $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20); - $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] - 1 : 0); + $count = defaults($_REQUEST, 'count', 20); + $page = (!empty($_REQUEST['page']) ? $_REQUEST['page'] - 1 : 0); if ($page < 0) { $page = 0; } - $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0); - $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0); - $exclude_replies = (x($_REQUEST, 'exclude_replies') ? 1 : 0); - $conversation_id = (x($_REQUEST, 'conversation_id') ? $_REQUEST['conversation_id'] : 0); + $since_id = defaults($_REQUEST, 'since_id', 0); + $max_id = defaults($_REQUEST, 'max_id', 0); + $exclude_replies = (!empty($_REQUEST['exclude_replies']) ? 1 : 0); + $conversation_id = defaults($_REQUEST, 'conversation_id', 0); $start = $page * $count; @@ -3185,8 +3182,8 @@ function api_statuses_f($qtype) } // pagination - $count = x($_GET, 'count') ? $_GET['count'] : 20; - $page = x($_GET, 'page') ? $_GET['page'] : 1; + $count = defaults($_GET, 'count', 20); + $page = defaults($_GET, 'page', 1); if ($page < 1) { $page = 1; } @@ -3194,7 +3191,7 @@ function api_statuses_f($qtype) $user_info = api_get_user($a); - if (x($_GET, 'cursor') && $_GET['cursor'] == 'undefined') { + if (!empty($_GET['cursor']) && $_GET['cursor'] == 'undefined') { /* this is to stop Hotot to load friends multiple times * I'm not sure if I'm missing return something or * is a bug in hotot. Workaround, meantime @@ -3522,7 +3519,7 @@ function api_direct_messages_new($type) $replyto = ''; $sub = ''; - if (x($_REQUEST, 'replyto')) { + if (!empty($_REQUEST['replyto'])) { $r = q( 'SELECT `parent-uri`, `title` FROM `mail` WHERE `uid`=%d AND `id`=%d', intval(api_user()), @@ -3531,7 +3528,7 @@ function api_direct_messages_new($type) $replyto = $r[0]['parent-uri']; $sub = $r[0]['title']; } else { - if (x($_REQUEST, 'title')) { + if (!empty($_REQUEST['title'])) { $sub = $_REQUEST['title']; } else { $sub = ((strlen($_POST['text'])>10) ? substr($_POST['text'], 0, 10)."...":$_POST['text']); @@ -3583,10 +3580,10 @@ function api_direct_messages_destroy($type) // params $user_info = api_get_user($a); //required - $id = (x($_REQUEST, 'id') ? $_REQUEST['id'] : 0); + $id = defaults($_REQUEST, 'id', 0); // optional - $parenturi = (x($_REQUEST, 'friendica_parenturi') ? $_REQUEST['friendica_parenturi'] : ""); - $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false"); + $parenturi = defaults($_REQUEST, 'friendica_parenturi', ""); + $verbose = (!empty($_GET['friendica_verbose']) ? strtolower($_GET['friendica_verbose']) : "false"); /// @todo optional parameter 'include_entities' from Twitter API not yet implemented $uid = $user_info['uid']; @@ -3838,7 +3835,7 @@ function api_direct_messages_box($type, $box, $verbose) */ function api_direct_messages_sentbox($type) { - $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false"); + $verbose = !empty($_GET['friendica_verbose']) ? strtolower($_GET['friendica_verbose']) : "false"; return api_direct_messages_box($type, "sentbox", $verbose); } @@ -3852,7 +3849,7 @@ function api_direct_messages_sentbox($type) */ function api_direct_messages_inbox($type) { - $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false"); + $verbose = !empty($_GET['friendica_verbose']) ? strtolower($_GET['friendica_verbose']) : "false"; return api_direct_messages_box($type, "inbox", $verbose); } @@ -3864,7 +3861,7 @@ function api_direct_messages_inbox($type) */ function api_direct_messages_all($type) { - $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false"); + $verbose = !empty($_GET['friendica_verbose']) ? strtolower($_GET['friendica_verbose']) : "false"; return api_direct_messages_box($type, "all", $verbose); } @@ -3876,7 +3873,7 @@ function api_direct_messages_all($type) */ function api_direct_messages_conversation($type) { - $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false"); + $verbose = !empty($_GET['friendica_verbose']) ? strtolower($_GET['friendica_verbose']) : "false"; return api_direct_messages_box($type, "conversation", $verbose); } @@ -3940,7 +3937,7 @@ function api_fr_photoalbum_delete($type) throw new ForbiddenException(); } // input params - $album = (x($_REQUEST, 'album') ? $_REQUEST['album'] : ""); + $album = defaults($_REQUEST, 'album', ""); // we do not allow calls without album string if ($album == "") { @@ -3992,8 +3989,8 @@ function api_fr_photoalbum_update($type) throw new ForbiddenException(); } // input params - $album = (x($_REQUEST, 'album') ? $_REQUEST['album'] : ""); - $album_new = (x($_REQUEST, 'album_new') ? $_REQUEST['album_new'] : ""); + $album = defaults($_REQUEST, 'album', ""); + $album_new = defaults($_REQUEST, 'album_new', ""); // we do not allow calls without album string if ($album == "") { @@ -4077,15 +4074,15 @@ function api_fr_photo_create_update($type) throw new ForbiddenException(); } // input params - $photo_id = (x($_REQUEST, 'photo_id') ? $_REQUEST['photo_id'] : null); - $desc = (x($_REQUEST, 'desc') ? $_REQUEST['desc'] : (array_key_exists('desc', $_REQUEST) ? "" : null)); // extra check necessary to distinguish between 'not provided' and 'empty string' - $album = (x($_REQUEST, 'album') ? $_REQUEST['album'] : null); - $album_new = (x($_REQUEST, 'album_new') ? $_REQUEST['album_new'] : null); - $allow_cid = (x($_REQUEST, 'allow_cid') ? $_REQUEST['allow_cid'] : (array_key_exists('allow_cid', $_REQUEST) ? " " : null)); - $deny_cid = (x($_REQUEST, 'deny_cid') ? $_REQUEST['deny_cid'] : (array_key_exists('deny_cid', $_REQUEST) ? " " : null)); - $allow_gid = (x($_REQUEST, 'allow_gid') ? $_REQUEST['allow_gid'] : (array_key_exists('allow_gid', $_REQUEST) ? " " : null)); - $deny_gid = (x($_REQUEST, 'deny_gid') ? $_REQUEST['deny_gid'] : (array_key_exists('deny_gid', $_REQUEST) ? " " : null)); - $visibility = (x($_REQUEST, 'visibility') ? (($_REQUEST['visibility'] == "true" || $_REQUEST['visibility'] == 1) ? true : false) : false); + $photo_id = defaults($_REQUEST, 'photo_id', null); + $desc = defaults($_REQUEST, 'desc', (array_key_exists('desc', $_REQUEST) ? "" : null)) ; // extra check necessary to distinguish between 'not provided' and 'empty string' + $album = defaults($_REQUEST, 'album', null); + $album_new = defaults($_REQUEST, 'album_new', null); + $allow_cid = defaults($_REQUEST, 'allow_cid', (array_key_exists('allow_cid', $_REQUEST) ? " " : null)); + $deny_cid = defaults($_REQUEST, 'deny_cid' , (array_key_exists('deny_cid' , $_REQUEST) ? " " : null)); + $allow_gid = defaults($_REQUEST, 'allow_gid', (array_key_exists('allow_gid', $_REQUEST) ? " " : null)); + $deny_gid = defaults($_REQUEST, 'deny_gid' , (array_key_exists('deny_gid' , $_REQUEST) ? " " : null)); + $visibility = !empty($_REQUEST['visibility']) || $_REQUEST['visibility'] !== "false"; // do several checks on input parameters // we do not allow calls without album string @@ -4097,7 +4094,7 @@ function api_fr_photo_create_update($type) $mode = "create"; // error if no media posted in create-mode - if (!x($_FILES, 'media')) { + if (empty($_FILES['media'])) { // Output error throw new BadRequestException("no media data submitted"); } @@ -4188,7 +4185,7 @@ function api_fr_photo_create_update($type) $nothingtodo = true; } - if (x($_FILES, 'media')) { + if (!empty($_FILES['media'])) { $nothingtodo = false; $media = $_FILES['media']; $data = save_media_to_database("photo", $media, $type, $album, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $desc, 0, $visibility, $photo_id); @@ -4224,7 +4221,7 @@ function api_fr_photo_delete($type) throw new ForbiddenException(); } // input params - $photo_id = (x($_REQUEST, 'photo_id') ? $_REQUEST['photo_id'] : null); + $photo_id = defaults($_REQUEST, 'photo_id', null); // do several checks on input parameters // we do not allow calls without photo id @@ -4275,11 +4272,11 @@ function api_fr_photo_detail($type) if (api_user() === false) { throw new ForbiddenException(); } - if (!x($_REQUEST, 'photo_id')) { + if (empty($_REQUEST['photo_id'])) { throw new BadRequestException("No photo id."); } - $scale = (x($_REQUEST, 'scale') ? intval($_REQUEST['scale']) : false); + $scale = (!empty($_REQUEST['scale']) ? intval($_REQUEST['scale']) : false); $photo_id = $_REQUEST['photo_id']; // prepare json/xml output with data from database for the requested photo @@ -4308,7 +4305,7 @@ function api_account_update_profile_image($type) $profile_id = defaults($_REQUEST, 'profile_id', 0); // error if image data is missing - if (!x($_FILES, 'image')) { + if (empty($_FILES['image'])) { throw new BadRequestException("no media data submitted"); } @@ -4326,9 +4323,9 @@ function api_account_update_profile_image($type) // get mediadata from image or media (Twitter call api/account/update_profile_image provides image) $media = null; - if (x($_FILES, 'image')) { + if (!empty($_FILES['image'])) { $media = $_FILES['image']; - } elseif (x($_FILES, 'media')) { + } elseif (!empty($_FILES['media'])) { $media = $_FILES['media']; } // save new profile image @@ -4788,8 +4785,8 @@ function prepare_photo_data($type, $scale, $photo_id) */ function api_friendica_remoteauth() { - $url = (x($_GET, 'url') ? $_GET['url'] : ''); - $c_url = (x($_GET, 'c_url') ? $_GET['c_url'] : ''); + $url = defaults($_GET, 'url', ''); + $c_url = defaults($_GET, 'c_url', ''); if ($url === '' || $c_url === '') { throw new BadRequestException("Wrong parameters."); @@ -5092,7 +5089,7 @@ function api_in_reply_to($item) */ function api_clean_plain_items($text) { - $include_entities = strtolower(x($_REQUEST, 'include_entities') ? $_REQUEST['include_entities'] : "false"); + $include_entities = strtolower(defaults($_REQUEST, 'include_entities', "false")); $text = BBCode::cleanPictureLinks($text); $URLSearchString = "^\[\]"; @@ -5224,7 +5221,7 @@ function api_friendica_group_show($type) // params $user_info = api_get_user($a); - $gid = (x($_REQUEST, 'gid') ? $_REQUEST['gid'] : 0); + $gid = defaults($_REQUEST, 'gid', 0); $uid = $user_info['uid']; // get data of the specified group id or all groups if not specified @@ -5289,8 +5286,8 @@ function api_friendica_group_delete($type) // params $user_info = api_get_user($a); - $gid = (x($_REQUEST, 'gid') ? $_REQUEST['gid'] : 0); - $name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : ""); + $gid = defaults($_REQUEST, 'gid', 0); + $name = defaults($_REQUEST, 'name', ""); $uid = $user_info['uid']; // error if no gid specified @@ -5351,7 +5348,7 @@ function api_lists_destroy($type) // params $user_info = api_get_user($a); - $gid = (x($_REQUEST, 'list_id') ? $_REQUEST['list_id'] : 0); + $gid = defaults($_REQUEST, 'list_id', 0); $uid = $user_info['uid']; // error if no gid specified @@ -5467,7 +5464,7 @@ function api_friendica_group_create($type) // params $user_info = api_get_user($a); - $name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : ""); + $name = defaults($_REQUEST, 'name', ""); $uid = $user_info['uid']; $json = json_decode($_POST['json'], true); $users = $json['user']; @@ -5496,7 +5493,7 @@ function api_lists_create($type) // params $user_info = api_get_user($a); - $name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : ""); + $name = defaults($_REQUEST, 'name', ""); $uid = $user_info['uid']; $success = group_create($name, $uid); @@ -5531,8 +5528,8 @@ function api_friendica_group_update($type) // params $user_info = api_get_user($a); $uid = $user_info['uid']; - $gid = (x($_REQUEST, 'gid') ? $_REQUEST['gid'] : 0); - $name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : ""); + $gid = defaults($_REQUEST, 'gid', 0); + $name = defaults($_REQUEST, 'name', ""); $json = json_decode($_POST['json'], true); $users = $json['user']; @@ -5604,8 +5601,8 @@ function api_lists_update($type) // params $user_info = api_get_user($a); - $gid = (x($_REQUEST, 'list_id') ? $_REQUEST['list_id'] : 0); - $name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : ""); + $gid = defaults($_REQUEST, 'list_id', 0); + $name = defaults($_REQUEST, 'name', ""); $uid = $user_info['uid']; // error if no gid specified @@ -5650,7 +5647,7 @@ function api_friendica_activity($type) $verb = strtolower($a->argv[3]); $verb = preg_replace("|\..*$|", "", $verb); - $id = (x($_REQUEST, 'id') ? $_REQUEST['id'] : 0); + $id = defaults($_REQUEST, 'id', 0); $res = Item::performLike($id, $verb); @@ -5732,7 +5729,7 @@ function api_friendica_notification_seen($type) throw new BadRequestException("Invalid argument count"); } - $id = (x($_REQUEST, 'id') ? intval($_REQUEST['id']) : 0); + $id = (!empty($_REQUEST['id']) ? intval($_REQUEST['id']) : 0); $nm = new NotificationsManager(); $note = $nm->getByID($id); @@ -5775,7 +5772,7 @@ function api_friendica_direct_messages_setseen($type) // params $user_info = api_get_user($a); $uid = $user_info['uid']; - $id = (x($_REQUEST, 'id') ? $_REQUEST['id'] : 0); + $id = defaults($_REQUEST, 'id', 0); // return error if id is zero if ($id == "") { @@ -5824,7 +5821,7 @@ function api_friendica_direct_messages_search($type, $box = "") // params $user_info = api_get_user($a); - $searchstring = (x($_REQUEST, 'searchstring') ? $_REQUEST['searchstring'] : ""); + $searchstring = defaults($_REQUEST, 'searchstring', ""); $uid = $user_info['uid']; // error if no searchstring specified @@ -5886,7 +5883,7 @@ function api_friendica_profile_show($type) } // input params - $profile_id = (x($_REQUEST, 'profile_id') ? $_REQUEST['profile_id'] : 0); + $profile_id = defaults($_REQUEST, 'profile_id', 0); // retrieve general information about profiles for user $multi_profiles = Feature::isEnabled(api_user(), 'multi_profiles'); diff --git a/include/conversation.php b/include/conversation.php index 023b6c875..1c97a1abe 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -462,17 +462,17 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ . "\r\n"; } @@ -482,7 +482,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ if (!$update) { $tab = 'posts'; - if (x($_GET, 'tab')) { + if (!empty($_GET['tab'])) { $tab = Strings::escapeTags(trim($_GET['tab'])); } if ($tab === 'posts') { @@ -951,7 +951,7 @@ function builtin_activity_puller($item, &$conv_responses) { $url = '' . htmlentities($item['author-name']) . ''; - if (!x($item, 'thr-parent')) { + if (empty($item['thr-parent'])) { $item['thr-parent'] = $item['parent-uri']; } @@ -1064,7 +1064,7 @@ function format_like($cnt, array $arr, $type, $id) { $expanded .= "\t" . ''; } - $phrase .= EOL ; + $phrase .= EOL; $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('voting_fakelink.tpl'), [ '$phrase' => $phrase, '$type' => $type, @@ -1079,7 +1079,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false) { $o = ''; - $geotag = x($x, 'allow_location') ? Renderer::replaceMacros(Renderer::getMarkupTemplate('jot_geotag.tpl'), []) : ''; + $geotag = !empty($x['allow_location']) ? Renderer::replaceMacros(Renderer::getMarkupTemplate('jot_geotag.tpl'), []) : ''; $tpl = Renderer::getMarkupTemplate('jot-header.tpl'); $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [ @@ -1100,7 +1100,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false) // Private/public post links for the non-JS ACL form $private_post = 1; - if (x($_REQUEST, 'public')) { + if (!empty($_REQUEST['public'])) { $private_post = 0; } @@ -1432,11 +1432,11 @@ function sort_thr_commented(array $a, array $b) } function render_location_dummy(array $item) { - if (x($item, 'location') && !empty($item['location'])) { + if (!empty($item['location']) && !empty($item['location'])) { return $item['location']; } - if (x($item, 'coord') && !empty($item['coord'])) { + if (!empty($item['coord']) && !empty($item['coord'])) { return $item['coord']; } } diff --git a/mod/admin.php b/mod/admin.php index cedd6748e..0a7f27a08 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -58,7 +58,7 @@ function admin_post(App $a) // do not allow a page manager to access the admin panel at all. - if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) { + if (!empty($_SESSION['submanage'])) { return; } @@ -167,14 +167,14 @@ function admin_content(App $a) return Login::form(); } - if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) { + if (!empty($_SESSION['submanage'])) { return ""; } // APC deactivated, since there are problems with PHP 5.5 //if (function_exists("apc_delete")) { - // $toDelete = new APCIterator('user', APC_ITER_VALUE); - // apc_delete($toDelete); + // $toDelete = new APCIterator('user', APC_ITER_VALUE); + // apc_delete($toDelete); //} // Header stuff $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('admin/settings_head.tpl'), []); @@ -321,7 +321,7 @@ function admin_page_tos(App $a) '$title' => L10n::t('Administration'), '$page' => L10n::t('Terms of Service'), '$displaytos' => ['displaytos', L10n::t('Display Terms of Service'), Config::get('system', 'tosdisplay'), L10n::t('Enable the Terms of Service page. If this is enabled a link to the terms will be added to the registration form and the general information page.')], - '$displayprivstatement' => ['displayprivstatement', L10n::t('Display Privacy Statement'), Config::get('system','tosprivstatement'), L10n::t('Show some informations regarding the needed information to operate the node according e.g. to EU-GDPR.','https://en.wikipedia.org/wiki/General_Data_Protection_Regulation')], + '$displayprivstatement' => ['displayprivstatement', L10n::t('Display Privacy Statement'), Config::get('system', 'tosprivstatement'), L10n::t('Show some informations regarding the needed information to operate the node according e.g. to EU-GDPR.', 'https://en.wikipedia.org/wiki/General_Data_Protection_Regulation')], '$preview' => L10n::t('Privacy Statement Preview'), '$privtext' => $tos->privacy_complete, '$tostext' => ['tostext', L10n::t('The Terms of Service'), Config::get('system', 'tostext'), L10n::t('Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below.')], @@ -329,6 +329,7 @@ function admin_page_tos(App $a) '$submit' => L10n::t('Save Settings'), ]); } + /** * @brief Process send data from Admin TOS Page * @@ -338,13 +339,13 @@ function admin_page_tos_post(App $a) { BaseModule::checkFormSecurityTokenRedirectOnError('/admin/tos', 'admin_tos'); - if (!x($_POST, "page_tos")) { + if (empty($_POST['page_tos'])) { return; } - $displaytos = ((x($_POST, 'displaytos')) ? True : False); - $displayprivstatement = ((x($_POST, 'displayprivstatement')) ? True : False); - $tostext = ((x($_POST, 'tostext')) ? strip_tags(trim($_POST['tostext'])) : ''); + $displaytos = !empty($_POST['displaytos']); + $displayprivstatement = !empty($_POST['displayprivstatement']); + $tostext = (!empty($_POST['tostext']) ? strip_tags(trim($_POST['tostext'])) : ''); Config::set('system', 'tosdisplay', $displaytos); Config::set('system', 'tosprivstatement', $displayprivstatement); @@ -354,6 +355,7 @@ function admin_page_tos_post(App $a) return; // NOTREACHED } + /** * @brief Subpage to modify the server wide block list via the admin panel. * @@ -407,13 +409,13 @@ function admin_page_blocklist(App $a) */ function admin_page_blocklist_post(App $a) { - if (!x($_POST, "page_blocklist_save") && (!x($_POST['page_blocklist_edit']))) { + if (empty($_POST['page_blocklist_save']) && empty($_POST['page_blocklist_edit'])) { return; } BaseModule::checkFormSecurityTokenRedirectOnError('/admin/blocklist', 'admin_blocklist'); - if (x($_POST['page_blocklist_save'])) { + if (!empty($_POST['page_blocklist_save'])) { // Add new item to blocklist $blocklist = Config::get('system', 'blocklist'); $blocklist[] = [ @@ -429,7 +431,7 @@ function admin_page_blocklist_post(App $a) // Trimming whitespaces as well as any lingering slashes $domain = Strings::escapeTags(trim($domain, "\x00..\x1F/")); $reason = Strings::escapeTags(trim($_POST['reason'][$id])); - if (!x($_POST['delete'][$id])) { + if (empty($_POST['delete'][$id])) { $blocklist[] = [ 'domain' => $domain, 'reason' => $reason @@ -451,12 +453,12 @@ function admin_page_blocklist_post(App $a) */ function admin_page_contactblock_post(App $a) { - $contact_url = x($_POST, 'contact_url') ? $_POST['contact_url'] : ''; - $contacts = x($_POST, 'contacts') ? $_POST['contacts'] : []; + $contact_url = defaults($_POST, 'contact_url', ''); + $contacts = defaults($_POST, 'contacts', []); BaseModule::checkFormSecurityTokenRedirectOnError('/admin/contactblock', 'admin_contactblock'); - if (x($_POST, 'page_contactblock_block')) { + if (!empty($_POST['page_contactblock_block'])) { $contact_id = Contact::getIdForURL($contact_url); if ($contact_id) { Contact::block($contact_id); @@ -465,7 +467,7 @@ function admin_page_contactblock_post(App $a) notice(L10n::t("Could not find any contact entry for this URL \x28%s\x29", $contact_url)); } } - if (x($_POST, 'page_contactblock_unblock')) { + if (!empty($_POST['page_contactblock_unblock'])) { foreach ($contacts as $uid) { Contact::unblock($uid); } @@ -559,13 +561,13 @@ function admin_page_deleteitem(App $a) */ function admin_page_deleteitem_post(App $a) { - if (!x($_POST['page_deleteitem_submit'])) { + if (empty($_POST['page_deleteitem_submit'])) { return; } BaseModule::checkFormSecurityTokenRedirectOnError('/admin/deleteitem/', 'admin_deleteitem'); - if (x($_POST['page_deleteitem_submit'])) { + if (!empty($_POST['page_deleteitem_submit'])) { $guid = trim(Strings::escapeTags($_POST['deleteitemguid'])); // The GUID should not include a "/", so if there is one, we got an URL // and the last part of it is most likely the GUID. @@ -838,7 +840,7 @@ function admin_page_workerqueue(App $a, $deferred) $info = L10n::t('This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you\'ve set up during install.'); } - $entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], $condition, ['order'=> ['priority']]); + $entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], $condition, ['order' => ['priority']]); $r = []; while ($entry = DBA::fetch($entries)) { @@ -938,7 +940,7 @@ function admin_page_summary(App $a) $users = 0; foreach ($r as $u) { $accounts[$u['page-flags']][1] = $u['count']; - $users+= $u['count']; + $users += $u['count']; } Logger::log('accounts: ' . print_r($accounts, true), Logger::DATA); @@ -962,10 +964,10 @@ function admin_page_summary(App $a) $max_allowed_packet = (($r) ? $r[0]['Value'] : 0); $server_settings = ['label' => L10n::t('Server Settings'), - 'php' => ['upload_max_filesize' => ini_get('upload_max_filesize'), - 'post_max_size' => ini_get('post_max_size'), - 'memory_limit' => ini_get('memory_limit')], - 'mysql' => ['max_allowed_packet' => $max_allowed_packet]]; + 'php' => ['upload_max_filesize' => ini_get('upload_max_filesize'), + 'post_max_size' => ini_get('post_max_size'), + 'memory_limit' => ini_get('memory_limit')], + 'mysql' => ['max_allowed_packet' => $max_allowed_packet]]; $t = Renderer::getMarkupTemplate('admin/summary.tpl'); return Renderer::replaceMacros($t, [ @@ -1001,17 +1003,17 @@ function admin_page_site_post(App $a) return; } - if (!x($_POST, "page_site")) { + if (empty($_POST['page_site'])) { return; } // relocate - if (x($_POST, 'relocate') && x($_POST, 'relocate_url') && $_POST['relocate_url'] != "") { + if (!empty($_POST['relocate']) && !empty($_POST['relocate_url']) && $_POST['relocate_url'] != "") { $new_url = $_POST['relocate_url']; $new_url = rtrim($new_url, "/"); $parsed = @parse_url($new_url); - if (!is_array($parsed) || !x($parsed, 'host') || !x($parsed, 'scheme')) { + if (!is_array($parsed) || empty($parsed['host']) || empty($parsed['scheme'])) { notice(L10n::t("Can not parse base url. Must have at least ://")); $a->internalRedirect('admin/site'); } @@ -1046,6 +1048,7 @@ function admin_page_site_post(App $a) $a->internalRedirect('admin/site'); } } + // update tables // update profile links in the format "http://server.tld" update_table($a, "profile", ['photo', 'thumb'], $old_url, $new_url); @@ -1059,7 +1062,7 @@ function admin_page_site_post(App $a) update_table($a, "gcontact", ['connect', 'addr'], $old_host, $new_host); // update config - Config::set('system', 'hostname', parse_url($new_url, PHP_URL_HOST)); + Config::set('system', 'hostname', parse_url($new_url, PHP_URL_HOST)); Config::set('system', 'url', $new_url); $a->setBaseURL($new_url); @@ -1076,98 +1079,97 @@ function admin_page_site_post(App $a) } // end relocate - $sitename = ((x($_POST,'sitename')) ? Strings::escapeTags(trim($_POST['sitename'])) : ''); - $hostname = ((x($_POST,'hostname')) ? Strings::escapeTags(trim($_POST['hostname'])) : ''); - $sender_email = ((x($_POST,'sender_email')) ? Strings::escapeTags(trim($_POST['sender_email'])) : ''); - $banner = ((x($_POST,'banner')) ? trim($_POST['banner']) : false); - $shortcut_icon = ((x($_POST,'shortcut_icon')) ? Strings::escapeTags(trim($_POST['shortcut_icon'])) : ''); - $touch_icon = ((x($_POST,'touch_icon')) ? Strings::escapeTags(trim($_POST['touch_icon'])) : ''); - $info = ((x($_POST,'info')) ? trim($_POST['info']) : false); - $language = ((x($_POST,'language')) ? Strings::escapeTags(trim($_POST['language'])) : ''); - $theme = ((x($_POST,'theme')) ? Strings::escapeTags(trim($_POST['theme'])) : ''); - $theme_mobile = ((x($_POST,'theme_mobile')) ? Strings::escapeTags(trim($_POST['theme_mobile'])) : ''); - $maximagesize = ((x($_POST,'maximagesize')) ? intval(trim($_POST['maximagesize'])) : 0); - $maximagelength = ((x($_POST,'maximagelength')) ? intval(trim($_POST['maximagelength'])) : MAX_IMAGE_LENGTH); - $jpegimagequality = ((x($_POST,'jpegimagequality')) ? intval(trim($_POST['jpegimagequality'])) : JPEG_QUALITY); + $sitename = (!empty($_POST['sitename']) ? Strings::escapeTags(trim($_POST['sitename'])) : ''); + $hostname = (!empty($_POST['hostname']) ? Strings::escapeTags(trim($_POST['hostname'])) : ''); + $sender_email = (!empty($_POST['sender_email']) ? Strings::escapeTags(trim($_POST['sender_email'])) : ''); + $banner = (!empty($_POST['banner']) ? trim($_POST['banner']) : false); + $shortcut_icon = (!empty($_POST['shortcut_icon']) ? Strings::escapeTags(trim($_POST['shortcut_icon'])) : ''); + $touch_icon = (!empty($_POST['touch_icon']) ? Strings::escapeTags(trim($_POST['touch_icon'])) : ''); + $info = (!empty($_POST['info']) ? trim($_POST['info']) : false); + $language = (!empty($_POST['language']) ? Strings::escapeTags(trim($_POST['language'])) : ''); + $theme = (!empty($_POST['theme']) ? Strings::escapeTags(trim($_POST['theme'])) : ''); + $theme_mobile = (!empty($_POST['theme_mobile']) ? Strings::escapeTags(trim($_POST['theme_mobile'])) : ''); + $maximagesize = (!empty($_POST['maximagesize']) ? intval(trim($_POST['maximagesize'])) : 0); + $maximagelength = (!empty($_POST['maximagelength']) ? intval(trim($_POST['maximagelength'])) : MAX_IMAGE_LENGTH); + $jpegimagequality = (!empty($_POST['jpegimagequality']) ? intval(trim($_POST['jpegimagequality'])) : JPEG_QUALITY); + $register_policy = (!empty($_POST['register_policy']) ? intval(trim($_POST['register_policy'])) : 0); + $daily_registrations = (!empty($_POST['max_daily_registrations']) ? intval(trim($_POST['max_daily_registrations'])) : 0); + $abandon_days = (!empty($_POST['abandon_days']) ? intval(trim($_POST['abandon_days'])) : 0); - $register_policy = ((x($_POST,'register_policy')) ? intval(trim($_POST['register_policy'])) : 0); - $daily_registrations = ((x($_POST,'max_daily_registrations')) ? intval(trim($_POST['max_daily_registrations'])) :0); - $abandon_days = ((x($_POST,'abandon_days')) ? intval(trim($_POST['abandon_days'])) : 0); + $register_text = (!empty($_POST['register_text']) ? strip_tags(trim($_POST['register_text'])) : ''); - $register_text = ((x($_POST,'register_text')) ? strip_tags(trim($_POST['register_text'])) : ''); + $allowed_sites = (!empty($_POST['allowed_sites']) ? Strings::escapeTags(trim($_POST['allowed_sites'])) : ''); + $allowed_email = (!empty($_POST['allowed_email']) ? Strings::escapeTags(trim($_POST['allowed_email'])) : ''); + $forbidden_nicknames = (!empty($_POST['forbidden_nicknames']) ? strtolower(Strings::escapeTags(trim($_POST['forbidden_nicknames']))) : ''); + $no_oembed_rich_content = !empty($_POST['no_oembed_rich_content']); + $allowed_oembed = (!empty($_POST['allowed_oembed']) ? Strings::escapeTags(trim($_POST['allowed_oembed'])) : ''); + $block_public = !empty($_POST['block_public']); + $force_publish = !empty($_POST['publish_all']); + $global_directory = (!empty($_POST['directory']) ? Strings::escapeTags(trim($_POST['directory'])) : ''); + $newuser_private = !empty($_POST['newuser_private']); + $enotify_no_content = !empty($_POST['enotify_no_content']); + $private_addons = !empty($_POST['private_addons']); + $disable_embedded = !empty($_POST['disable_embedded']); + $allow_users_remote_self = !empty($_POST['allow_users_remote_self']); + $explicit_content = !empty($_POST['explicit_content']); - $allowed_sites = ((x($_POST,'allowed_sites')) ? Strings::escapeTags(trim($_POST['allowed_sites'])) : ''); - $allowed_email = ((x($_POST,'allowed_email')) ? Strings::escapeTags(trim($_POST['allowed_email'])) : ''); - $forbidden_nicknames = ((x($_POST,'forbidden_nicknames')) ? strtolower(Strings::escapeTags(trim($_POST['forbidden_nicknames']))) : ''); - $no_oembed_rich_content = x($_POST,'no_oembed_rich_content'); - $allowed_oembed = ((x($_POST,'allowed_oembed')) ? Strings::escapeTags(trim($_POST['allowed_oembed'])) : ''); - $block_public = ((x($_POST,'block_public')) ? True : False); - $force_publish = ((x($_POST,'publish_all')) ? True : False); - $global_directory = ((x($_POST,'directory')) ? Strings::escapeTags(trim($_POST['directory'])) : ''); - $newuser_private = ((x($_POST,'newuser_private')) ? True : False); - $enotify_no_content = ((x($_POST,'enotify_no_content')) ? True : False); - $private_addons = ((x($_POST,'private_addons')) ? True : False); - $disable_embedded = ((x($_POST,'disable_embedded')) ? True : False); - $allow_users_remote_self = ((x($_POST,'allow_users_remote_self')) ? True : False); - $explicit_content = ((x($_POST,'explicit_content')) ? True : False); + $no_multi_reg = !empty($_POST['no_multi_reg']); + $no_openid = !empty($_POST['no_openid']); + $no_regfullname = !empty($_POST['no_regfullname']); + $community_page_style = (!empty($_POST['community_page_style']) ? intval(trim($_POST['community_page_style'])) : 0); + $max_author_posts_community_page = (!empty($_POST['max_author_posts_community_page']) ? intval(trim($_POST['max_author_posts_community_page'])) : 0); - $no_multi_reg = ((x($_POST,'no_multi_reg')) ? True : False); - $no_openid = !((x($_POST,'no_openid')) ? True : False); - $no_regfullname = !((x($_POST,'no_regfullname')) ? True : False); - $community_page_style = ((x($_POST,'community_page_style')) ? intval(trim($_POST['community_page_style'])) : 0); - $max_author_posts_community_page = ((x($_POST,'max_author_posts_community_page')) ? intval(trim($_POST['max_author_posts_community_page'])) : 0); + $verifyssl = !empty($_POST['verifyssl']); + $proxyuser = (!empty($_POST['proxyuser']) ? Strings::escapeTags(trim($_POST['proxyuser'])) : ''); + $proxy = (!empty($_POST['proxy']) ? Strings::escapeTags(trim($_POST['proxy'])) : ''); + $timeout = (!empty($_POST['timeout']) ? intval(trim($_POST['timeout'])) : 60); + $maxloadavg = (!empty($_POST['maxloadavg']) ? intval(trim($_POST['maxloadavg'])) : 50); + $maxloadavg_frontend = (!empty($_POST['maxloadavg_frontend']) ? intval(trim($_POST['maxloadavg_frontend'])) : 50); + $min_memory = (!empty($_POST['min_memory']) ? intval(trim($_POST['min_memory'])) : 0); + $optimize_max_tablesize = (!empty($_POST['optimize_max_tablesize']) ? intval(trim($_POST['optimize_max_tablesize'])) : 100); + $optimize_fragmentation = (!empty($_POST['optimize_fragmentation']) ? intval(trim($_POST['optimize_fragmentation'])) : 30); + $poco_completion = (!empty($_POST['poco_completion']) ? intval(trim($_POST['poco_completion'])) : false); + $poco_requery_days = (!empty($_POST['poco_requery_days']) ? intval(trim($_POST['poco_requery_days'])) : 7); + $poco_discovery = (!empty($_POST['poco_discovery']) ? intval(trim($_POST['poco_discovery'])) : 0); + $poco_discovery_since = (!empty($_POST['poco_discovery_since']) ? intval(trim($_POST['poco_discovery_since'])) : 30); + $poco_local_search = !empty($_POST['poco_local_search']); + $nodeinfo = !empty($_POST['nodeinfo']); + $dfrn_only = !empty($_POST['dfrn_only']); + $ostatus_disabled = !empty($_POST['ostatus_disabled']); + $ostatus_full_threads = !empty($_POST['ostatus_full_threads']); + $diaspora_enabled = !empty($_POST['diaspora_enabled']); + $ssl_policy = (!empty($_POST['ssl_policy']) ? intval($_POST['ssl_policy']) : 0); + $force_ssl = !empty($_POST['force_ssl']); + $hide_help = !empty($_POST['hide_help']); + $dbclean = !empty($_POST['dbclean']); + $dbclean_expire_days = (!empty($_POST['dbclean_expire_days']) ? intval($_POST['dbclean_expire_days']) : 0); + $dbclean_unclaimed = (!empty($_POST['dbclean_unclaimed']) ? intval($_POST['dbclean_unclaimed']) : 0); + $dbclean_expire_conv = (!empty($_POST['dbclean_expire_conv']) ? intval($_POST['dbclean_expire_conv']) : 0); + $suppress_tags = !empty($_POST['suppress_tags']); + $itemcache = (!empty($_POST['itemcache']) ? Strings::escapeTags(trim($_POST['itemcache'])) : ''); + $itemcache_duration = (!empty($_POST['itemcache_duration']) ? intval($_POST['itemcache_duration']) : 0); + $max_comments = (!empty($_POST['max_comments']) ? intval($_POST['max_comments']) : 0); + $temppath = (!empty($_POST['temppath']) ? Strings::escapeTags(trim($_POST['temppath'])) : ''); + $basepath = (!empty($_POST['basepath']) ? Strings::escapeTags(trim($_POST['basepath'])) : ''); + $singleuser = (!empty($_POST['singleuser']) ? Strings::escapeTags(trim($_POST['singleuser'])) : ''); + $proxy_disabled = !empty($_POST['proxy_disabled']); + $only_tag_search = !empty($_POST['only_tag_search']); + $rino = (!empty($_POST['rino']) ? intval($_POST['rino']) : 0); + $check_new_version_url = (!empty($_POST['check_new_version_url']) ? Strings::escapeTags(trim($_POST['check_new_version_url'])) : 'none'); - $verifyssl = ((x($_POST,'verifyssl')) ? True : False); - $proxyuser = ((x($_POST,'proxyuser')) ? Strings::escapeTags(trim($_POST['proxyuser'])) : ''); - $proxy = ((x($_POST,'proxy')) ? Strings::escapeTags(trim($_POST['proxy'])) : ''); - $timeout = ((x($_POST,'timeout')) ? intval(trim($_POST['timeout'])) : 60); - $maxloadavg = ((x($_POST,'maxloadavg')) ? intval(trim($_POST['maxloadavg'])) : 50); - $maxloadavg_frontend = ((x($_POST,'maxloadavg_frontend')) ? intval(trim($_POST['maxloadavg_frontend'])) : 50); - $min_memory = ((x($_POST,'min_memory')) ? intval(trim($_POST['min_memory'])) : 0); - $optimize_max_tablesize = ((x($_POST,'optimize_max_tablesize')) ? intval(trim($_POST['optimize_max_tablesize'])): 100); - $optimize_fragmentation = ((x($_POST,'optimize_fragmentation')) ? intval(trim($_POST['optimize_fragmentation'])): 30); - $poco_completion = ((x($_POST,'poco_completion')) ? intval(trim($_POST['poco_completion'])) : false); - $poco_requery_days = ((x($_POST,'poco_requery_days')) ? intval(trim($_POST['poco_requery_days'])) : 7); - $poco_discovery = ((x($_POST,'poco_discovery')) ? intval(trim($_POST['poco_discovery'])) : 0); - $poco_discovery_since = ((x($_POST,'poco_discovery_since')) ? intval(trim($_POST['poco_discovery_since'])) : 30); - $poco_local_search = ((x($_POST,'poco_local_search')) ? intval(trim($_POST['poco_local_search'])) : false); - $nodeinfo = ((x($_POST,'nodeinfo')) ? intval(trim($_POST['nodeinfo'])) : false); - $dfrn_only = ((x($_POST,'dfrn_only')) ? True : False); - $ostatus_disabled = !((x($_POST,'ostatus_disabled')) ? True : False); - $ostatus_full_threads = ((x($_POST,'ostatus_full_threads')) ? True : False); - $diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? True : False); - $ssl_policy = ((x($_POST,'ssl_policy')) ? intval($_POST['ssl_policy']) : 0); - $force_ssl = ((x($_POST,'force_ssl')) ? True : False); - $hide_help = ((x($_POST,'hide_help')) ? True : False); - $dbclean = ((x($_POST,'dbclean')) ? True : False); - $dbclean_expire_days = ((x($_POST,'dbclean_expire_days')) ? intval($_POST['dbclean_expire_days']) : 0); - $dbclean_unclaimed = ((x($_POST,'dbclean_unclaimed')) ? intval($_POST['dbclean_unclaimed']) : 0); - $dbclean_expire_conv = ((x($_POST,'dbclean_expire_conv')) ? intval($_POST['dbclean_expire_conv']) : 0); - $suppress_tags = ((x($_POST,'suppress_tags')) ? True : False); - $itemcache = ((x($_POST,'itemcache')) ? Strings::escapeTags(trim($_POST['itemcache'])) : ''); - $itemcache_duration = ((x($_POST,'itemcache_duration')) ? intval($_POST['itemcache_duration']) : 0); - $max_comments = ((x($_POST,'max_comments')) ? intval($_POST['max_comments']) : 0); - $temppath = ((x($_POST,'temppath')) ? Strings::escapeTags(trim($_POST['temppath'])) : ''); - $basepath = ((x($_POST,'basepath')) ? Strings::escapeTags(trim($_POST['basepath'])) : ''); - $singleuser = ((x($_POST,'singleuser')) ? Strings::escapeTags(trim($_POST['singleuser'])) : ''); - $proxy_disabled = ((x($_POST,'proxy_disabled')) ? True : False); - $only_tag_search = ((x($_POST,'only_tag_search')) ? True : False); - $rino = ((x($_POST,'rino')) ? intval($_POST['rino']) : 0); - $check_new_version_url = ((x($_POST, 'check_new_version_url')) ? Strings::escapeTags(trim($_POST['check_new_version_url'])) : 'none'); + $worker_queues = (!empty($_POST['worker_queues']) ? intval($_POST['worker_queues']) : 10); + $worker_dont_fork = !empty($_POST['worker_dont_fork']); + $worker_fastlane = !empty($_POST['worker_fastlane']); + $worker_frontend = !empty($_POST['worker_frontend']); - $worker_queues = ((x($_POST,'worker_queues')) ? intval($_POST['worker_queues']) : 10); - $worker_dont_fork = ((x($_POST,'worker_dont_fork')) ? True : False); - $worker_fastlane = ((x($_POST,'worker_fastlane')) ? True : False); - $worker_frontend = ((x($_POST,'worker_frontend')) ? True : False); - - $relay_directly = ((x($_POST,'relay_directly')) ? True : False); - $relay_server = ((x($_POST,'relay_server')) ? Strings::escapeTags(trim($_POST['relay_server'])) : ''); - $relay_subscribe = ((x($_POST,'relay_subscribe')) ? True : False); - $relay_scope = ((x($_POST,'relay_scope')) ? Strings::escapeTags(trim($_POST['relay_scope'])) : ''); - $relay_server_tags = ((x($_POST,'relay_server_tags')) ? Strings::escapeTags(trim($_POST['relay_server_tags'])) : ''); - $relay_user_tags = ((x($_POST,'relay_user_tags')) ? True : False); - $active_panel = (defaults($_POST, 'active_panel', '') ? "#" . Strings::escapeTags(trim($_POST['active_panel'])) : ''); + $relay_directly = !empty($_POST['relay_directly']); + $relay_server = (!empty($_POST['relay_server']) ? Strings::escapeTags(trim($_POST['relay_server'])) : ''); + $relay_subscribe = !empty($_POST['relay_subscribe']); + $relay_scope = (!empty($_POST['relay_scope']) ? Strings::escapeTags(trim($_POST['relay_scope'])) : ''); + $relay_server_tags = (!empty($_POST['relay_server_tags']) ? Strings::escapeTags(trim($_POST['relay_server_tags'])) : ''); + $relay_user_tags = !empty($_POST['relay_user_tags']); + $active_panel = (!empty($_POST['active_panel']) ? "#" . Strings::escapeTags(trim($_POST['active_panel'])) : ''); // Has the directory url changed? If yes, then resubmit the existing profiles there if ($global_directory != Config::get('system', 'directory') && ($global_directory != '')) { @@ -1217,24 +1219,24 @@ function admin_page_site_post(App $a) ); } } - Config::set('system', 'ssl_policy', $ssl_policy); - Config::set('system', 'maxloadavg', $maxloadavg); - Config::set('system', 'maxloadavg_frontend', $maxloadavg_frontend); - Config::set('system', 'min_memory', $min_memory); + Config::set('system', 'ssl_policy' , $ssl_policy); + Config::set('system', 'maxloadavg' , $maxloadavg); + Config::set('system', 'maxloadavg_frontend' , $maxloadavg_frontend); + Config::set('system', 'min_memory' , $min_memory); Config::set('system', 'optimize_max_tablesize', $optimize_max_tablesize); Config::set('system', 'optimize_fragmentation', $optimize_fragmentation); - Config::set('system', 'poco_completion', $poco_completion); - Config::set('system', 'poco_requery_days', $poco_requery_days); - Config::set('system', 'poco_discovery', $poco_discovery); - Config::set('system', 'poco_discovery_since', $poco_discovery_since); - Config::set('system', 'poco_local_search', $poco_local_search); - Config::set('system', 'nodeinfo', $nodeinfo); - Config::set('config', 'sitename', $sitename); - Config::set('config', 'hostname', $hostname); - Config::set('config', 'sender_email', $sender_email); - Config::set('system', 'suppress_tags', $suppress_tags); - Config::set('system', 'shortcut_icon', $shortcut_icon); - Config::set('system', 'touch_icon', $touch_icon); + Config::set('system', 'poco_completion' , $poco_completion); + Config::set('system', 'poco_requery_days' , $poco_requery_days); + Config::set('system', 'poco_discovery' , $poco_discovery); + Config::set('system', 'poco_discovery_since' , $poco_discovery_since); + Config::set('system', 'poco_local_search' , $poco_local_search); + Config::set('system', 'nodeinfo' , $nodeinfo); + Config::set('config', 'sitename' , $sitename); + Config::set('config', 'hostname' , $hostname); + Config::set('config', 'sender_email' , $sender_email); + Config::set('system', 'suppress_tags' , $suppress_tags); + Config::set('system', 'shortcut_icon' , $shortcut_icon); + Config::set('system', 'touch_icon' , $touch_icon); if ($banner == "") { Config::delete('system', 'banner'); @@ -1261,49 +1263,49 @@ function admin_page_site_post(App $a) } else { Config::set('system', 'singleuser', $singleuser); } - Config::set('system', 'maximagesize', $maximagesize); - Config::set('system', 'max_image_length', $maximagelength); - Config::set('system', 'jpeg_quality', $jpegimagequality); + Config::set('system', 'maximagesize' , $maximagesize); + Config::set('system', 'max_image_length' , $maximagelength); + Config::set('system', 'jpeg_quality' , $jpegimagequality); - Config::set('config', 'register_policy', $register_policy); + Config::set('config', 'register_policy' , $register_policy); Config::set('system', 'max_daily_registrations', $daily_registrations); - Config::set('system', 'account_abandon_days', $abandon_days); - Config::set('config', 'register_text', $register_text); - Config::set('system', 'allowed_sites', $allowed_sites); - Config::set('system', 'allowed_email', $allowed_email); - Config::set('system', 'forbidden_nicknames', $forbidden_nicknames); - Config::set('system', 'no_oembed_rich_content', $no_oembed_rich_content); - Config::set('system', 'allowed_oembed', $allowed_oembed); - Config::set('system', 'block_public', $block_public); - Config::set('system', 'publish_all', $force_publish); - Config::set('system', 'newuser_private', $newuser_private); - Config::set('system', 'enotify_no_content', $enotify_no_content); - Config::set('system', 'disable_embedded', $disable_embedded); + Config::set('system', 'account_abandon_days' , $abandon_days); + Config::set('config', 'register_text' , $register_text); + Config::set('system', 'allowed_sites' , $allowed_sites); + Config::set('system', 'allowed_email' , $allowed_email); + Config::set('system', 'forbidden_nicknames' , $forbidden_nicknames); + Config::set('system', 'no_oembed_rich_content' , $no_oembed_rich_content); + Config::set('system', 'allowed_oembed' , $allowed_oembed); + Config::set('system', 'block_public' , $block_public); + Config::set('system', 'publish_all' , $force_publish); + Config::set('system', 'newuser_private' , $newuser_private); + Config::set('system', 'enotify_no_content' , $enotify_no_content); + Config::set('system', 'disable_embedded' , $disable_embedded); Config::set('system', 'allow_users_remote_self', $allow_users_remote_self); - Config::set('system', 'explicit_content', $explicit_content); - Config::set('system', 'check_new_version_url', $check_new_version_url); + Config::set('system', 'explicit_content' , $explicit_content); + Config::set('system', 'check_new_version_url' , $check_new_version_url); Config::set('system', 'block_extended_register', $no_multi_reg); - Config::set('system', 'no_openid', $no_openid); - Config::set('system', 'no_regfullname', $no_regfullname); - Config::set('system', 'community_page_style', $community_page_style); + Config::set('system', 'no_openid' , $no_openid); + Config::set('system', 'no_regfullname' , $no_regfullname); + Config::set('system', 'community_page_style' , $community_page_style); Config::set('system', 'max_author_posts_community_page', $max_author_posts_community_page); - Config::set('system', 'verifyssl', $verifyssl); - Config::set('system', 'proxyuser', $proxyuser); - Config::set('system', 'proxy', $proxy); - Config::set('system', 'curl_timeout', $timeout); - Config::set('system', 'dfrn_only', $dfrn_only); - Config::set('system', 'ostatus_disabled', $ostatus_disabled); - Config::set('system', 'ostatus_full_threads', $ostatus_full_threads); - Config::set('system', 'diaspora_enabled', $diaspora_enabled); + Config::set('system', 'verifyssl' , $verifyssl); + Config::set('system', 'proxyuser' , $proxyuser); + Config::set('system', 'proxy' , $proxy); + Config::set('system', 'curl_timeout' , $timeout); + Config::set('system', 'dfrn_only' , $dfrn_only); + Config::set('system', 'ostatus_disabled' , $ostatus_disabled); + Config::set('system', 'ostatus_full_threads' , $ostatus_full_threads); + Config::set('system', 'diaspora_enabled' , $diaspora_enabled); - Config::set('config', 'private_addons', $private_addons); + Config::set('config', 'private_addons' , $private_addons); - Config::set('system', 'force_ssl', $force_ssl); - Config::set('system', 'hide_help', $hide_help); + Config::set('system', 'force_ssl' , $force_ssl); + Config::set('system', 'hide_help' , $hide_help); - Config::set('system', 'dbclean', $dbclean); - Config::set('system', 'dbclean-expire-days', $dbclean_expire_days); + Config::set('system', 'dbclean' , $dbclean); + Config::set('system', 'dbclean-expire-days' , $dbclean_expire_days); Config::set('system', 'dbclean_expire_conversation', $dbclean_expire_conv); if ($dbclean_unclaimed == 0) { @@ -1330,23 +1332,23 @@ function admin_page_site_post(App $a) $basepath = App::getRealPath($basepath); } - Config::set('system', 'basepath', $basepath); - Config::set('system', 'proxy_disabled', $proxy_disabled); - Config::set('system', 'only_tag_search', $only_tag_search); + Config::set('system', 'basepath' , $basepath); + Config::set('system', 'proxy_disabled' , $proxy_disabled); + Config::set('system', 'only_tag_search' , $only_tag_search); - Config::set('system', 'worker_queues', $worker_queues); - Config::set('system', 'worker_dont_fork', $worker_dont_fork); - Config::set('system', 'worker_fastlane', $worker_fastlane); - Config::set('system', 'frontend_worker', $worker_frontend); + Config::set('system', 'worker_queues' , $worker_queues); + Config::set('system', 'worker_dont_fork' , $worker_dont_fork); + Config::set('system', 'worker_fastlane' , $worker_fastlane); + Config::set('system', 'frontend_worker' , $worker_frontend); - Config::set('system', 'relay_directly', $relay_directly); - Config::set('system', 'relay_server', $relay_server); - Config::set('system', 'relay_subscribe', $relay_subscribe); - Config::set('system', 'relay_scope', $relay_scope); + Config::set('system', 'relay_directly' , $relay_directly); + Config::set('system', 'relay_server' , $relay_server); + Config::set('system', 'relay_subscribe' , $relay_subscribe); + Config::set('system', 'relay_scope' , $relay_scope); Config::set('system', 'relay_server_tags', $relay_server_tags); - Config::set('system', 'relay_user_tags', $relay_user_tags); + Config::set('system', 'relay_user_tags' , $relay_user_tags); - Config::set('system', 'rino_encrypt', $rino); + Config::set('system', 'rino_encrypt' , $rino); info(L10n::t('Site settings updated.') . EOL); @@ -1484,120 +1486,121 @@ function admin_page_site(App $a) $t = Renderer::getMarkupTemplate('admin/site.tpl'); return Renderer::replaceMacros($t, [ - '$title' => L10n::t('Administration'), - '$page' => L10n::t('Site'), - '$submit' => L10n::t('Save Settings'), - '$republish' => L10n::t('Republish users to directory'), - '$registration' => L10n::t('Registration'), - '$upload' => L10n::t('File upload'), - '$corporate' => L10n::t('Policies'), - '$advanced' => L10n::t('Advanced'), + '$title' => L10n::t('Administration'), + '$page' => L10n::t('Site'), + '$submit' => L10n::t('Save Settings'), + '$republish' => L10n::t('Republish users to directory'), + '$registration' => L10n::t('Registration'), + '$upload' => L10n::t('File upload'), + '$corporate' => L10n::t('Policies'), + '$advanced' => L10n::t('Advanced'), '$portable_contacts' => L10n::t('Auto Discovered Contact Directory'), - '$performance' => L10n::t('Performance'), - '$worker_title' => L10n::t('Worker'), - '$relay_title' => L10n::t('Message Relay'), - '$relocate' => L10n::t('Relocate Instance'), - '$relocate_warning' => L10n::t('Warning! Advanced function. Could make this server unreachable.'), - '$baseurl' => System::baseUrl(true), + '$performance' => L10n::t('Performance'), + '$worker_title' => L10n::t('Worker'), + '$relay_title' => L10n::t('Message Relay'), + '$relocate' => L10n::t('Relocate Instance'), + '$relocate_warning' => L10n::t('Warning! Advanced function. Could make this server unreachable.'), + '$baseurl' => System::baseUrl(true), + // name, label, value, help string, extra data... - '$sitename' => ['sitename', L10n::t("Site name"), Config::get('config', 'sitename'),''], - '$hostname' => ['hostname', L10n::t("Host name"), Config::get('config', 'hostname'), ""], - '$sender_email' => ['sender_email', L10n::t("Sender Email"), Config::get('config', 'sender_email'), L10n::t("The email address your server shall use to send notification emails from."), "", "", "email"], - '$banner' => ['banner', L10n::t("Banner/Logo"), $banner, ""], - '$shortcut_icon' => ['shortcut_icon', L10n::t("Shortcut icon"), Config::get('system','shortcut_icon'), L10n::t("Link to an icon that will be used for browsers.")], - '$touch_icon' => ['touch_icon', L10n::t("Touch icon"), Config::get('system','touch_icon'), L10n::t("Link to an icon that will be used for tablets and mobiles.")], - '$info' => ['info', L10n::t('Additional Info'), $info, L10n::t('For public servers: you can add additional information here that will be listed at %s/servers.', get_server())], - '$language' => ['language', L10n::t("System language"), Config::get('system','language'), "", $lang_choices], - '$theme' => ['theme', L10n::t("System theme"), Config::get('system','theme'), L10n::t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices], - '$theme_mobile' => ['theme_mobile', L10n::t("Mobile system theme"), Config::get('system', 'mobile-theme', '---'), L10n::t("Theme for mobile devices"), $theme_choices_mobile], - '$ssl_policy' => ['ssl_policy', L10n::t("SSL link policy"), (string) intval(Config::get('system','ssl_policy')), L10n::t("Determines whether generated links should be forced to use SSL"), $ssl_choices], - '$force_ssl' => ['force_ssl', L10n::t("Force SSL"), Config::get('system','force_ssl'), L10n::t("Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops.")], - '$hide_help' => ['hide_help', L10n::t("Hide help entry from navigation menu"), Config::get('system','hide_help'), L10n::t("Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly.")], - '$singleuser' => ['singleuser', L10n::t("Single user instance"), Config::get('system', 'singleuser', '---'), L10n::t("Make this instance multi-user or single-user for the named user"), $user_names], - '$maximagesize' => ['maximagesize', L10n::t("Maximum image size"), Config::get('system','maximagesize'), L10n::t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")], - '$maximagelength' => ['maximagelength', L10n::t("Maximum image length"), Config::get('system','max_image_length'), L10n::t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")], - '$jpegimagequality' => ['jpegimagequality', L10n::t("JPEG image quality"), Config::get('system','jpeg_quality'), L10n::t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")], + '$sitename' => ['sitename', L10n::t("Site name"), Config::get('config', 'sitename'), ''], + '$hostname' => ['hostname', L10n::t("Host name"), Config::get('config', 'hostname'), ""], + '$sender_email' => ['sender_email', L10n::t("Sender Email"), Config::get('config', 'sender_email'), L10n::t("The email address your server shall use to send notification emails from."), "", "", "email"], + '$banner' => ['banner', L10n::t("Banner/Logo"), $banner, ""], + '$shortcut_icon' => ['shortcut_icon', L10n::t("Shortcut icon"), Config::get('system', 'shortcut_icon'), L10n::t("Link to an icon that will be used for browsers.")], + '$touch_icon' => ['touch_icon', L10n::t("Touch icon"), Config::get('system', 'touch_icon'), L10n::t("Link to an icon that will be used for tablets and mobiles.")], + '$info' => ['info', L10n::t('Additional Info'), $info, L10n::t('For public servers: you can add additional information here that will be listed at %s/servers.', get_server())], + '$language' => ['language', L10n::t("System language"), Config::get('system', 'language'), "", $lang_choices], + '$theme' => ['theme', L10n::t("System theme"), Config::get('system', 'theme'), L10n::t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices], + '$theme_mobile' => ['theme_mobile', L10n::t("Mobile system theme"), Config::get('system', 'mobile-theme', '---'), L10n::t("Theme for mobile devices"), $theme_choices_mobile], + '$ssl_policy' => ['ssl_policy', L10n::t("SSL link policy"), (string)intval(Config::get('system', 'ssl_policy')), L10n::t("Determines whether generated links should be forced to use SSL"), $ssl_choices], + '$force_ssl' => ['force_ssl', L10n::t("Force SSL"), Config::get('system', 'force_ssl'), L10n::t("Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops.")], + '$hide_help' => ['hide_help', L10n::t("Hide help entry from navigation menu"), Config::get('system', 'hide_help'), L10n::t("Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly.")], + '$singleuser' => ['singleuser', L10n::t("Single user instance"), Config::get('system', 'singleuser', '---'), L10n::t("Make this instance multi-user or single-user for the named user"), $user_names], + '$maximagesize' => ['maximagesize', L10n::t("Maximum image size"), Config::get('system', 'maximagesize'), L10n::t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")], + '$maximagelength' => ['maximagelength', L10n::t("Maximum image length"), Config::get('system', 'max_image_length'), L10n::t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")], + '$jpegimagequality' => ['jpegimagequality', L10n::t("JPEG image quality"), Config::get('system', 'jpeg_quality'), L10n::t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")], - '$register_policy' => ['register_policy', L10n::t("Register policy"), Config::get('config', 'register_policy'), "", $register_choices], - '$daily_registrations' => ['max_daily_registrations', L10n::t("Maximum Daily Registrations"), Config::get('system', 'max_daily_registrations'), L10n::t("If registration is permitted above, this sets the maximum number of new user registrations to accept per day. If register is set to closed, this setting has no effect.")], - '$register_text' => ['register_text', L10n::t("Register text"), Config::get('config', 'register_text'), L10n::t("Will be displayed prominently on the registration page. You can use BBCode here.")], - '$forbidden_nicknames' => ['forbidden_nicknames', L10n::t('Forbidden Nicknames'), Config::get('system', 'forbidden_nicknames'), L10n::t('Comma separated list of nicknames that are forbidden from registration. Preset is a list of role names according RFC 2142.')], - '$abandon_days' => ['abandon_days', L10n::t('Accounts abandoned after x days'), Config::get('system','account_abandon_days'), L10n::t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')], - '$allowed_sites' => ['allowed_sites', L10n::t("Allowed friend domains"), Config::get('system','allowed_sites'), L10n::t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")], - '$allowed_email' => ['allowed_email', L10n::t("Allowed email domains"), Config::get('system','allowed_email'), L10n::t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")], - '$no_oembed_rich_content' => ['no_oembed_rich_content', L10n::t("No OEmbed rich content"), Config::get('system','no_oembed_rich_content'), L10n::t("Don't show the rich content \x28e.g. embedded PDF\x29, except from the domains listed below.")], - '$allowed_oembed' => ['allowed_oembed', L10n::t("Allowed OEmbed domains"), Config::get('system','allowed_oembed'), L10n::t("Comma separated list of domains which oembed content is allowed to be displayed. Wildcards are accepted.")], - '$block_public' => ['block_public', L10n::t("Block public"), Config::get('system','block_public'), L10n::t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")], - '$force_publish' => ['publish_all', L10n::t("Force publish"), Config::get('system','publish_all'), L10n::t("Check to force all profiles on this site to be listed in the site directory.") . '' . L10n::t('Enabling this may violate privacy laws like the GDPR') . ''], - '$global_directory' => ['directory', L10n::t("Global directory URL"), Config::get('system', 'directory', 'https://dir.friendica.social'), L10n::t("URL to the global directory. If this is not set, the global directory is completely unavailable to the application.")], - '$newuser_private' => ['newuser_private', L10n::t("Private posts by default for new users"), Config::get('system','newuser_private'), L10n::t("Set default post permissions for all new members to the default privacy group rather than public.")], - '$enotify_no_content' => ['enotify_no_content', L10n::t("Don't include post content in email notifications"), Config::get('system','enotify_no_content'), L10n::t("Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure.")], - '$private_addons' => ['private_addons', L10n::t("Disallow public access to addons listed in the apps menu."), Config::get('config','private_addons'), L10n::t("Checking this box will restrict addons listed in the apps menu to members only.")], - '$disable_embedded' => ['disable_embedded', L10n::t("Don't embed private images in posts"), Config::get('system','disable_embedded'), L10n::t("Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while.")], - '$explicit_content' => ['explicit_content', L10n::t('Explicit Content'), Config::get('system', 'explicit_content', False), L10n::t('Set this to announce that your node is used mostly for explicit content that might not be suited for minors. This information will be published in the node information and might be used, e.g. by the global directory, to filter your node from listings of nodes to join. Additionally a note about this will be shown at the user registration page.')], - '$allow_users_remote_self' => ['allow_users_remote_self', L10n::t('Allow Users to set remote_self'), Config::get('system','allow_users_remote_self'), L10n::t('With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream.')], - '$no_multi_reg' => ['no_multi_reg', L10n::t("Block multiple registrations"), Config::get('system','block_extended_register'), L10n::t("Disallow users to register additional accounts for use as pages.")], - '$no_openid' => ['no_openid', L10n::t("OpenID support"), !Config::get('system','no_openid'), L10n::t("OpenID support for registration and logins.")], - '$no_regfullname' => ['no_regfullname', L10n::t("Fullname check"), !Config::get('system','no_regfullname'), L10n::t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")], - '$community_page_style' => ['community_page_style', L10n::t("Community pages for visitors"), Config::get('system','community_page_style'), L10n::t("Which community pages should be available for visitors. Local users always see both pages."), $community_page_style_choices], - '$max_author_posts_community_page' => ['max_author_posts_community_page', L10n::t("Posts per user on community page"), Config::get('system','max_author_posts_community_page'), L10n::t("The maximum number of posts per user on the community page. \x28Not valid for 'Global Community'\x29")], - '$ostatus_disabled' => ['ostatus_disabled', L10n::t("Enable OStatus support"), !Config::get('system','ostatus_disabled'), L10n::t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")], - '$ostatus_full_threads' => ['ostatus_full_threads', L10n::t("Only import OStatus/ActivityPub threads from our contacts"), Config::get('system','ostatus_full_threads'), L10n::t("Normally we import every content from our OStatus and ActivityPub contacts. With this option we only store threads that are started by a contact that is known on our system.")], - '$ostatus_not_able' => L10n::t("OStatus support can only be enabled if threading is enabled."), - '$diaspora_able' => $diaspora_able, - '$diaspora_not_able' => L10n::t("Diaspora support can't be enabled because Friendica was installed into a sub directory."), - '$diaspora_enabled' => ['diaspora_enabled', L10n::t("Enable Diaspora support"), Config::get('system', 'diaspora_enabled', $diaspora_able), L10n::t("Provide built-in Diaspora network compatibility.")], - '$dfrn_only' => ['dfrn_only', L10n::t('Only allow Friendica contacts'), Config::get('system','dfrn_only'), L10n::t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")], - '$verifyssl' => ['verifyssl', L10n::t("Verify SSL"), Config::get('system','verifyssl'), L10n::t("If you wish, you can turn on strict certificate checking. This will mean you cannot connect \x28at all\x29 to self-signed SSL sites.")], - '$proxyuser' => ['proxyuser', L10n::t("Proxy user"), Config::get('system','proxyuser'), ""], - '$proxy' => ['proxy', L10n::t("Proxy URL"), Config::get('system','proxy'), ""], - '$timeout' => ['timeout', L10n::t("Network timeout"), Config::get('system', 'curl_timeout', 60), L10n::t("Value is in seconds. Set to 0 for unlimited \x28not recommended\x29.")], - '$maxloadavg' => ['maxloadavg', L10n::t("Maximum Load Average"), Config::get('system', 'maxloadavg', 50), L10n::t("Maximum system load before delivery and poll processes are deferred - default 50.")], - '$maxloadavg_frontend' => ['maxloadavg_frontend', L10n::t("Maximum Load Average \x28Frontend\x29"), Config::get('system', 'maxloadavg_frontend', 50), L10n::t("Maximum system load before the frontend quits service - default 50.")], - '$min_memory' => ['min_memory', L10n::t("Minimal Memory"), Config::get('system', 'min_memory', 0), L10n::t("Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 \x28deactivated\x29.")], - '$optimize_max_tablesize'=> ['optimize_max_tablesize', L10n::t("Maximum table size for optimization"), $optimize_max_tablesize, L10n::t("Maximum table size \x28in MB\x29 for the automatic optimization. Enter -1 to disable it.")], - '$optimize_fragmentation'=> ['optimize_fragmentation', L10n::t("Minimum level of fragmentation"), Config::get('system', 'optimize_fragmentation', 30), L10n::t("Minimum fragmenation level to start the automatic optimization - default value is 30%.")], + '$register_policy' => ['register_policy', L10n::t("Register policy"), Config::get('config', 'register_policy'), "", $register_choices], + '$daily_registrations' => ['max_daily_registrations', L10n::t("Maximum Daily Registrations"), Config::get('system', 'max_daily_registrations'), L10n::t("If registration is permitted above, this sets the maximum number of new user registrations to accept per day. If register is set to closed, this setting has no effect.")], + '$register_text' => ['register_text', L10n::t("Register text"), Config::get('config', 'register_text'), L10n::t("Will be displayed prominently on the registration page. You can use BBCode here.")], + '$forbidden_nicknames' => ['forbidden_nicknames', L10n::t('Forbidden Nicknames'), Config::get('system', 'forbidden_nicknames'), L10n::t('Comma separated list of nicknames that are forbidden from registration. Preset is a list of role names according RFC 2142.')], + '$abandon_days' => ['abandon_days', L10n::t('Accounts abandoned after x days'), Config::get('system', 'account_abandon_days'), L10n::t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')], + '$allowed_sites' => ['allowed_sites', L10n::t("Allowed friend domains"), Config::get('system', 'allowed_sites'), L10n::t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")], + '$allowed_email' => ['allowed_email', L10n::t("Allowed email domains"), Config::get('system', 'allowed_email'), L10n::t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")], + '$no_oembed_rich_content' => ['no_oembed_rich_content', L10n::t("No OEmbed rich content"), Config::get('system', 'no_oembed_rich_content'), L10n::t("Don't show the rich content \x28e.g. embedded PDF\x29, except from the domains listed below.")], + '$allowed_oembed' => ['allowed_oembed', L10n::t("Allowed OEmbed domains"), Config::get('system', 'allowed_oembed'), L10n::t("Comma separated list of domains which oembed content is allowed to be displayed. Wildcards are accepted.")], + '$block_public' => ['block_public', L10n::t("Block public"), Config::get('system', 'block_public'), L10n::t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")], + '$force_publish' => ['publish_all', L10n::t("Force publish"), Config::get('system', 'publish_all'), L10n::t("Check to force all profiles on this site to be listed in the site directory.") . '' . L10n::t('Enabling this may violate privacy laws like the GDPR') . ''], + '$global_directory' => ['directory', L10n::t("Global directory URL"), Config::get('system', 'directory', 'https://dir.friendica.social'), L10n::t("URL to the global directory. If this is not set, the global directory is completely unavailable to the application.")], + '$newuser_private' => ['newuser_private', L10n::t("Private posts by default for new users"), Config::get('system', 'newuser_private'), L10n::t("Set default post permissions for all new members to the default privacy group rather than public.")], + '$enotify_no_content' => ['enotify_no_content', L10n::t("Don't include post content in email notifications"), Config::get('system', 'enotify_no_content'), L10n::t("Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure.")], + '$private_addons' => ['private_addons', L10n::t("Disallow public access to addons listed in the apps menu."), Config::get('config', 'private_addons'), L10n::t("Checking this box will restrict addons listed in the apps menu to members only.")], + '$disable_embedded' => ['disable_embedded', L10n::t("Don't embed private images in posts"), Config::get('system', 'disable_embedded'), L10n::t("Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while.")], + '$explicit_content' => ['explicit_content', L10n::t('Explicit Content'), Config::get('system', 'explicit_content', false), L10n::t('Set this to announce that your node is used mostly for explicit content that might not be suited for minors. This information will be published in the node information and might be used, e.g. by the global directory, to filter your node from listings of nodes to join. Additionally a note about this will be shown at the user registration page.')], + '$allow_users_remote_self'=> ['allow_users_remote_self', L10n::t('Allow Users to set remote_self'), Config::get('system', 'allow_users_remote_self'), L10n::t('With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream.')], + '$no_multi_reg' => ['no_multi_reg', L10n::t("Block multiple registrations"), Config::get('system', 'block_extended_register'), L10n::t("Disallow users to register additional accounts for use as pages.")], + '$no_openid' => ['no_openid', L10n::t("Disable OpenID"), Config::get('system', 'no_openid'), L10n::t("Disable OpenID support for registration and logins.")], + '$no_regfullname' => ['no_regfullname', L10n::t("No Fullname check"), Config::get('system', 'no_regfullname'), L10n::t("Allow users to register without a space between the first name and the last name in their full name.")], + '$community_page_style' => ['community_page_style', L10n::t("Community pages for visitors"), Config::get('system', 'community_page_style'), L10n::t("Which community pages should be available for visitors. Local users always see both pages."), $community_page_style_choices], + '$max_author_posts_community_page' => ['max_author_posts_community_page', L10n::t("Posts per user on community page"), Config::get('system', 'max_author_posts_community_page'), L10n::t("The maximum number of posts per user on the community page. \x28Not valid for 'Global Community'\x29")], + '$ostatus_disabled' => ['ostatus_disabled', L10n::t("Disable OStatus support"), Config::get('system', 'ostatus_disabled'), L10n::t("Disable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")], + '$ostatus_full_threads' => ['ostatus_full_threads', L10n::t("Only import OStatus/ActivityPub threads from our contacts"), Config::get('system', 'ostatus_full_threads'), L10n::t("Normally we import every content from our OStatus and ActivityPub contacts. With this option we only store threads that are started by a contact that is known on our system.")], + '$ostatus_not_able' => L10n::t("OStatus support can only be enabled if threading is enabled."), + '$diaspora_able' => $diaspora_able, + '$diaspora_not_able' => L10n::t("Diaspora support can't be enabled because Friendica was installed into a sub directory."), + '$diaspora_enabled' => ['diaspora_enabled', L10n::t("Enable Diaspora support"), Config::get('system', 'diaspora_enabled', $diaspora_able), L10n::t("Provide built-in Diaspora network compatibility.")], + '$dfrn_only' => ['dfrn_only', L10n::t('Only allow Friendica contacts'), Config::get('system', 'dfrn_only'), L10n::t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")], + '$verifyssl' => ['verifyssl', L10n::t("Verify SSL"), Config::get('system', 'verifyssl'), L10n::t("If you wish, you can turn on strict certificate checking. This will mean you cannot connect \x28at all\x29 to self-signed SSL sites.")], + '$proxyuser' => ['proxyuser', L10n::t("Proxy user"), Config::get('system', 'proxyuser'), ""], + '$proxy' => ['proxy', L10n::t("Proxy URL"), Config::get('system', 'proxy'), ""], + '$timeout' => ['timeout', L10n::t("Network timeout"), Config::get('system', 'curl_timeout', 60), L10n::t("Value is in seconds. Set to 0 for unlimited \x28not recommended\x29.")], + '$maxloadavg' => ['maxloadavg', L10n::t("Maximum Load Average"), Config::get('system', 'maxloadavg', 50), L10n::t("Maximum system load before delivery and poll processes are deferred - default 50.")], + '$maxloadavg_frontend' => ['maxloadavg_frontend', L10n::t("Maximum Load Average \x28Frontend\x29"), Config::get('system', 'maxloadavg_frontend', 50), L10n::t("Maximum system load before the frontend quits service - default 50.")], + '$min_memory' => ['min_memory', L10n::t("Minimal Memory"), Config::get('system', 'min_memory', 0), L10n::t("Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 \x28deactivated\x29.")], + '$optimize_max_tablesize' => ['optimize_max_tablesize', L10n::t("Maximum table size for optimization"), $optimize_max_tablesize, L10n::t("Maximum table size \x28in MB\x29 for the automatic optimization. Enter -1 to disable it.")], + '$optimize_fragmentation' => ['optimize_fragmentation', L10n::t("Minimum level of fragmentation"), Config::get('system', 'optimize_fragmentation', 30), L10n::t("Minimum fragmenation level to start the automatic optimization - default value is 30%.")], - '$poco_completion' => ['poco_completion', L10n::t("Periodical check of global contacts"), Config::get('system','poco_completion'), L10n::t("If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers.")], - '$poco_requery_days' => ['poco_requery_days', L10n::t("Days between requery"), Config::get('system','poco_requery_days'), L10n::t("Number of days after which a server is requeried for his contacts.")], - '$poco_discovery' => ['poco_discovery', L10n::t("Discover contacts from other servers"), (string) intval(Config::get('system','poco_discovery')), L10n::t("Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommened setting is 'Users, Global Contacts'."), $poco_discovery_choices], - '$poco_discovery_since' => ['poco_discovery_since', L10n::t("Timeframe for fetching global contacts"), (string) intval(Config::get('system','poco_discovery_since')), L10n::t("When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."), $poco_discovery_since_choices], - '$poco_local_search' => ['poco_local_search', L10n::t("Search the local directory"), Config::get('system','poco_local_search'), L10n::t("Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated.")], + '$poco_completion' => ['poco_completion', L10n::t("Periodical check of global contacts"), Config::get('system', 'poco_completion'), L10n::t("If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers.")], + '$poco_requery_days' => ['poco_requery_days', L10n::t("Days between requery"), Config::get('system', 'poco_requery_days'), L10n::t("Number of days after which a server is requeried for his contacts.")], + '$poco_discovery' => ['poco_discovery', L10n::t("Discover contacts from other servers"), (string)intval(Config::get('system', 'poco_discovery')), L10n::t("Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommened setting is 'Users, Global Contacts'."), $poco_discovery_choices], + '$poco_discovery_since' => ['poco_discovery_since', L10n::t("Timeframe for fetching global contacts"), (string)intval(Config::get('system', 'poco_discovery_since')), L10n::t("When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."), $poco_discovery_since_choices], + '$poco_local_search' => ['poco_local_search', L10n::t("Search the local directory"), Config::get('system', 'poco_local_search'), L10n::t("Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated.")], - '$nodeinfo' => ['nodeinfo', L10n::t("Publish server information"), Config::get('system','nodeinfo'), L10n::t("If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See the-federation.info for details.")], + '$nodeinfo' => ['nodeinfo', L10n::t("Publish server information"), Config::get('system', 'nodeinfo'), L10n::t("If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See the-federation.info for details.")], - '$check_new_version_url' => ['check_new_version_url', L10n::t("Check upstream version"), Config::get('system', 'check_new_version_url'), L10n::t("Enables checking for new Friendica versions at github. If there is a new version, you will be informed in the admin panel overview."), $check_git_version_choices], - '$suppress_tags' => ['suppress_tags', L10n::t("Suppress Tags"), Config::get('system','suppress_tags'), L10n::t("Suppress showing a list of hashtags at the end of the posting.")], - '$dbclean' => ['dbclean', L10n::t("Clean database"), Config::get('system','dbclean', false), L10n::t("Remove old remote items, orphaned database records and old content from some other helper tables.")], - '$dbclean_expire_days' => ['dbclean_expire_days', L10n::t("Lifespan of remote items"), Config::get('system','dbclean-expire-days', 0), L10n::t("When the database cleanup is enabled, this defines the days after which remote items will be deleted. Own items, and marked or filed items are always kept. 0 disables this behaviour.")], - '$dbclean_unclaimed' => ['dbclean_unclaimed', L10n::t("Lifespan of unclaimed items"), Config::get('system','dbclean-expire-unclaimed', 90), L10n::t("When the database cleanup is enabled, this defines the days after which unclaimed remote items (mostly content from the relay) will be deleted. Default value is 90 days. Defaults to the general lifespan value of remote items if set to 0.")], - '$dbclean_expire_conv' => ['dbclean_expire_conv', L10n::t("Lifespan of raw conversation data"), Config::get('system','dbclean_expire_conversation', 90), L10n::t("The conversation data is used for ActivityPub and OStatus, as well as for debug purposes. It should be safe to remove it after 14 days, default is 90 days.")], - '$itemcache' => ['itemcache', L10n::t("Path to item cache"), Config::get('system','itemcache'), L10n::t("The item caches buffers generated bbcode and external images.")], - '$itemcache_duration' => ['itemcache_duration', L10n::t("Cache duration in seconds"), Config::get('system','itemcache_duration'), L10n::t("How long should the cache files be hold? Default value is 86400 seconds \x28One day\x29. To disable the item cache, set the value to -1.")], - '$max_comments' => ['max_comments', L10n::t("Maximum numbers of comments per post"), Config::get('system','max_comments'), L10n::t("How much comments should be shown for each post? Default value is 100.")], - '$temppath' => ['temppath', L10n::t("Temp path"), Config::get('system','temppath'), L10n::t("If you have a restricted system where the webserver can't access the system temp path, enter another path here.")], - '$basepath' => ['basepath', L10n::t("Base path to installation"), Config::get('system','basepath'), L10n::t("If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot.")], - '$proxy_disabled' => ['proxy_disabled', L10n::t("Disable picture proxy"), Config::get('system','proxy_disabled'), L10n::t("The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwidth.")], - '$only_tag_search' => ['only_tag_search', L10n::t("Only search in tags"), Config::get('system','only_tag_search'), L10n::t("On large systems the text search can slow down the system extremely.")], + '$check_new_version_url' => ['check_new_version_url', L10n::t("Check upstream version"), Config::get('system', 'check_new_version_url'), L10n::t("Enables checking for new Friendica versions at github. If there is a new version, you will be informed in the admin panel overview."), $check_git_version_choices], + '$suppress_tags' => ['suppress_tags', L10n::t("Suppress Tags"), Config::get('system', 'suppress_tags'), L10n::t("Suppress showing a list of hashtags at the end of the posting.")], + '$dbclean' => ['dbclean', L10n::t("Clean database"), Config::get('system', 'dbclean', false), L10n::t("Remove old remote items, orphaned database records and old content from some other helper tables.")], + '$dbclean_expire_days' => ['dbclean_expire_days', L10n::t("Lifespan of remote items"), Config::get('system', 'dbclean-expire-days', 0), L10n::t("When the database cleanup is enabled, this defines the days after which remote items will be deleted. Own items, and marked or filed items are always kept. 0 disables this behaviour.")], + '$dbclean_unclaimed' => ['dbclean_unclaimed', L10n::t("Lifespan of unclaimed items"), Config::get('system', 'dbclean-expire-unclaimed', 90), L10n::t("When the database cleanup is enabled, this defines the days after which unclaimed remote items (mostly content from the relay) will be deleted. Default value is 90 days. Defaults to the general lifespan value of remote items if set to 0.")], + '$dbclean_expire_conv' => ['dbclean_expire_conv', L10n::t("Lifespan of raw conversation data"), Config::get('system', 'dbclean_expire_conversation', 90), L10n::t("The conversation data is used for ActivityPub and OStatus, as well as for debug purposes. It should be safe to remove it after 14 days, default is 90 days.")], + '$itemcache' => ['itemcache', L10n::t("Path to item cache"), Config::get('system', 'itemcache'), L10n::t("The item caches buffers generated bbcode and external images.")], + '$itemcache_duration' => ['itemcache_duration', L10n::t("Cache duration in seconds"), Config::get('system', 'itemcache_duration'), L10n::t("How long should the cache files be hold? Default value is 86400 seconds \x28One day\x29. To disable the item cache, set the value to -1.")], + '$max_comments' => ['max_comments', L10n::t("Maximum numbers of comments per post"), Config::get('system', 'max_comments'), L10n::t("How much comments should be shown for each post? Default value is 100.")], + '$temppath' => ['temppath', L10n::t("Temp path"), Config::get('system', 'temppath'), L10n::t("If you have a restricted system where the webserver can't access the system temp path, enter another path here.")], + '$basepath' => ['basepath', L10n::t("Base path to installation"), Config::get('system', 'basepath'), L10n::t("If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot.")], + '$proxy_disabled' => ['proxy_disabled', L10n::t("Disable picture proxy"), Config::get('system', 'proxy_disabled'), L10n::t("The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwidth.")], + '$only_tag_search' => ['only_tag_search', L10n::t("Only search in tags"), Config::get('system', 'only_tag_search'), L10n::t("On large systems the text search can slow down the system extremely.")], - '$relocate_url' => ['relocate_url', L10n::t("New base url"), System::baseUrl(), L10n::t("Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users.")], + '$relocate_url' => ['relocate_url', L10n::t("New base url"), System::baseUrl(), L10n::t("Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users.")], - '$rino' => ['rino', L10n::t("RINO Encryption"), intval(Config::get('system','rino_encrypt')), L10n::t("Encryption layer between nodes."), [0 => L10n::t("Disabled"), 1 => L10n::t("Enabled")]], + '$rino' => ['rino', L10n::t("RINO Encryption"), intval(Config::get('system', 'rino_encrypt')), L10n::t("Encryption layer between nodes."), [0 => L10n::t("Disabled"), 1 => L10n::t("Enabled")]], - '$worker_queues' => ['worker_queues', L10n::t("Maximum number of parallel workers"), Config::get('system','worker_queues'), L10n::t("On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d.", 5, 20, 10)], - '$worker_dont_fork' => ['worker_dont_fork', L10n::t("Don't use 'proc_open' with the worker"), Config::get('system','worker_dont_fork'), L10n::t("Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of worker calls in your crontab.")], - '$worker_fastlane' => ['worker_fastlane', L10n::t("Enable fastlane"), Config::get('system','worker_fastlane'), L10n::t("When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.")], - '$worker_frontend' => ['worker_frontend', L10n::t('Enable frontend worker'), Config::get('system','frontend_worker'), L10n::t('When enabled the Worker process is triggered when backend access is performed \x28e.g. messages being delivered\x29. On smaller sites you might want to call %s/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server.', System::baseUrl())], + '$worker_queues' => ['worker_queues', L10n::t("Maximum number of parallel workers"), Config::get('system', 'worker_queues'), L10n::t("On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d.", 5, 20, 10)], + '$worker_dont_fork' => ['worker_dont_fork', L10n::t("Don't use 'proc_open' with the worker"), Config::get('system', 'worker_dont_fork'), L10n::t("Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of worker calls in your crontab.")], + '$worker_fastlane' => ['worker_fastlane', L10n::t("Enable fastlane"), Config::get('system', 'worker_fastlane'), L10n::t("When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.")], + '$worker_frontend' => ['worker_frontend', L10n::t('Enable frontend worker'), Config::get('system', 'frontend_worker'), L10n::t('When enabled the Worker process is triggered when backend access is performed \x28e.g. messages being delivered\x29. On smaller sites you might want to call %s/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server.', System::baseUrl())], - '$relay_subscribe' => ['relay_subscribe', L10n::t("Subscribe to relay"), Config::get('system','relay_subscribe'), L10n::t("Enables the receiving of public posts from the relay. They will be included in the search, subscribed tags and on the global community page.")], - '$relay_server' => ['relay_server', L10n::t("Relay server"), Config::get('system', 'relay_server', 'https://relay.diasp.org'), L10n::t("Address of the relay server where public posts should be send to. For example https://relay.diasp.org")], - '$relay_directly' => ['relay_directly', L10n::t("Direct relay transfer"), Config::get('system','relay_directly'), L10n::t("Enables the direct transfer to other servers without using the relay servers")], - '$relay_scope' => ['relay_scope', L10n::t("Relay scope"), Config::get('system','relay_scope'), L10n::t("Can be 'all' or 'tags'. 'all' means that every public post should be received. 'tags' means that only posts with selected tags should be received."), ['' => L10n::t('Disabled'), 'all' => L10n::t('all'), 'tags' => L10n::t('tags')]], - '$relay_server_tags' => ['relay_server_tags', L10n::t("Server tags"), Config::get('system','relay_server_tags'), L10n::t("Comma separated list of tags for the 'tags' subscription.")], - '$relay_user_tags' => ['relay_user_tags', L10n::t("Allow user tags"), Config::get('system', 'relay_user_tags', true), L10n::t("If enabled, the tags from the saved searches will used for the 'tags' subscription in addition to the 'relay_server_tags'.")], + '$relay_subscribe' => ['relay_subscribe', L10n::t("Subscribe to relay"), Config::get('system', 'relay_subscribe'), L10n::t("Enables the receiving of public posts from the relay. They will be included in the search, subscribed tags and on the global community page.")], + '$relay_server' => ['relay_server', L10n::t("Relay server"), Config::get('system', 'relay_server', 'https://relay.diasp.org'), L10n::t("Address of the relay server where public posts should be send to. For example https://relay.diasp.org")], + '$relay_directly' => ['relay_directly', L10n::t("Direct relay transfer"), Config::get('system', 'relay_directly'), L10n::t("Enables the direct transfer to other servers without using the relay servers")], + '$relay_scope' => ['relay_scope', L10n::t("Relay scope"), Config::get('system', 'relay_scope'), L10n::t("Can be 'all' or 'tags'. 'all' means that every public post should be received. 'tags' means that only posts with selected tags should be received."), ['' => L10n::t('Disabled'), 'all' => L10n::t('all'), 'tags' => L10n::t('tags')]], + '$relay_server_tags' => ['relay_server_tags', L10n::t("Server tags"), Config::get('system', 'relay_server_tags'), L10n::t("Comma separated list of tags for the 'tags' subscription.")], + '$relay_user_tags' => ['relay_user_tags', L10n::t("Allow user tags"), Config::get('system', 'relay_user_tags', true), L10n::t("If enabled, the tags from the saved searches will used for the 'tags' subscription in addition to the 'relay_server_tags'.")], - '$form_security_token' => BaseModule::getFormSecurityToken("admin_site"), - '$relocate_button' => L10n::t('Start Relocation'), + '$form_security_token' => BaseModule::getFormSecurityToken("admin_site"), + '$relocate_button' => L10n::t('Start Relocation'), ]); } @@ -1774,14 +1777,14 @@ function admin_page_users_post(App $a) 'body' => $body]); } - if (x($_POST, 'page_users_block')) { + if (!empty($_POST['page_users_block'])) { foreach ($users as $uid) { q("UPDATE `user` SET `blocked` = 1-`blocked` WHERE `uid` = %s", intval($uid) ); } notice(L10n::tt("%s user blocked/unblocked", "%s users blocked/unblocked", count($users))); } - if (x($_POST, 'page_users_delete')) { + if (!empty($_POST['page_users_delete'])) { foreach ($users as $uid) { if (local_user() != $uid) { User::remove($uid); @@ -1792,13 +1795,13 @@ function admin_page_users_post(App $a) notice(L10n::tt("%s user deleted", "%s users deleted", count($users))); } - if (x($_POST, 'page_users_approve')) { + if (!empty($_POST['page_users_approve'])) { require_once "mod/regmod.php"; foreach ($pending as $hash) { user_allow($hash); } } - if (x($_POST, 'page_users_deny')) { + if (!empty($_POST['page_users_deny'])) { require_once "mod/regmod.php"; foreach ($pending as $hash) { user_deny($hash); @@ -1872,7 +1875,7 @@ function admin_page_users(App $a) $order = "contact.name"; $order_direction = "+"; - if (x($_GET, 'o')) { + if (!empty($_GET['o'])) { $new_order = $_GET['o']; if ($new_order[0] === "-") { $order_direction = "-"; @@ -2098,7 +2101,7 @@ function admin_page_addons(App $a, array $addons_admin) /* * List addons */ - if (x($_GET, "a") && $_GET['a'] == "r") { + if (!empty($_GET['a']) && $_GET['a'] == "r") { BaseModule::checkFormSecurityTokenRedirectOnError($a->getBaseURL() . '/admin/addons', 'admin_themes', 't'); Addon::reload(); info("Addons reloaded"); @@ -2147,14 +2150,14 @@ function admin_page_addons(App $a, array $addons_admin) } /** - * @param array $themes + * @param array $themes * @param string $th - * @param int $result + * @param int $result */ function toggle_theme(&$themes, $th, &$result) { $count = count($themes); - for ($x = 0; $x < $count; $x ++) { + for ($x = 0; $x < $count; $x++) { if ($themes[$x]['name'] === $th) { if ($themes[$x]['allowed']) { $themes[$x]['allowed'] = 0; @@ -2168,14 +2171,14 @@ function toggle_theme(&$themes, $th, &$result) } /** - * @param array $themes + * @param array $themes * @param string $th * @return int */ function theme_status($themes, $th) { $count = count($themes); - for ($x = 0; $x < $count; $x ++) { + for ($x = 0; $x < $count; $x++) { if ($themes[$x]['name'] === $th) { if ($themes[$x]['allowed']) { return 1; @@ -2276,7 +2279,7 @@ function admin_page_themes(App $a) return ''; } - if (x($_GET, "a") && $_GET['a'] == "t") { + if (!empty($_GET['a']) && $_GET['a'] == "t") { BaseModule::checkFormSecurityTokenRedirectOnError('/admin/themes', 'admin_themes', 't'); // Toggle theme status @@ -2364,7 +2367,7 @@ function admin_page_themes(App $a) } // reload active themes - if (x($_GET, "a") && $_GET['a'] == "r") { + if (!empty($_GET['a']) && $_GET['a'] == "r") { BaseModule::checkFormSecurityTokenRedirectOnError(System::baseUrl() . '/admin/themes', 'admin_themes', 't'); foreach ($themes as $th) { if ($th['allowed']) { @@ -2409,12 +2412,12 @@ function admin_page_themes(App $a) */ function admin_page_logs_post(App $a) { - if (x($_POST, "page_logs")) { + if (!empty($_POST['page_logs'])) { BaseModule::checkFormSecurityTokenRedirectOnError('/admin/logs', 'admin_logs'); - $logfile = ((x($_POST,'logfile')) ? Strings::escapeTags(trim($_POST['logfile'])) : ''); - $debugging = ((x($_POST,'debugging')) ? true : false); - $loglevel = ((x($_POST,'loglevel')) ? intval(trim($_POST['loglevel'])) : 0); + $logfile = (!empty($_POST['logfile']) ? Strings::escapeTags(trim($_POST['logfile'])) : ''); + $debugging = !empty($_POST['debugging']); + $loglevel = (!empty($_POST['loglevel']) ? intval(trim($_POST['loglevel'])) : 0); Config::set('system', 'logfile', $logfile); Config::set('system', 'debugging', $debugging); @@ -2555,14 +2558,14 @@ function admin_page_features_post(App $a) $feature_state = 'feature_' . $feature; $featurelock = 'featurelock_' . $feature; - if (x($_POST, $feature_state)) { + if (!empty($_POST[$feature_state])) { $val = intval($_POST[$feature_state]); } else { $val = 0; } Config::set('feature', $feature, $val); - if (x($_POST, $featurelock)) { + if (!empty($_POST[$featurelock])) { Config::set('feature_lock', $feature, $val); } else { Config::delete('feature_lock', $feature); diff --git a/mod/api.php b/mod/api.php index 52ddf37be..e72146242 100644 --- a/mod/api.php +++ b/mod/api.php @@ -38,7 +38,7 @@ function api_post(App $a) return; } - if (count($a->user) && x($a->user, 'uid') && $a->user['uid'] != local_user()) { + if (count($a->user) && !empty($a->user['uid']) && $a->user['uid'] != local_user()) { notice(L10n::t('Permission denied.') . EOL); return; } @@ -62,7 +62,7 @@ function api_content(App $a) killme(); } - if (x($_POST, 'oauth_yes')) { + if (!empty($_POST['oauth_yes'])) { $app = oauth_get_client($request); if (is_null($app)) { return "Invalid request. Unknown token."; diff --git a/mod/cal.php b/mod/cal.php index 29095082d..526e33c00 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -72,7 +72,7 @@ function cal_init(App $a) $cal_widget = Widget\CalendarExport::getHTML(); - if (!x($a->page, 'aside')) { + if (empty($a->page['aside'])) { $a->page['aside'] = ''; } @@ -100,7 +100,7 @@ function cal_content(App $a) $mode = 'view'; $y = 0; $m = 0; - $ignored = (x($_REQUEST, 'ignored') ? intval($_REQUEST['ignored']) : 0); + $ignored = (!empty($_REQUEST['ignored']) ? intval($_REQUEST['ignored']) : 0); $format = 'ical'; if ($a->argc == 4 && $a->argv[2] == 'export') { @@ -115,7 +115,7 @@ function cal_content(App $a) $owner_uid = $a->data['user']['uid']; $nick = $a->data['user']['nickname']; - if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) { + if (!empty($_SESSION['remote']) && is_array($_SESSION['remote'])) { foreach ($_SESSION['remote'] as $v) { if ($v['uid'] == $a->profile['profile_uid']) { $contact_id = $v['cid']; @@ -195,11 +195,11 @@ function cal_content(App $a) if (!empty($a->argv[2]) && ($a->argv[2] === 'json')) { - if (x($_GET, 'start')) { + if (!empty($_GET['start'])) { $start = $_GET['start']; } - if (x($_GET, 'end')) { + if (!empty($_GET['end'])) { $finish = $_GET['end']; } } @@ -233,7 +233,7 @@ function cal_content(App $a) $r = Event::sortByDate($r); foreach ($r as $rr) { $j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j'); - if (!x($links, $j)) { + if (empty($links[$j])) { $links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j; } } @@ -248,7 +248,7 @@ function cal_content(App $a) } // links: array('href', 'text', 'extra css classes', 'title') - if (x($_GET, 'id')) { + if (!empty($_GET['id'])) { $tpl = Renderer::getMarkupTemplate("event.tpl"); } else { // if (Config::get('experimentals','new_calendar')==1){ @@ -284,7 +284,7 @@ function cal_content(App $a) "list" => L10n::t("list"), ]); - if (x($_GET, 'id')) { + if (!empty($_GET['id'])) { echo $o; killme(); } diff --git a/mod/common.php b/mod/common.php index b335e296d..c88d6ee77 100644 --- a/mod/common.php +++ b/mod/common.php @@ -55,7 +55,7 @@ function common_content(App $a) 'url' => 'contact/' . $cid ]); - if (!x($a->page, 'aside')) { + if (empty($a->page['aside'])) { $a->page['aside'] = ''; } $a->page['aside'] .= $vcard_widget; diff --git a/mod/contactgroup.php b/mod/contactgroup.php index bf34c59d7..753d3a073 100644 --- a/mod/contactgroup.php +++ b/mod/contactgroup.php @@ -40,7 +40,7 @@ function contactgroup_content(App $a) } } - if (x($change)) { + if (!empty($change)) { if (in_array($change, $preselected)) { Group::removeMember($group['id'], $change); } else { diff --git a/mod/crepair.php b/mod/crepair.php index f9ba281d1..8623d3c4a 100644 --- a/mod/crepair.php +++ b/mod/crepair.php @@ -25,7 +25,7 @@ function crepair_init(App $a) $contact = DBA::selectFirst('contact', [], ['uid' => local_user(), 'id' => $a->argv[1]]); } - if (!x($a->page, 'aside')) { + if (empty($a->page['aside'])) { $a->page['aside'] = ''; } diff --git a/mod/delegate.php b/mod/delegate.php index c8987ab57..280498db6 100644 --- a/mod/delegate.php +++ b/mod/delegate.php @@ -27,7 +27,7 @@ function delegate_post(App $a) return; } - if (count($a->user) && x($a->user, 'uid') && $a->user['uid'] != local_user()) { + if (count($a->user) && !empty($a->user['uid']) && $a->user['uid'] != local_user()) { notice(L10n::t('Permission denied.') . EOL); return; } @@ -63,7 +63,7 @@ function delegate_content(App $a) if ($a->argc > 2 && $a->argv[1] === 'add' && intval($a->argv[2])) { // delegated admins can view but not change delegation permissions - if (x($_SESSION, 'submanage')) { + if (!empty($_SESSION['submanage'])) { $a->internalRedirect('delegate'); } @@ -84,7 +84,7 @@ function delegate_content(App $a) if ($a->argc > 2 && $a->argv[1] === 'remove' && intval($a->argv[2])) { // delegated admins can view but not change delegation permissions - if (x($_SESSION, 'submanage')) { + if (!empty($_SESSION['submanage'])) { $a->internalRedirect('delegate'); } diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 48c8e32e5..6f365c531 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -63,7 +63,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) * this being a page type which supports automatic friend acceptance. That is also Scenario 1 * since we are operating on behalf of our registered user to approve a friendship. */ - if (!x($_POST, 'source_url')) { + if (empty($_POST['source_url'])) { $uid = defaults($handsfree, 'uid', local_user()); if (!$uid) { notice(L10n::t('Permission denied.') . EOL); @@ -417,7 +417,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) * In the section above where the confirming party makes a POST and * retrieves xml status information, they are communicating with the following code. */ - if (x($_POST, 'source_url')) { + if (!empty($_POST['source_url'])) { // We are processing an external confirmation to an introduction created by our user. $public_key = defaults($_POST, 'public_key', ''); $dfrn_id = hex2bin(defaults($_POST, 'dfrn_id' , '')); @@ -435,7 +435,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) // If $aes_key is set, both of these items require unpacking from the hex transport encoding. - if (x($aes_key)) { + if (!empty($aes_key)) { $aes_key = hex2bin($aes_key); $public_key = hex2bin($public_key); } diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 63f53e060..51576b3b4 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -39,16 +39,16 @@ function dfrn_notify_post(App $a) { } } - $dfrn_id = ((x($_POST,'dfrn_id')) ? Strings::escapeTags(trim($_POST['dfrn_id'])) : ''); - $dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0); - $challenge = ((x($_POST,'challenge')) ? Strings::escapeTags(trim($_POST['challenge'])) : ''); - $data = ((x($_POST,'data')) ? $_POST['data'] : ''); - $key = ((x($_POST,'key')) ? $_POST['key'] : ''); - $rino_remote = ((x($_POST,'rino')) ? intval($_POST['rino']) : 0); - $dissolve = ((x($_POST,'dissolve')) ? intval($_POST['dissolve']) : 0); - $perm = ((x($_POST,'perm')) ? Strings::escapeTags(trim($_POST['perm'])) : 'r'); - $ssl_policy = ((x($_POST,'ssl_policy')) ? Strings::escapeTags(trim($_POST['ssl_policy'])): 'none'); - $page = ((x($_POST,'page')) ? intval($_POST['page']) : 0); + $dfrn_id = (!empty($_POST['dfrn_id']) ? Strings::escapeTags(trim($_POST['dfrn_id'])) : ''); + $dfrn_version = (!empty($_POST['dfrn_version']) ? (float) $_POST['dfrn_version'] : 2.0); + $challenge = (!empty($_POST['challenge']) ? Strings::escapeTags(trim($_POST['challenge'])) : ''); + $data = defaults($_POST, 'data', ''); + $key = defaults($_POST, 'key', ''); + $rino_remote = (!empty($_POST['rino']) ? intval($_POST['rino']) : 0); + $dissolve = (!empty($_POST['dissolve']) ? intval($_POST['dissolve']) : 0); + $perm = (!empty($_POST['perm']) ? Strings::escapeTags(trim($_POST['perm'])) : 'r'); + $ssl_policy = (!empty($_POST['ssl_policy']) ? Strings::escapeTags(trim($_POST['ssl_policy'])): 'none'); + $page = (!empty($_POST['page']) ? intval($_POST['page']) : 0); $forum = (($page == 1) ? 1 : 0); $prv = (($page == 2) ? 1 : 0); @@ -247,7 +247,7 @@ function dfrn_dispatch_private($user, $postdata) function dfrn_notify_content(App $a) { - if (x($_GET,'dfrn_id')) { + if (!empty($_GET['dfrn_id'])) { /* * initial communication from external contact, $direction is their direction. @@ -256,7 +256,7 @@ function dfrn_notify_content(App $a) { $dfrn_id = Strings::escapeTags(trim($_GET['dfrn_id'])); $dfrn_version = (float) $_GET['dfrn_version']; - $rino_remote = ((x($_GET,'rino')) ? intval($_GET['rino']) : 0); + $rino_remote = (!empty($_GET['rino']) ? intval($_GET['rino']) : 0); $type = ""; $last_update = ""; @@ -370,7 +370,7 @@ function dfrn_notify_content(App $a) { . "\t" . '' . $perm . '' . "\r\n" . "\t" . '' . $encrypted_id . '' . "\r\n" . "\t" . '' . $challenge . '' . "\r\n" - . '' . "\r\n" ; + . '' . "\r\n"; killme(); } diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index ecca0adf7..646047ea5 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -31,7 +31,7 @@ function dfrn_poll_init(App $a) $sec = defaults($_GET, 'sec' , ''); $dfrn_version = (float) defaults($_GET, 'dfrn_version' , 2.0); $perm = defaults($_GET, 'perm' , 'r'); - $quiet = x($_GET, 'quiet'); + $quiet = !empty($_GET['quiet']); // Possibly it is an OStatus compatible server that requests a user feed $user_agent = defaults($_SERVER, 'HTTP_USER_AGENT', ''); @@ -51,7 +51,7 @@ function dfrn_poll_init(App $a) $hidewall = false; - if (($dfrn_id === '') && (!x($_POST, 'dfrn_id'))) { + if (($dfrn_id === '') && empty($_POST['dfrn_id'])) { if (Config::get('system', 'block_public') && !local_user() && !remote_user()) { System::httpExit(403); } @@ -113,7 +113,7 @@ function dfrn_poll_init(App $a) if ((int)$xml->status === 1) { $_SESSION['authenticated'] = 1; - if (!x($_SESSION, 'remote')) { + if (empty($_SESSION['remote'])) { $_SESSION['remote'] = []; } @@ -230,13 +230,13 @@ function dfrn_poll_init(App $a) function dfrn_poll_post(App $a) { - $dfrn_id = x($_POST,'dfrn_id') ? $_POST['dfrn_id'] : ''; - $challenge = x($_POST,'challenge') ? $_POST['challenge'] : ''; - $url = x($_POST,'url') ? $_POST['url'] : ''; - $sec = x($_POST,'sec') ? $_POST['sec'] : ''; - $ptype = x($_POST,'type') ? $_POST['type'] : ''; - $dfrn_version = x($_POST,'dfrn_version') ? (float) $_POST['dfrn_version'] : 2.0; - $perm = x($_POST,'perm') ? $_POST['perm'] : 'r'; + $dfrn_id = defaults($_POST, 'dfrn_id' , ''); + $challenge = defaults($_POST, 'challenge', ''); + $url = defaults($_POST, 'url' , ''); + $sec = defaults($_POST, 'sec' , ''); + $ptype = defaults($_POST, 'type' , ''); + $perm = defaults($_POST, 'perm' , 'r'); + $dfrn_version = !empty($_POST['dfrn_version']) ? (float) $_POST['dfrn_version'] : 2.0; if ($ptype === 'profile-check') { if (strlen($challenge) && strlen($sec)) { @@ -399,14 +399,13 @@ function dfrn_poll_post(App $a) function dfrn_poll_content(App $a) { - $dfrn_id = x($_GET,'dfrn_id') ? $_GET['dfrn_id'] : ''; - $type = x($_GET,'type') ? $_GET['type'] : 'data'; - $last_update = x($_GET,'last_update') ? $_GET['last_update'] : ''; - $destination_url = x($_GET,'destination_url') ? $_GET['destination_url'] : ''; - $sec = x($_GET,'sec') ? $_GET['sec'] : ''; - $dfrn_version = x($_GET,'dfrn_version') ? (float) $_GET['dfrn_version'] : 2.0; - $perm = x($_GET,'perm') ? $_GET['perm'] : 'r'; - $quiet = x($_GET,'quiet') ? true : false; + $dfrn_id = defaults($_GET, 'dfrn_id' , ''); + $type = defaults($_GET, 'type' , 'data'); + $last_update = defaults($_GET, 'last_update' , ''); + $destination_url = defaults($_GET, 'destination_url', ''); + $sec = defaults($_GET, 'sec' , ''); + $dfrn_version = !empty($_GET['dfrn_version']) ? (float) $_GET['dfrn_version'] : 2.0; + $quiet = !empty($_GET['quiet']); $direction = -1; if (strpos($dfrn_id, ':') == 1) { @@ -524,7 +523,7 @@ function dfrn_poll_content(App $a) if (((int) $xml->status == 0) && ($xml->challenge == $hash) && ($xml->sec == $sec)) { $_SESSION['authenticated'] = 1; - if (!x($_SESSION, 'remote')) { + if (empty($_SESSION['remote'])) { $_SESSION['remote'] = []; } diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 26d7efda5..16a2da556 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -64,7 +64,7 @@ function dfrn_request_post(App $a) return; } - if (x($_POST, 'cancel')) { + if (!empty($_POST['cancel'])) { $a->internalRedirect(); } @@ -73,18 +73,18 @@ function dfrn_request_post(App $a) * to confirm the request, and then we've clicked submit (perhaps after logging in). * That brings us here: */ - if ((x($_POST, 'localconfirm')) && ($_POST['localconfirm'] == 1)) { + if (!empty($_POST['localconfirm']) && ($_POST['localconfirm'] == 1)) { // Ensure this is a valid request - if (local_user() && ($a->user['nickname'] == $a->argv[1]) && (x($_POST, 'dfrn_url'))) { - $dfrn_url = Strings::escapeTags(trim($_POST['dfrn_url'])); - $aes_allow = (((x($_POST, 'aes_allow')) && ($_POST['aes_allow'] == 1)) ? 1 : 0); - $confirm_key = ((x($_POST, 'confirm_key')) ? $_POST['confirm_key'] : ""); - $hidden = ((x($_POST, 'hidden-contact')) ? intval($_POST['hidden-contact']) : 0); + if (local_user() && ($a->user['nickname'] == $a->argv[1]) && !empty($_POST['dfrn_url'])) { + $dfrn_url = Strings::escapeTags(trim($_POST['dfrn_url'])); + $aes_allow = !empty($_POST['aes_allow']); + $confirm_key = defaults($_POST, 'confirm_key', ""); + $hidden = (!empty($_POST['hidden-contact']) ? intval($_POST['hidden-contact']) : 0); $contact_record = null; - $blocked = 1; - $pending = 1; + $blocked = 1; + $pending = 1; - if (x($dfrn_url)) { + if (!empty($dfrn_url)) { // Lookup the contact based on their URL (which is the only unique thing we have at the moment) $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND NOT `self` LIMIT 1", intval(local_user()), @@ -115,10 +115,10 @@ function dfrn_request_post(App $a) notice(L10n::t('Profile location is not valid or does not contain profile information.') . EOL); return; } else { - if (!x($parms, 'fn')) { + if (empty($parms['fn'])) { notice(L10n::t('Warning: profile location has no identifiable owner name.') . EOL); } - if (!x($parms, 'photo')) { + if (empty($parms['photo'])) { notice(L10n::t('Warning: profile location has no profile photo.') . EOL); } $invalid = Probe::validDfrn($parms); @@ -238,7 +238,7 @@ function dfrn_request_post(App $a) $blocked = 1; $pending = 1; - if (x($_POST, 'dfrn_url')) { + if (!empty($_POST['dfrn_url'])) { // Block friend request spam if ($maxreq) { $r = q("SELECT * FROM `intro` WHERE `datetime` > '%s' AND `uid` = %d", @@ -270,7 +270,7 @@ function dfrn_request_post(App $a) } } - $real_name = x($_POST, 'realname') ? Strings::escapeTags(trim($_POST['realname'])) : ''; + $real_name = !empty($_POST['realname']) ? Strings::escapeTags(trim($_POST['realname'])) : ''; $url = trim($_POST['dfrn_url']); if (!strlen($url)) { @@ -356,10 +356,10 @@ function dfrn_request_post(App $a) notice(L10n::t('Profile location is not valid or does not contain profile information.') . EOL); $a->internalRedirect($a->cmd); } else { - if (!x($parms, 'fn')) { + if (empty($parms['fn'])) { notice(L10n::t('Warning: profile location has no identifiable owner name.') . EOL); } - if (!x($parms, 'photo')) { + if (empty($parms['photo'])) { notice(L10n::t('Warning: profile location has no profile photo.') . EOL); } $invalid = Probe::validDfrn($parms); @@ -423,7 +423,7 @@ function dfrn_request_post(App $a) VALUES ( %d, %d, 1, %d, '%s', '%s', '%s' )", intval($uid), intval($contact_record['id']), - ((x($_POST,'knowyou') && ($_POST['knowyou'] == 1)) ? 1 : 0), + intval(!empty($_POST['knowyou'])), DBA::escape(Strings::escapeTags(trim(defaults($_POST, 'dfrn-request-message', '')))), DBA::escape($hash), DBA::escape(DateTimeFormat::utcNow()) @@ -484,7 +484,7 @@ function dfrn_request_content(App $a) // "Homecoming". Make sure we're logged in to this site as the correct user. Then offer a confirm button // to send us to the post section to record the introduction. - if (x($_GET, 'dfrn_url')) { + if (!empty($_GET['dfrn_url'])) { if (!local_user()) { info(L10n::t("Please login to confirm introduction.") . EOL); /* setup the return URL to come back to this page if they use openid */ @@ -499,11 +499,11 @@ function dfrn_request_content(App $a) } $dfrn_url = Strings::escapeTags(trim(hex2bin($_GET['dfrn_url']))); - $aes_allow = x($_GET, 'aes_allow') && $_GET['aes_allow'] == 1 ? 1 : 0; - $confirm_key = x($_GET, 'confirm_key') ? $_GET['confirm_key'] : ""; + $aes_allow = !empty($_GET['aes_allow']); + $confirm_key = defaults($_GET, 'confirm_key', ""); // Checking fastlane for validity - if (x($_SESSION, "fastlane") && (Strings::normaliseLink($_SESSION["fastlane"]) == Strings::normaliseLink($dfrn_url))) { + if (!empty($_SESSION['fastlane']) && (Strings::normaliseLink($_SESSION["fastlane"]) == Strings::normaliseLink($dfrn_url))) { $_POST["dfrn_url"] = $dfrn_url; $_POST["confirm_key"] = $confirm_key; $_POST["localconfirm"] = 1; @@ -531,7 +531,7 @@ function dfrn_request_content(App $a) 'dfrn_rawurl' => $_GET['dfrn_url'] ]); return $o; - } elseif ((x($_GET, 'confirm_key')) && strlen($_GET['confirm_key'])) { + } elseif (!empty($_GET['confirm_key'])) { // we are the requestee and it is now safe to send our user their introduction, // We could just unblock it, but first we have to jump through a few hoops to // send an email, or even to find out if we need to send an email. @@ -607,9 +607,9 @@ function dfrn_request_content(App $a) // Try to auto-fill the profile address // At first look if an address was provided // Otherwise take the local address - if (x($_GET, 'addr') && ($_GET['addr'] != "")) { + if (!empty($_GET['addr'])) { $myaddr = hex2bin($_GET['addr']); - } elseif (x($_GET, 'address') && ($_GET['address'] != "")) { + } elseif (!empty($_GET['address'])) { $myaddr = $_GET['address']; } elseif (local_user()) { if (strlen($a->getURLPath())) { diff --git a/mod/directory.php b/mod/directory.php index e59cf7b82..3fd0aa848 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -30,7 +30,7 @@ function directory_init(App $a) function directory_post(App $a) { - if (x($_POST, 'search')) { + if (!empty($_POST['search'])) { $a->data['search'] = $_POST['search']; } } @@ -47,10 +47,10 @@ function directory_content(App $a) $o = ''; Nav::setSelected('directory'); - if (x($a->data, 'search')) { + if (!empty($a->data['search'])) { $search = Strings::escapeTags(trim($a->data['search'])); } else { - $search = ((x($_GET, 'search')) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : ''); + $search = (!empty($_GET['search']) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : ''); } $gdirpath = ''; @@ -138,28 +138,28 @@ function directory_content(App $a) } // if(strlen($rr['dob'])) { // if(($years = age($rr['dob'],$rr['timezone'],'')) != 0) -// $details .= '
' . L10n::t('Age: ') . $years ; +// $details .= '
' . L10n::t('Age: ') . $years; // } // if(strlen($rr['gender'])) // $details .= '
' . L10n::t('Gender: ') . $rr['gender']; $profile = $rr; - if ((x($profile, 'address') == 1) - || (x($profile, 'locality') == 1) - || (x($profile, 'region') == 1) - || (x($profile, 'postal-code') == 1) - || (x($profile, 'country-name') == 1) + if (!empty($profile['address']) + || !empty($profile['locality']) + || !empty($profile['region']) + || !empty($profile['postal-code']) + || !empty($profile['country-name']) ) { $location = L10n::t('Location:'); } else { $location = ''; } - $gender = ((x($profile, 'gender') == 1) ? L10n::t('Gender:') : false); - $marital = ((x($profile, 'marital') == 1) ? L10n::t('Status:') : false); - $homepage = ((x($profile, 'homepage') == 1) ? L10n::t('Homepage:') : false); - $about = ((x($profile, 'about') == 1) ? L10n::t('About:') : false); + $gender = (!empty($profile['gender']) ? L10n::t('Gender:') : false); + $marital = (!empty($profile['marital']) ? L10n::t('Status:') : false); + $homepage = (!empty($profile['homepage']) ? L10n::t('Homepage:') : false); + $about = (!empty($profile['about']) ? L10n::t('About:') : false); $location_e = $location; diff --git a/mod/dirfind.php b/mod/dirfind.php index 7f1a6691f..909a72316 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -30,7 +30,7 @@ function dirfind_init(App $a) { return; } - if (! x($a->page,'aside')) { + if (empty($a->page['aside'])) { $a->page['aside'] = ''; } diff --git a/mod/display.php b/mod/display.php index 39661cb76..3edeade72 100644 --- a/mod/display.php +++ b/mod/display.php @@ -276,7 +276,7 @@ function display_content(App $a, $update = false, $update_uid = 0) $contact_id = 0; - if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) { + if (!empty($_SESSION['remote']) && is_array($_SESSION['remote'])) { foreach ($_SESSION['remote'] as $v) { if ($v['uid'] == $a->profile['uid']) { $contact_id = $v['cid']; @@ -307,7 +307,7 @@ function display_content(App $a, $update = false, $update_uid = 0) } $is_owner = (local_user() && (in_array($a->profile['profile_uid'], [local_user(), 0])) ? true : false); - if (x($a->profile, 'hidewall') && !$is_owner && !$is_remote_contact) { + if (!empty($a->profile['hidewall']) && !$is_owner && !$is_remote_contact) { notice(L10n::t('Access to this profile has been restricted.') . EOL); return; } diff --git a/mod/fbrowser.php b/mod/fbrowser.php index cc51d4199..64af908aa 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -27,7 +27,7 @@ function fbrowser_content(App $a) $template_file = "filebrowser.tpl"; $mode = ""; - if (x($_GET, 'mode')) { + if (!empty($_GET['mode'])) { $mode = "?mode=".$_GET['mode']; } @@ -142,7 +142,7 @@ function fbrowser_content(App $a) break; } - if (x($_GET, 'mode')) { + if (!empty($_GET['mode'])) { return $o; } else { echo $o; diff --git a/mod/friendica.php b/mod/friendica.php index 77adccbfb..81275df6f 100644 --- a/mod/friendica.php +++ b/mod/friendica.php @@ -22,7 +22,7 @@ function friendica_init(App $a) } $sql_extra = ''; - if (x($a->config, 'admin_nickname')) { + if (!empty($a->config['admin_nickname'])) { $sql_extra = sprintf(" AND `nickname` = '%s' ", DBA::escape(Config::get('config', 'admin_nickname'))); } if (!empty(Config::get('config', 'admin_email'))) { @@ -41,7 +41,7 @@ function friendica_init(App $a) Config::load('feature_lock'); $locked_features = []; - if (!empty($a->config['feature_lock']) && count($a->config['feature_lock'])) { + if (!empty($a->config['feature_lock'])) { foreach ($a->config['feature_lock'] as $k => $v) { if ($k === 'config_loaded') { continue; diff --git a/mod/hcard.php b/mod/hcard.php index 7e5c2cc08..c8b6db455 100644 --- a/mod/hcard.php +++ b/mod/hcard.php @@ -29,27 +29,27 @@ function hcard_init(App $a) Profile::load($a, $which, $profile); - if ((x($a->profile, 'page-flags')) && ($a->profile['page-flags'] == Contact::PAGE_COMMUNITY)) { + if (!empty($a->profile['page-flags']) && ($a->profile['page-flags'] == Contact::PAGE_COMMUNITY)) { $a->page['htmlhead'] .= ''; } - if (x($a->profile, 'openidserver')) { + if (!empty($a->profile['openidserver'])) { $a->page['htmlhead'] .= '' . "\r\n"; } - if (x($a->profile, 'openid')) { + if (!empty($a->profile['openid'])) { $delegate = ((strstr($a->profile['openid'], '://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']); $a->page['htmlhead'] .= '' . "\r\n"; } if (!$blocked) { - $keywords = ((x($a->profile, 'pub_keywords')) ? $a->profile['pub_keywords'] : ''); + $keywords = defaults($a->profile, 'pub_keywords', ''); $keywords = str_replace([',',' ',',,'], [' ',',',','], $keywords); if (strlen($keywords)) { - $a->page['htmlhead'] .= '' . "\r\n" ; + $a->page['htmlhead'] .= '' . "\r\n"; } } - $a->page['htmlhead'] .= '' . "\r\n" ; - $a->page['htmlhead'] .= '' . "\r\n" ; + $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->getHostName() . (($a->getURLPath()) ? '/' . $a->getURLPath() : '')); $a->page['htmlhead'] .= '' . "\r\n"; header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false); diff --git a/mod/home.php b/mod/home.php index b37570740..02ec51dc0 100644 --- a/mod/home.php +++ b/mod/home.php @@ -29,10 +29,10 @@ function home_init(App $a) { if(! function_exists('home_content')) { function home_content(App $a) { - if (x($_SESSION,'theme')) { + if (!empty($_SESSION['theme'])) { unset($_SESSION['theme']); } - if (x($_SESSION,'mobile-theme')) { + if (!empty($_SESSION['mobile-theme'])) { unset($_SESSION['mobile-theme']); } diff --git a/mod/item.php b/mod/item.php index 5f9173fab..cc801df57 100644 --- a/mod/item.php +++ b/mod/item.php @@ -166,7 +166,7 @@ function item_post(App $a) { // Now check that valid personal details have been provided if (!Security::canWriteToUserWall($profile_uid) && !$allow_comment) { - notice(L10n::t('Permission denied.') . EOL) ; + notice(L10n::t('Permission denied.') . EOL); if (!empty($_REQUEST['return'])) { $a->internalRedirect($return_path); @@ -690,7 +690,7 @@ function item_post(App $a) { } $json = ['cancel' => 1]; - if (!empty($_REQUEST['jsreload']) && strlen($_REQUEST['jsreload'])) { + if (!empty($_REQUEST['jsreload'])) { $json['reload'] = System::baseUrl() . '/' . $_REQUEST['jsreload']; } @@ -869,7 +869,7 @@ function item_post_return($baseurl, $api_source, $return_path) } $json = ['success' => 1]; - if (!empty($_REQUEST['jsreload']) && strlen($_REQUEST['jsreload'])) { + if (!empty($_REQUEST['jsreload'])) { $json['reload'] = $baseurl . '/' . $_REQUEST['jsreload']; } diff --git a/mod/like.php b/mod/like.php index 97eaca163..5ea30a3ff 100644 --- a/mod/like.php +++ b/mod/like.php @@ -27,7 +27,7 @@ function like_content(App $a) { } // See if we've been passed a return path to redirect to - $return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : ''); + $return_path = defaults($_REQUEST, 'return', ''); like_content_return($a, $return_path); killme(); // NOTREACHED diff --git a/mod/localtime.php b/mod/localtime.php index 9a754ac80..f68c3fba5 100644 --- a/mod/localtime.php +++ b/mod/localtime.php @@ -42,7 +42,7 @@ function localtime_content(App $a) $o .= '

' . L10n::t('Current timezone: %s', $_REQUEST['timezone']) . '

'; } - if (x($a->data, 'mod-localtime')) { + if (!empty($a->data['mod-localtime'])) { $o .= '

' . L10n::t('Converted localtime: %s', $a->data['mod-localtime']) . '

'; } diff --git a/mod/manage.php b/mod/manage.php index f92a94549..b42b990aa 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -21,7 +21,7 @@ function manage_post(App $a) { $uid = local_user(); $orig_record = $a->user; - if((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) { + if(!empty($_SESSION['submanage'])) { $r = q("select * from user where uid = %d limit 1", intval($_SESSION['submanage']) ); @@ -37,7 +37,7 @@ function manage_post(App $a) { $submanage = $r; - $identity = (x($_POST['identity']) ? intval($_POST['identity']) : 0); + $identity = (!empty($_POST['identity']) ? intval($_POST['identity']) : 0); if (!$identity) { return; } @@ -101,13 +101,13 @@ function manage_post(App $a) { unset($_SESSION['mobile-theme']); unset($_SESSION['page_flags']); unset($_SESSION['return_path']); - if (x($_SESSION, 'submanage')) { + if (!empty($_SESSION['submanage'])) { unset($_SESSION['submanage']); } - if (x($_SESSION, 'sysmsg')) { + if (!empty($_SESSION['sysmsg'])) { unset($_SESSION['sysmsg']); } - if (x($_SESSION, 'sysmsg_info')) { + if (!empty($_SESSION['sysmsg_info'])) { unset($_SESSION['sysmsg_info']); } diff --git a/mod/message.php b/mod/message.php index 7491cd1bc..e0d9f4404 100644 --- a/mod/message.php +++ b/mod/message.php @@ -59,10 +59,10 @@ function message_post(App $a) return; } - $replyto = x($_REQUEST, 'replyto') ? Strings::escapeTags(trim($_REQUEST['replyto'])) : ''; - $subject = x($_REQUEST, 'subject') ? Strings::escapeTags(trim($_REQUEST['subject'])) : ''; - $body = x($_REQUEST, 'body') ? Strings::escapeHtml(trim($_REQUEST['body'])) : ''; - $recipient = x($_REQUEST, 'messageto') ? intval($_REQUEST['messageto']) : 0; + $replyto = !empty($_REQUEST['replyto']) ? Strings::escapeTags(trim($_REQUEST['replyto'])) : ''; + $subject = !empty($_REQUEST['subject']) ? Strings::escapeTags(trim($_REQUEST['subject'])) : ''; + $body = !empty($_REQUEST['body']) ? Strings::escapeHtml(trim($_REQUEST['body'])) : ''; + $recipient = !empty($_REQUEST['messageto']) ? intval($_REQUEST['messageto']) : 0; $ret = Mail::send($recipient, $body, $subject, $replyto); $norecip = false; @@ -253,8 +253,8 @@ function message_content(App $a) '$prefill' => $prefill, '$preid' => $preid, '$subject' => L10n::t('Subject:'), - '$subjtxt' => x($_REQUEST, 'subject') ? strip_tags($_REQUEST['subject']) : '', - '$text' => x($_REQUEST, 'body') ? Strings::escapeHtml(htmlspecialchars($_REQUEST['body'])) : '', + '$subjtxt' => !empty($_REQUEST['subject']) ? strip_tags($_REQUEST['subject']) : '', + '$text' => !empty($_REQUEST['body']) ? Strings::escapeHtml(htmlspecialchars($_REQUEST['body'])) : '', '$readonly' => '', '$yourmessage' => L10n::t('Your message:'), '$select' => $select, diff --git a/mod/modexp.php b/mod/modexp.php index 966c111d5..5819268e9 100644 --- a/mod/modexp.php +++ b/mod/modexp.php @@ -28,7 +28,7 @@ function modexp_init(App $a) { $e = $r[0]->asnData[1]->asnData[0]->asnData[1]->asnData; header("Content-type: application/magic-public-key"); - echo 'RSA' . '.' . $m . '.' . $e ; + echo 'RSA' . '.' . $m . '.' . $e; killme(); diff --git a/mod/network.php b/mod/network.php index 594a55799..52daa2eef 100644 --- a/mod/network.php +++ b/mod/network.php @@ -42,19 +42,19 @@ function network_init(App $a) Hook::add('head', __FILE__, 'network_infinite_scroll_head'); - $search = (x($_GET, 'search') ? Strings::escapeHtml($_GET['search']) : ''); + $search = (!empty($_GET['search']) ? Strings::escapeHtml($_GET['search']) : ''); if (($search != '') && !empty($_GET['submit'])) { $a->internalRedirect('search?search=' . urlencode($search)); } - if (x($_GET, 'save')) { + if (!empty($_GET['save'])) { $exists = DBA::exists('search', ['uid' => local_user(), 'term' => $search]); if (!$exists) { DBA::insert('search', ['uid' => local_user(), 'term' => $search]); } } - if (x($_GET, 'remove')) { + if (!empty($_GET['remove'])) { DBA::delete('search', ['uid' => local_user(), 'term' => $search]); } @@ -63,7 +63,7 @@ function network_init(App $a) $group_id = (($a->argc > 1 && is_numeric($a->argv[1])) ? intval($a->argv[1]) : 0); $cid = 0; - if (x($_GET, 'cid') && intval($_GET['cid']) != 0) { + if (!empty($_GET['cid'])) { $cid = $_GET['cid']; $_GET['nets'] = 'all'; $group_id = 0; @@ -152,33 +152,33 @@ function network_init(App $a) } // If nets is set to all, unset it - if (x($_GET, 'nets') && $_GET['nets'] === 'all') { + if (!empty($_GET['nets']) && $_GET['nets'] === 'all') { unset($_GET['nets']); } - if (!x($a->page, 'aside')) { + if (empty($a->page['aside'])) { $a->page['aside'] = ''; } $a->page['aside'] .= Group::sidebarWidget('network/0', 'network', 'standard', $group_id); $a->page['aside'] .= ForumManager::widget(local_user(), $cid); $a->page['aside'] .= posted_date_widget('network', local_user(), false); - $a->page['aside'] .= Widget::networks('network', (x($_GET, 'nets') ? $_GET['nets'] : '')); + $a->page['aside'] .= Widget::networks('network', defaults($_GET, 'nets', '') ); $a->page['aside'] .= saved_searches($search); - $a->page['aside'] .= Widget::fileAs('network', (x($_GET, 'file') ? $_GET['file'] : '')); + $a->page['aside'] .= Widget::fileAs('network', defaults($_GET, 'file', '') ); } function saved_searches($search) { $srchurl = '/network?f=' - . ((x($_GET, 'cid')) ? '&cid=' . rawurlencode($_GET['cid']) : '') - . ((x($_GET, 'star')) ? '&star=' . rawurlencode($_GET['star']) : '') - . ((x($_GET, 'bmark')) ? '&bmark=' . rawurlencode($_GET['bmark']) : '') - . ((x($_GET, 'conv')) ? '&conv=' . rawurlencode($_GET['conv']) : '') - . ((x($_GET, 'nets')) ? '&nets=' . rawurlencode($_GET['nets']) : '') - . ((x($_GET, 'cmin')) ? '&cmin=' . rawurlencode($_GET['cmin']) : '') - . ((x($_GET, 'cmax')) ? '&cmax=' . rawurlencode($_GET['cmax']) : '') - . ((x($_GET, 'file')) ? '&file=' . rawurlencode($_GET['file']) : ''); + . (!empty($_GET['cid']) ? '&cid=' . rawurlencode($_GET['cid']) : '') + . (!empty($_GET['star']) ? '&star=' . rawurlencode($_GET['star']) : '') + . (!empty($_GET['bmark']) ? '&bmark=' . rawurlencode($_GET['bmark']) : '') + . (!empty($_GET['conv']) ? '&conv=' . rawurlencode($_GET['conv']) : '') + . (!empty($_GET['nets']) ? '&nets=' . rawurlencode($_GET['nets']) : '') + . (!empty($_GET['cmin']) ? '&cmin=' . rawurlencode($_GET['cmin']) : '') + . (!empty($_GET['cmax']) ? '&cmax=' . rawurlencode($_GET['cmax']) : '') + . (!empty($_GET['file']) ? '&file=' . rawurlencode($_GET['file']) : ''); ; $terms = DBA::select('search', ['id', 'term'], ['uid' => local_user()]); @@ -233,15 +233,15 @@ function network_query_get_sel_tab(App $a) $new_active = 'active'; } - if (x($_GET, 'star')) { + if (!empty($_GET['star'])) { $starred_active = 'active'; } - if (x($_GET, 'bmark')) { + if (!empty($_GET['bmark'])) { $bookmarked_active = 'active'; } - if (x($_GET, 'conv')) { + if (!empty($_GET['conv'])) { $conv_active = 'active'; } @@ -249,7 +249,7 @@ function network_query_get_sel_tab(App $a) $no_active = 'active'; } - if ($no_active == 'active' && x($_GET, 'order')) { + if ($no_active == 'active' && !empty($_GET['order'])) { switch($_GET['order']) { case 'post' : $postord_active = 'active'; $no_active=''; break; case 'comment' : $all_active = 'active'; $no_active=''; break; @@ -914,7 +914,7 @@ function networkThreadedView(App $a, $update, $parent) $parents_str = implode(', ', $parents_arr); } - if (x($_GET, 'offset')) { + if (!empty($_GET['offset'])) { $date_offset = $_GET['offset']; } @@ -968,7 +968,7 @@ function network_tabs(App $a) $tabs = [ [ 'label' => L10n::t('Commented Order'), - 'url' => str_replace('/new', '', $cmd) . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), + 'url' => str_replace('/new', '', $cmd) . '?f=&order=comment' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''), 'sel' => $all_active, 'title' => L10n::t('Sort by Comment Date'), 'id' => 'commented-order-tab', @@ -976,7 +976,7 @@ function network_tabs(App $a) ], [ 'label' => L10n::t('Posted Order'), - 'url' => str_replace('/new', '', $cmd) . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), + 'url' => str_replace('/new', '', $cmd) . '?f=&order=post' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''), 'sel' => $postord_active, 'title' => L10n::t('Sort by Post Date'), 'id' => 'posted-order-tab', @@ -986,7 +986,7 @@ function network_tabs(App $a) $tabs[] = [ 'label' => L10n::t('Personal'), - 'url' => str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&conv=1', + 'url' => str_replace('/new', '', $cmd) . (!empty($_GET['cid']) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&conv=1', 'sel' => $conv_active, 'title' => L10n::t('Posts that mention or involve you'), 'id' => 'personal-tab', @@ -996,7 +996,7 @@ function network_tabs(App $a) if (Feature::isEnabled(local_user(), 'new_tab')) { $tabs[] = [ 'label' => L10n::t('New'), - 'url' => 'network/new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''), + 'url' => 'network/new' . (!empty($_GET['cid']) ? '/?f=&cid=' . $_GET['cid'] : ''), 'sel' => $new_active, 'title' => L10n::t('Activity Stream - by date'), 'id' => 'activitiy-by-date-tab', @@ -1007,7 +1007,7 @@ function network_tabs(App $a) if (Feature::isEnabled(local_user(), 'link_tab')) { $tabs[] = [ 'label' => L10n::t('Shared Links'), - 'url' => str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&bmark=1', + 'url' => str_replace('/new', '', $cmd) . (!empty($_GET['cid']) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&bmark=1', 'sel' => $bookmarked_active, 'title' => L10n::t('Interesting Links'), 'id' => 'shared-links-tab', @@ -1017,7 +1017,7 @@ function network_tabs(App $a) $tabs[] = [ 'label' => L10n::t('Starred'), - 'url' => str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&star=1', + 'url' => str_replace('/new', '', $cmd) . (!empty($_GET['cid']) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&star=1', 'sel' => $starred_active, 'title' => L10n::t('Favourite Posts'), 'id' => 'starred-posts-tab', @@ -1025,7 +1025,7 @@ function network_tabs(App $a) ]; // save selected tab, but only if not in file mode - if (!x($_GET, 'file')) { + if (empty($_GET['file'])) { PConfig::set(local_user(), 'network.view', 'tab.selected', [ $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active ]); diff --git a/mod/noscrape.php b/mod/noscrape.php index 87367d536..e1d51e5a8 100644 --- a/mod/noscrape.php +++ b/mod/noscrape.php @@ -48,7 +48,7 @@ function noscrape_init(App $a) exit; } - $keywords = ((x($a->profile, 'pub_keywords')) ? $a->profile['pub_keywords'] : ''); + $keywords = defaults($a->profile, 'pub_keywords', ''); $keywords = str_replace(['#',',',' ',',,'], ['',' ',',',','], $keywords); $keywords = explode(',', $keywords); diff --git a/mod/oexchange.php b/mod/oexchange.php index 62d0bba07..6d682d6ad 100644 --- a/mod/oexchange.php +++ b/mod/oexchange.php @@ -33,13 +33,13 @@ function oexchange_content(App $a) { return; } - $url = ((x($_REQUEST,'url') && strlen($_REQUEST['url'])) + $url = ((!empty($_REQUEST['url'])) ? urlencode(Strings::escapeTags(trim($_REQUEST['url']))) : ''); - $title = ((x($_REQUEST,'title') && strlen($_REQUEST['title'])) + $title = ((!empty($_REQUEST['title'])) ? '&title=' . urlencode(Strings::escapeTags(trim($_REQUEST['title']))) : ''); - $description = ((x($_REQUEST,'description') && strlen($_REQUEST['description'])) + $description = ((!empty($_REQUEST['description'])) ? '&description=' . urlencode(Strings::escapeTags(trim($_REQUEST['description']))) : ''); - $tags = ((x($_REQUEST,'tags') && strlen($_REQUEST['tags'])) + $tags = ((!empty($_REQUEST['tags'])) ? '&tags=' . urlencode(Strings::escapeTags(trim($_REQUEST['tags']))) : ''); $s = Network::fetchUrl(System::baseUrl() . '/parse_url?f=&url=' . $url . $title . $description . $tags); diff --git a/mod/openid.php b/mod/openid.php index 209960ee5..4e247b384 100644 --- a/mod/openid.php +++ b/mod/openid.php @@ -20,7 +20,7 @@ function openid_content(App $a) { Logger::log('mod_openid ' . print_r($_REQUEST,true), Logger::DATA); - if((x($_GET,'openid_mode')) && (x($_SESSION,'openid'))) { + if(!empty($_GET['openid_mode']) && !empty($_SESSION['openid'])) { $openid = new LightOpenID($a->getHostName()); diff --git a/mod/parse_url.php b/mod/parse_url.php index a1bacb0d8..07f319fdc 100644 --- a/mod/parse_url.php +++ b/mod/parse_url.php @@ -47,8 +47,8 @@ function parse_url_content(App $a) // Add url scheme if it is missing $arrurl = parse_url($url); - if (!x($arrurl, 'scheme')) { - if (x($arrurl, 'host')) { + if (empty($arrurl['scheme'])) { + if (!empty($arrurl['host'])) { $url = 'http:' . $url; } else { $url = 'http://' . $url; diff --git a/mod/photos.php b/mod/photos.php index 70e0e1882..d1dffd4d0 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -283,7 +283,7 @@ function photos_post(App $a) if (DBA::isResult($r)) { foreach ($r as $rr) { - $res[] = "'" . DBA::escape($rr['rid']) . "'" ; + $res[] = "'" . DBA::escape($rr['rid']) . "'"; } } else { $a->internalRedirect($_SESSION['photo_return']); @@ -365,10 +365,10 @@ function photos_post(App $a) return; // NOTREACHED } - if ($a->argc > 2 && (!empty($_POST['desc']) || !empty($_POST['newtag']) || !empty($_POST['albname']) !== false)) { + if ($a->argc > 2 && (!empty($_POST['desc']) || !empty($_POST['newtag']) || isset($_POST['albname']))) { $desc = !empty($_POST['desc']) ? Strings::escapeTags(trim($_POST['desc'])) : ''; $rawtags = !empty($_POST['newtag']) ? Strings::escapeTags(trim($_POST['newtag'])) : ''; - $item_id = !empty($_POST['item_id']) ? intval($_POST['item_id']) : 0; + $item_id = !empty($_POST['item_id']) ? intval($_POST['item_id']) : 0; $albname = !empty($_POST['albname']) ? Strings::escapeTags(trim($_POST['albname'])) : ''; $origaname = !empty($_POST['origaname']) ? Strings::escapeTags(trim($_POST['origaname'])) : ''; @@ -681,8 +681,8 @@ function photos_post(App $a) $arr['tag'] = $tagged[4]; $arr['inform'] = $tagged[2]; $arr['origin'] = 1; - $arr['body'] = L10n::t('%1$s was tagged in %2$s by %3$s', '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . L10n::t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ; - $arr['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . System::baseUrl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ; + $arr['body'] = L10n::t('%1$s was tagged in %2$s by %3$s', '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . L10n::t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]'); + $arr['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . System::baseUrl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n"; $arr['object'] = '' . ACTIVITY_OBJ_PERSON . '' . $tagged[0] . '' . $tagged[1] . '/' . $tagged[0] . ''; $arr['object'] .= '' . XML::escape('' . "\n"); @@ -1353,7 +1353,7 @@ function photos_content(App $a) } if ($prevlink) { - $prevlink = [$prevlink, ''] ; + $prevlink = [$prevlink, '']; } $photo = [ diff --git a/mod/ping.php b/mod/ping.php index edc1a1121..40700f36f 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -188,7 +188,7 @@ function ping_init(App $a) $intro_count = count($intros1) + count($intros2); $intros = $intros1 + $intros2; - $myurl = System::baseUrl() . '/profile/' . $a->user['nickname'] ; + $myurl = System::baseUrl() . '/profile/' . $a->user['nickname']; $mails = q( "SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail` WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ", @@ -373,12 +373,12 @@ function ping_init(App $a) $sysmsgs = []; $sysmsgs_info = []; - if (x($_SESSION, 'sysmsg')) { + if (!empty($_SESSION['sysmsg'])) { $sysmsgs = $_SESSION['sysmsg']; unset($_SESSION['sysmsg']); } - if (x($_SESSION, 'sysmsg_info')) { + if (!empty($_SESSION['sysmsg_info'])) { $sysmsgs_info = $_SESSION['sysmsg_info']; unset($_SESSION['sysmsg_info']); } @@ -483,7 +483,7 @@ function ping_get_notifications($uid) if ($notification["visible"] && !$notification["deleted"] - && !(x($result, $notification["parent"]) && !empty($result[$notification["parent"]])) + && empty($result[$notification["parent"]]) ) { // Should we condense the notifications or show them all? if (PConfig::get(local_user(), 'system', 'detailed_notif')) { diff --git a/mod/poco.php b/mod/poco.php index cc2493c08..3456beb12 100644 --- a/mod/poco.php +++ b/mod/poco.php @@ -88,7 +88,7 @@ function poco_init(App $a) { if (!empty($cid)) { $sql_extra = sprintf(" AND `contact`.`id` = %d ", intval($cid)); } - if (x($_GET, 'updatedSince')) { + if (!empty($_GET['updatedSince'])) { $update_limit = date(DateTimeFormat::MYSQL, strtotime($_GET['updatedSince'])); } if ($global) { @@ -122,7 +122,7 @@ function poco_init(App $a) { } else { $startIndex = 0; } - $itemsPerPage = ((x($_GET, 'count') && intval($_GET['count'])) ? intval($_GET['count']) : $totalResults); + $itemsPerPage = ((!empty($_GET['count'])) ? intval($_GET['count']) : $totalResults); if ($global) { Logger::log("Start global query", Logger::DEBUG); @@ -164,13 +164,13 @@ function poco_init(App $a) { Logger::log("Query done", Logger::DEBUG); $ret = []; - if (x($_GET, 'sorted')) { + if (!empty($_GET['sorted'])) { $ret['sorted'] = false; } - if (x($_GET, 'filtered')) { + if (!empty($_GET['filtered'])) { $ret['filtered'] = false; } - if (x($_GET, 'updatedSince') && ! $global) { + if (!empty($_GET['updatedSince']) && ! $global) { $ret['updatedSince'] = false; } $ret['startIndex'] = (int) $startIndex; @@ -196,7 +196,7 @@ function poco_init(App $a) { 'generation' => false ]; - if ((! x($_GET, 'fields')) || ($_GET['fields'] === '@all')) { + if (empty($_GET['fields']) || ($_GET['fields'] === '@all')) { foreach ($fields_ret as $k => $v) { $fields_ret[$k] = true; } diff --git a/mod/poke.php b/mod/poke.php index 6f09b348c..f1bad7742 100644 --- a/mod/poke.php +++ b/mod/poke.php @@ -54,7 +54,7 @@ function poke_init(App $a) return; } - $parent = (x($_GET,'parent') ? intval($_GET['parent']) : 0); + $parent = (!empty($_GET['parent']) ? intval($_GET['parent']) : 0); Logger::log('poke: verb ' . $verb . ' contact ' . $contact_id, Logger::DEBUG); @@ -86,7 +86,7 @@ function poke_init(App $a) $deny_gid = $item['deny_gid']; } } else { - $private = (x($_GET,'private') ? intval($_GET['private']) : 0); + $private = (!empty($_GET['private']) ? intval($_GET['private']) : 0); $allow_cid = ($private ? '<' . $target['id']. '>' : $a->user['allow_cid']); $allow_gid = ($private ? '' : $a->user['allow_gid']); @@ -169,7 +169,7 @@ function poke_content(App $a) ]); - $parent = (x($_GET,'parent') ? intval($_GET['parent']) : '0'); + $parent = (!empty($_GET['parent']) ? intval($_GET['parent']) : '0'); $verbs = L10n::getPokeVerbs(); diff --git a/mod/profile.php b/mod/profile.php index 3164f173b..abbe65ccb 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -242,7 +242,7 @@ function profile_content(App $a, $update = 0) $sql_extra2 = ''; if ($update) { - $last_updated = (!empty($_SESSION['last_updated'][$last_updated_key]) ? $_SESSION['last_updated'][$last_updated_key] : 0); + $last_updated = (defaults($_SESSION['last_updated'], $last_updated_key, 0)); // If the page user is the owner of the page we should query for unseen // items. Otherwise use a timestamp of the last succesful update request. diff --git a/mod/profiles.php b/mod/profiles.php index fe3b36231..6a32fbee5 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -251,7 +251,7 @@ function profiles_post(App $a) { $marital = Strings::escapeTags(trim($_POST['marital'])); $howlong = Strings::escapeTags(trim($_POST['howlong'])); - $with = ((x($_POST,'with')) ? Strings::escapeTags(trim($_POST['with'])) : ''); + $with = (!empty($_POST['with']) ? Strings::escapeTags(trim($_POST['with'])) : ''); if (! strlen($howlong)) { $howlong = DBA::NULL_DATETIME; diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php index c9cb54d2e..11fbf2cf5 100644 --- a/mod/pubsubhubbub.php +++ b/mod/pubsubhubbub.php @@ -10,7 +10,7 @@ use Friendica\Util\Network; use Friendica\Util\Strings; function post_var($name) { - return (x($_POST, $name)) ? Strings::escapeTags(trim($_POST[$name])) : ''; + return !empty($_POST[$name]) ? Strings::escapeTags(trim($_POST[$name])) : ''; } function pubsubhubbub_init(App $a) { diff --git a/mod/redir.php b/mod/redir.php index 701b85953..9f579a9dc 100644 --- a/mod/redir.php +++ b/mod/redir.php @@ -67,7 +67,7 @@ function redir_init(App $a) { // for authentification everytime he/she is visiting a profile page of the local // contact. if ($host == $remotehost - && x($_SESSION, 'remote') + && !empty($_SESSION['remote']) && is_array($_SESSION['remote'])) { foreach ($_SESSION['remote'] as $v) { diff --git a/mod/register.php b/mod/register.php index 2b0d87ca9..b85f0ed43 100644 --- a/mod/register.php +++ b/mod/register.php @@ -84,7 +84,7 @@ function register_post(App $a) $using_invites = Config::get('system', 'invitation_only'); $num_invites = Config::get('system', 'number_invites'); - $invite_id = ((x($_POST, 'invite_id')) ? Strings::escapeTags(trim($_POST['invite_id'])) : ''); + $invite_id = (!empty($_POST['invite_id']) ? Strings::escapeTags(trim($_POST['invite_id'])) : ''); if (intval(Config::get('config', 'register_policy')) === REGISTER_OPEN) { if ($using_invites && $invite_id) { @@ -93,7 +93,7 @@ function register_post(App $a) } // Only send a password mail when the password wasn't manually provided - if (!x($_POST, 'password1') || !x($_POST, 'confirm')) { + if (empty($_POST['password1']) || empty($_POST['confirm'])) { $res = Model\User::sendRegisterOpenEmail( $user, Config::get('config', 'sitename'), @@ -195,20 +195,20 @@ function register_content(App $a) } } - if (x($_SESSION, 'theme')) { + if (!empty($_SESSION['theme'])) { unset($_SESSION['theme']); } - if (x($_SESSION, 'mobile-theme')) { + if (!empty($_SESSION['mobile-theme'])) { unset($_SESSION['mobile-theme']); } - $username = x($_REQUEST, 'username') ? $_REQUEST['username'] : ''; - $email = x($_REQUEST, 'email') ? $_REQUEST['email'] : ''; - $openid_url = x($_REQUEST, 'openid_url') ? $_REQUEST['openid_url'] : ''; - $nickname = x($_REQUEST, 'nickname') ? $_REQUEST['nickname'] : ''; - $photo = x($_REQUEST, 'photo') ? $_REQUEST['photo'] : ''; - $invite_id = x($_REQUEST, 'invite_id') ? $_REQUEST['invite_id'] : ''; + $username = defaults($_REQUEST, 'username' , ''); + $email = defaults($_REQUEST, 'email' , ''); + $openid_url = defaults($_REQUEST, 'openid_url', ''); + $nickname = defaults($_REQUEST, 'nickname' , ''); + $photo = defaults($_REQUEST, 'photo' , ''); + $invite_id = defaults($_REQUEST, 'invite_id' , ''); $noid = Config::get('system', 'no_openid'); diff --git a/mod/removeme.php b/mod/removeme.php index ee0b66db8..19bf0bc85 100644 --- a/mod/removeme.php +++ b/mod/removeme.php @@ -20,15 +20,15 @@ function removeme_post(App $a) return; } - if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) { + if (!empty($_SESSION['submanage'])) { return; } - if ((!x($_POST, 'qxz_password')) || (!strlen(trim($_POST['qxz_password'])))) { + if (empty($_POST['qxz_password'])) { return; } - if ((!x($_POST, 'verify')) || (!strlen(trim($_POST['verify'])))) { + if (empty($_POST['verify'])) { return; } diff --git a/mod/search.php b/mod/search.php index 2810b23b1..b40fe0715 100644 --- a/mod/search.php +++ b/mod/search.php @@ -24,7 +24,7 @@ require_once 'mod/dirfind.php'; function search_saved_searches() { $o = ''; - $search = ((x($_GET,'search')) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : ''); + $search = (!empty($_GET['search']) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : ''); $r = q("SELECT `id`,`term` FROM `search` WHERE `uid` = %d", intval(local_user()) @@ -60,10 +60,10 @@ function search_saved_searches() { function search_init(App $a) { - $search = ((x($_GET,'search')) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : ''); + $search = (!empty($_GET['search']) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : ''); if (local_user()) { - if (x($_GET,'save') && $search) { + if (!empty($_GET['save']) && $search) { $r = q("SELECT * FROM `search` WHERE `uid` = %d AND `term` = '%s' LIMIT 1", intval(local_user()), DBA::escape($search) @@ -72,7 +72,7 @@ function search_init(App $a) { DBA::insert('search', ['uid' => local_user(), 'term' => $search]); } } - if (x($_GET,'remove') && $search) { + if (!empty($_GET['remove']) && $search) { DBA::delete('search', ['uid' => local_user(), 'term' => $search]); } @@ -92,14 +92,6 @@ function search_init(App $a) { } - - -function search_post(App $a) { - if (x($_POST,'search')) - $a->data['search'] = $_POST['search']; -} - - function search_content(App $a) { if (Config::get('system','block_public') && !local_user() && !remote_user()) { @@ -145,16 +137,12 @@ function search_content(App $a) { Nav::setSelected('search'); - $search = ''; - if (x($a->data,'search')) - $search = Strings::escapeTags(trim($a->data['search'])); - else - $search = ((x($_GET,'search')) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : ''); + $search = (!empty($_REQUEST['search']) ? Strings::escapeTags(trim(rawurldecode($_REQUEST['search']))) : ''); $tag = false; - if (x($_GET,'tag')) { + if (!empty($_GET['tag'])) { $tag = true; - $search = (x($_GET,'tag') ? '#' . Strings::escapeTags(trim(rawurldecode($_GET['tag']))) : ''); + $search = (!empty($_GET['tag']) ? '#' . Strings::escapeTags(trim(rawurldecode($_GET['tag']))) : ''); } // contruct a wrapper for the search header @@ -176,7 +164,7 @@ function search_content(App $a) { return dirfind_content($a); } - if (x($_GET,'search-option')) + if (!empty($_GET['search-option'])) switch($_GET['search-option']) { case 'fulltext': break; diff --git a/mod/settings.php b/mod/settings.php index 857012048..1ec3725dc 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -146,18 +146,18 @@ function settings_post(App $a) return; } - if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) { + if (!empty($_SESSION['submanage'])) { return; } - if (count($a->user) && x($a->user, 'uid') && $a->user['uid'] != local_user()) { + if (count($a->user) && !empty($a->user['uid']) && $a->user['uid'] != local_user()) { notice(L10n::t('Permission denied.') . EOL); return; } $old_page_flags = $a->user['page-flags']; - if (($a->argc > 1) && ($a->argv[1] === 'oauth') && x($_POST, 'remove')) { + if (($a->argc > 1) && ($a->argv[1] === 'oauth') && !empty($_POST['remove'])) { BaseModule::checkFormSecurityTokenRedirectOnError('/settings/oauth', 'settings_oauth'); $key = $_POST['remove']; @@ -166,7 +166,7 @@ function settings_post(App $a) return; } - if (($a->argc > 2) && ($a->argv[1] === 'oauth') && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && x($_POST, 'submit')) { + if (($a->argc > 2) && ($a->argv[1] === 'oauth') && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && !empty($_POST['submit'])) { BaseModule::checkFormSecurityTokenRedirectOnError('/settings/oauth', 'settings_oauth'); $name = defaults($_POST, 'name' , ''); @@ -222,23 +222,23 @@ function settings_post(App $a) if (($a->argc > 1) && ($a->argv[1] == 'connectors')) { BaseModule::checkFormSecurityTokenRedirectOnError('/settings/connectors', 'settings_connectors'); - if (x($_POST, 'general-submit')) { + if (!empty($_POST['general-submit'])) { PConfig::set(local_user(), 'system', 'disable_cw', intval($_POST['disable_cw'])); PConfig::set(local_user(), 'system', 'no_intelligent_shortening', intval($_POST['no_intelligent_shortening'])); PConfig::set(local_user(), 'system', 'ostatus_autofriend', intval($_POST['snautofollow'])); PConfig::set(local_user(), 'ostatus', 'default_group', $_POST['group-selection']); PConfig::set(local_user(), 'ostatus', 'legacy_contact', $_POST['legacy_contact']); - } elseif (x($_POST, 'imap-submit')) { + } elseif (!empty($_POST['imap-submit'])) { - $mail_server = ((x($_POST, 'mail_server')) ? $_POST['mail_server'] : ''); - $mail_port = ((x($_POST, 'mail_port')) ? $_POST['mail_port'] : ''); - $mail_ssl = ((x($_POST, 'mail_ssl')) ? strtolower(trim($_POST['mail_ssl'])) : ''); - $mail_user = ((x($_POST, 'mail_user')) ? $_POST['mail_user'] : ''); - $mail_pass = ((x($_POST, 'mail_pass')) ? trim($_POST['mail_pass']) : ''); - $mail_action = ((x($_POST, 'mail_action')) ? trim($_POST['mail_action']) : ''); - $mail_movetofolder = ((x($_POST, 'mail_movetofolder')) ? trim($_POST['mail_movetofolder']) : ''); - $mail_replyto = ((x($_POST, 'mail_replyto')) ? $_POST['mail_replyto'] : ''); - $mail_pubmail = ((x($_POST, 'mail_pubmail')) ? $_POST['mail_pubmail'] : ''); + $mail_server = defaults($_POST, 'mail_server', ''); + $mail_port = defaults($_POST, 'mail_port', ''); + $mail_ssl = (!empty($_POST['mail_ssl']) ? strtolower(trim($_POST['mail_ssl'])) : ''); + $mail_user = defaults($_POST, 'mail_user', ''); + $mail_pass = (!empty($_POST['mail_pass']) ? trim($_POST['mail_pass']) : ''); + $mail_action = (!empty($_POST['mail_action']) ? trim($_POST['mail_action']) : ''); + $mail_movetofolder = (!empty($_POST['mail_movetofolder']) ? trim($_POST['mail_movetofolder']) : ''); + $mail_replyto = defaults($_POST, 'mail_replyto', ''); + $mail_pubmail = defaults($_POST, 'mail_pubmail', ''); $mail_disabled = ((function_exists('imap_open') && (!Config::get('system', 'imap_disabled'))) ? 0 : 1); @@ -315,17 +315,17 @@ function settings_post(App $a) if (($a->argc > 1) && ($a->argv[1] === 'display')) { BaseModule::checkFormSecurityTokenRedirectOnError('/settings/display', 'settings_display'); - $theme = x($_POST, 'theme') ? Strings::escapeTags(trim($_POST['theme'])) : $a->user['theme']; - $mobile_theme = x($_POST, 'mobile_theme') ? Strings::escapeTags(trim($_POST['mobile_theme'])) : ''; - $nosmile = x($_POST, 'nosmile') ? intval($_POST['nosmile']) : 0; - $first_day_of_week = x($_POST, 'first_day_of_week') ? intval($_POST['first_day_of_week']) : 0; - $noinfo = x($_POST, 'noinfo') ? intval($_POST['noinfo']) : 0; - $infinite_scroll = x($_POST, 'infinite_scroll') ? intval($_POST['infinite_scroll']) : 0; - $no_auto_update = x($_POST, 'no_auto_update') ? intval($_POST['no_auto_update']) : 0; - $bandwidth_saver = x($_POST, 'bandwidth_saver') ? intval($_POST['bandwidth_saver']) : 0; - $smart_threading = x($_POST, 'smart_threading') ? intval($_POST['smart_threading']) : 0; - $nowarn_insecure = x($_POST, 'nowarn_insecure') ? intval($_POST['nowarn_insecure']) : 0; - $browser_update = x($_POST, 'browser_update') ? intval($_POST['browser_update']) : 0; + $theme = !empty($_POST['theme']) ? Strings::escapeTags(trim($_POST['theme'])) : $a->user['theme']; + $mobile_theme = !empty($_POST['mobile_theme']) ? Strings::escapeTags(trim($_POST['mobile_theme'])) : ''; + $nosmile = !empty($_POST['nosmile']) ? intval($_POST['nosmile']) : 0; + $first_day_of_week = !empty($_POST['first_day_of_week']) ? intval($_POST['first_day_of_week']) : 0; + $noinfo = !empty($_POST['noinfo']) ? intval($_POST['noinfo']) : 0; + $infinite_scroll = !empty($_POST['infinite_scroll']) ? intval($_POST['infinite_scroll']) : 0; + $no_auto_update = !empty($_POST['no_auto_update']) ? intval($_POST['no_auto_update']) : 0; + $bandwidth_saver = !empty($_POST['bandwidth_saver']) ? intval($_POST['bandwidth_saver']) : 0; + $smart_threading = !empty($_POST['smart_threading']) ? intval($_POST['smart_threading']) : 0; + $nowarn_insecure = !empty($_POST['nowarn_insecure']) ? intval($_POST['nowarn_insecure']) : 0; + $browser_update = !empty($_POST['browser_update']) ? intval($_POST['browser_update']) : 0; if ($browser_update != -1) { $browser_update = $browser_update * 1000; if ($browser_update < 10000) { @@ -333,11 +333,11 @@ function settings_post(App $a) } } - $itemspage_network = x($_POST, 'itemspage_network') ? intval($_POST['itemspage_network']) : 40; + $itemspage_network = !empty($_POST['itemspage_network']) ? intval($_POST['itemspage_network']) : 40; if ($itemspage_network > 100) { $itemspage_network = 100; } - $itemspage_mobile_network = x($_POST, 'itemspage_mobile_network') ? intval($_POST['itemspage_mobile_network']) : 20; + $itemspage_mobile_network = !empty($_POST['itemspage_mobile_network']) ? intval($_POST['itemspage_mobile_network']) : 20; if ($itemspage_mobile_network > 100) { $itemspage_mobile_network = 100; } @@ -379,7 +379,7 @@ function settings_post(App $a) BaseModule::checkFormSecurityTokenRedirectOnError('/settings', 'settings'); - if (x($_POST,'resend_relocate')) { + if (!empty($_POST['resend_relocate'])) { Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', local_user()); info(L10n::t("Relocate message has been send to your contacts")); $a->internalRedirect('settings'); @@ -387,7 +387,7 @@ function settings_post(App $a) Addon::callHooks('settings_post', $_POST); - if (x($_POST, 'password') || x($_POST, 'confirm')) { + if (!empty($_POST['password']) || !empty($_POST['confirm'])) { $newpass = $_POST['password']; $confirm = $_POST['confirm']; @@ -397,7 +397,7 @@ function settings_post(App $a) $err = true; } - if (!x($newpass) || !x($confirm)) { + if (empty($newpass) || empty($confirm)) { notice(L10n::t('Empty passwords are not allowed. Password unchanged.') . EOL); $err = true; } @@ -423,35 +423,35 @@ function settings_post(App $a) } } - $username = ((x($_POST, 'username')) ? Strings::escapeTags(trim($_POST['username'])) : ''); - $email = ((x($_POST, 'email')) ? Strings::escapeTags(trim($_POST['email'])) : ''); - $timezone = ((x($_POST, 'timezone')) ? Strings::escapeTags(trim($_POST['timezone'])) : ''); - $language = ((x($_POST, 'language')) ? Strings::escapeTags(trim($_POST['language'])) : ''); + $username = (!empty($_POST['username']) ? Strings::escapeTags(trim($_POST['username'])) : ''); + $email = (!empty($_POST['email']) ? Strings::escapeTags(trim($_POST['email'])) : ''); + $timezone = (!empty($_POST['timezone']) ? Strings::escapeTags(trim($_POST['timezone'])) : ''); + $language = (!empty($_POST['language']) ? Strings::escapeTags(trim($_POST['language'])) : ''); - $defloc = ((x($_POST, 'defloc')) ? Strings::escapeTags(trim($_POST['defloc'])) : ''); - $openid = ((x($_POST, 'openid_url')) ? Strings::escapeTags(trim($_POST['openid_url'])) : ''); - $maxreq = ((x($_POST, 'maxreq')) ? intval($_POST['maxreq']) : 0); - $expire = ((x($_POST, 'expire')) ? intval($_POST['expire']) : 0); - $def_gid = ((x($_POST, 'group-selection')) ? intval($_POST['group-selection']) : 0); + $defloc = (!empty($_POST['defloc']) ? Strings::escapeTags(trim($_POST['defloc'])) : ''); + $openid = (!empty($_POST['openid_url']) ? Strings::escapeTags(trim($_POST['openid_url'])) : ''); + $maxreq = (!empty($_POST['maxreq']) ? intval($_POST['maxreq']) : 0); + $expire = (!empty($_POST['expire']) ? intval($_POST['expire']) : 0); + $def_gid = (!empty($_POST['group-selection']) ? intval($_POST['group-selection']) : 0); - $expire_items = ((x($_POST, 'expire_items')) ? intval($_POST['expire_items']) : 0); - $expire_notes = ((x($_POST, 'expire_notes')) ? intval($_POST['expire_notes']) : 0); - $expire_starred = ((x($_POST, 'expire_starred')) ? intval($_POST['expire_starred']) : 0); - $expire_photos = ((x($_POST, 'expire_photos'))? intval($_POST['expire_photos']) : 0); - $expire_network_only = ((x($_POST, 'expire_network_only'))? intval($_POST['expire_network_only']) : 0); + $expire_items = (!empty($_POST['expire_items']) ? intval($_POST['expire_items']) : 0); + $expire_notes = (!empty($_POST['expire_notes']) ? intval($_POST['expire_notes']) : 0); + $expire_starred = (!empty($_POST['expire_starred']) ? intval($_POST['expire_starred']) : 0); + $expire_photos = (!empty($_POST['expire_photos'])? intval($_POST['expire_photos']) : 0); + $expire_network_only = (!empty($_POST['expire_network_only'])? intval($_POST['expire_network_only']) : 0); - $allow_location = (((x($_POST, 'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0); - $publish = (((x($_POST, 'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0); - $net_publish = (((x($_POST, 'profile_in_netdirectory')) && (intval($_POST['profile_in_netdirectory']) == 1)) ? 1: 0); - $old_visibility = (((x($_POST, 'visibility')) && (intval($_POST['visibility']) == 1)) ? 1 : 0); - $account_type = (((x($_POST, 'account-type')) && (intval($_POST['account-type']))) ? intval($_POST['account-type']) : 0); - $page_flags = (((x($_POST, 'page-flags')) && (intval($_POST['page-flags']))) ? intval($_POST['page-flags']) : 0); - $blockwall = (((x($_POST, 'blockwall')) && (intval($_POST['blockwall']) == 1)) ? 0: 1); // this setting is inverted! - $blocktags = (((x($_POST, 'blocktags')) && (intval($_POST['blocktags']) == 1)) ? 0: 1); // this setting is inverted! - $unkmail = (((x($_POST, 'unkmail')) && (intval($_POST['unkmail']) == 1)) ? 1: 0); - $cntunkmail = ((x($_POST, 'cntunkmail')) ? intval($_POST['cntunkmail']) : 0); - $suggestme = ((x($_POST, 'suggestme')) ? intval($_POST['suggestme']) : 0); + $allow_location = ((!empty($_POST['allow_location']) && (intval($_POST['allow_location']) == 1)) ? 1: 0); + $publish = ((!empty($_POST['profile_in_directory']) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0); + $net_publish = ((!empty($_POST['profile_in_netdirectory']) && (intval($_POST['profile_in_netdirectory']) == 1)) ? 1: 0); + $old_visibility = ((!empty($_POST['visibility']) && (intval($_POST['visibility']) == 1)) ? 1 : 0); + $account_type = ((!empty($_POST['account-type']) && (intval($_POST['account-type']))) ? intval($_POST['account-type']) : 0); + $page_flags = ((!empty($_POST['page-flags']) && (intval($_POST['page-flags']))) ? intval($_POST['page-flags']) : 0); + $blockwall = ((!empty($_POST['blockwall']) && (intval($_POST['blockwall']) == 1)) ? 0: 1); // this setting is inverted! + $blocktags = ((!empty($_POST['blocktags']) && (intval($_POST['blocktags']) == 1)) ? 0: 1); // this setting is inverted! + $unkmail = ((!empty($_POST['unkmail']) && (intval($_POST['unkmail']) == 1)) ? 1: 0); + $cntunkmail = (!empty($_POST['cntunkmail']) ? intval($_POST['cntunkmail']) : 0); + $suggestme = (!empty($_POST['suggestme']) ? intval($_POST['suggestme']) : 0); $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0); $hidewall = (($_POST['hidewall'] == 1) ? 1: 0); @@ -460,28 +460,28 @@ function settings_post(App $a) $notify = 0; - if (x($_POST, 'notify1')) { + if (!empty($_POST['notify1'])) { $notify += intval($_POST['notify1']); } - if (x($_POST, 'notify2')) { + if (!empty($_POST['notify2'])) { $notify += intval($_POST['notify2']); } - if (x($_POST, 'notify3')) { + if (!empty($_POST['notify3'])) { $notify += intval($_POST['notify3']); } - if (x($_POST, 'notify4')) { + if (!empty($_POST['notify4'])) { $notify += intval($_POST['notify4']); } - if (x($_POST, 'notify5')) { + if (!empty($_POST['notify5'])) { $notify += intval($_POST['notify5']); } - if (x($_POST, 'notify6')) { + if (!empty($_POST['notify6'])) { $notify += intval($_POST['notify6']); } - if (x($_POST, 'notify7')) { + if (!empty($_POST['notify7'])) { $notify += intval($_POST['notify7']); } - if (x($_POST, 'notify8')) { + if (!empty($_POST['notify8'])) { $notify += intval($_POST['notify8']); } @@ -666,7 +666,7 @@ function settings_content(App $a) return Login::form(); } - if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) { + if (!empty($_SESSION['submanage'])) { notice(L10n::t('Permission denied.') . EOL); return; } @@ -796,7 +796,7 @@ function settings_content(App $a) $default_group = PConfig::get(local_user(), 'ostatus', 'default_group'); $legacy_contact = PConfig::get(local_user(), 'ostatus', 'legacy_contact'); - if (x($legacy_contact)) { + if (!empty($legacy_contact)) { /// @todo Isn't it supposed to be a $a->internalRedirect() call? $a->page['htmlhead'] = ''; } diff --git a/mod/starred.php b/mod/starred.php index 9b46b522b..537f39202 100644 --- a/mod/starred.php +++ b/mod/starred.php @@ -33,7 +33,7 @@ function starred_init(App $a) { Item::update(['starred' => $starred], ['id' => $message_id]); // See if we've been passed a return path to redirect to - $return_path = (x($_REQUEST,'return') ? $_REQUEST['return'] : ''); + $return_path = defaults($_REQUEST, 'return', ''); if ($return_path) { $rand = '_=' . time(); if (strpos($return_path, '?')) { diff --git a/mod/subthread.php b/mod/subthread.php index b287957b2..90ab5a3aa 100644 --- a/mod/subthread.php +++ b/mod/subthread.php @@ -89,7 +89,7 @@ function subthread_content(App $a) { $post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status')); $objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE ); - $link = XML::escape('' . "\n") ; + $link = XML::escape('' . "\n"); $body = $item['body']; $obj = <<< EOT diff --git a/mod/suggest.php b/mod/suggest.php index ed9f6e0f2..7f1fe3386 100644 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -20,7 +20,7 @@ function suggest_init(App $a) return; } - if (x($_GET,'ignore') && intval($_GET['ignore'])) { + if (!empty($_GET['ignore'])) { // Check if we should do HTML-based delete confirmation if ($_REQUEST['confirm']) { //
can't take arguments in its "action" parameter diff --git a/mod/tagger.php b/mod/tagger.php index 5a8047414..f8979ae6c 100644 --- a/mod/tagger.php +++ b/mod/tagger.php @@ -78,7 +78,7 @@ function tagger_content(App $a) { $href = System::baseUrl() . '/display/' . $item['guid']; } - $link = XML::escape('' . "\n") ; + $link = XML::escape('' . "\n"); $body = XML::escape($item['body']); diff --git a/mod/tagrm.php b/mod/tagrm.php index 3785d8750..24a41be95 100644 --- a/mod/tagrm.php +++ b/mod/tagrm.php @@ -17,7 +17,7 @@ function tagrm_post(App $a) $a->internalRedirect($_SESSION['photo_return']); } - if (x($_POST,'submit') && ($_POST['submit'] === L10n::t('Cancel'))) { + if (!empty($_POST['submit']) && ($_POST['submit'] === L10n::t('Cancel'))) { $a->internalRedirect($_SESSION['photo_return']); } diff --git a/mod/uimport.php b/mod/uimport.php index 5df919d7d..dfeab8a2f 100644 --- a/mod/uimport.php +++ b/mod/uimport.php @@ -42,10 +42,10 @@ function uimport_content(App $a) } - if (x($_SESSION, 'theme')) { + if (!empty($_SESSION['theme'])) { unset($_SESSION['theme']); } - if (x($_SESSION, 'mobile-theme')) { + if (!empty($_SESSION['mobile-theme'])) { unset($_SESSION['mobile-theme']); } diff --git a/mod/wall_attach.php b/mod/wall_attach.php index b4254ba64..ba1a8205c 100644 --- a/mod/wall_attach.php +++ b/mod/wall_attach.php @@ -15,7 +15,7 @@ use Friendica\Util\Strings; function wall_attach_post(App $a) { - $r_json = (x($_GET,'response') && $_GET['response']=='json'); + $r_json = (!empty($_GET['response']) && $_GET['response']=='json'); if ($a->argc > 1) { $nick = $a->argv[1]; @@ -85,7 +85,7 @@ function wall_attach_post(App $a) { killme(); } - if (! x($_FILES,'userfile')) { + if (empty($_FILES['userfile'])) { if ($r_json) { echo json_encode(['error' => L10n::t('Invalid request.')]); } @@ -120,7 +120,7 @@ function wall_attach_post(App $a) { if ($r_json) { echo json_encode(['error' => $msg]); } else { - echo $msg . EOL ; + echo $msg . EOL; } @unlink($src); killme(); @@ -144,7 +144,7 @@ function wall_attach_post(App $a) { if ($r_json) { echo json_encode(['error' => $msg]); } else { - echo $msg . EOL ; + echo $msg . EOL; } killme(); } @@ -160,7 +160,7 @@ function wall_attach_post(App $a) { if ($r_json) { echo json_encode(['error' => $msg]); } else { - echo $msg . EOL ; + echo $msg . EOL; } killme(); } diff --git a/mod/wall_upload.php b/mod/wall_upload.php index 3358433da..89655981e 100644 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@ -23,11 +23,11 @@ function wall_upload_post(App $a, $desktopmode = true) { Logger::log("wall upload: starting new upload", Logger::DEBUG); - $r_json = (x($_GET, 'response') && $_GET['response'] == 'json'); - $album = (x($_GET, 'album') ? Strings::escapeTags(trim($_GET['album'])) : ''); + $r_json = (!empty($_GET['response']) && $_GET['response'] == 'json'); + $album = (!empty($_GET['album']) ? Strings::escapeTags(trim($_GET['album'])) : ''); if ($a->argc > 1) { - if (!x($_FILES, 'media')) { + if (empty($_FILES['media'])) { $nick = $a->argv[1]; $r = q("SELECT `user`.*, `contact`.`id` FROM `user` INNER JOIN `contact` on `user`.`uid` = `contact`.`uid` @@ -110,7 +110,7 @@ function wall_upload_post(App $a, $desktopmode = true) killme(); } - if (!x($_FILES, 'userfile') && !x($_FILES, 'media')) { + if (empty($_FILES['userfile']) && empty($_FILES['media'])) { if ($r_json) { echo json_encode(['error' => L10n::t('Invalid request.')]); } @@ -121,13 +121,13 @@ function wall_upload_post(App $a, $desktopmode = true) $filename = ''; $filesize = 0; $filetype = ''; - if (x($_FILES, 'userfile')) { + if (!empty($_FILES['userfile'])) { $src = $_FILES['userfile']['tmp_name']; $filename = basename($_FILES['userfile']['name']); $filesize = intval($_FILES['userfile']['size']); $filetype = $_FILES['userfile']['type']; - } elseif (x($_FILES, 'media')) { + } elseif (!empty($_FILES['media'])) { if (!empty($_FILES['media']['tmp_name'])) { if (is_array($_FILES['media']['tmp_name'])) { $src = $_FILES['media']['tmp_name'][0]; diff --git a/mod/wallmessage.php b/mod/wallmessage.php index b7a62b3ad..d93104644 100644 --- a/mod/wallmessage.php +++ b/mod/wallmessage.php @@ -20,8 +20,8 @@ function wallmessage_post(App $a) { return; } - $subject = ((x($_REQUEST,'subject')) ? Strings::escapeTags(trim($_REQUEST['subject'])) : ''); - $body = ((x($_REQUEST,'body')) ? Strings::escapeHtml(trim($_REQUEST['body'])) : ''); + $subject = (!empty($_REQUEST['subject']) ? Strings::escapeTags(trim($_REQUEST['subject'])) : ''); + $body = (!empty($_REQUEST['body']) ? Strings::escapeHtml(trim($_REQUEST['body'])) : ''); $recipient = (($a->argc > 1) ? Strings::escapeTags($a->argv[1]) : ''); if ((! $recipient) || (! $body)) { @@ -131,8 +131,8 @@ function wallmessage_content(App $a) { '$subject' => L10n::t('Subject:'), '$recipname' => $user['username'], '$nickname' => $user['nickname'], - '$subjtxt' => ((x($_REQUEST, 'subject')) ? strip_tags($_REQUEST['subject']) : ''), - '$text' => ((x($_REQUEST, 'body')) ? Strings::escapeHtml(htmlspecialchars($_REQUEST['body'])) : ''), + '$subjtxt' => (!empty($_REQUEST['subject']) ? strip_tags($_REQUEST['subject']) : ''), + '$text' => (!empty($_REQUEST['body']) ? Strings::escapeHtml(htmlspecialchars($_REQUEST['body'])) : ''), '$readonly' => '', '$yourmessage' => L10n::t('Your message:'), '$parent' => '', diff --git a/mod/webfinger.php b/mod/webfinger.php index 4f23db6d8..01743f05b 100644 --- a/mod/webfinger.php +++ b/mod/webfinger.php @@ -28,7 +28,7 @@ function webfinger_content(App $a) $o .= '

'; - if (x($_GET, 'addr')) { + if (!empty($_GET['addr'])) { $addr = trim($_GET['addr']); $res = Probe::lrdd($addr); $o .= '
';
diff --git a/spec/dfrn2_contact_request.svg b/spec/dfrn2_contact_request.svg
index 34de340f3..d32718271 100644
--- a/spec/dfrn2_contact_request.svg
+++ b/spec/dfrn2_contact_request.svg
@@ -80,7 +80,7 @@ text { font:12px Dialog; }
 ($_POST['localconfirm'] == 1)
 -----------------------------------------------------------------------
 - if(local_user() && ($a->user['nickname'] == $a-
->argv[1]) && (x($_POST,'dfrn_url')))
+>argv[1]) && !empty($_POST['dfrn_url']))
 ->
 - $confirm_key comes from $_POST
 - get data for contact Karen (contact table) by 
@@ -104,7 +104,7 @@ text { font:12px Dialog; }
 
 http://karenhomepage.com/dfrn_request?confirm_key=”ABC123”
 dfrn_request_content() -
-(elseif((x($_GET,'confirm_key')) && strlen($_GET['confirm_key'])) )
+elseif (!empty($_GET['confirm_key']))
 ----------------------------------------------------------------------------------------------
 - select the intro by confirm_key (intro table) -> get contact id
 - use the intro contact id to get the contact in the contact table
diff --git a/src/App.php b/src/App.php
index 845560a4d..6f95b8edb 100644
--- a/src/App.php
+++ b/src/App.php
@@ -549,7 +549,7 @@ class App
 
 		// Use environment variables for mysql if they are set beforehand
 		if (!empty(getenv('MYSQL_HOST'))
-			&& (!empty(getenv('MYSQL_USERNAME')) || !empty(getenv('MYSQL_USER')))
+			&& !empty(getenv('MYSQL_USERNAME') || !empty(getenv('MYSQL_USER')))
 			&& getenv('MYSQL_PASSWORD') !== false
 			&& !empty(getenv('MYSQL_DATABASE')))
 		{
@@ -668,7 +668,7 @@ class App
 			$this->hostname = Core\Config::get('config', 'hostname');
 		}
 
-		return $scheme . '://' . $this->hostname . (!empty($this->getURLPath()) ? '/' . $this->getURLPath() : '' );
+		return $scheme . '://' . $this->hostname . !empty($this->getURLPath() ? '/' . $this->getURLPath() : '' );
 	}
 
 	/**
diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index b8691e934..938697f9c 100644
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -58,7 +58,7 @@ class Nav
 	public static function build(App $a)
 	{
 		// Placeholder div for popup panel
-		$nav = '' ;
+		$nav = '';
 
 		$nav_info = self::getInfo($a);
 
@@ -170,7 +170,7 @@ class Nav
 		// "Home" should also take you home from an authenticated remote profile connection
 		$homelink = Profile::getMyURL();
 		if (! $homelink) {
-			$homelink = ((x($_SESSION, 'visitor_home')) ? $_SESSION['visitor_home'] : '');
+			$homelink = defaults($_SESSION, 'visitor_home', '');
 		}
 
 		if (($a->module != 'home') && (! (local_user()))) {
diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index c37e36f60..6eb11c7b3 100644
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -308,12 +308,12 @@ class OEmbed
 		}
 
 		$domain = parse_url($url, PHP_URL_HOST);
-		if (!x($domain)) {
+		if (empty($domain)) {
 			return false;
 		}
 
 		$str_allowed = Config::get('system', 'allowed_oembed', '');
-		if (!x($str_allowed)) {
+		if (empty($str_allowed)) {
 			return false;
 		}
 
@@ -334,7 +334,7 @@ class OEmbed
 			throw new Exception('OEmbed failed for URL: ' . $url);
 		}
 
-		if (x($title)) {
+		if (!empty($title)) {
 			$o->title = $title;
 		}
 
diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index cb375dcd2..e304f4763 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -130,12 +130,12 @@ class BBCode extends BaseObject
 
 		$type = "";
 		preg_match("/type='(.*?)'/ism", $attributes, $matches);
-		if (x($matches, 1)) {
+		if (!empty($matches[1])) {
 			$type = strtolower($matches[1]);
 		}
 
 		preg_match('/type="(.*?)"/ism', $attributes, $matches);
-		if (x($matches, 1)) {
+		if (!empty($matches[1])) {
 			$type = strtolower($matches[1]);
 		}
 
@@ -153,12 +153,12 @@ class BBCode extends BaseObject
 
 		$url = "";
 		preg_match("/url='(.*?)'/ism", $attributes, $matches);
-		if (x($matches, 1)) {
+		if (!empty($matches[1])) {
 			$url = $matches[1];
 		}
 
 		preg_match('/url="(.*?)"/ism', $attributes, $matches);
-		if (x($matches, 1)) {
+		if (!empty($matches[1])) {
 			$url = $matches[1];
 		}
 
@@ -168,12 +168,12 @@ class BBCode extends BaseObject
 
 		$title = "";
 		preg_match("/title='(.*?)'/ism", $attributes, $matches);
-		if (x($matches, 1)) {
+		if (!empty($matches[1])) {
 			$title = $matches[1];
 		}
 
 		preg_match('/title="(.*?)"/ism', $attributes, $matches);
-		if (x($matches, 1)) {
+		if (!empty($matches[1])) {
 			$title = $matches[1];
 		}
 
@@ -186,12 +186,12 @@ class BBCode extends BaseObject
 
 		$image = "";
 		preg_match("/image='(.*?)'/ism", $attributes, $matches);
-		if (x($matches, 1)) {
+		if (!empty($matches[1])) {
 			$image = $matches[1];
 		}
 
 		preg_match('/image="(.*?)"/ism', $attributes, $matches);
-		if (x($matches, 1)) {
+		if (!empty($matches[1])) {
 			$image = $matches[1];
 		}
 
@@ -201,12 +201,12 @@ class BBCode extends BaseObject
 
 		$preview = "";
 		preg_match("/preview='(.*?)'/ism", $attributes, $matches);
-		if (x($matches, 1)) {
+		if (!empty($matches[1])) {
 			$preview = $matches[1];
 		}
 
 		preg_match('/preview="(.*?)"/ism', $attributes, $matches);
-		if (x($matches, 1)) {
+		if (!empty($matches[1])) {
 			$preview = $matches[1];
 		}
 
@@ -234,7 +234,7 @@ class BBCode extends BaseObject
 		*/
 
 		$has_title = !empty($item['title']);
-		$plink = (!empty($item['plink']) ? $item['plink'] : '');
+		$plink = defaults($item, 'plink', '');
 		$post = self::getAttachmentData($body);
 
 		// if nothing is found, it maybe having an image.
@@ -1662,7 +1662,7 @@ class BBCode extends BaseObject
 		// Summary (e.g. title) is required, earlier revisions only required description (in addition to
 		// start which is always required). Allow desc with a missing summary for compatibility.
 
-		if ((x($ev, 'desc') || x($ev, 'summary')) && x($ev, 'start')) {
+		if ((!empty($ev['desc']) || !empty($ev['summary'])) && !empty($ev['start'])) {
 			$sub = Event::getHTML($ev, $simple_html);
 
 			$text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism", '', $text);
diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php
index 6451b74fa..e452e6835 100644
--- a/src/Content/Text/HTML.php
+++ b/src/Content/Text/HTML.php
@@ -908,7 +908,7 @@ class HTML
 	public static function micropro($contact, $redirect = false, $class = '', $textmode = false)
 	{
 		// Use the contact URL if no address is available
-		if (!x($contact, "addr")) {
+		if (empty($contact['addr'])) {
 			$contact["addr"] = $contact["url"];
 		}
 
@@ -924,7 +924,7 @@ class HTML
 		}
 
 		// If there is some js available we don't need the url
-		if (x($contact, 'click')) {
+		if (!empty($contact['click'])) {
 			$url = '';
 		}
 
diff --git a/src/Core/Authentication.php b/src/Core/Authentication.php
index 50825c525..ca5ec3fd0 100644
--- a/src/Core/Authentication.php
+++ b/src/Core/Authentication.php
@@ -106,7 +106,7 @@ class Authentication extends BaseObject
 
 		$masterUid = $user_record['uid'];
 
-		if ((x($_SESSION, 'submanage')) && intval($_SESSION['submanage'])) {
+		if (!empty($_SESSION['submanage'])) {
 			$user = DBA::selectFirst('user', ['uid'], ['uid' => $_SESSION['submanage']]);
 			if (DBA::isResult($user)) {
 				$masterUid = $user['uid'];
diff --git a/src/Core/Console/AutomaticInstallation.php b/src/Core/Console/AutomaticInstallation.php
index 150b7e52a..e6065dfb8 100644
--- a/src/Core/Console/AutomaticInstallation.php
+++ b/src/Core/Console/AutomaticInstallation.php
@@ -119,11 +119,11 @@ HELP;
 			$db_data = $this->getOption(['d', 'dbdata'], ($save_db) ? getenv('MYSQL_DATABASE') : '');
 			$db_user = $this->getOption(['U', 'dbuser'], ($save_db) ? getenv('MYSQL_USER') . getenv('MYSQL_USERNAME') : '');
 			$db_pass = $this->getOption(['P', 'dbpass'], ($save_db) ? getenv('MYSQL_PASSWORD') : '');
-			$url_path = $this->getOption(['u', 'urlpath'], (!empty('FRIENDICA_URL_PATH')) ? getenv('FRIENDICA_URL_PATH') : null);
-			$php_path = $this->getOption(['b', 'phppath'], (!empty('FRIENDICA_PHP_PATH')) ? getenv('FRIENDICA_PHP_PATH') : null);
-			$admin_mail = $this->getOption(['A', 'admin'], (!empty('FRIENDICA_ADMIN_MAIL')) ? getenv('FRIENDICA_ADMIN_MAIL') : '');
-			$tz = $this->getOption(['T', 'tz'], (!empty('FRIENDICA_TZ')) ? getenv('FRIENDICA_TZ') : '');
-			$lang = $this->getOption(['L', 'lang'], (!empty('FRIENDICA_LANG')) ? getenv('FRIENDICA_LANG') : '');
+			$url_path = $this->getOption(['u', 'urlpath'], !empty('FRIENDICA_URL_PATH') ? getenv('FRIENDICA_URL_PATH') : null);
+			$php_path = $this->getOption(['b', 'phppath'], !empty('FRIENDICA_PHP_PATH') ? getenv('FRIENDICA_PHP_PATH') : null);
+			$admin_mail = $this->getOption(['A', 'admin'], !empty('FRIENDICA_ADMIN_MAIL') ? getenv('FRIENDICA_ADMIN_MAIL') : '');
+			$tz = $this->getOption(['T', 'tz'], !empty('FRIENDICA_TZ') ? getenv('FRIENDICA_TZ') : '');
+			$lang = $this->getOption(['L', 'lang'], !empty('FRIENDICA_LANG') ? getenv('FRIENDICA_LANG') : '');
 
 			if (empty($php_path)) {
 				$php_path = $installer->getPHPPath();
@@ -132,7 +132,7 @@ HELP;
 			$installer->createConfig(
 				$php_path,
 				$url_path,
-				((!empty($db_port)) ? $db_host . ':' . $db_port : $db_host),
+				(!empty($db_port) ? $db_host . ':' . $db_port : $db_host),
 				$db_user,
 				$db_pass,
 				$db_data,
diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php
index 19aae2b82..d11fea03a 100644
--- a/src/Core/NotificationsManager.php
+++ b/src/Core/NotificationsManager.php
@@ -643,7 +643,7 @@ class NotificationsManager extends BaseObject
 					'madeby_zrl' => Contact::magicLink($it['url']),
 					'madeby_addr' => $it['addr'],
 					'contact_id' => $it['contact-id'],
-					'photo' => ((x($it, 'fphoto')) ? ProxyUtils::proxifyUrl($it['fphoto'], false, ProxyUtils::SIZE_SMALL) : "images/person-300.jpg"),
+					'photo' => (!empty($it['fphoto']) ? ProxyUtils::proxifyUrl($it['fphoto'], false, ProxyUtils::SIZE_SMALL) : "images/person-300.jpg"),
 					'name' => $it['fname'],
 					'url' => $it['furl'],
 					'zrl' => Contact::magicLink($it['furl']),
@@ -675,7 +675,7 @@ class NotificationsManager extends BaseObject
 					'uid' => $_SESSION['uid'],
 					'intro_id' => $it['intro_id'],
 					'contact_id' => $it['contact-id'],
-					'photo' => ((x($it, 'photo')) ? ProxyUtils::proxifyUrl($it['photo'], false, ProxyUtils::SIZE_SMALL) : "images/person-300.jpg"),
+					'photo' => (!empty($it['photo']) ? ProxyUtils::proxifyUrl($it['photo'], false, ProxyUtils::SIZE_SMALL) : "images/person-300.jpg"),
 					'name' => $it['name'],
 					'location' => BBCode::convert($it['glocation'], false),
 					'about' => BBCode::convert($it['gabout'], false),
diff --git a/src/Core/Session/DatabaseSessionHandler.php b/src/Core/Session/DatabaseSessionHandler.php
index 91788588f..c4f23b1bf 100644
--- a/src/Core/Session/DatabaseSessionHandler.php
+++ b/src/Core/Session/DatabaseSessionHandler.php
@@ -26,7 +26,7 @@ class DatabaseSessionHandler extends BaseObject implements SessionHandlerInterfa
 
 	public function read($session_id)
 	{
-		if (!x($session_id)) {
+		if (empty($session_id)) {
 			return '';
 		}
 
diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index 1e2693a94..70d93b0cc 100644
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -105,7 +105,7 @@ class UserImport
 		}
 
 
-		if (!x($account, 'version')) {
+		if (empty($account['version'])) {
 			notice(L10n::t("Error! No version data in file! This is not a Friendica account file?"));
 			return;
 		}
diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index b5e444020..92666edb8 100644
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -538,7 +538,7 @@ class DBStructure
 		$primary_keys = [];
 		foreach ($structure["fields"] AS $fieldname => $field) {
 			$sql_rows[] = "`".DBA::escape($fieldname)."` ".self::FieldCommand($field);
-			if (x($field,'primary') && $field['primary']!='') {
+			if (!empty($field['primary'])) {
 				$primary_keys[] = $fieldname;
 			}
 		}
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index bb6fc2585..c5f120202 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1061,7 +1061,7 @@ class Contact extends BaseObject
 			$update_contact = ($contact['avatar-date'] < DateTimeFormat::utc('now -7 days'));
 
 			// We force the update if the avatar is empty
-			if (!x($contact, 'avatar')) {
+			if (empty($contact['avatar'])) {
 				$update_contact = true;
 			}
 			if (!$update_contact || $no_update) {
@@ -1618,7 +1618,7 @@ class Contact extends BaseObject
 			return $result;
 		}
 
-		if (x($arr['contact'], 'name')) {
+		if (!empty($arr['contact']['name'])) {
 			$ret = $arr['contact'];
 		} else {
 			$ret = Probe::uri($url, $network, $uid, false);
@@ -1664,16 +1664,15 @@ class Contact extends BaseObject
 		}
 
 		// do we have enough information?
-
-		if (!((x($ret, 'name')) && (x($ret, 'poll')) && ((x($ret, 'url')) || (x($ret, 'addr'))))) {
+		if (empty($ret['name']) || empty($ret['poll']) || (empty($ret['url']) && empty($ret['addr']))) {
 			$result['message'] .= L10n::t('The profile address specified does not provide adequate information.') . EOL;
-			if (!x($ret, 'poll')) {
+			if (empty($ret['poll'])) {
 				$result['message'] .= L10n::t('No compatible communication protocols or feeds were discovered.') . EOL;
 			}
-			if (!x($ret, 'name')) {
+			if (empty($ret['name'])) {
 				$result['message'] .= L10n::t('An author or name was not found.') . EOL;
 			}
-			if (!x($ret, 'url')) {
+			if (empty($ret['url'])) {
 				$result['message'] .= L10n::t('No browser URL could be matched to this address.') . EOL;
 			}
 			if (strpos($url, '@') !== false) {
diff --git a/src/Model/FileTag.php b/src/Model/FileTag.php
index 06040403a..4ba4e3ca7 100644
--- a/src/Model/FileTag.php
+++ b/src/Model/FileTag.php
@@ -276,10 +276,10 @@ class FileTag
         }
 
         if ($cat == true) {
-            $pattern = '<' . self::encode($file) . '>' ;
+            $pattern = '<' . self::encode($file) . '>';
             $termtype = TERM_CATEGORY;
         } else {
-            $pattern = '[' . self::encode($file) . ']' ;
+            $pattern = '[' . self::encode($file) . ']';
             $termtype = TERM_FILE;
         }
 
diff --git a/src/Model/Group.php b/src/Model/Group.php
index 1640cb87b..d33690d58 100644
--- a/src/Model/Group.php
+++ b/src/Model/Group.php
@@ -33,7 +33,7 @@ class Group extends BaseObject
 	public static function create($uid, $name)
 	{
 		$return = false;
-		if (x($uid) && x($name)) {
+		if (!empty($uid) && !empty($name)) {
 			$gid = self::getIdByName($uid, $name); // check for dupes
 			if ($gid !== false) {
 				// This could be a problem.
@@ -202,7 +202,7 @@ class Group extends BaseObject
 	 */
 	public static function removeByName($uid, $name) {
 		$return = false;
-		if (x($uid) && x($name)) {
+		if (!empty($uid) && !empty($name)) {
 			$gid = self::getIdByName($uid, $name);
 
 			$return = self::remove($gid);
diff --git a/src/Model/Item.php b/src/Model/Item.php
index 0c420550b..b0a346bc0 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1359,15 +1359,15 @@ class Item extends BaseObject
 		$item['owner-name']    = trim(defaults($item, 'owner-name', ''));
 		$item['owner-link']    = trim(defaults($item, 'owner-link', ''));
 		$item['owner-avatar']  = trim(defaults($item, 'owner-avatar', ''));
-		$item['received']      = ((x($item, 'received') !== false) ? DateTimeFormat::utc($item['received']) : DateTimeFormat::utcNow());
-		$item['created']       = ((x($item, 'created') !== false) ? DateTimeFormat::utc($item['created']) : $item['received']);
-		$item['edited']        = ((x($item, 'edited') !== false) ? DateTimeFormat::utc($item['edited']) : $item['created']);
-		$item['changed']       = ((x($item, 'changed') !== false) ? DateTimeFormat::utc($item['changed']) : $item['created']);
-		$item['commented']     = ((x($item, 'commented') !== false) ? DateTimeFormat::utc($item['commented']) : $item['created']);
+		$item['received']      = (isset($item['received'])  ? DateTimeFormat::utc($item['received'])  : DateTimeFormat::utcNow());
+		$item['created']       = (isset($item['created'])   ? DateTimeFormat::utc($item['created'])   : $item['received']);
+		$item['edited']        = (isset($item['edited'])    ? DateTimeFormat::utc($item['edited'])    : $item['created']);
+		$item['changed']       = (isset($item['changed'])   ? DateTimeFormat::utc($item['changed'])   : $item['created']);
+		$item['commented']     = (isset($item['commented']) ? DateTimeFormat::utc($item['commented']) : $item['created']);
 		$item['title']         = trim(defaults($item, 'title', ''));
 		$item['location']      = trim(defaults($item, 'location', ''));
 		$item['coord']         = trim(defaults($item, 'coord', ''));
-		$item['visible']       = ((x($item, 'visible') !== false) ? intval($item['visible'])         : 1);
+		$item['visible']       = (isset($item['visible']) ? intval($item['visible']) : 1);
 		$item['deleted']       = 0;
 		$item['parent-uri']    = trim(defaults($item, 'parent-uri', $item['uri']));
 		$item['post-type']     = defaults($item, 'post-type', self::PT_ARTICLE);
@@ -1626,7 +1626,7 @@ class Item extends BaseObject
 		// It is mainly used in the "post_local" hook.
 		unset($item['api_source']);
 
-		if (x($item, 'cancel')) {
+		if (!empty($item['cancel'])) {
 			Logger::log('post cancelled by addon.');
 			return 0;
 		}
@@ -3443,7 +3443,7 @@ class Item extends BaseObject
 				$filesubtype = 'unkn';
 			}
 
-			$title = Strings::escapeHtml(trim(!empty($mtch[4]) ? $mtch[4] : $mtch[1]));
+			$title = Strings::escapeHtml(trim(defaults($mtch, 4, $mtch[1])));
 			$title .= ' ' . $mtch[2] . ' ' . L10n::t('bytes');
 
 			$icon = '
';
@@ -3455,7 +3455,7 @@ class Item extends BaseObject
 		}
 
 		// Map.
-		if (strpos($s, '
') !== false && x($item, 'coord')) {
+		if (strpos($s, '
') !== false && !empty($item['coord'])) {
 			$x = Map::byCoordinates(trim($item['coord']));
 			if ($x) {
 				$s = preg_replace('/\
/', '$0' . $x, $s);
diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index a9b4c0fb7..a87730087 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -97,7 +97,7 @@ class Photo
 		$photo = DBA::selectFirst(
 			'photo', ['resource-id'], ['uid' => $uid, 'contact-id' => $cid, 'scale' => 4, 'album' => 'Contact Photos']
 		);
-		if (x($photo['resource-id'])) {
+		if (!empty($photo['resource-id'])) {
 			$hash = $photo['resource-id'];
 		} else {
 			$hash = self::newResource();
diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 61357ef77..a73c8410b 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -288,7 +288,7 @@ class Profile
 		$location = false;
 
 		// This function can also use contact information in $profile
-		$is_contact = x($profile, 'cid');
+		$is_contact = !empty($profile['cid']);
 
 		if (!is_array($profile) && !count($profile)) {
 			return $o;
@@ -357,7 +357,7 @@ class Profile
 
 		// See issue https://github.com/friendica/friendica/issues/3838
 		// Either we remove the message link for remote users or we enable creating messages from remote users
-		if (remote_user() || (self::getMyURL() && x($profile, 'unkmail') && ($profile['uid'] != local_user()))) {
+		if (remote_user() || (self::getMyURL() && !empty($profile['unkmail']) && ($profile['uid'] != local_user()))) {
 			$wallmessage = L10n::t('Message');
 
 			if (remote_user()) {
@@ -424,23 +424,23 @@ class Profile
 		// Fetch the account type
 		$account_type = Contact::getAccountType($profile);
 
-		if (x($profile, 'address')
-			|| x($profile, 'location')
-			|| x($profile, 'locality')
-			|| x($profile, 'region')
-			|| x($profile, 'postal-code')
-			|| x($profile, 'country-name')
+		if (!empty($profile['address'])
+			|| !empty($profile['location'])
+			|| !empty($profile['locality'])
+			|| !empty($profile['region'])
+			|| !empty($profile['postal-code'])
+			|| !empty($profile['country-name'])
 		) {
 			$location = L10n::t('Location:');
 		}
 
-		$gender   = x($profile, 'gender')   ? L10n::t('Gender:')   : false;
-		$marital  = x($profile, 'marital')  ? L10n::t('Status:')   : false;
-		$homepage = x($profile, 'homepage') ? L10n::t('Homepage:') : false;
-		$about    = x($profile, 'about')    ? L10n::t('About:')    : false;
-		$xmpp     = x($profile, 'xmpp')     ? L10n::t('XMPP:')     : false;
+		$gender   = !empty($profile['gender'])   ? L10n::t('Gender:')   : false;
+		$marital  = !empty($profile['marital'])  ? L10n::t('Status:')   : false;
+		$homepage = !empty($profile['homepage']) ? L10n::t('Homepage:') : false;
+		$about    = !empty($profile['about'])    ? L10n::t('About:')    : false;
+		$xmpp     = !empty($profile['xmpp'])     ? L10n::t('XMPP:')     : false;
 
-		if ((x($profile, 'hidewall') || $block) && !local_user() && !remote_user()) {
+		if ((!empty($profile['hidewall']) || $block) && !local_user() && !remote_user()) {
 			$location = $gender = $marital = $homepage = $about = false;
 		}
 
@@ -448,7 +448,7 @@ class Profile
 		$firstname = $split_name['first'];
 		$lastname = $split_name['last'];
 
-		if (x($profile, 'guid')) {
+		if (!empty($profile['guid'])) {
 			$diaspora = [
 				'guid' => $profile['guid'],
 				'podloc' => System::baseUrl(),
@@ -890,7 +890,7 @@ class Profile
 		}
 
 		$tab = false;
-		if (x($_GET, 'tab')) {
+		if (!empty($_GET['tab'])) {
 			$tab = Strings::escapeTags(trim($_GET['tab']));
 		}
 
@@ -1001,7 +1001,7 @@ class Profile
 	 */
 	public static function getMyURL()
 	{
-		if (x($_SESSION, 'my_url')) {
+		if (!empty($_SESSION['my_url'])) {
 			return $_SESSION['my_url'];
 		}
 		return null;
@@ -1173,7 +1173,7 @@ class Profile
 	 */
 	public static function getThemeUid()
 	{
-		$uid = ((!empty($_REQUEST['puid'])) ? intval($_REQUEST['puid']) : 0);
+		$uid = (!empty($_REQUEST['puid']) ? intval($_REQUEST['puid']) : 0);
 		if ((local_user()) && ((PConfig::get(local_user(), 'system', 'always_my_theme')) || (!$uid))) {
 			return local_user();
 		}
diff --git a/src/Model/User.php b/src/Model/User.php
index aef4bcbfc..40b6c4ff1 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -412,12 +412,12 @@ class User
 		$password   = !empty($data['password'])   ? trim($data['password'])           : '';
 		$password1  = !empty($data['password1'])  ? trim($data['password1'])          : '';
 		$confirm    = !empty($data['confirm'])    ? trim($data['confirm'])            : '';
-		$blocked    = !empty($data['blocked'])    ? intval($data['blocked'])          : 0;
-		$verified   = !empty($data['verified'])   ? intval($data['verified'])         : 0;
+		$blocked    = !empty($data['blocked']);
+		$verified   = !empty($data['verified']);
 		$language   = !empty($data['language'])   ? Strings::escapeTags(trim($data['language']))   : 'en';
 
-		$publish = !empty($data['profile_publish_reg']) && intval($data['profile_publish_reg']) ? 1 : 0;
-		$netpublish = strlen(Config::get('system', 'directory')) ? $publish : 0;
+		$publish = !empty($data['profile_publish_reg']);
+		$netpublish = $publish && Config::get('system', 'directory');
 
 		if ($password1 != $confirm) {
 			throw new Exception(L10n::t('Passwords do not match. Password unchanged.'));
diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 66e8c97fd..3cfe70540 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -44,7 +44,7 @@ class Contact extends BaseModule
 			$nets = '';
 		}
 
-		if (!x($a->page, 'aside')) {
+		if (empty($a->page['aside'])) {
 			$a->page['aside'] = '';
 		}
 
diff --git a/src/Module/Feed.php b/src/Module/Feed.php
index 9e4461271..4c7059c03 100644
--- a/src/Module/Feed.php
+++ b/src/Module/Feed.php
@@ -28,8 +28,8 @@ class Feed extends BaseModule
 	{
 		$a = self::getApp();
 
-		$last_update = x($_GET, 'last_update') ? $_GET['last_update'] : '';
-		$nocache     = x($_GET, 'nocache') && local_user();
+		$last_update = defaults($_GET, 'last_update', '');
+		$nocache     = !empty($_GET['nocache']) && local_user();
 
 		if ($a->argc < 2) {
 			System::httpExit(400);
diff --git a/src/Module/Login.php b/src/Module/Login.php
index 330988df5..82d704982 100644
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -34,11 +34,11 @@ class Login extends BaseModule
 	{
 		$a = self::getApp();
 
-		if (x($_SESSION, 'theme')) {
+		if (!empty($_SESSION['theme'])) {
 			unset($_SESSION['theme']);
 		}
 
-		if (x($_SESSION, 'mobile-theme')) {
+		if (!empty($_SESSION['mobile-theme'])) {
 			unset($_SESSION['mobile-theme']);
 		}
 
@@ -68,7 +68,7 @@ class Login extends BaseModule
 			self::openIdAuthentication($openid_url, !empty($_POST['remember']));
 		}
 
-		if (x($_POST, 'auth-params') && $_POST['auth-params'] === 'login') {
+		if (!empty($_POST['auth-params']) && $_POST['auth-params'] === 'login') {
 			self::passwordAuthentication(
 				trim($_POST['username']),
 				trim($_POST['password']),
@@ -163,7 +163,7 @@ class Login extends BaseModule
 		$_SESSION['last_login_date'] = DateTimeFormat::utcNow();
 		Authentication::setAuthenticatedSessionForUser($record, true, true);
 
-		if (x($_SESSION, 'return_path')) {
+		if (!empty($_SESSION['return_path'])) {
 			$return_path = $_SESSION['return_path'];
 			unset($_SESSION['return_path']);
 		} else {
@@ -221,15 +221,15 @@ class Login extends BaseModule
 			}
 		}
 
-		if (isset($_SESSION) && x($_SESSION, 'authenticated')) {
-			if (x($_SESSION, 'visitor_id') && !x($_SESSION, 'uid')) {
+		if (!empty($_SESSION['authenticated'])) {
+			if (!empty($_SESSION['visitor_id']) && empty($_SESSION['uid'])) {
 				$contact = DBA::selectFirst('contact', [], ['id' => $_SESSION['visitor_id']]);
 				if (DBA::isResult($contact)) {
 					self::getApp()->contact = $contact;
 				}
 			}
 
-			if (x($_SESSION, 'uid')) {
+			if (!empty($_SESSION['uid'])) {
 				// already logged in user returning
 				$check = Config::get('system', 'paranoia');
 				// extra paranoia - if the IP changed, log them out
diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index ecfe18e59..51f501b85 100644
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -28,10 +28,10 @@ class Magic extends BaseModule
 
 		Logger::log('args: ' . print_r($_REQUEST, true), Logger::DATA);
 
-		$addr = ((x($_REQUEST, 'addr')) ? $_REQUEST['addr'] : '');
-		$dest = ((x($_REQUEST, 'dest')) ? $_REQUEST['dest'] : '');
-		$test = ((x($_REQUEST, 'test')) ? intval($_REQUEST['test']) : 0);
-		$owa  = ((x($_REQUEST, 'owa'))  ? intval($_REQUEST['owa'])  : 0);
+		$addr = defaults($_REQUEST, 'addr', '');
+		$dest = defaults($_REQUEST, 'dest', '');
+		$test = (!empty($_REQUEST['test']) ? intval($_REQUEST['test']) : 0);
+		$owa  = (!empty($_REQUEST['owa'])  ? intval($_REQUEST['owa'])  : 0);
 
 		// NOTE: I guess $dest isn't just the profile url (could be also
 		// other profile pages e.g. photo). We need to find a solution
diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 9c57d624f..5d392a2af 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -347,7 +347,7 @@ class Probe
 			$data['url'] = $uri;
 		}
 
-		if (x($data, 'photo')) {
+		if (!empty($data['photo'])) {
 			$data['baseurl'] = Network::getUrlMatch(Strings::normaliseLink(defaults($data, 'baseurl', '')), Strings::normaliseLink($data['photo']));
 		} else {
 			$data['photo'] = System::baseUrl() . '/images/person-300.jpg';
@@ -358,7 +358,7 @@ class Probe
 				$data['name'] = $data['nick'];
 			}
 
-			if (!x($data, 'name')) {
+			if (empty($data['name'])) {
 				$data['name'] = $data['url'];
 			}
 		}
diff --git a/src/Object/Post.php b/src/Object/Post.php
index 50d903f02..1ca1e222e 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -67,7 +67,7 @@ class Post extends BaseObject
 		$this->setTemplate('wall');
 		$this->toplevel = $this->getId() == $this->getDataValue('parent');
 
-		if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) {
+		if (!empty($_SESSION['remote']) && is_array($_SESSION['remote'])) {
 			foreach ($_SESSION['remote'] as $visitor) {
 				if ($visitor['cid'] == $this->getDataValue('contact-id')) {
 					$this->visiting = true;
@@ -253,7 +253,7 @@ class Post extends BaseObject
 		$responses = get_responses($conv_responses, $response_verbs, $this, $item);
 
 		foreach ($response_verbs as $value => $verbs) {
-			$responses[$verbs]['output'] = x($conv_responses[$verbs], $item['uri']) ? format_like($conv_responses[$verbs][$item['uri']], $conv_responses[$verbs][$item['uri'] . '-l'], $verbs, $item['uri']) : '';
+			$responses[$verbs]['output'] = !empty($conv_responses[$verbs][$item['uri']]) ? format_like($conv_responses[$verbs][$item['uri']], $conv_responses[$verbs][$item['uri'] . '-l'], $verbs, $item['uri']) : '';
 		}
 
 		/*
@@ -678,7 +678,7 @@ class Post extends BaseObject
 	 */
 	private function setTemplate($name)
 	{
-		if (!x($this->available_templates, $name)) {
+		if (empty($this->available_templates[$name])) {
 			Logger::log('[ERROR] Item::setTemplate : Template not available ("' . $name . '").', Logger::DEBUG);
 			return false;
 		}
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index b67b7c021..7c807b921 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2637,7 +2637,7 @@ class DFRN
 			if (($item["object-type"] == ACTIVITY_OBJ_EVENT) && !$owner_unknown) {
 				Logger::log("Item ".$item["uri"]." seems to contain an event.", Logger::DEBUG);
 				$ev = Event::fromBBCode($item["body"]);
-				if ((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) {
+				if ((!empty($ev['desc']) || !empty($ev['summary'])) && !empty($ev['start'])) {
 					Logger::log("Event in item ".$item["uri"]." was found.", Logger::DEBUG);
 					$ev["cid"]     = $importer["id"];
 					$ev["uid"]     = $importer["importer_uid"];
@@ -2925,7 +2925,7 @@ class DFRN
 	public static function autoRedir(App $a, $contact_nick)
 	{
 		// prevent looping
-		if (x($_REQUEST, 'redir') && intval($_REQUEST['redir'])) {
+		if (!empty($_REQUEST['redir'])) {
 			return;
 		}
 
@@ -3077,10 +3077,10 @@ class DFRN
 	 */
 	private static function isEditedTimestampNewer($existing, $update)
 	{
-		if (!x($existing, 'edited') || !$existing['edited']) {
+		if (empty($existing['edited'])) {
 			return true;
 		}
-		if (!x($update, 'edited') || !$update['edited']) {
+		if (empty($update['edited'])) {
 			return false;
 		}
 
diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index 0f4ef12f9..374eb02ae 100644
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -84,7 +84,7 @@ class PortableContact
 			return;
 		}
 
-		$url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation' : '?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation') ;
+		$url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation' : '?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation');
 
 		Logger::log('load: ' . $url, Logger::DEBUG);
 
diff --git a/src/Render/FriendicaSmarty.php b/src/Render/FriendicaSmarty.php
index e544a76d1..8ecea0518 100644
--- a/src/Render/FriendicaSmarty.php
+++ b/src/Render/FriendicaSmarty.php
@@ -28,7 +28,7 @@ class FriendicaSmarty extends Smarty
 		// setTemplateDir can be set to an array, which Smarty will parse in order.
 		// The order is thus very important here
 		$template_dirs = ['theme' => "view/theme/$theme/" . self::SMARTY3_TEMPLATE_FOLDER . "/"];
-		if (x($a->theme_info, "extends")) {
+		if (!empty($a->theme_info['extends'])) {
 			$template_dirs = $template_dirs + ['extends' => "view/theme/" . $a->theme_info["extends"] . "/" . self::SMARTY3_TEMPLATE_FOLDER . "/"];
 		}
 
diff --git a/src/Render/FriendicaSmartyEngine.php b/src/Render/FriendicaSmartyEngine.php
index 1053ab08e..2b6d7a877 100644
--- a/src/Render/FriendicaSmartyEngine.php
+++ b/src/Render/FriendicaSmartyEngine.php
@@ -67,7 +67,7 @@ class FriendicaSmartyEngine implements ITemplateEngine
 
 		if (file_exists("{$root}view/theme/$theme/$filename")) {
 			$template_file = "{$root}view/theme/$theme/$filename";
-		} elseif (x($a->theme_info, 'extends') && file_exists(sprintf('%sview/theme/%s}/%s', $root, $a->theme_info['extends'], $filename))) {
+		} elseif (!empty($a->theme_info['extends']) && file_exists(sprintf('%sview/theme/%s}/%s', $root, $a->theme_info['extends'], $filename))) {
 			$template_file = sprintf('%sview/theme/%s}/%s', $root, $a->theme_info['extends'], $filename);
 		} elseif (file_exists("{$root}/$filename")) {
 			$template_file = "{$root}/$filename";
diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php
index 42aab8f5f..b291076cc 100644
--- a/src/Util/Emailer.php
+++ b/src/Util/Emailer.php
@@ -36,7 +36,7 @@ class Emailer
 		Addon::callHooks('emailer_send_prepare', $params);
 
 		$email_textonly = false;
-		if (x($params, "uid")) {
+		if (!empty($params['uid'])) {
 			$email_textonly = PConfig::get($params['uid'], "system", "email_textonly");
 		}
 
diff --git a/src/Util/Network.php b/src/Util/Network.php
index 0ac0f2aeb..e7707baf3 100644
--- a/src/Util/Network.php
+++ b/src/Util/Network.php
@@ -121,7 +121,7 @@ class Network
 
 		@curl_setopt($ch, CURLOPT_HEADER, true);
 
-		if (x($opts, "cookiejar")) {
+		if (!empty($opts['cookiejar'])) {
 			curl_setopt($ch, CURLOPT_COOKIEJAR, $opts["cookiejar"]);
 			curl_setopt($ch, CURLOPT_COOKIEFILE, $opts["cookiejar"]);
 		}
@@ -130,7 +130,7 @@ class Network
 		//	@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
 		//	@curl_setopt($ch, CURLOPT_MAXREDIRS, 5);
 
-		if (x($opts, 'accept_content')) {
+		if (!empty($opts['accept_content'])) {
 			curl_setopt(
 				$ch,
 				CURLOPT_HTTPHEADER,
@@ -156,15 +156,15 @@ class Network
 		/// @todo  We could possibly set this value to "gzip" or something similar
 		curl_setopt($ch, CURLOPT_ENCODING, '');
 
-		if (x($opts, 'headers')) {
+		if (!empty($opts['headers'])) {
 			@curl_setopt($ch, CURLOPT_HTTPHEADER, $opts['headers']);
 		}
 
-		if (x($opts, 'nobody')) {
+		if (!empty($opts['nobody'])) {
 			@curl_setopt($ch, CURLOPT_NOBODY, $opts['nobody']);
 		}
 
-		if (x($opts, 'timeout')) {
+		if (!empty($opts['timeout'])) {
 			@curl_setopt($ch, CURLOPT_TIMEOUT, $opts['timeout']);
 		} else {
 			$curl_time = Config::get('system', 'curl_timeout', 60);
@@ -489,7 +489,7 @@ class Network
 		}
 
 		$str_allowed = Config::get('system', 'allowed_email', '');
-		if (!x($str_allowed)) {
+		if (empty($str_allowed)) {
 			return true;
 		}
 
diff --git a/src/Util/Temporal.php b/src/Util/Temporal.php
index 140d3db37..44b960116 100644
--- a/src/Util/Temporal.php
+++ b/src/Util/Temporal.php
@@ -481,7 +481,7 @@ class Temporal
 			$o .= "";
 			$day = str_replace(' ', ' ', sprintf('%2.2d', $d));
 			if ($started) {
-				if (x($links, $d) !== false) {
+				if (isset($links[$d])) {
 					$o .= "$day";
 				} else {
 					$o .= $day;
diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index 22fbf700a..f25459672 100644
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -201,7 +201,7 @@ class OnePoll
 			$url = $contact['poll'] . '?dfrn_id=' . $idtosend
 				. '&dfrn_version=' . DFRN_PROTOCOL_VERSION
 				. '&type=data&last_update=' . $last_update
-				. '&perm=' . $perm ;
+				. '&perm=' . $perm;
 
 			$curlResult = Network::curl($url);
 
diff --git a/tests/src/Core/Console/AutomaticInstallationConsoleTest.php b/tests/src/Core/Console/AutomaticInstallationConsoleTest.php
index 29a0e907e..813277ebb 100644
--- a/tests/src/Core/Console/AutomaticInstallationConsoleTest.php
+++ b/tests/src/Core/Console/AutomaticInstallationConsoleTest.php
@@ -47,7 +47,7 @@ class AutomaticInstallationConsoleTest extends ConsoleTest
 		}
 
 		$this->db_host = getenv('MYSQL_HOST');
-		$this->db_port = (!empty(getenv('MYSQL_PORT'))) ? getenv('MYSQL_PORT') : null;
+		$this->db_port = !empty(getenv('MYSQL_PORT')) ? getenv('MYSQL_PORT') : null;
 		$this->db_data = getenv('MYSQL_DATABASE');
 		$this->db_user = getenv('MYSQL_USERNAME') . getenv('MYSQL_USER');
 		$this->db_pass = getenv('MYSQL_PASSWORD');
diff --git a/view/php/default.php b/view/php/default.php
index 29a21ff33..dc124a845 100644
--- a/view/php/default.php
+++ b/view/php/default.php
@@ -1,19 +1,19 @@
 
 
 
-  <?php if(x($page,'title')) echo $page['title'] ?>
+  <?php if(!empty($page['title'])) echo $page['title'] ?>
   
-  
+  
 
 
-	
-	
+	
+	
 	

-		
+		
 		
 
 		

 	

-	
-	

+	
+	

 
 
diff --git a/view/php/minimal.php b/view/php/minimal.php
index 0b1a4b8b7..dabd422db 100644
--- a/view/php/minimal.php
+++ b/view/php/minimal.php
@@ -1,12 +1,12 @@
 
 
 
-  <?php if(x($page,'title')) echo $page['title'] ?>
+  <?php if(!empty($page['title'])) echo $page['title'] ?>
   
-  
+  
 
 
-	

+	

 		

 	

 
diff --git a/view/php/none.php b/view/php/none.php
index 5b96e282e..702620419 100644
--- a/view/php/none.php
+++ b/view/php/none.php
@@ -7,5 +7,5 @@
  * only the pure content
  */
 
-if(x($page,'content')) echo $page['content'];
+if(!empty($page['content'])) echo $page['content'];
 
diff --git a/view/theme/duepuntozero/style.php b/view/theme/duepuntozero/style.php
index ff55f462f..6d102350c 100644
--- a/view/theme/duepuntozero/style.php
+++ b/view/theme/duepuntozero/style.php
@@ -15,7 +15,7 @@ $uid = Profile::getThemeUid();
 $s_colorset = Config::get('duepuntozero', 'colorset');
 $colorset = PConfig::get($uid, 'duepuntozero', 'colorset');
 
-if (!x($colorset)) {
+if (empty($colorset)) {
 	$colorset = $s_colorset;
 }
 
diff --git a/view/theme/frio/php/PHPColors/Color.php b/view/theme/frio/php/PHPColors/Color.php
index 3f290becf..e4de79c40 100644
--- a/view/theme/frio/php/PHPColors/Color.php
+++ b/view/theme/frio/php/PHPColors/Color.php
@@ -392,7 +392,7 @@ class Color {
             $hsl['L'] = ($hsl['L'] < 0) ? 0:$hsl['L']/100;
         } else {
             // We need to find out how much to darken
-            $hsl['L'] = $hsl['L']/2 ;
+            $hsl['L'] = $hsl['L']/2;
         }
 
         return $hsl;
diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php
index 24c722e8e..ce7fd4d77 100644
--- a/view/theme/frio/php/default.php
+++ b/view/theme/frio/php/default.php
@@ -36,7 +36,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
 		// if the page is an standard page (so we don't have it twice for modals)
 		//
 		/// @todo Think about to move js stuff in the footer
-		if (!$minimal && x($page, 'htmlhead')) {
+		if (!$minimal && !empty($page['htmlhead'])) {
 			echo $page['htmlhead'];
 		}
 
@@ -67,7 +67,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
 	">
 		Skip to main content
 
 		

-			
+			
 			

 		

 
 				

 ';
 
-						if (x($page, 'aside')) {
+						if (!empty($page['aside'])) {
 							echo $page['aside'];
 						}
 
-						if (x($page, 'right_aside')) {
+						if (!empty($page['right_aside'])) {
 							echo $page['right_aside'];
 						}
 
@@ -113,7 +113,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
 						
';
-							if (x($page, 'content')) {
+							if (!empty($page['content'])) {
 								echo $page['content'];
 							}
 							echo '
@@ -124,7 +124,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
 				} else {
 					echo '
 					
';
-						if (x($page, 'content')) {
+						if (!empty($page['content'])) {
 							echo $page['content'];
 						}
 						echo '
diff --git a/view/theme/frio/php/frio_boot.php b/view/theme/frio/php/frio_boot.php
index 3f8ed1ed0..dcb87b6d2 100644
--- a/view/theme/frio/php/frio_boot.php
+++ b/view/theme/frio/php/frio_boot.php
@@ -22,7 +22,7 @@ function load_page(App $a)
 		require 'view/theme/frio/none.php';
 	} else {
 		$template = 'view/theme/' . $a->getCurrentTheme() . '/'
-			. ((x($a->page, 'template')) ? $a->page['template'] : 'default' ) . '.php';
+			. defaults($a->page, 'template', 'default' ) . '.php';
 		if (file_exists($template)) {
 			require_once $template;
 		} else {
diff --git a/view/theme/frio/php/standard.php b/view/theme/frio/php/standard.php
index 64c4544cd..71b5028a4 100644
--- a/view/theme/frio/php/standard.php
+++ b/view/theme/frio/php/standard.php
@@ -7,20 +7,20 @@
 
 
 
-	<?php if(x($page,'title')) echo $page['title'] ?>
+	<?php if(!empty($page['title'])) echo $page['title'] ?>
 	
 	
 	
 	
 	
 	
-	
+	
 
 
 
 Skip to main content
 
-						"; if(x($page,'aside')) echo $page['aside']; echo"
-						"; if(x($page,'right_aside')) echo $page['right_aside']; echo"
+						"; if(!empty($page['aside'])) echo $page['aside']; echo"
+						"; if(!empty($page['right_aside'])) echo $page['right_aside']; echo"
 						"; include('includes/photo_side.php'); echo"
 					
 
@@ -42,7 +42,7 @@
 						

 								
argv[0]; echo "-content-wrapper\">
 									
";
-										if(x($page,'content')) echo $page['content']; echo"
+										if(!empty($page['content'])) echo $page['content']; echo"
 										
 
 									

 								

diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index e0f65960f..7570ae0e5 100644
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -63,7 +63,7 @@ if ($a->module !== 'install') {
 // Setting $scheme to '' wasn't working for some reason, so we'll check it's
 // not --- like the mobile theme does instead.
 // Allow layouts to over-ride the scheme.
-if (x($_REQUEST, 'scheme')) {
+if (!empty($_REQUEST['scheme'])) {
 	$scheme = $_REQUEST['scheme'];
 }
 
diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index aa59081d9..a61810f99 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -301,7 +301,7 @@ function frio_remote_nav($a, &$nav)
  */
 function frio_acl_lookup(App $a, &$results)
 {
-	$nets = x($_GET, 'nets') ? Strings::escapeTags(trim($_GET['nets'])) : '';
+	$nets = !empty($_GET['nets']) ? Strings::escapeTags(trim($_GET['nets'])) : '';
 
 	// we introduce a new search type, r should do the same query like it's
 	// done in /src/Module/Contact.php for connections
diff --git a/view/theme/smoothly/php/default.php b/view/theme/smoothly/php/default.php
index 1bbd32cc1..b0d8a7e31 100644
--- a/view/theme/smoothly/php/default.php
+++ b/view/theme/smoothly/php/default.php
@@ -1,38 +1,38 @@
 
 
 
-  <?php if(x($page,'title')) echo $page['title'] ?>
+  <?php if(!empty($page['title'])) echo $page['title'] ?>
   
   
-  
+  
 
 
 	

-		
+		
 	

 
-	
+	
 
-	
+	
 
 	

-		
+		
 		
 
 		

 	

 
-	
+	
 
 	

-	
+	
 	

 
 	
-	
+	
 	
 	
 
-	
+	
 
 
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 9427f1f23..89fea650b 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -214,10 +214,7 @@ function vier_community_info()
 
 	//Community_Pages at right_aside
 	if ($show_pages && local_user()) {
-		$cid = null;
-		if (x($_GET, 'cid') && intval($_GET['cid']) != 0) {
-			$cid = $_GET['cid'];
-		}
+		$cid = defaults($_GET, 'cid', null);
 
 		//sort by last updated item
 		$lastitem = true;