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()
This commit is contained in:
Hypolite Petovan
parent
ea4e772b1e
commit
458981f75c
101 changed files with 896 additions and 914 deletions
37
boot.php
37
boot.php
|
|
@ -341,12 +341,13 @@ function get_app()
|
||||||
/**
|
/**
|
||||||
* @brief Multi-purpose function to check variable state.
|
* @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
|
* returns false if variable/key is not set
|
||||||
* if variable is set, returns 1 if has 'non-zero' value, otherwise returns 0.
|
* if variable is set, returns 1 if has 'non-zero' value, otherwise returns 0.
|
||||||
* e.g. x('') or x(0) returns 0;
|
* e.g. x('') or x(0) returns 0;
|
||||||
*
|
*
|
||||||
|
* @deprecated since version 2018.12
|
||||||
* @param string|array $s variable to check
|
* @param string|array $s variable to check
|
||||||
* @param string $k key inside the array to check
|
* @param string $k key inside the array to check
|
||||||
*
|
*
|
||||||
|
|
@ -383,13 +384,12 @@ function x($s, $k = null)
|
||||||
* - defaults($var, $default)
|
* - defaults($var, $default)
|
||||||
* - defaults($array, 'key', $default)
|
* - defaults($array, 'key', $default)
|
||||||
*
|
*
|
||||||
|
* @param array $args
|
||||||
* @brief Returns a defaut value if the provided variable or array key is falsy
|
* @brief Returns a defaut value if the provided variable or array key is falsy
|
||||||
* @see x()
|
|
||||||
* @return mixed
|
* @return mixed
|
||||||
*/
|
*/
|
||||||
function defaults() {
|
function defaults(...$args)
|
||||||
$args = func_get_args();
|
{
|
||||||
|
|
||||||
if (count($args) < 2) {
|
if (count($args) < 2) {
|
||||||
throw new BadFunctionCallException('defaults() requires at least 2 parameters');
|
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');
|
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) == 2 && is_array($args[0]) && !empty($args[0][$args[1]])) {
|
||||||
if (count($args) === 1) {
|
|
||||||
$return = $args[0];
|
|
||||||
} else {
|
|
||||||
$return = $args[0][$args[1]];
|
$return = $args[0][$args[1]];
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
$return = $default;
|
if (count($args) == 1 && !empty($args[0])) {
|
||||||
|
$return = $args[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
return $return;
|
return $return;
|
||||||
|
|
@ -446,15 +445,15 @@ function public_contact()
|
||||||
{
|
{
|
||||||
static $public_contact_id = false;
|
static $public_contact_id = false;
|
||||||
|
|
||||||
if (!$public_contact_id && x($_SESSION, 'authenticated')) {
|
if (!$public_contact_id && !empty($_SESSION['authenticated'])) {
|
||||||
if (x($_SESSION, 'my_address')) {
|
if (!empty($_SESSION['my_address'])) {
|
||||||
// Local user
|
// Local user
|
||||||
$public_contact_id = intval(Contact::getIdForURL($_SESSION['my_address'], 0, true));
|
$public_contact_id = intval(Contact::getIdForURL($_SESSION['my_address'], 0, true));
|
||||||
} elseif (x($_SESSION, 'visitor_home')) {
|
} elseif (!empty($_SESSION['visitor_home'])) {
|
||||||
// Remote user
|
// Remote user
|
||||||
$public_contact_id = intval(Contact::getIdForURL($_SESSION['visitor_home'], 0, true));
|
$public_contact_id = intval(Contact::getIdForURL($_SESSION['visitor_home'], 0, true));
|
||||||
}
|
}
|
||||||
} elseif (!x($_SESSION, 'authenticated')) {
|
} elseif (empty($_SESSION['authenticated'])) {
|
||||||
$public_contact_id = false;
|
$public_contact_id = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -479,7 +478,7 @@ function remote_user()
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_SESSION, 'authenticated') && x($_SESSION, 'visitor_id')) {
|
if (!empty($_SESSION['authenticated']) && !empty($_SESSION['visitor_id'])) {
|
||||||
return intval($_SESSION['visitor_id']);
|
return intval($_SESSION['visitor_id']);
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
@ -499,7 +498,7 @@ function notice($s)
|
||||||
}
|
}
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
if (!x($_SESSION, 'sysmsg')) {
|
if (empty($_SESSION['sysmsg'])) {
|
||||||
$_SESSION['sysmsg'] = [];
|
$_SESSION['sysmsg'] = [];
|
||||||
}
|
}
|
||||||
if ($a->interactive) {
|
if ($a->interactive) {
|
||||||
|
|
@ -522,7 +521,7 @@ function info($s)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!x($_SESSION, 'sysmsg_info')) {
|
if (empty($_SESSION['sysmsg_info'])) {
|
||||||
$_SESSION['sysmsg_info'] = [];
|
$_SESSION['sysmsg_info'] = [];
|
||||||
}
|
}
|
||||||
if ($a->interactive) {
|
if ($a->interactive) {
|
||||||
|
|
|
||||||
|
|
@ -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:
|
So the central part of the file now looks like this:
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<?php if(x($page,'nav')) echo $page['nav']; ?>
|
<?php if(!empty($page['nav'])) echo $page['nav']; ?>
|
||||||
<aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside>
|
<aside><?php if(!empty($page['right_aside'])) echo $page['right_aside']; ?></aside>
|
||||||
<section><?php if(x($page,'content')) echo $page['content']; ?>
|
<section><?php if(!empty($page['content'])) echo $page['content']; ?>
|
||||||
<div id="page-footer"></div>
|
<div id="page-footer"></div>
|
||||||
</section>
|
</section>
|
||||||
<right_aside><?php if(x($page,'aside')) echo $page['aside']; ?></right_aside>
|
<right_aside><?php if(!empty($page['aside'])) echo $page['aside']; ?></right_aside>
|
||||||
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
|
<footer><?php if(!empty($page['footer'])) echo $page['footer']; ?></footer>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
Finally we need a style.css file, inheriting the definitions from the parent theme and containing out changes for the new theme.
|
Finally we need a style.css file, inheriting the definitions from the parent theme and containing out changes for the new theme.
|
||||||
|
|
|
||||||
219
include/api.php
219
include/api.php
|
|
@ -68,7 +68,7 @@ $called_api = [];
|
||||||
*/
|
*/
|
||||||
function api_user()
|
function api_user()
|
||||||
{
|
{
|
||||||
if (x($_SESSION, 'allow_api')) {
|
if (!empty($_SESSION['allow_api'])) {
|
||||||
return local_user();
|
return local_user();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -186,7 +186,7 @@ function api_login(App $a)
|
||||||
}
|
}
|
||||||
|
|
||||||
// workaround for HTTP-auth in CGI mode
|
// workaround for HTTP-auth in CGI mode
|
||||||
if (x($_SERVER, 'REDIRECT_REMOTE_USER')) {
|
if (!empty($_SERVER['REDIRECT_REMOTE_USER'])) {
|
||||||
$userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6));
|
$userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6));
|
||||||
if (strlen($userpass)) {
|
if (strlen($userpass)) {
|
||||||
list($name, $password) = explode(':', $userpass);
|
list($name, $password) = explode(':', $userpass);
|
||||||
|
|
@ -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);
|
Logger::log('API_login: ' . print_r($_SERVER, true), Logger::DEBUG);
|
||||||
header('WWW-Authenticate: Basic realm="Friendica"');
|
header('WWW-Authenticate: Basic realm="Friendica"');
|
||||||
throw new UnauthorizedException("This API requires login");
|
throw new UnauthorizedException("This API requires login");
|
||||||
|
|
@ -396,7 +396,7 @@ function api_call(App $a)
|
||||||
case "json":
|
case "json":
|
||||||
header("Content-Type: application/json");
|
header("Content-Type: application/json");
|
||||||
$json = json_encode(end($return));
|
$json = json_encode(end($return));
|
||||||
if (x($_GET, 'callback')) {
|
if (!empty($_GET['callback'])) {
|
||||||
$json = $_GET['callback'] . "(" . $json . ")";
|
$json = $_GET['callback'] . "(" . $json . ")";
|
||||||
}
|
}
|
||||||
$return = $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']));
|
$user = DBA::escape(api_unique_id_to_nurl($_GET['user_id']));
|
||||||
|
|
||||||
if ($user == "") {
|
if ($user == "") {
|
||||||
|
|
@ -563,7 +563,7 @@ function api_get_user(App $a, $contact_id = null)
|
||||||
$extra_query .= "AND `contact`.`uid`=" . intval(api_user());
|
$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']);
|
$user = DBA::escape($_GET['screen_name']);
|
||||||
$extra_query = "AND `contact`.`nick` = '%s' ";
|
$extra_query = "AND `contact`.`nick` = '%s' ";
|
||||||
if (api_user() !== false) {
|
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']));
|
$user = DBA::escape(Strings::normaliseLink($_GET['profileurl']));
|
||||||
$extra_query = "AND `contact`.`nurl` = '%s' ";
|
$extra_query = "AND `contact`.`nurl` = '%s' ";
|
||||||
if (api_user() !== false) {
|
if (api_user() !== false) {
|
||||||
|
|
@ -980,7 +980,7 @@ function api_account_verify_credentials($type)
|
||||||
unset($_REQUEST["screen_name"]);
|
unset($_REQUEST["screen_name"]);
|
||||||
unset($_GET["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);
|
$user_info = api_get_user($a);
|
||||||
|
|
||||||
|
|
@ -1014,10 +1014,10 @@ api_register_func('api/account/verify_credentials', 'api_account_verify_credenti
|
||||||
*/
|
*/
|
||||||
function requestdata($k)
|
function requestdata($k)
|
||||||
{
|
{
|
||||||
if (x($_POST, $k)) {
|
if (!empty($_POST[$k])) {
|
||||||
return $_POST[$k];
|
return $_POST[$k];
|
||||||
}
|
}
|
||||||
if (x($_GET, $k)) {
|
if (!empty($_GET[$k])) {
|
||||||
return $_GET[$k];
|
return $_GET[$k];
|
||||||
}
|
}
|
||||||
return null;
|
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
|
// upload the image if we have one
|
||||||
$picture = wall_upload_post($a, false);
|
$picture = wall_upload_post($a, false);
|
||||||
if (is_array($picture)) {
|
if (is_array($picture)) {
|
||||||
|
|
@ -1199,7 +1199,7 @@ function api_statuses_update($type)
|
||||||
|
|
||||||
$_REQUEST['api_source'] = true;
|
$_REQUEST['api_source'] = true;
|
||||||
|
|
||||||
if (!x($_REQUEST, "source")) {
|
if (empty($_REQUEST['source'])) {
|
||||||
$_REQUEST["source"] = api_source();
|
$_REQUEST["source"] = api_source();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1231,7 +1231,7 @@ function api_media_upload()
|
||||||
|
|
||||||
api_get_user($a);
|
api_get_user($a);
|
||||||
|
|
||||||
if (!x($_FILES, 'media')) {
|
if (empty($_FILES['media'])) {
|
||||||
// Output error
|
// Output error
|
||||||
throw new BadRequestException("No media.");
|
throw new BadRequestException("No media.");
|
||||||
}
|
}
|
||||||
|
|
@ -1445,7 +1445,7 @@ function api_users_search($type)
|
||||||
|
|
||||||
$userlist = [];
|
$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"]));
|
$r = q("SELECT id FROM `contact` WHERE `uid` = 0 AND `name` = '%s'", DBA::escape($_GET["q"]));
|
||||||
|
|
||||||
if (!DBA::isResult($r)) {
|
if (!DBA::isResult($r)) {
|
||||||
|
|
@ -1530,21 +1530,21 @@ function api_search($type)
|
||||||
|
|
||||||
$data = [];
|
$data = [];
|
||||||
|
|
||||||
if (!x($_REQUEST, 'q')) {
|
if (empty($_REQUEST['q'])) {
|
||||||
throw new BadRequestException("q parameter is required.");
|
throw new BadRequestException("q parameter is required.");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_REQUEST, 'rpp')) {
|
if (!empty($_REQUEST['rpp'])) {
|
||||||
$count = $_REQUEST['rpp'];
|
$count = $_REQUEST['rpp'];
|
||||||
} elseif (x($_REQUEST, 'count')) {
|
} elseif (!empty($_REQUEST['count'])) {
|
||||||
$count = $_REQUEST['count'];
|
$count = $_REQUEST['count'];
|
||||||
} else {
|
} else {
|
||||||
$count = 15;
|
$count = 15;
|
||||||
}
|
}
|
||||||
|
|
||||||
$since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
|
$since_id = defaults($_REQUEST, 'since_id', 0);
|
||||||
$max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0);
|
$max_id = defaults($_REQUEST, 'max_id', 0);
|
||||||
$page = (x($_REQUEST, 'page') ? $_REQUEST['page'] - 1 : 0);
|
$page = (!empty($_REQUEST['page']) ? $_REQUEST['page'] - 1 : 0);
|
||||||
|
|
||||||
$start = $page * $count;
|
$start = $page * $count;
|
||||||
|
|
||||||
|
|
@ -1598,16 +1598,15 @@ function api_statuses_home_timeline($type)
|
||||||
// get last network messages
|
// get last network messages
|
||||||
|
|
||||||
// params
|
// params
|
||||||
$count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20);
|
$count = defaults($_REQUEST, 'count', 20);
|
||||||
$page = (x($_REQUEST, 'page') ? $_REQUEST['page'] - 1 : 0);
|
$page = (!empty($_REQUEST['page']) ? $_REQUEST['page'] - 1 : 0);
|
||||||
if ($page < 0) {
|
if ($page < 0) {
|
||||||
$page = 0;
|
$page = 0;
|
||||||
}
|
}
|
||||||
$since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
|
$since_id = defaults($_REQUEST, 'since_id', 0);
|
||||||
$max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0);
|
$max_id = defaults($_REQUEST, 'max_id', 0);
|
||||||
//$since_id = 0;//$since_id = (x($_REQUEST, 'since_id')?$_REQUEST['since_id'] : 0);
|
$exclude_replies = !empty($_REQUEST['exclude_replies']);
|
||||||
$exclude_replies = (x($_REQUEST, 'exclude_replies') ? 1 : 0);
|
$conversation_id = defaults($_REQUEST, 'conversation_id', 0);
|
||||||
$conversation_id = (x($_REQUEST, 'conversation_id') ? $_REQUEST['conversation_id'] : 0);
|
|
||||||
|
|
||||||
$start = $page * $count;
|
$start = $page * $count;
|
||||||
|
|
||||||
|
|
@ -1618,7 +1617,7 @@ function api_statuses_home_timeline($type)
|
||||||
$condition[0] .= " AND `item`.`id` <= ?";
|
$condition[0] .= " AND `item`.`id` <= ?";
|
||||||
$condition[] = $max_id;
|
$condition[] = $max_id;
|
||||||
}
|
}
|
||||||
if ($exclude_replies > 0) {
|
if ($exclude_replies) {
|
||||||
$condition[0] .= ' AND `item`.`parent` = `item`.`id`';
|
$condition[0] .= ' AND `item`.`parent` = `item`.`id`';
|
||||||
}
|
}
|
||||||
if ($conversation_id > 0) {
|
if ($conversation_id > 0) {
|
||||||
|
|
@ -1681,19 +1680,17 @@ function api_statuses_public_timeline($type)
|
||||||
// get last network messages
|
// get last network messages
|
||||||
|
|
||||||
// params
|
// params
|
||||||
$count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20);
|
$count = defaults($_REQUEST, 'count', 20);
|
||||||
$page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0);
|
$page = (!empty($_REQUEST['page']) ? $_REQUEST['page'] -1 : 0);
|
||||||
if ($page < 0) {
|
if ($page < 0) {
|
||||||
$page = 0;
|
$page = 0;
|
||||||
}
|
}
|
||||||
$since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
|
$since_id = defaults($_REQUEST, 'since_id', 0);
|
||||||
$max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0);
|
$max_id = defaults($_REQUEST, 'max_id', 0);
|
||||||
//$since_id = 0;//$since_id = (x($_REQUEST, 'since_id')?$_REQUEST['since_id'] : 0);
|
$exclude_replies = (!empty($_REQUEST['exclude_replies']) ? 1 : 0);
|
||||||
$exclude_replies = (x($_REQUEST, 'exclude_replies') ? 1 : 0);
|
$conversation_id = defaults($_REQUEST, 'conversation_id', 0);
|
||||||
$conversation_id = (x($_REQUEST, 'conversation_id') ? $_REQUEST['conversation_id'] : 0);
|
|
||||||
|
|
||||||
$start = $page * $count;
|
$start = $page * $count;
|
||||||
$sql_extra = '';
|
|
||||||
|
|
||||||
if ($exclude_replies && !$conversation_id) {
|
if ($exclude_replies && !$conversation_id) {
|
||||||
$condition = ["`gravity` IN (?, ?) AND `iid` > ? AND NOT `private` AND `wall` AND NOT `user`.`hidewall`",
|
$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();
|
throw new ForbiddenException();
|
||||||
}
|
}
|
||||||
|
|
||||||
$since_id = x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0;
|
$since_id = defaults($_REQUEST, 'since_id', 0);
|
||||||
$max_id = x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0;
|
$max_id = defaults($_REQUEST, 'max_id', 0);
|
||||||
|
|
||||||
// pagination
|
// pagination
|
||||||
$count = x($_REQUEST, 'count') ? $_REQUEST['count'] : 20;
|
$count = defaults($_REQUEST, 'count', 20);
|
||||||
$page = x($_REQUEST, 'page') ? $_REQUEST['page'] : 1;
|
$page = defaults($_REQUEST, 'page', 1);
|
||||||
if ($page < 1) {
|
if ($page < 1) {
|
||||||
$page = 1;
|
$page = 1;
|
||||||
}
|
}
|
||||||
|
|
@ -2001,7 +1998,7 @@ function api_statuses_repeat($type)
|
||||||
$_REQUEST['profile_uid'] = api_user();
|
$_REQUEST['profile_uid'] = api_user();
|
||||||
$_REQUEST['api_source'] = true;
|
$_REQUEST['api_source'] = true;
|
||||||
|
|
||||||
if (!x($_REQUEST, "source")) {
|
if (empty($_REQUEST['source'])) {
|
||||||
$_REQUEST["source"] = api_source();
|
$_REQUEST["source"] = api_source();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -2150,14 +2147,14 @@ function api_statuses_user_timeline($type)
|
||||||
Logger::DEBUG
|
Logger::DEBUG
|
||||||
);
|
);
|
||||||
|
|
||||||
$since_id = x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0;
|
$since_id = defaults($_REQUEST, 'since_id', 0);
|
||||||
$max_id = x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0;
|
$max_id = defaults($_REQUEST, 'max_id', 0);
|
||||||
$exclude_replies = x($_REQUEST, 'exclude_replies') ? 1 : 0;
|
$exclude_replies = !empty($_REQUEST['exclude_replies']);
|
||||||
$conversation_id = x($_REQUEST, 'conversation_id') ? $_REQUEST['conversation_id'] : 0;
|
$conversation_id = defaults($_REQUEST, 'conversation_id', 0);
|
||||||
|
|
||||||
// pagination
|
// pagination
|
||||||
$count = x($_REQUEST, 'count') ? $_REQUEST['count'] : 20;
|
$count = defaults($_REQUEST, 'count', 20);
|
||||||
$page = x($_REQUEST, 'page') ? $_REQUEST['page'] : 1;
|
$page = defaults($_REQUEST, 'page', 1);
|
||||||
if ($page < 1) {
|
if ($page < 1) {
|
||||||
$page = 1;
|
$page = 1;
|
||||||
}
|
}
|
||||||
|
|
@ -2170,7 +2167,7 @@ function api_statuses_user_timeline($type)
|
||||||
$condition[0] .= ' AND `item`.`wall` ';
|
$condition[0] .= ' AND `item`.`wall` ';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($exclude_replies > 0) {
|
if ($exclude_replies) {
|
||||||
$condition[0] .= ' AND `item`.`parent` = `item`.`id`';
|
$condition[0] .= ' AND `item`.`parent` = `item`.`id`';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -2309,10 +2306,10 @@ function api_favorites($type)
|
||||||
$ret = [];
|
$ret = [];
|
||||||
} else {
|
} else {
|
||||||
// params
|
// params
|
||||||
$since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
|
$since_id = defaults($_REQUEST, 'since_id', 0);
|
||||||
$max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0);
|
$max_id = defaults($_REQUEST, 'max_id', 0);
|
||||||
$count = (x($_GET, 'count') ? $_GET['count'] : 20);
|
$count = defaults($_GET, 'count', 20);
|
||||||
$page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0);
|
$page = (!empty($_REQUEST['page']) ? $_REQUEST['page'] -1 : 0);
|
||||||
if ($page < 0) {
|
if ($page < 0) {
|
||||||
$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
|
//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'];
|
$ret['title'] = $item['title'];
|
||||||
if ($_GET['getText'] == 'html') {
|
if ($_GET['getText'] == 'html') {
|
||||||
$ret['text'] = BBCode::convert($item['body'], false);
|
$ret['text'] = BBCode::convert($item['body'], false);
|
||||||
|
|
@ -2400,7 +2397,7 @@ function api_format_messages($item, $recipient, $sender)
|
||||||
} else {
|
} else {
|
||||||
$ret['text'] = $item['title'] . "\n" . HTML::toPlaintext(BBCode::convert(api_clean_plain_items($item['body']), false, 2, true), 0);
|
$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['sender']);
|
||||||
unset($ret['recipient']);
|
unset($ret['recipient']);
|
||||||
}
|
}
|
||||||
|
|
@ -2530,7 +2527,7 @@ function api_get_attachments(&$body)
|
||||||
*/
|
*/
|
||||||
function api_get_entitities(&$text, $bbcode)
|
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") {
|
if ($include_entities != "true") {
|
||||||
preg_match_all("/\[img](.*?)\[\/img\]/ism", $bbcode, $images);
|
preg_match_all("/\[img](.*?)\[\/img\]/ism", $bbcode, $images);
|
||||||
|
|
@ -3119,15 +3116,15 @@ function api_lists_statuses($type)
|
||||||
}
|
}
|
||||||
|
|
||||||
// params
|
// params
|
||||||
$count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20);
|
$count = defaults($_REQUEST, 'count', 20);
|
||||||
$page = (x($_REQUEST, 'page') ? $_REQUEST['page'] - 1 : 0);
|
$page = (!empty($_REQUEST['page']) ? $_REQUEST['page'] - 1 : 0);
|
||||||
if ($page < 0) {
|
if ($page < 0) {
|
||||||
$page = 0;
|
$page = 0;
|
||||||
}
|
}
|
||||||
$since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
|
$since_id = defaults($_REQUEST, 'since_id', 0);
|
||||||
$max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0);
|
$max_id = defaults($_REQUEST, 'max_id', 0);
|
||||||
$exclude_replies = (x($_REQUEST, 'exclude_replies') ? 1 : 0);
|
$exclude_replies = (!empty($_REQUEST['exclude_replies']) ? 1 : 0);
|
||||||
$conversation_id = (x($_REQUEST, 'conversation_id') ? $_REQUEST['conversation_id'] : 0);
|
$conversation_id = defaults($_REQUEST, 'conversation_id', 0);
|
||||||
|
|
||||||
$start = $page * $count;
|
$start = $page * $count;
|
||||||
|
|
||||||
|
|
@ -3185,8 +3182,8 @@ function api_statuses_f($qtype)
|
||||||
}
|
}
|
||||||
|
|
||||||
// pagination
|
// pagination
|
||||||
$count = x($_GET, 'count') ? $_GET['count'] : 20;
|
$count = defaults($_GET, 'count', 20);
|
||||||
$page = x($_GET, 'page') ? $_GET['page'] : 1;
|
$page = defaults($_GET, 'page', 1);
|
||||||
if ($page < 1) {
|
if ($page < 1) {
|
||||||
$page = 1;
|
$page = 1;
|
||||||
}
|
}
|
||||||
|
|
@ -3194,7 +3191,7 @@ function api_statuses_f($qtype)
|
||||||
|
|
||||||
$user_info = api_get_user($a);
|
$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
|
/* this is to stop Hotot to load friends multiple times
|
||||||
* I'm not sure if I'm missing return something or
|
* I'm not sure if I'm missing return something or
|
||||||
* is a bug in hotot. Workaround, meantime
|
* is a bug in hotot. Workaround, meantime
|
||||||
|
|
@ -3522,7 +3519,7 @@ function api_direct_messages_new($type)
|
||||||
|
|
||||||
$replyto = '';
|
$replyto = '';
|
||||||
$sub = '';
|
$sub = '';
|
||||||
if (x($_REQUEST, 'replyto')) {
|
if (!empty($_REQUEST['replyto'])) {
|
||||||
$r = q(
|
$r = q(
|
||||||
'SELECT `parent-uri`, `title` FROM `mail` WHERE `uid`=%d AND `id`=%d',
|
'SELECT `parent-uri`, `title` FROM `mail` WHERE `uid`=%d AND `id`=%d',
|
||||||
intval(api_user()),
|
intval(api_user()),
|
||||||
|
|
@ -3531,7 +3528,7 @@ function api_direct_messages_new($type)
|
||||||
$replyto = $r[0]['parent-uri'];
|
$replyto = $r[0]['parent-uri'];
|
||||||
$sub = $r[0]['title'];
|
$sub = $r[0]['title'];
|
||||||
} else {
|
} else {
|
||||||
if (x($_REQUEST, 'title')) {
|
if (!empty($_REQUEST['title'])) {
|
||||||
$sub = $_REQUEST['title'];
|
$sub = $_REQUEST['title'];
|
||||||
} else {
|
} else {
|
||||||
$sub = ((strlen($_POST['text'])>10) ? substr($_POST['text'], 0, 10)."...":$_POST['text']);
|
$sub = ((strlen($_POST['text'])>10) ? substr($_POST['text'], 0, 10)."...":$_POST['text']);
|
||||||
|
|
@ -3583,10 +3580,10 @@ function api_direct_messages_destroy($type)
|
||||||
// params
|
// params
|
||||||
$user_info = api_get_user($a);
|
$user_info = api_get_user($a);
|
||||||
//required
|
//required
|
||||||
$id = (x($_REQUEST, 'id') ? $_REQUEST['id'] : 0);
|
$id = defaults($_REQUEST, 'id', 0);
|
||||||
// optional
|
// optional
|
||||||
$parenturi = (x($_REQUEST, 'friendica_parenturi') ? $_REQUEST['friendica_parenturi'] : "");
|
$parenturi = defaults($_REQUEST, 'friendica_parenturi', "");
|
||||||
$verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false");
|
$verbose = (!empty($_GET['friendica_verbose']) ? strtolower($_GET['friendica_verbose']) : "false");
|
||||||
/// @todo optional parameter 'include_entities' from Twitter API not yet implemented
|
/// @todo optional parameter 'include_entities' from Twitter API not yet implemented
|
||||||
|
|
||||||
$uid = $user_info['uid'];
|
$uid = $user_info['uid'];
|
||||||
|
|
@ -3838,7 +3835,7 @@ function api_direct_messages_box($type, $box, $verbose)
|
||||||
*/
|
*/
|
||||||
function api_direct_messages_sentbox($type)
|
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);
|
return api_direct_messages_box($type, "sentbox", $verbose);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -3852,7 +3849,7 @@ function api_direct_messages_sentbox($type)
|
||||||
*/
|
*/
|
||||||
function api_direct_messages_inbox($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);
|
return api_direct_messages_box($type, "inbox", $verbose);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -3864,7 +3861,7 @@ function api_direct_messages_inbox($type)
|
||||||
*/
|
*/
|
||||||
function api_direct_messages_all($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);
|
return api_direct_messages_box($type, "all", $verbose);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -3876,7 +3873,7 @@ function api_direct_messages_all($type)
|
||||||
*/
|
*/
|
||||||
function api_direct_messages_conversation($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);
|
return api_direct_messages_box($type, "conversation", $verbose);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -3940,7 +3937,7 @@ function api_fr_photoalbum_delete($type)
|
||||||
throw new ForbiddenException();
|
throw new ForbiddenException();
|
||||||
}
|
}
|
||||||
// input params
|
// input params
|
||||||
$album = (x($_REQUEST, 'album') ? $_REQUEST['album'] : "");
|
$album = defaults($_REQUEST, 'album', "");
|
||||||
|
|
||||||
// we do not allow calls without album string
|
// we do not allow calls without album string
|
||||||
if ($album == "") {
|
if ($album == "") {
|
||||||
|
|
@ -3992,8 +3989,8 @@ function api_fr_photoalbum_update($type)
|
||||||
throw new ForbiddenException();
|
throw new ForbiddenException();
|
||||||
}
|
}
|
||||||
// input params
|
// input params
|
||||||
$album = (x($_REQUEST, 'album') ? $_REQUEST['album'] : "");
|
$album = defaults($_REQUEST, 'album', "");
|
||||||
$album_new = (x($_REQUEST, 'album_new') ? $_REQUEST['album_new'] : "");
|
$album_new = defaults($_REQUEST, 'album_new', "");
|
||||||
|
|
||||||
// we do not allow calls without album string
|
// we do not allow calls without album string
|
||||||
if ($album == "") {
|
if ($album == "") {
|
||||||
|
|
@ -4077,15 +4074,15 @@ function api_fr_photo_create_update($type)
|
||||||
throw new ForbiddenException();
|
throw new ForbiddenException();
|
||||||
}
|
}
|
||||||
// input params
|
// input params
|
||||||
$photo_id = (x($_REQUEST, 'photo_id') ? $_REQUEST['photo_id'] : null);
|
$photo_id = defaults($_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'
|
$desc = defaults($_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 = defaults($_REQUEST, 'album', null);
|
||||||
$album_new = (x($_REQUEST, 'album_new') ? $_REQUEST['album_new'] : null);
|
$album_new = defaults($_REQUEST, 'album_new', null);
|
||||||
$allow_cid = (x($_REQUEST, 'allow_cid') ? $_REQUEST['allow_cid'] : (array_key_exists('allow_cid', $_REQUEST) ? " " : null));
|
$allow_cid = defaults($_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));
|
$deny_cid = defaults($_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));
|
$allow_gid = defaults($_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));
|
$deny_gid = defaults($_REQUEST, 'deny_gid' , (array_key_exists('deny_gid' , $_REQUEST) ? " " : null));
|
||||||
$visibility = (x($_REQUEST, 'visibility') ? (($_REQUEST['visibility'] == "true" || $_REQUEST['visibility'] == 1) ? true : false) : false);
|
$visibility = !empty($_REQUEST['visibility']) || $_REQUEST['visibility'] !== "false";
|
||||||
|
|
||||||
// do several checks on input parameters
|
// do several checks on input parameters
|
||||||
// we do not allow calls without album string
|
// we do not allow calls without album string
|
||||||
|
|
@ -4097,7 +4094,7 @@ function api_fr_photo_create_update($type)
|
||||||
$mode = "create";
|
$mode = "create";
|
||||||
|
|
||||||
// error if no media posted in create-mode
|
// error if no media posted in create-mode
|
||||||
if (!x($_FILES, 'media')) {
|
if (empty($_FILES['media'])) {
|
||||||
// Output error
|
// Output error
|
||||||
throw new BadRequestException("no media data submitted");
|
throw new BadRequestException("no media data submitted");
|
||||||
}
|
}
|
||||||
|
|
@ -4188,7 +4185,7 @@ function api_fr_photo_create_update($type)
|
||||||
$nothingtodo = true;
|
$nothingtodo = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_FILES, 'media')) {
|
if (!empty($_FILES['media'])) {
|
||||||
$nothingtodo = false;
|
$nothingtodo = false;
|
||||||
$media = $_FILES['media'];
|
$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);
|
$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();
|
throw new ForbiddenException();
|
||||||
}
|
}
|
||||||
// input params
|
// 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
|
// do several checks on input parameters
|
||||||
// we do not allow calls without photo id
|
// we do not allow calls without photo id
|
||||||
|
|
@ -4275,11 +4272,11 @@ function api_fr_photo_detail($type)
|
||||||
if (api_user() === false) {
|
if (api_user() === false) {
|
||||||
throw new ForbiddenException();
|
throw new ForbiddenException();
|
||||||
}
|
}
|
||||||
if (!x($_REQUEST, 'photo_id')) {
|
if (empty($_REQUEST['photo_id'])) {
|
||||||
throw new BadRequestException("No 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'];
|
$photo_id = $_REQUEST['photo_id'];
|
||||||
|
|
||||||
// prepare json/xml output with data from database for the requested photo
|
// 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);
|
$profile_id = defaults($_REQUEST, 'profile_id', 0);
|
||||||
|
|
||||||
// error if image data is missing
|
// error if image data is missing
|
||||||
if (!x($_FILES, 'image')) {
|
if (empty($_FILES['image'])) {
|
||||||
throw new BadRequestException("no media data submitted");
|
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)
|
// get mediadata from image or media (Twitter call api/account/update_profile_image provides image)
|
||||||
$media = null;
|
$media = null;
|
||||||
if (x($_FILES, 'image')) {
|
if (!empty($_FILES['image'])) {
|
||||||
$media = $_FILES['image'];
|
$media = $_FILES['image'];
|
||||||
} elseif (x($_FILES, 'media')) {
|
} elseif (!empty($_FILES['media'])) {
|
||||||
$media = $_FILES['media'];
|
$media = $_FILES['media'];
|
||||||
}
|
}
|
||||||
// save new profile image
|
// save new profile image
|
||||||
|
|
@ -4788,8 +4785,8 @@ function prepare_photo_data($type, $scale, $photo_id)
|
||||||
*/
|
*/
|
||||||
function api_friendica_remoteauth()
|
function api_friendica_remoteauth()
|
||||||
{
|
{
|
||||||
$url = (x($_GET, 'url') ? $_GET['url'] : '');
|
$url = defaults($_GET, 'url', '');
|
||||||
$c_url = (x($_GET, 'c_url') ? $_GET['c_url'] : '');
|
$c_url = defaults($_GET, 'c_url', '');
|
||||||
|
|
||||||
if ($url === '' || $c_url === '') {
|
if ($url === '' || $c_url === '') {
|
||||||
throw new BadRequestException("Wrong parameters.");
|
throw new BadRequestException("Wrong parameters.");
|
||||||
|
|
@ -5092,7 +5089,7 @@ function api_in_reply_to($item)
|
||||||
*/
|
*/
|
||||||
function api_clean_plain_items($text)
|
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);
|
$text = BBCode::cleanPictureLinks($text);
|
||||||
$URLSearchString = "^\[\]";
|
$URLSearchString = "^\[\]";
|
||||||
|
|
@ -5224,7 +5221,7 @@ function api_friendica_group_show($type)
|
||||||
|
|
||||||
// params
|
// params
|
||||||
$user_info = api_get_user($a);
|
$user_info = api_get_user($a);
|
||||||
$gid = (x($_REQUEST, 'gid') ? $_REQUEST['gid'] : 0);
|
$gid = defaults($_REQUEST, 'gid', 0);
|
||||||
$uid = $user_info['uid'];
|
$uid = $user_info['uid'];
|
||||||
|
|
||||||
// get data of the specified group id or all groups if not specified
|
// get data of the specified group id or all groups if not specified
|
||||||
|
|
@ -5289,8 +5286,8 @@ function api_friendica_group_delete($type)
|
||||||
|
|
||||||
// params
|
// params
|
||||||
$user_info = api_get_user($a);
|
$user_info = api_get_user($a);
|
||||||
$gid = (x($_REQUEST, 'gid') ? $_REQUEST['gid'] : 0);
|
$gid = defaults($_REQUEST, 'gid', 0);
|
||||||
$name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : "");
|
$name = defaults($_REQUEST, 'name', "");
|
||||||
$uid = $user_info['uid'];
|
$uid = $user_info['uid'];
|
||||||
|
|
||||||
// error if no gid specified
|
// error if no gid specified
|
||||||
|
|
@ -5351,7 +5348,7 @@ function api_lists_destroy($type)
|
||||||
|
|
||||||
// params
|
// params
|
||||||
$user_info = api_get_user($a);
|
$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'];
|
$uid = $user_info['uid'];
|
||||||
|
|
||||||
// error if no gid specified
|
// error if no gid specified
|
||||||
|
|
@ -5467,7 +5464,7 @@ function api_friendica_group_create($type)
|
||||||
|
|
||||||
// params
|
// params
|
||||||
$user_info = api_get_user($a);
|
$user_info = api_get_user($a);
|
||||||
$name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : "");
|
$name = defaults($_REQUEST, 'name', "");
|
||||||
$uid = $user_info['uid'];
|
$uid = $user_info['uid'];
|
||||||
$json = json_decode($_POST['json'], true);
|
$json = json_decode($_POST['json'], true);
|
||||||
$users = $json['user'];
|
$users = $json['user'];
|
||||||
|
|
@ -5496,7 +5493,7 @@ function api_lists_create($type)
|
||||||
|
|
||||||
// params
|
// params
|
||||||
$user_info = api_get_user($a);
|
$user_info = api_get_user($a);
|
||||||
$name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : "");
|
$name = defaults($_REQUEST, 'name', "");
|
||||||
$uid = $user_info['uid'];
|
$uid = $user_info['uid'];
|
||||||
|
|
||||||
$success = group_create($name, $uid);
|
$success = group_create($name, $uid);
|
||||||
|
|
@ -5531,8 +5528,8 @@ function api_friendica_group_update($type)
|
||||||
// params
|
// params
|
||||||
$user_info = api_get_user($a);
|
$user_info = api_get_user($a);
|
||||||
$uid = $user_info['uid'];
|
$uid = $user_info['uid'];
|
||||||
$gid = (x($_REQUEST, 'gid') ? $_REQUEST['gid'] : 0);
|
$gid = defaults($_REQUEST, 'gid', 0);
|
||||||
$name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : "");
|
$name = defaults($_REQUEST, 'name', "");
|
||||||
$json = json_decode($_POST['json'], true);
|
$json = json_decode($_POST['json'], true);
|
||||||
$users = $json['user'];
|
$users = $json['user'];
|
||||||
|
|
||||||
|
|
@ -5604,8 +5601,8 @@ function api_lists_update($type)
|
||||||
|
|
||||||
// params
|
// params
|
||||||
$user_info = api_get_user($a);
|
$user_info = api_get_user($a);
|
||||||
$gid = (x($_REQUEST, 'list_id') ? $_REQUEST['list_id'] : 0);
|
$gid = defaults($_REQUEST, 'list_id', 0);
|
||||||
$name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : "");
|
$name = defaults($_REQUEST, 'name', "");
|
||||||
$uid = $user_info['uid'];
|
$uid = $user_info['uid'];
|
||||||
|
|
||||||
// error if no gid specified
|
// error if no gid specified
|
||||||
|
|
@ -5650,7 +5647,7 @@ function api_friendica_activity($type)
|
||||||
$verb = strtolower($a->argv[3]);
|
$verb = strtolower($a->argv[3]);
|
||||||
$verb = preg_replace("|\..*$|", "", $verb);
|
$verb = preg_replace("|\..*$|", "", $verb);
|
||||||
|
|
||||||
$id = (x($_REQUEST, 'id') ? $_REQUEST['id'] : 0);
|
$id = defaults($_REQUEST, 'id', 0);
|
||||||
|
|
||||||
$res = Item::performLike($id, $verb);
|
$res = Item::performLike($id, $verb);
|
||||||
|
|
||||||
|
|
@ -5732,7 +5729,7 @@ function api_friendica_notification_seen($type)
|
||||||
throw new BadRequestException("Invalid argument count");
|
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();
|
$nm = new NotificationsManager();
|
||||||
$note = $nm->getByID($id);
|
$note = $nm->getByID($id);
|
||||||
|
|
@ -5775,7 +5772,7 @@ function api_friendica_direct_messages_setseen($type)
|
||||||
// params
|
// params
|
||||||
$user_info = api_get_user($a);
|
$user_info = api_get_user($a);
|
||||||
$uid = $user_info['uid'];
|
$uid = $user_info['uid'];
|
||||||
$id = (x($_REQUEST, 'id') ? $_REQUEST['id'] : 0);
|
$id = defaults($_REQUEST, 'id', 0);
|
||||||
|
|
||||||
// return error if id is zero
|
// return error if id is zero
|
||||||
if ($id == "") {
|
if ($id == "") {
|
||||||
|
|
@ -5824,7 +5821,7 @@ function api_friendica_direct_messages_search($type, $box = "")
|
||||||
|
|
||||||
// params
|
// params
|
||||||
$user_info = api_get_user($a);
|
$user_info = api_get_user($a);
|
||||||
$searchstring = (x($_REQUEST, 'searchstring') ? $_REQUEST['searchstring'] : "");
|
$searchstring = defaults($_REQUEST, 'searchstring', "");
|
||||||
$uid = $user_info['uid'];
|
$uid = $user_info['uid'];
|
||||||
|
|
||||||
// error if no searchstring specified
|
// error if no searchstring specified
|
||||||
|
|
@ -5886,7 +5883,7 @@ function api_friendica_profile_show($type)
|
||||||
}
|
}
|
||||||
|
|
||||||
// input params
|
// 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
|
// retrieve general information about profiles for user
|
||||||
$multi_profiles = Feature::isEnabled(api_user(), 'multi_profiles');
|
$multi_profiles = Feature::isEnabled(api_user(), 'multi_profiles');
|
||||||
|
|
|
||||||
|
|
@ -462,17 +462,17 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
|
||||||
. "<script> var profile_uid = " . $_SESSION['uid']
|
. "<script> var profile_uid = " . $_SESSION['uid']
|
||||||
. "; var netargs = '" . substr($a->cmd, 8)
|
. "; var netargs = '" . substr($a->cmd, 8)
|
||||||
. '?f='
|
. '?f='
|
||||||
. ((x($_GET, 'cid')) ? '&cid=' . rawurlencode($_GET['cid']) : '')
|
. (!empty($_GET['cid']) ? '&cid=' . rawurlencode($_GET['cid']) : '')
|
||||||
. ((x($_GET, 'search')) ? '&search=' . rawurlencode($_GET['search']) : '')
|
. (!empty($_GET['search']) ? '&search=' . rawurlencode($_GET['search']) : '')
|
||||||
. ((x($_GET, 'star')) ? '&star=' . rawurlencode($_GET['star']) : '')
|
. (!empty($_GET['star']) ? '&star=' . rawurlencode($_GET['star']) : '')
|
||||||
. ((x($_GET, 'order')) ? '&order=' . rawurlencode($_GET['order']) : '')
|
. (!empty($_GET['order']) ? '&order=' . rawurlencode($_GET['order']) : '')
|
||||||
. ((x($_GET, 'bmark')) ? '&bmark=' . rawurlencode($_GET['bmark']) : '')
|
. (!empty($_GET['bmark']) ? '&bmark=' . rawurlencode($_GET['bmark']) : '')
|
||||||
. ((x($_GET, 'liked')) ? '&liked=' . rawurlencode($_GET['liked']) : '')
|
. (!empty($_GET['liked']) ? '&liked=' . rawurlencode($_GET['liked']) : '')
|
||||||
. ((x($_GET, 'conv')) ? '&conv=' . rawurlencode($_GET['conv']) : '')
|
. (!empty($_GET['conv']) ? '&conv=' . rawurlencode($_GET['conv']) : '')
|
||||||
. ((x($_GET, 'nets')) ? '&nets=' . rawurlencode($_GET['nets']) : '')
|
. (!empty($_GET['nets']) ? '&nets=' . rawurlencode($_GET['nets']) : '')
|
||||||
. ((x($_GET, 'cmin')) ? '&cmin=' . rawurlencode($_GET['cmin']) : '')
|
. (!empty($_GET['cmin']) ? '&cmin=' . rawurlencode($_GET['cmin']) : '')
|
||||||
. ((x($_GET, 'cmax')) ? '&cmax=' . rawurlencode($_GET['cmax']) : '')
|
. (!empty($_GET['cmax']) ? '&cmax=' . rawurlencode($_GET['cmax']) : '')
|
||||||
. ((x($_GET, 'file')) ? '&file=' . rawurlencode($_GET['file']) : '')
|
. (!empty($_GET['file']) ? '&file=' . rawurlencode($_GET['file']) : '')
|
||||||
|
|
||||||
. "'; var profile_page = " . $pager->getPage() . "; </script>\r\n";
|
. "'; var profile_page = " . $pager->getPage() . "; </script>\r\n";
|
||||||
}
|
}
|
||||||
|
|
@ -482,7 +482,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
|
||||||
|
|
||||||
if (!$update) {
|
if (!$update) {
|
||||||
$tab = 'posts';
|
$tab = 'posts';
|
||||||
if (x($_GET, 'tab')) {
|
if (!empty($_GET['tab'])) {
|
||||||
$tab = Strings::escapeTags(trim($_GET['tab']));
|
$tab = Strings::escapeTags(trim($_GET['tab']));
|
||||||
}
|
}
|
||||||
if ($tab === 'posts') {
|
if ($tab === 'posts') {
|
||||||
|
|
@ -951,7 +951,7 @@ function builtin_activity_puller($item, &$conv_responses) {
|
||||||
|
|
||||||
$url = '<a href="'. $url . '"'. $sparkle .'>' . htmlentities($item['author-name']) . '</a>';
|
$url = '<a href="'. $url . '"'. $sparkle .'>' . htmlentities($item['author-name']) . '</a>';
|
||||||
|
|
||||||
if (!x($item, 'thr-parent')) {
|
if (empty($item['thr-parent'])) {
|
||||||
$item['thr-parent'] = $item['parent-uri'];
|
$item['thr-parent'] = $item['parent-uri'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1079,7 +1079,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
|
||||||
{
|
{
|
||||||
$o = '';
|
$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');
|
$tpl = Renderer::getMarkupTemplate('jot-header.tpl');
|
||||||
$a->page['htmlhead'] .= Renderer::replaceMacros($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/public post links for the non-JS ACL form
|
||||||
$private_post = 1;
|
$private_post = 1;
|
||||||
if (x($_REQUEST, 'public')) {
|
if (!empty($_REQUEST['public'])) {
|
||||||
$private_post = 0;
|
$private_post = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1432,11 +1432,11 @@ function sort_thr_commented(array $a, array $b)
|
||||||
}
|
}
|
||||||
|
|
||||||
function render_location_dummy(array $item) {
|
function render_location_dummy(array $item) {
|
||||||
if (x($item, 'location') && !empty($item['location'])) {
|
if (!empty($item['location']) && !empty($item['location'])) {
|
||||||
return $item['location'];
|
return $item['location'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($item, 'coord') && !empty($item['coord'])) {
|
if (!empty($item['coord']) && !empty($item['coord'])) {
|
||||||
return $item['coord'];
|
return $item['coord'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
245
mod/admin.php
245
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.
|
// 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;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -167,7 +167,7 @@ function admin_content(App $a)
|
||||||
return Login::form();
|
return Login::form();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
|
if (!empty($_SESSION['submanage'])) {
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -329,6 +329,7 @@ function admin_page_tos(App $a)
|
||||||
'$submit' => L10n::t('Save Settings'),
|
'$submit' => L10n::t('Save Settings'),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Process send data from Admin TOS Page
|
* @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');
|
BaseModule::checkFormSecurityTokenRedirectOnError('/admin/tos', 'admin_tos');
|
||||||
|
|
||||||
if (!x($_POST, "page_tos")) {
|
if (empty($_POST['page_tos'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$displaytos = ((x($_POST, 'displaytos')) ? True : False);
|
$displaytos = !empty($_POST['displaytos']);
|
||||||
$displayprivstatement = ((x($_POST, 'displayprivstatement')) ? True : False);
|
$displayprivstatement = !empty($_POST['displayprivstatement']);
|
||||||
$tostext = ((x($_POST, 'tostext')) ? strip_tags(trim($_POST['tostext'])) : '');
|
$tostext = (!empty($_POST['tostext']) ? strip_tags(trim($_POST['tostext'])) : '');
|
||||||
|
|
||||||
Config::set('system', 'tosdisplay', $displaytos);
|
Config::set('system', 'tosdisplay', $displaytos);
|
||||||
Config::set('system', 'tosprivstatement', $displayprivstatement);
|
Config::set('system', 'tosprivstatement', $displayprivstatement);
|
||||||
|
|
@ -354,6 +355,7 @@ function admin_page_tos_post(App $a)
|
||||||
|
|
||||||
return; // NOTREACHED
|
return; // NOTREACHED
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Subpage to modify the server wide block list via the admin panel.
|
* @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)
|
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;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
BaseModule::checkFormSecurityTokenRedirectOnError('/admin/blocklist', 'admin_blocklist');
|
BaseModule::checkFormSecurityTokenRedirectOnError('/admin/blocklist', 'admin_blocklist');
|
||||||
|
|
||||||
if (x($_POST['page_blocklist_save'])) {
|
if (!empty($_POST['page_blocklist_save'])) {
|
||||||
// Add new item to blocklist
|
// Add new item to blocklist
|
||||||
$blocklist = Config::get('system', 'blocklist');
|
$blocklist = Config::get('system', 'blocklist');
|
||||||
$blocklist[] = [
|
$blocklist[] = [
|
||||||
|
|
@ -429,7 +431,7 @@ function admin_page_blocklist_post(App $a)
|
||||||
// Trimming whitespaces as well as any lingering slashes
|
// Trimming whitespaces as well as any lingering slashes
|
||||||
$domain = Strings::escapeTags(trim($domain, "\x00..\x1F/"));
|
$domain = Strings::escapeTags(trim($domain, "\x00..\x1F/"));
|
||||||
$reason = Strings::escapeTags(trim($_POST['reason'][$id]));
|
$reason = Strings::escapeTags(trim($_POST['reason'][$id]));
|
||||||
if (!x($_POST['delete'][$id])) {
|
if (empty($_POST['delete'][$id])) {
|
||||||
$blocklist[] = [
|
$blocklist[] = [
|
||||||
'domain' => $domain,
|
'domain' => $domain,
|
||||||
'reason' => $reason
|
'reason' => $reason
|
||||||
|
|
@ -451,12 +453,12 @@ function admin_page_blocklist_post(App $a)
|
||||||
*/
|
*/
|
||||||
function admin_page_contactblock_post(App $a)
|
function admin_page_contactblock_post(App $a)
|
||||||
{
|
{
|
||||||
$contact_url = x($_POST, 'contact_url') ? $_POST['contact_url'] : '';
|
$contact_url = defaults($_POST, 'contact_url', '');
|
||||||
$contacts = x($_POST, 'contacts') ? $_POST['contacts'] : [];
|
$contacts = defaults($_POST, 'contacts', []);
|
||||||
|
|
||||||
BaseModule::checkFormSecurityTokenRedirectOnError('/admin/contactblock', 'admin_contactblock');
|
BaseModule::checkFormSecurityTokenRedirectOnError('/admin/contactblock', 'admin_contactblock');
|
||||||
|
|
||||||
if (x($_POST, 'page_contactblock_block')) {
|
if (!empty($_POST['page_contactblock_block'])) {
|
||||||
$contact_id = Contact::getIdForURL($contact_url);
|
$contact_id = Contact::getIdForURL($contact_url);
|
||||||
if ($contact_id) {
|
if ($contact_id) {
|
||||||
Contact::block($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));
|
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) {
|
foreach ($contacts as $uid) {
|
||||||
Contact::unblock($uid);
|
Contact::unblock($uid);
|
||||||
}
|
}
|
||||||
|
|
@ -559,13 +561,13 @@ function admin_page_deleteitem(App $a)
|
||||||
*/
|
*/
|
||||||
function admin_page_deleteitem_post(App $a)
|
function admin_page_deleteitem_post(App $a)
|
||||||
{
|
{
|
||||||
if (!x($_POST['page_deleteitem_submit'])) {
|
if (empty($_POST['page_deleteitem_submit'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
BaseModule::checkFormSecurityTokenRedirectOnError('/admin/deleteitem/', 'admin_deleteitem');
|
BaseModule::checkFormSecurityTokenRedirectOnError('/admin/deleteitem/', 'admin_deleteitem');
|
||||||
|
|
||||||
if (x($_POST['page_deleteitem_submit'])) {
|
if (!empty($_POST['page_deleteitem_submit'])) {
|
||||||
$guid = trim(Strings::escapeTags($_POST['deleteitemguid']));
|
$guid = trim(Strings::escapeTags($_POST['deleteitemguid']));
|
||||||
// The GUID should not include a "/", so if there is one, we got an URL
|
// 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.
|
// and the last part of it is most likely the GUID.
|
||||||
|
|
@ -1001,17 +1003,17 @@ function admin_page_site_post(App $a)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!x($_POST, "page_site")) {
|
if (empty($_POST['page_site'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// relocate
|
// 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 = $_POST['relocate_url'];
|
||||||
$new_url = rtrim($new_url, "/");
|
$new_url = rtrim($new_url, "/");
|
||||||
|
|
||||||
$parsed = @parse_url($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 <scheme>://<domain>"));
|
notice(L10n::t("Can not parse base url. Must have at least <scheme>://<domain>"));
|
||||||
$a->internalRedirect('admin/site');
|
$a->internalRedirect('admin/site');
|
||||||
}
|
}
|
||||||
|
|
@ -1046,6 +1048,7 @@ function admin_page_site_post(App $a)
|
||||||
$a->internalRedirect('admin/site');
|
$a->internalRedirect('admin/site');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// update tables
|
// update tables
|
||||||
// update profile links in the format "http://server.tld"
|
// update profile links in the format "http://server.tld"
|
||||||
update_table($a, "profile", ['photo', 'thumb'], $old_url, $new_url);
|
update_table($a, "profile", ['photo', 'thumb'], $old_url, $new_url);
|
||||||
|
|
@ -1076,98 +1079,97 @@ function admin_page_site_post(App $a)
|
||||||
}
|
}
|
||||||
// end relocate
|
// end relocate
|
||||||
|
|
||||||
$sitename = ((x($_POST,'sitename')) ? Strings::escapeTags(trim($_POST['sitename'])) : '');
|
$sitename = (!empty($_POST['sitename']) ? Strings::escapeTags(trim($_POST['sitename'])) : '');
|
||||||
$hostname = ((x($_POST,'hostname')) ? Strings::escapeTags(trim($_POST['hostname'])) : '');
|
$hostname = (!empty($_POST['hostname']) ? Strings::escapeTags(trim($_POST['hostname'])) : '');
|
||||||
$sender_email = ((x($_POST,'sender_email')) ? Strings::escapeTags(trim($_POST['sender_email'])) : '');
|
$sender_email = (!empty($_POST['sender_email']) ? Strings::escapeTags(trim($_POST['sender_email'])) : '');
|
||||||
$banner = ((x($_POST,'banner')) ? trim($_POST['banner']) : false);
|
$banner = (!empty($_POST['banner']) ? trim($_POST['banner']) : false);
|
||||||
$shortcut_icon = ((x($_POST,'shortcut_icon')) ? Strings::escapeTags(trim($_POST['shortcut_icon'])) : '');
|
$shortcut_icon = (!empty($_POST['shortcut_icon']) ? Strings::escapeTags(trim($_POST['shortcut_icon'])) : '');
|
||||||
$touch_icon = ((x($_POST,'touch_icon')) ? Strings::escapeTags(trim($_POST['touch_icon'])) : '');
|
$touch_icon = (!empty($_POST['touch_icon']) ? Strings::escapeTags(trim($_POST['touch_icon'])) : '');
|
||||||
$info = ((x($_POST,'info')) ? trim($_POST['info']) : false);
|
$info = (!empty($_POST['info']) ? trim($_POST['info']) : false);
|
||||||
$language = ((x($_POST,'language')) ? Strings::escapeTags(trim($_POST['language'])) : '');
|
$language = (!empty($_POST['language']) ? Strings::escapeTags(trim($_POST['language'])) : '');
|
||||||
$theme = ((x($_POST,'theme')) ? Strings::escapeTags(trim($_POST['theme'])) : '');
|
$theme = (!empty($_POST['theme']) ? Strings::escapeTags(trim($_POST['theme'])) : '');
|
||||||
$theme_mobile = ((x($_POST,'theme_mobile')) ? Strings::escapeTags(trim($_POST['theme_mobile'])) : '');
|
$theme_mobile = (!empty($_POST['theme_mobile']) ? Strings::escapeTags(trim($_POST['theme_mobile'])) : '');
|
||||||
$maximagesize = ((x($_POST,'maximagesize')) ? intval(trim($_POST['maximagesize'])) : 0);
|
$maximagesize = (!empty($_POST['maximagesize']) ? intval(trim($_POST['maximagesize'])) : 0);
|
||||||
$maximagelength = ((x($_POST,'maximagelength')) ? intval(trim($_POST['maximagelength'])) : MAX_IMAGE_LENGTH);
|
$maximagelength = (!empty($_POST['maximagelength']) ? intval(trim($_POST['maximagelength'])) : MAX_IMAGE_LENGTH);
|
||||||
$jpegimagequality = ((x($_POST,'jpegimagequality')) ? intval(trim($_POST['jpegimagequality'])) : JPEG_QUALITY);
|
$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);
|
$register_text = (!empty($_POST['register_text']) ? strip_tags(trim($_POST['register_text'])) : '');
|
||||||
$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 = ((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'])) : '');
|
$no_multi_reg = !empty($_POST['no_multi_reg']);
|
||||||
$allowed_email = ((x($_POST,'allowed_email')) ? Strings::escapeTags(trim($_POST['allowed_email'])) : '');
|
$no_openid = !empty($_POST['no_openid']);
|
||||||
$forbidden_nicknames = ((x($_POST,'forbidden_nicknames')) ? strtolower(Strings::escapeTags(trim($_POST['forbidden_nicknames']))) : '');
|
$no_regfullname = !empty($_POST['no_regfullname']);
|
||||||
$no_oembed_rich_content = x($_POST,'no_oembed_rich_content');
|
$community_page_style = (!empty($_POST['community_page_style']) ? intval(trim($_POST['community_page_style'])) : 0);
|
||||||
$allowed_oembed = ((x($_POST,'allowed_oembed')) ? Strings::escapeTags(trim($_POST['allowed_oembed'])) : '');
|
$max_author_posts_community_page = (!empty($_POST['max_author_posts_community_page']) ? intval(trim($_POST['max_author_posts_community_page'])) : 0);
|
||||||
$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 = ((x($_POST,'no_multi_reg')) ? True : False);
|
$verifyssl = !empty($_POST['verifyssl']);
|
||||||
$no_openid = !((x($_POST,'no_openid')) ? True : False);
|
$proxyuser = (!empty($_POST['proxyuser']) ? Strings::escapeTags(trim($_POST['proxyuser'])) : '');
|
||||||
$no_regfullname = !((x($_POST,'no_regfullname')) ? True : False);
|
$proxy = (!empty($_POST['proxy']) ? Strings::escapeTags(trim($_POST['proxy'])) : '');
|
||||||
$community_page_style = ((x($_POST,'community_page_style')) ? intval(trim($_POST['community_page_style'])) : 0);
|
$timeout = (!empty($_POST['timeout']) ? intval(trim($_POST['timeout'])) : 60);
|
||||||
$max_author_posts_community_page = ((x($_POST,'max_author_posts_community_page')) ? intval(trim($_POST['max_author_posts_community_page'])) : 0);
|
$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);
|
$worker_queues = (!empty($_POST['worker_queues']) ? intval($_POST['worker_queues']) : 10);
|
||||||
$proxyuser = ((x($_POST,'proxyuser')) ? Strings::escapeTags(trim($_POST['proxyuser'])) : '');
|
$worker_dont_fork = !empty($_POST['worker_dont_fork']);
|
||||||
$proxy = ((x($_POST,'proxy')) ? Strings::escapeTags(trim($_POST['proxy'])) : '');
|
$worker_fastlane = !empty($_POST['worker_fastlane']);
|
||||||
$timeout = ((x($_POST,'timeout')) ? intval(trim($_POST['timeout'])) : 60);
|
$worker_frontend = !empty($_POST['worker_frontend']);
|
||||||
$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 = ((x($_POST,'worker_queues')) ? intval($_POST['worker_queues']) : 10);
|
$relay_directly = !empty($_POST['relay_directly']);
|
||||||
$worker_dont_fork = ((x($_POST,'worker_dont_fork')) ? True : False);
|
$relay_server = (!empty($_POST['relay_server']) ? Strings::escapeTags(trim($_POST['relay_server'])) : '');
|
||||||
$worker_fastlane = ((x($_POST,'worker_fastlane')) ? True : False);
|
$relay_subscribe = !empty($_POST['relay_subscribe']);
|
||||||
$worker_frontend = ((x($_POST,'worker_frontend')) ? True : False);
|
$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_directly = ((x($_POST,'relay_directly')) ? True : False);
|
$relay_user_tags = !empty($_POST['relay_user_tags']);
|
||||||
$relay_server = ((x($_POST,'relay_server')) ? Strings::escapeTags(trim($_POST['relay_server'])) : '');
|
$active_panel = (!empty($_POST['active_panel']) ? "#" . Strings::escapeTags(trim($_POST['active_panel'])) : '');
|
||||||
$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'])) : '');
|
|
||||||
|
|
||||||
// Has the directory url changed? If yes, then resubmit the existing profiles there
|
// Has the directory url changed? If yes, then resubmit the existing profiles there
|
||||||
if ($global_directory != Config::get('system', 'directory') && ($global_directory != '')) {
|
if ($global_directory != Config::get('system', 'directory') && ($global_directory != '')) {
|
||||||
|
|
@ -1499,6 +1501,7 @@ function admin_page_site(App $a)
|
||||||
'$relocate' => L10n::t('Relocate Instance'),
|
'$relocate' => L10n::t('Relocate Instance'),
|
||||||
'$relocate_warning' => L10n::t('Warning! Advanced function. Could make this server unreachable.'),
|
'$relocate_warning' => L10n::t('Warning! Advanced function. Could make this server unreachable.'),
|
||||||
'$baseurl' => System::baseUrl(true),
|
'$baseurl' => System::baseUrl(true),
|
||||||
|
|
||||||
// name, label, value, help string, extra data...
|
// name, label, value, help string, extra data...
|
||||||
'$sitename' => ['sitename', L10n::t("Site name"), Config::get('config', 'sitename'), ''],
|
'$sitename' => ['sitename', L10n::t("Site name"), Config::get('config', 'sitename'), ''],
|
||||||
'$hostname' => ['hostname', L10n::t("Host name"), Config::get('config', 'hostname'), ""],
|
'$hostname' => ['hostname', L10n::t("Host name"), Config::get('config', 'hostname'), ""],
|
||||||
|
|
@ -1534,14 +1537,14 @@ function admin_page_site(App $a)
|
||||||
'$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.")],
|
'$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.")],
|
'$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.")],
|
'$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.')],
|
'$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.')],
|
'$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_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_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("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")],
|
'$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],
|
'$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")],
|
'$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_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_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."),
|
'$ostatus_not_able' => L10n::t("OStatus support can only be enabled if threading is enabled."),
|
||||||
'$diaspora_able' => $diaspora_able,
|
'$diaspora_able' => $diaspora_able,
|
||||||
|
|
@ -1774,14 +1777,14 @@ function admin_page_users_post(App $a)
|
||||||
'body' => $body]);
|
'body' => $body]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_POST, 'page_users_block')) {
|
if (!empty($_POST['page_users_block'])) {
|
||||||
foreach ($users as $uid) {
|
foreach ($users as $uid) {
|
||||||
q("UPDATE `user` SET `blocked` = 1-`blocked` WHERE `uid` = %s", intval($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)));
|
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) {
|
foreach ($users as $uid) {
|
||||||
if (local_user() != $uid) {
|
if (local_user() != $uid) {
|
||||||
User::remove($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)));
|
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";
|
require_once "mod/regmod.php";
|
||||||
foreach ($pending as $hash) {
|
foreach ($pending as $hash) {
|
||||||
user_allow($hash);
|
user_allow($hash);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (x($_POST, 'page_users_deny')) {
|
if (!empty($_POST['page_users_deny'])) {
|
||||||
require_once "mod/regmod.php";
|
require_once "mod/regmod.php";
|
||||||
foreach ($pending as $hash) {
|
foreach ($pending as $hash) {
|
||||||
user_deny($hash);
|
user_deny($hash);
|
||||||
|
|
@ -1872,7 +1875,7 @@ function admin_page_users(App $a)
|
||||||
|
|
||||||
$order = "contact.name";
|
$order = "contact.name";
|
||||||
$order_direction = "+";
|
$order_direction = "+";
|
||||||
if (x($_GET, 'o')) {
|
if (!empty($_GET['o'])) {
|
||||||
$new_order = $_GET['o'];
|
$new_order = $_GET['o'];
|
||||||
if ($new_order[0] === "-") {
|
if ($new_order[0] === "-") {
|
||||||
$order_direction = "-";
|
$order_direction = "-";
|
||||||
|
|
@ -2098,7 +2101,7 @@ function admin_page_addons(App $a, array $addons_admin)
|
||||||
/*
|
/*
|
||||||
* List addons
|
* 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');
|
BaseModule::checkFormSecurityTokenRedirectOnError($a->getBaseURL() . '/admin/addons', 'admin_themes', 't');
|
||||||
Addon::reload();
|
Addon::reload();
|
||||||
info("Addons reloaded");
|
info("Addons reloaded");
|
||||||
|
|
@ -2276,7 +2279,7 @@ function admin_page_themes(App $a)
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_GET, "a") && $_GET['a'] == "t") {
|
if (!empty($_GET['a']) && $_GET['a'] == "t") {
|
||||||
BaseModule::checkFormSecurityTokenRedirectOnError('/admin/themes', 'admin_themes', 't');
|
BaseModule::checkFormSecurityTokenRedirectOnError('/admin/themes', 'admin_themes', 't');
|
||||||
|
|
||||||
// Toggle theme status
|
// Toggle theme status
|
||||||
|
|
@ -2364,7 +2367,7 @@ function admin_page_themes(App $a)
|
||||||
}
|
}
|
||||||
|
|
||||||
// reload active themes
|
// 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');
|
BaseModule::checkFormSecurityTokenRedirectOnError(System::baseUrl() . '/admin/themes', 'admin_themes', 't');
|
||||||
foreach ($themes as $th) {
|
foreach ($themes as $th) {
|
||||||
if ($th['allowed']) {
|
if ($th['allowed']) {
|
||||||
|
|
@ -2409,12 +2412,12 @@ function admin_page_themes(App $a)
|
||||||
*/
|
*/
|
||||||
function admin_page_logs_post(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');
|
BaseModule::checkFormSecurityTokenRedirectOnError('/admin/logs', 'admin_logs');
|
||||||
|
|
||||||
$logfile = ((x($_POST,'logfile')) ? Strings::escapeTags(trim($_POST['logfile'])) : '');
|
$logfile = (!empty($_POST['logfile']) ? Strings::escapeTags(trim($_POST['logfile'])) : '');
|
||||||
$debugging = ((x($_POST,'debugging')) ? true : false);
|
$debugging = !empty($_POST['debugging']);
|
||||||
$loglevel = ((x($_POST,'loglevel')) ? intval(trim($_POST['loglevel'])) : 0);
|
$loglevel = (!empty($_POST['loglevel']) ? intval(trim($_POST['loglevel'])) : 0);
|
||||||
|
|
||||||
Config::set('system', 'logfile', $logfile);
|
Config::set('system', 'logfile', $logfile);
|
||||||
Config::set('system', 'debugging', $debugging);
|
Config::set('system', 'debugging', $debugging);
|
||||||
|
|
@ -2555,14 +2558,14 @@ function admin_page_features_post(App $a)
|
||||||
$feature_state = 'feature_' . $feature;
|
$feature_state = 'feature_' . $feature;
|
||||||
$featurelock = 'featurelock_' . $feature;
|
$featurelock = 'featurelock_' . $feature;
|
||||||
|
|
||||||
if (x($_POST, $feature_state)) {
|
if (!empty($_POST[$feature_state])) {
|
||||||
$val = intval($_POST[$feature_state]);
|
$val = intval($_POST[$feature_state]);
|
||||||
} else {
|
} else {
|
||||||
$val = 0;
|
$val = 0;
|
||||||
}
|
}
|
||||||
Config::set('feature', $feature, $val);
|
Config::set('feature', $feature, $val);
|
||||||
|
|
||||||
if (x($_POST, $featurelock)) {
|
if (!empty($_POST[$featurelock])) {
|
||||||
Config::set('feature_lock', $feature, $val);
|
Config::set('feature_lock', $feature, $val);
|
||||||
} else {
|
} else {
|
||||||
Config::delete('feature_lock', $feature);
|
Config::delete('feature_lock', $feature);
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@ function api_post(App $a)
|
||||||
return;
|
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);
|
notice(L10n::t('Permission denied.') . EOL);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -62,7 +62,7 @@ function api_content(App $a)
|
||||||
killme();
|
killme();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_POST, 'oauth_yes')) {
|
if (!empty($_POST['oauth_yes'])) {
|
||||||
$app = oauth_get_client($request);
|
$app = oauth_get_client($request);
|
||||||
if (is_null($app)) {
|
if (is_null($app)) {
|
||||||
return "Invalid request. Unknown token.";
|
return "Invalid request. Unknown token.";
|
||||||
|
|
|
||||||
16
mod/cal.php
16
mod/cal.php
|
|
@ -72,7 +72,7 @@ function cal_init(App $a)
|
||||||
|
|
||||||
$cal_widget = Widget\CalendarExport::getHTML();
|
$cal_widget = Widget\CalendarExport::getHTML();
|
||||||
|
|
||||||
if (!x($a->page, 'aside')) {
|
if (empty($a->page['aside'])) {
|
||||||
$a->page['aside'] = '';
|
$a->page['aside'] = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -100,7 +100,7 @@ function cal_content(App $a)
|
||||||
$mode = 'view';
|
$mode = 'view';
|
||||||
$y = 0;
|
$y = 0;
|
||||||
$m = 0;
|
$m = 0;
|
||||||
$ignored = (x($_REQUEST, 'ignored') ? intval($_REQUEST['ignored']) : 0);
|
$ignored = (!empty($_REQUEST['ignored']) ? intval($_REQUEST['ignored']) : 0);
|
||||||
|
|
||||||
$format = 'ical';
|
$format = 'ical';
|
||||||
if ($a->argc == 4 && $a->argv[2] == 'export') {
|
if ($a->argc == 4 && $a->argv[2] == 'export') {
|
||||||
|
|
@ -115,7 +115,7 @@ function cal_content(App $a)
|
||||||
$owner_uid = $a->data['user']['uid'];
|
$owner_uid = $a->data['user']['uid'];
|
||||||
$nick = $a->data['user']['nickname'];
|
$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) {
|
foreach ($_SESSION['remote'] as $v) {
|
||||||
if ($v['uid'] == $a->profile['profile_uid']) {
|
if ($v['uid'] == $a->profile['profile_uid']) {
|
||||||
$contact_id = $v['cid'];
|
$contact_id = $v['cid'];
|
||||||
|
|
@ -195,11 +195,11 @@ function cal_content(App $a)
|
||||||
|
|
||||||
|
|
||||||
if (!empty($a->argv[2]) && ($a->argv[2] === 'json')) {
|
if (!empty($a->argv[2]) && ($a->argv[2] === 'json')) {
|
||||||
if (x($_GET, 'start')) {
|
if (!empty($_GET['start'])) {
|
||||||
$start = $_GET['start'];
|
$start = $_GET['start'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_GET, 'end')) {
|
if (!empty($_GET['end'])) {
|
||||||
$finish = $_GET['end'];
|
$finish = $_GET['end'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -233,7 +233,7 @@ function cal_content(App $a)
|
||||||
$r = Event::sortByDate($r);
|
$r = Event::sortByDate($r);
|
||||||
foreach ($r as $rr) {
|
foreach ($r as $rr) {
|
||||||
$j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j');
|
$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;
|
$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')
|
// links: array('href', 'text', 'extra css classes', 'title')
|
||||||
if (x($_GET, 'id')) {
|
if (!empty($_GET['id'])) {
|
||||||
$tpl = Renderer::getMarkupTemplate("event.tpl");
|
$tpl = Renderer::getMarkupTemplate("event.tpl");
|
||||||
} else {
|
} else {
|
||||||
// if (Config::get('experimentals','new_calendar')==1){
|
// if (Config::get('experimentals','new_calendar')==1){
|
||||||
|
|
@ -284,7 +284,7 @@ function cal_content(App $a)
|
||||||
"list" => L10n::t("list"),
|
"list" => L10n::t("list"),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if (x($_GET, 'id')) {
|
if (!empty($_GET['id'])) {
|
||||||
echo $o;
|
echo $o;
|
||||||
killme();
|
killme();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@ function common_content(App $a)
|
||||||
'url' => 'contact/' . $cid
|
'url' => 'contact/' . $cid
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if (!x($a->page, 'aside')) {
|
if (empty($a->page['aside'])) {
|
||||||
$a->page['aside'] = '';
|
$a->page['aside'] = '';
|
||||||
}
|
}
|
||||||
$a->page['aside'] .= $vcard_widget;
|
$a->page['aside'] .= $vcard_widget;
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ function contactgroup_content(App $a)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($change)) {
|
if (!empty($change)) {
|
||||||
if (in_array($change, $preselected)) {
|
if (in_array($change, $preselected)) {
|
||||||
Group::removeMember($group['id'], $change);
|
Group::removeMember($group['id'], $change);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ function crepair_init(App $a)
|
||||||
$contact = DBA::selectFirst('contact', [], ['uid' => local_user(), 'id' => $a->argv[1]]);
|
$contact = DBA::selectFirst('contact', [], ['uid' => local_user(), 'id' => $a->argv[1]]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!x($a->page, 'aside')) {
|
if (empty($a->page['aside'])) {
|
||||||
$a->page['aside'] = '';
|
$a->page['aside'] = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ function delegate_post(App $a)
|
||||||
return;
|
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);
|
notice(L10n::t('Permission denied.') . EOL);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -63,7 +63,7 @@ function delegate_content(App $a)
|
||||||
|
|
||||||
if ($a->argc > 2 && $a->argv[1] === 'add' && intval($a->argv[2])) {
|
if ($a->argc > 2 && $a->argv[1] === 'add' && intval($a->argv[2])) {
|
||||||
// delegated admins can view but not change delegation permissions
|
// delegated admins can view but not change delegation permissions
|
||||||
if (x($_SESSION, 'submanage')) {
|
if (!empty($_SESSION['submanage'])) {
|
||||||
$a->internalRedirect('delegate');
|
$a->internalRedirect('delegate');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -84,7 +84,7 @@ function delegate_content(App $a)
|
||||||
|
|
||||||
if ($a->argc > 2 && $a->argv[1] === 'remove' && intval($a->argv[2])) {
|
if ($a->argc > 2 && $a->argv[1] === 'remove' && intval($a->argv[2])) {
|
||||||
// delegated admins can view but not change delegation permissions
|
// delegated admins can view but not change delegation permissions
|
||||||
if (x($_SESSION, 'submanage')) {
|
if (!empty($_SESSION['submanage'])) {
|
||||||
$a->internalRedirect('delegate');
|
$a->internalRedirect('delegate');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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
|
* 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.
|
* 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());
|
$uid = defaults($handsfree, 'uid', local_user());
|
||||||
if (!$uid) {
|
if (!$uid) {
|
||||||
notice(L10n::t('Permission denied.') . EOL);
|
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
|
* In the section above where the confirming party makes a POST and
|
||||||
* retrieves xml status information, they are communicating with the following code.
|
* 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.
|
// We are processing an external confirmation to an introduction created by our user.
|
||||||
$public_key = defaults($_POST, 'public_key', '');
|
$public_key = defaults($_POST, 'public_key', '');
|
||||||
$dfrn_id = hex2bin(defaults($_POST, 'dfrn_id' , ''));
|
$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 $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);
|
$aes_key = hex2bin($aes_key);
|
||||||
$public_key = hex2bin($public_key);
|
$public_key = hex2bin($public_key);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -39,16 +39,16 @@ function dfrn_notify_post(App $a) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$dfrn_id = ((x($_POST,'dfrn_id')) ? Strings::escapeTags(trim($_POST['dfrn_id'])) : '');
|
$dfrn_id = (!empty($_POST['dfrn_id']) ? Strings::escapeTags(trim($_POST['dfrn_id'])) : '');
|
||||||
$dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0);
|
$dfrn_version = (!empty($_POST['dfrn_version']) ? (float) $_POST['dfrn_version'] : 2.0);
|
||||||
$challenge = ((x($_POST,'challenge')) ? Strings::escapeTags(trim($_POST['challenge'])) : '');
|
$challenge = (!empty($_POST['challenge']) ? Strings::escapeTags(trim($_POST['challenge'])) : '');
|
||||||
$data = ((x($_POST,'data')) ? $_POST['data'] : '');
|
$data = defaults($_POST, 'data', '');
|
||||||
$key = ((x($_POST,'key')) ? $_POST['key'] : '');
|
$key = defaults($_POST, 'key', '');
|
||||||
$rino_remote = ((x($_POST,'rino')) ? intval($_POST['rino']) : 0);
|
$rino_remote = (!empty($_POST['rino']) ? intval($_POST['rino']) : 0);
|
||||||
$dissolve = ((x($_POST,'dissolve')) ? intval($_POST['dissolve']) : 0);
|
$dissolve = (!empty($_POST['dissolve']) ? intval($_POST['dissolve']) : 0);
|
||||||
$perm = ((x($_POST,'perm')) ? Strings::escapeTags(trim($_POST['perm'])) : 'r');
|
$perm = (!empty($_POST['perm']) ? Strings::escapeTags(trim($_POST['perm'])) : 'r');
|
||||||
$ssl_policy = ((x($_POST,'ssl_policy')) ? Strings::escapeTags(trim($_POST['ssl_policy'])): 'none');
|
$ssl_policy = (!empty($_POST['ssl_policy']) ? Strings::escapeTags(trim($_POST['ssl_policy'])): 'none');
|
||||||
$page = ((x($_POST,'page')) ? intval($_POST['page']) : 0);
|
$page = (!empty($_POST['page']) ? intval($_POST['page']) : 0);
|
||||||
|
|
||||||
$forum = (($page == 1) ? 1 : 0);
|
$forum = (($page == 1) ? 1 : 0);
|
||||||
$prv = (($page == 2) ? 1 : 0);
|
$prv = (($page == 2) ? 1 : 0);
|
||||||
|
|
@ -247,7 +247,7 @@ function dfrn_dispatch_private($user, $postdata)
|
||||||
|
|
||||||
function dfrn_notify_content(App $a) {
|
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.
|
* 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_id = Strings::escapeTags(trim($_GET['dfrn_id']));
|
||||||
$dfrn_version = (float) $_GET['dfrn_version'];
|
$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 = "";
|
$type = "";
|
||||||
$last_update = "";
|
$last_update = "";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ function dfrn_poll_init(App $a)
|
||||||
$sec = defaults($_GET, 'sec' , '');
|
$sec = defaults($_GET, 'sec' , '');
|
||||||
$dfrn_version = (float) defaults($_GET, 'dfrn_version' , 2.0);
|
$dfrn_version = (float) defaults($_GET, 'dfrn_version' , 2.0);
|
||||||
$perm = defaults($_GET, 'perm' , 'r');
|
$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
|
// Possibly it is an OStatus compatible server that requests a user feed
|
||||||
$user_agent = defaults($_SERVER, 'HTTP_USER_AGENT', '');
|
$user_agent = defaults($_SERVER, 'HTTP_USER_AGENT', '');
|
||||||
|
|
@ -51,7 +51,7 @@ function dfrn_poll_init(App $a)
|
||||||
|
|
||||||
$hidewall = false;
|
$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()) {
|
if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
|
||||||
System::httpExit(403);
|
System::httpExit(403);
|
||||||
}
|
}
|
||||||
|
|
@ -113,7 +113,7 @@ function dfrn_poll_init(App $a)
|
||||||
|
|
||||||
if ((int)$xml->status === 1) {
|
if ((int)$xml->status === 1) {
|
||||||
$_SESSION['authenticated'] = 1;
|
$_SESSION['authenticated'] = 1;
|
||||||
if (!x($_SESSION, 'remote')) {
|
if (empty($_SESSION['remote'])) {
|
||||||
$_SESSION['remote'] = [];
|
$_SESSION['remote'] = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -230,13 +230,13 @@ function dfrn_poll_init(App $a)
|
||||||
|
|
||||||
function dfrn_poll_post(App $a)
|
function dfrn_poll_post(App $a)
|
||||||
{
|
{
|
||||||
$dfrn_id = x($_POST,'dfrn_id') ? $_POST['dfrn_id'] : '';
|
$dfrn_id = defaults($_POST, 'dfrn_id' , '');
|
||||||
$challenge = x($_POST,'challenge') ? $_POST['challenge'] : '';
|
$challenge = defaults($_POST, 'challenge', '');
|
||||||
$url = x($_POST,'url') ? $_POST['url'] : '';
|
$url = defaults($_POST, 'url' , '');
|
||||||
$sec = x($_POST,'sec') ? $_POST['sec'] : '';
|
$sec = defaults($_POST, 'sec' , '');
|
||||||
$ptype = x($_POST,'type') ? $_POST['type'] : '';
|
$ptype = defaults($_POST, 'type' , '');
|
||||||
$dfrn_version = x($_POST,'dfrn_version') ? (float) $_POST['dfrn_version'] : 2.0;
|
$perm = defaults($_POST, 'perm' , 'r');
|
||||||
$perm = x($_POST,'perm') ? $_POST['perm'] : 'r';
|
$dfrn_version = !empty($_POST['dfrn_version']) ? (float) $_POST['dfrn_version'] : 2.0;
|
||||||
|
|
||||||
if ($ptype === 'profile-check') {
|
if ($ptype === 'profile-check') {
|
||||||
if (strlen($challenge) && strlen($sec)) {
|
if (strlen($challenge) && strlen($sec)) {
|
||||||
|
|
@ -399,14 +399,13 @@ function dfrn_poll_post(App $a)
|
||||||
|
|
||||||
function dfrn_poll_content(App $a)
|
function dfrn_poll_content(App $a)
|
||||||
{
|
{
|
||||||
$dfrn_id = x($_GET,'dfrn_id') ? $_GET['dfrn_id'] : '';
|
$dfrn_id = defaults($_GET, 'dfrn_id' , '');
|
||||||
$type = x($_GET,'type') ? $_GET['type'] : 'data';
|
$type = defaults($_GET, 'type' , 'data');
|
||||||
$last_update = x($_GET,'last_update') ? $_GET['last_update'] : '';
|
$last_update = defaults($_GET, 'last_update' , '');
|
||||||
$destination_url = x($_GET,'destination_url') ? $_GET['destination_url'] : '';
|
$destination_url = defaults($_GET, 'destination_url', '');
|
||||||
$sec = x($_GET,'sec') ? $_GET['sec'] : '';
|
$sec = defaults($_GET, 'sec' , '');
|
||||||
$dfrn_version = x($_GET,'dfrn_version') ? (float) $_GET['dfrn_version'] : 2.0;
|
$dfrn_version = !empty($_GET['dfrn_version']) ? (float) $_GET['dfrn_version'] : 2.0;
|
||||||
$perm = x($_GET,'perm') ? $_GET['perm'] : 'r';
|
$quiet = !empty($_GET['quiet']);
|
||||||
$quiet = x($_GET,'quiet') ? true : false;
|
|
||||||
|
|
||||||
$direction = -1;
|
$direction = -1;
|
||||||
if (strpos($dfrn_id, ':') == 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)) {
|
if (((int) $xml->status == 0) && ($xml->challenge == $hash) && ($xml->sec == $sec)) {
|
||||||
$_SESSION['authenticated'] = 1;
|
$_SESSION['authenticated'] = 1;
|
||||||
if (!x($_SESSION, 'remote')) {
|
if (empty($_SESSION['remote'])) {
|
||||||
$_SESSION['remote'] = [];
|
$_SESSION['remote'] = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@ function dfrn_request_post(App $a)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_POST, 'cancel')) {
|
if (!empty($_POST['cancel'])) {
|
||||||
$a->internalRedirect();
|
$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).
|
* to confirm the request, and then we've clicked submit (perhaps after logging in).
|
||||||
* That brings us here:
|
* That brings us here:
|
||||||
*/
|
*/
|
||||||
if ((x($_POST, 'localconfirm')) && ($_POST['localconfirm'] == 1)) {
|
if (!empty($_POST['localconfirm']) && ($_POST['localconfirm'] == 1)) {
|
||||||
// Ensure this is a valid request
|
// Ensure this is a valid request
|
||||||
if (local_user() && ($a->user['nickname'] == $a->argv[1]) && (x($_POST, 'dfrn_url'))) {
|
if (local_user() && ($a->user['nickname'] == $a->argv[1]) && !empty($_POST['dfrn_url'])) {
|
||||||
$dfrn_url = Strings::escapeTags(trim($_POST['dfrn_url']));
|
$dfrn_url = Strings::escapeTags(trim($_POST['dfrn_url']));
|
||||||
$aes_allow = (((x($_POST, 'aes_allow')) && ($_POST['aes_allow'] == 1)) ? 1 : 0);
|
$aes_allow = !empty($_POST['aes_allow']);
|
||||||
$confirm_key = ((x($_POST, 'confirm_key')) ? $_POST['confirm_key'] : "");
|
$confirm_key = defaults($_POST, 'confirm_key', "");
|
||||||
$hidden = ((x($_POST, 'hidden-contact')) ? intval($_POST['hidden-contact']) : 0);
|
$hidden = (!empty($_POST['hidden-contact']) ? intval($_POST['hidden-contact']) : 0);
|
||||||
$contact_record = null;
|
$contact_record = null;
|
||||||
$blocked = 1;
|
$blocked = 1;
|
||||||
$pending = 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)
|
// 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",
|
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND NOT `self` LIMIT 1",
|
||||||
intval(local_user()),
|
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);
|
notice(L10n::t('Profile location is not valid or does not contain profile information.') . EOL);
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
if (!x($parms, 'fn')) {
|
if (empty($parms['fn'])) {
|
||||||
notice(L10n::t('Warning: profile location has no identifiable owner name.') . EOL);
|
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);
|
notice(L10n::t('Warning: profile location has no profile photo.') . EOL);
|
||||||
}
|
}
|
||||||
$invalid = Probe::validDfrn($parms);
|
$invalid = Probe::validDfrn($parms);
|
||||||
|
|
@ -238,7 +238,7 @@ function dfrn_request_post(App $a)
|
||||||
$blocked = 1;
|
$blocked = 1;
|
||||||
$pending = 1;
|
$pending = 1;
|
||||||
|
|
||||||
if (x($_POST, 'dfrn_url')) {
|
if (!empty($_POST['dfrn_url'])) {
|
||||||
// Block friend request spam
|
// Block friend request spam
|
||||||
if ($maxreq) {
|
if ($maxreq) {
|
||||||
$r = q("SELECT * FROM `intro` WHERE `datetime` > '%s' AND `uid` = %d",
|
$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']);
|
$url = trim($_POST['dfrn_url']);
|
||||||
if (!strlen($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);
|
notice(L10n::t('Profile location is not valid or does not contain profile information.') . EOL);
|
||||||
$a->internalRedirect($a->cmd);
|
$a->internalRedirect($a->cmd);
|
||||||
} else {
|
} else {
|
||||||
if (!x($parms, 'fn')) {
|
if (empty($parms['fn'])) {
|
||||||
notice(L10n::t('Warning: profile location has no identifiable owner name.') . EOL);
|
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);
|
notice(L10n::t('Warning: profile location has no profile photo.') . EOL);
|
||||||
}
|
}
|
||||||
$invalid = Probe::validDfrn($parms);
|
$invalid = Probe::validDfrn($parms);
|
||||||
|
|
@ -423,7 +423,7 @@ function dfrn_request_post(App $a)
|
||||||
VALUES ( %d, %d, 1, %d, '%s', '%s', '%s' )",
|
VALUES ( %d, %d, 1, %d, '%s', '%s', '%s' )",
|
||||||
intval($uid),
|
intval($uid),
|
||||||
intval($contact_record['id']),
|
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(Strings::escapeTags(trim(defaults($_POST, 'dfrn-request-message', '')))),
|
||||||
DBA::escape($hash),
|
DBA::escape($hash),
|
||||||
DBA::escape(DateTimeFormat::utcNow())
|
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
|
// "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.
|
// to send us to the post section to record the introduction.
|
||||||
if (x($_GET, 'dfrn_url')) {
|
if (!empty($_GET['dfrn_url'])) {
|
||||||
if (!local_user()) {
|
if (!local_user()) {
|
||||||
info(L10n::t("Please login to confirm introduction.") . EOL);
|
info(L10n::t("Please login to confirm introduction.") . EOL);
|
||||||
/* setup the return URL to come back to this page if they use openid */
|
/* 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'])));
|
$dfrn_url = Strings::escapeTags(trim(hex2bin($_GET['dfrn_url'])));
|
||||||
$aes_allow = x($_GET, 'aes_allow') && $_GET['aes_allow'] == 1 ? 1 : 0;
|
$aes_allow = !empty($_GET['aes_allow']);
|
||||||
$confirm_key = x($_GET, 'confirm_key') ? $_GET['confirm_key'] : "";
|
$confirm_key = defaults($_GET, 'confirm_key', "");
|
||||||
|
|
||||||
// Checking fastlane for validity
|
// 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["dfrn_url"] = $dfrn_url;
|
||||||
$_POST["confirm_key"] = $confirm_key;
|
$_POST["confirm_key"] = $confirm_key;
|
||||||
$_POST["localconfirm"] = 1;
|
$_POST["localconfirm"] = 1;
|
||||||
|
|
@ -531,7 +531,7 @@ function dfrn_request_content(App $a)
|
||||||
'dfrn_rawurl' => $_GET['dfrn_url']
|
'dfrn_rawurl' => $_GET['dfrn_url']
|
||||||
]);
|
]);
|
||||||
return $o;
|
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 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
|
// 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.
|
// 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
|
// Try to auto-fill the profile address
|
||||||
// At first look if an address was provided
|
// At first look if an address was provided
|
||||||
// Otherwise take the local address
|
// Otherwise take the local address
|
||||||
if (x($_GET, 'addr') && ($_GET['addr'] != "")) {
|
if (!empty($_GET['addr'])) {
|
||||||
$myaddr = hex2bin($_GET['addr']);
|
$myaddr = hex2bin($_GET['addr']);
|
||||||
} elseif (x($_GET, 'address') && ($_GET['address'] != "")) {
|
} elseif (!empty($_GET['address'])) {
|
||||||
$myaddr = $_GET['address'];
|
$myaddr = $_GET['address'];
|
||||||
} elseif (local_user()) {
|
} elseif (local_user()) {
|
||||||
if (strlen($a->getURLPath())) {
|
if (strlen($a->getURLPath())) {
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ function directory_init(App $a)
|
||||||
|
|
||||||
function directory_post(App $a)
|
function directory_post(App $a)
|
||||||
{
|
{
|
||||||
if (x($_POST, 'search')) {
|
if (!empty($_POST['search'])) {
|
||||||
$a->data['search'] = $_POST['search'];
|
$a->data['search'] = $_POST['search'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -47,10 +47,10 @@ function directory_content(App $a)
|
||||||
$o = '';
|
$o = '';
|
||||||
Nav::setSelected('directory');
|
Nav::setSelected('directory');
|
||||||
|
|
||||||
if (x($a->data, 'search')) {
|
if (!empty($a->data['search'])) {
|
||||||
$search = Strings::escapeTags(trim($a->data['search']));
|
$search = Strings::escapeTags(trim($a->data['search']));
|
||||||
} else {
|
} else {
|
||||||
$search = ((x($_GET, 'search')) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
|
$search = (!empty($_GET['search']) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
|
||||||
}
|
}
|
||||||
|
|
||||||
$gdirpath = '';
|
$gdirpath = '';
|
||||||
|
|
@ -145,21 +145,21 @@ function directory_content(App $a)
|
||||||
|
|
||||||
$profile = $rr;
|
$profile = $rr;
|
||||||
|
|
||||||
if ((x($profile, 'address') == 1)
|
if (!empty($profile['address'])
|
||||||
|| (x($profile, 'locality') == 1)
|
|| !empty($profile['locality'])
|
||||||
|| (x($profile, 'region') == 1)
|
|| !empty($profile['region'])
|
||||||
|| (x($profile, 'postal-code') == 1)
|
|| !empty($profile['postal-code'])
|
||||||
|| (x($profile, 'country-name') == 1)
|
|| !empty($profile['country-name'])
|
||||||
) {
|
) {
|
||||||
$location = L10n::t('Location:');
|
$location = L10n::t('Location:');
|
||||||
} else {
|
} else {
|
||||||
$location = '';
|
$location = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
$gender = ((x($profile, 'gender') == 1) ? L10n::t('Gender:') : false);
|
$gender = (!empty($profile['gender']) ? L10n::t('Gender:') : false);
|
||||||
$marital = ((x($profile, 'marital') == 1) ? L10n::t('Status:') : false);
|
$marital = (!empty($profile['marital']) ? L10n::t('Status:') : false);
|
||||||
$homepage = ((x($profile, 'homepage') == 1) ? L10n::t('Homepage:') : false);
|
$homepage = (!empty($profile['homepage']) ? L10n::t('Homepage:') : false);
|
||||||
$about = ((x($profile, 'about') == 1) ? L10n::t('About:') : false);
|
$about = (!empty($profile['about']) ? L10n::t('About:') : false);
|
||||||
|
|
||||||
$location_e = $location;
|
$location_e = $location;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ function dirfind_init(App $a) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! x($a->page,'aside')) {
|
if (empty($a->page['aside'])) {
|
||||||
$a->page['aside'] = '';
|
$a->page['aside'] = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -276,7 +276,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
|
||||||
|
|
||||||
$contact_id = 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) {
|
foreach ($_SESSION['remote'] as $v) {
|
||||||
if ($v['uid'] == $a->profile['uid']) {
|
if ($v['uid'] == $a->profile['uid']) {
|
||||||
$contact_id = $v['cid'];
|
$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);
|
$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);
|
notice(L10n::t('Access to this profile has been restricted.') . EOL);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ function fbrowser_content(App $a)
|
||||||
|
|
||||||
$template_file = "filebrowser.tpl";
|
$template_file = "filebrowser.tpl";
|
||||||
$mode = "";
|
$mode = "";
|
||||||
if (x($_GET, 'mode')) {
|
if (!empty($_GET['mode'])) {
|
||||||
$mode = "?mode=".$_GET['mode'];
|
$mode = "?mode=".$_GET['mode'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -142,7 +142,7 @@ function fbrowser_content(App $a)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_GET, 'mode')) {
|
if (!empty($_GET['mode'])) {
|
||||||
return $o;
|
return $o;
|
||||||
} else {
|
} else {
|
||||||
echo $o;
|
echo $o;
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ function friendica_init(App $a)
|
||||||
}
|
}
|
||||||
|
|
||||||
$sql_extra = '';
|
$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')));
|
$sql_extra = sprintf(" AND `nickname` = '%s' ", DBA::escape(Config::get('config', 'admin_nickname')));
|
||||||
}
|
}
|
||||||
if (!empty(Config::get('config', 'admin_email'))) {
|
if (!empty(Config::get('config', 'admin_email'))) {
|
||||||
|
|
@ -41,7 +41,7 @@ function friendica_init(App $a)
|
||||||
|
|
||||||
Config::load('feature_lock');
|
Config::load('feature_lock');
|
||||||
$locked_features = [];
|
$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) {
|
foreach ($a->config['feature_lock'] as $k => $v) {
|
||||||
if ($k === 'config_loaded') {
|
if ($k === 'config_loaded') {
|
||||||
continue;
|
continue;
|
||||||
|
|
|
||||||
|
|
@ -29,19 +29,19 @@ function hcard_init(App $a)
|
||||||
|
|
||||||
Profile::load($a, $which, $profile);
|
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'] .= '<meta name="friendica.community" content="true" />';
|
$a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
|
||||||
}
|
}
|
||||||
if (x($a->profile, 'openidserver')) {
|
if (!empty($a->profile['openidserver'])) {
|
||||||
$a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
|
$a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
|
||||||
}
|
}
|
||||||
if (x($a->profile, 'openid')) {
|
if (!empty($a->profile['openid'])) {
|
||||||
$delegate = ((strstr($a->profile['openid'], '://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']);
|
$delegate = ((strstr($a->profile['openid'], '://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']);
|
||||||
$a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
|
$a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$blocked) {
|
if (!$blocked) {
|
||||||
$keywords = ((x($a->profile, 'pub_keywords')) ? $a->profile['pub_keywords'] : '');
|
$keywords = defaults($a->profile, 'pub_keywords', '');
|
||||||
$keywords = str_replace([',',' ',',,'], [' ',',',','], $keywords);
|
$keywords = str_replace([',',' ',',,'], [' ',',',','], $keywords);
|
||||||
if (strlen($keywords)) {
|
if (strlen($keywords)) {
|
||||||
$a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n";
|
$a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n";
|
||||||
|
|
|
||||||
|
|
@ -29,10 +29,10 @@ function home_init(App $a) {
|
||||||
if(! function_exists('home_content')) {
|
if(! function_exists('home_content')) {
|
||||||
function home_content(App $a) {
|
function home_content(App $a) {
|
||||||
|
|
||||||
if (x($_SESSION,'theme')) {
|
if (!empty($_SESSION['theme'])) {
|
||||||
unset($_SESSION['theme']);
|
unset($_SESSION['theme']);
|
||||||
}
|
}
|
||||||
if (x($_SESSION,'mobile-theme')) {
|
if (!empty($_SESSION['mobile-theme'])) {
|
||||||
unset($_SESSION['mobile-theme']);
|
unset($_SESSION['mobile-theme']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -690,7 +690,7 @@ function item_post(App $a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
$json = ['cancel' => 1];
|
$json = ['cancel' => 1];
|
||||||
if (!empty($_REQUEST['jsreload']) && strlen($_REQUEST['jsreload'])) {
|
if (!empty($_REQUEST['jsreload'])) {
|
||||||
$json['reload'] = System::baseUrl() . '/' . $_REQUEST['jsreload'];
|
$json['reload'] = System::baseUrl() . '/' . $_REQUEST['jsreload'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -869,7 +869,7 @@ function item_post_return($baseurl, $api_source, $return_path)
|
||||||
}
|
}
|
||||||
|
|
||||||
$json = ['success' => 1];
|
$json = ['success' => 1];
|
||||||
if (!empty($_REQUEST['jsreload']) && strlen($_REQUEST['jsreload'])) {
|
if (!empty($_REQUEST['jsreload'])) {
|
||||||
$json['reload'] = $baseurl . '/' . $_REQUEST['jsreload'];
|
$json['reload'] = $baseurl . '/' . $_REQUEST['jsreload'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ function like_content(App $a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// See if we've been passed a return path to redirect to
|
// 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);
|
like_content_return($a, $return_path);
|
||||||
killme(); // NOTREACHED
|
killme(); // NOTREACHED
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ function localtime_content(App $a)
|
||||||
$o .= '<p>' . L10n::t('Current timezone: %s', $_REQUEST['timezone']) . '</p>';
|
$o .= '<p>' . L10n::t('Current timezone: %s', $_REQUEST['timezone']) . '</p>';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($a->data, 'mod-localtime')) {
|
if (!empty($a->data['mod-localtime'])) {
|
||||||
$o .= '<p>' . L10n::t('Converted localtime: %s', $a->data['mod-localtime']) . '</p>';
|
$o .= '<p>' . L10n::t('Converted localtime: %s', $a->data['mod-localtime']) . '</p>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ function manage_post(App $a) {
|
||||||
$uid = local_user();
|
$uid = local_user();
|
||||||
$orig_record = $a->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",
|
$r = q("select * from user where uid = %d limit 1",
|
||||||
intval($_SESSION['submanage'])
|
intval($_SESSION['submanage'])
|
||||||
);
|
);
|
||||||
|
|
@ -37,7 +37,7 @@ function manage_post(App $a) {
|
||||||
|
|
||||||
$submanage = $r;
|
$submanage = $r;
|
||||||
|
|
||||||
$identity = (x($_POST['identity']) ? intval($_POST['identity']) : 0);
|
$identity = (!empty($_POST['identity']) ? intval($_POST['identity']) : 0);
|
||||||
if (!$identity) {
|
if (!$identity) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -101,13 +101,13 @@ function manage_post(App $a) {
|
||||||
unset($_SESSION['mobile-theme']);
|
unset($_SESSION['mobile-theme']);
|
||||||
unset($_SESSION['page_flags']);
|
unset($_SESSION['page_flags']);
|
||||||
unset($_SESSION['return_path']);
|
unset($_SESSION['return_path']);
|
||||||
if (x($_SESSION, 'submanage')) {
|
if (!empty($_SESSION['submanage'])) {
|
||||||
unset($_SESSION['submanage']);
|
unset($_SESSION['submanage']);
|
||||||
}
|
}
|
||||||
if (x($_SESSION, 'sysmsg')) {
|
if (!empty($_SESSION['sysmsg'])) {
|
||||||
unset($_SESSION['sysmsg']);
|
unset($_SESSION['sysmsg']);
|
||||||
}
|
}
|
||||||
if (x($_SESSION, 'sysmsg_info')) {
|
if (!empty($_SESSION['sysmsg_info'])) {
|
||||||
unset($_SESSION['sysmsg_info']);
|
unset($_SESSION['sysmsg_info']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -59,10 +59,10 @@ function message_post(App $a)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$replyto = x($_REQUEST, 'replyto') ? Strings::escapeTags(trim($_REQUEST['replyto'])) : '';
|
$replyto = !empty($_REQUEST['replyto']) ? Strings::escapeTags(trim($_REQUEST['replyto'])) : '';
|
||||||
$subject = x($_REQUEST, 'subject') ? Strings::escapeTags(trim($_REQUEST['subject'])) : '';
|
$subject = !empty($_REQUEST['subject']) ? Strings::escapeTags(trim($_REQUEST['subject'])) : '';
|
||||||
$body = x($_REQUEST, 'body') ? Strings::escapeHtml(trim($_REQUEST['body'])) : '';
|
$body = !empty($_REQUEST['body']) ? Strings::escapeHtml(trim($_REQUEST['body'])) : '';
|
||||||
$recipient = x($_REQUEST, 'messageto') ? intval($_REQUEST['messageto']) : 0;
|
$recipient = !empty($_REQUEST['messageto']) ? intval($_REQUEST['messageto']) : 0;
|
||||||
|
|
||||||
$ret = Mail::send($recipient, $body, $subject, $replyto);
|
$ret = Mail::send($recipient, $body, $subject, $replyto);
|
||||||
$norecip = false;
|
$norecip = false;
|
||||||
|
|
@ -253,8 +253,8 @@ function message_content(App $a)
|
||||||
'$prefill' => $prefill,
|
'$prefill' => $prefill,
|
||||||
'$preid' => $preid,
|
'$preid' => $preid,
|
||||||
'$subject' => L10n::t('Subject:'),
|
'$subject' => L10n::t('Subject:'),
|
||||||
'$subjtxt' => x($_REQUEST, 'subject') ? strip_tags($_REQUEST['subject']) : '',
|
'$subjtxt' => !empty($_REQUEST['subject']) ? strip_tags($_REQUEST['subject']) : '',
|
||||||
'$text' => x($_REQUEST, 'body') ? Strings::escapeHtml(htmlspecialchars($_REQUEST['body'])) : '',
|
'$text' => !empty($_REQUEST['body']) ? Strings::escapeHtml(htmlspecialchars($_REQUEST['body'])) : '',
|
||||||
'$readonly' => '',
|
'$readonly' => '',
|
||||||
'$yourmessage' => L10n::t('Your message:'),
|
'$yourmessage' => L10n::t('Your message:'),
|
||||||
'$select' => $select,
|
'$select' => $select,
|
||||||
|
|
|
||||||
|
|
@ -42,19 +42,19 @@ function network_init(App $a)
|
||||||
|
|
||||||
Hook::add('head', __FILE__, 'network_infinite_scroll_head');
|
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'])) {
|
if (($search != '') && !empty($_GET['submit'])) {
|
||||||
$a->internalRedirect('search?search=' . urlencode($search));
|
$a->internalRedirect('search?search=' . urlencode($search));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_GET, 'save')) {
|
if (!empty($_GET['save'])) {
|
||||||
$exists = DBA::exists('search', ['uid' => local_user(), 'term' => $search]);
|
$exists = DBA::exists('search', ['uid' => local_user(), 'term' => $search]);
|
||||||
if (!$exists) {
|
if (!$exists) {
|
||||||
DBA::insert('search', ['uid' => local_user(), 'term' => $search]);
|
DBA::insert('search', ['uid' => local_user(), 'term' => $search]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (x($_GET, 'remove')) {
|
if (!empty($_GET['remove'])) {
|
||||||
DBA::delete('search', ['uid' => local_user(), 'term' => $search]);
|
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);
|
$group_id = (($a->argc > 1 && is_numeric($a->argv[1])) ? intval($a->argv[1]) : 0);
|
||||||
|
|
||||||
$cid = 0;
|
$cid = 0;
|
||||||
if (x($_GET, 'cid') && intval($_GET['cid']) != 0) {
|
if (!empty($_GET['cid'])) {
|
||||||
$cid = $_GET['cid'];
|
$cid = $_GET['cid'];
|
||||||
$_GET['nets'] = 'all';
|
$_GET['nets'] = 'all';
|
||||||
$group_id = 0;
|
$group_id = 0;
|
||||||
|
|
@ -152,33 +152,33 @@ function network_init(App $a)
|
||||||
}
|
}
|
||||||
|
|
||||||
// If nets is set to all, unset it
|
// 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']);
|
unset($_GET['nets']);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!x($a->page, 'aside')) {
|
if (empty($a->page['aside'])) {
|
||||||
$a->page['aside'] = '';
|
$a->page['aside'] = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
$a->page['aside'] .= Group::sidebarWidget('network/0', 'network', 'standard', $group_id);
|
$a->page['aside'] .= Group::sidebarWidget('network/0', 'network', 'standard', $group_id);
|
||||||
$a->page['aside'] .= ForumManager::widget(local_user(), $cid);
|
$a->page['aside'] .= ForumManager::widget(local_user(), $cid);
|
||||||
$a->page['aside'] .= posted_date_widget('network', local_user(), false);
|
$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'] .= 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)
|
function saved_searches($search)
|
||||||
{
|
{
|
||||||
$srchurl = '/network?f='
|
$srchurl = '/network?f='
|
||||||
. ((x($_GET, 'cid')) ? '&cid=' . rawurlencode($_GET['cid']) : '')
|
. (!empty($_GET['cid']) ? '&cid=' . rawurlencode($_GET['cid']) : '')
|
||||||
. ((x($_GET, 'star')) ? '&star=' . rawurlencode($_GET['star']) : '')
|
. (!empty($_GET['star']) ? '&star=' . rawurlencode($_GET['star']) : '')
|
||||||
. ((x($_GET, 'bmark')) ? '&bmark=' . rawurlencode($_GET['bmark']) : '')
|
. (!empty($_GET['bmark']) ? '&bmark=' . rawurlencode($_GET['bmark']) : '')
|
||||||
. ((x($_GET, 'conv')) ? '&conv=' . rawurlencode($_GET['conv']) : '')
|
. (!empty($_GET['conv']) ? '&conv=' . rawurlencode($_GET['conv']) : '')
|
||||||
. ((x($_GET, 'nets')) ? '&nets=' . rawurlencode($_GET['nets']) : '')
|
. (!empty($_GET['nets']) ? '&nets=' . rawurlencode($_GET['nets']) : '')
|
||||||
. ((x($_GET, 'cmin')) ? '&cmin=' . rawurlencode($_GET['cmin']) : '')
|
. (!empty($_GET['cmin']) ? '&cmin=' . rawurlencode($_GET['cmin']) : '')
|
||||||
. ((x($_GET, 'cmax')) ? '&cmax=' . rawurlencode($_GET['cmax']) : '')
|
. (!empty($_GET['cmax']) ? '&cmax=' . rawurlencode($_GET['cmax']) : '')
|
||||||
. ((x($_GET, 'file')) ? '&file=' . rawurlencode($_GET['file']) : '');
|
. (!empty($_GET['file']) ? '&file=' . rawurlencode($_GET['file']) : '');
|
||||||
;
|
;
|
||||||
|
|
||||||
$terms = DBA::select('search', ['id', 'term'], ['uid' => local_user()]);
|
$terms = DBA::select('search', ['id', 'term'], ['uid' => local_user()]);
|
||||||
|
|
@ -233,15 +233,15 @@ function network_query_get_sel_tab(App $a)
|
||||||
$new_active = 'active';
|
$new_active = 'active';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_GET, 'star')) {
|
if (!empty($_GET['star'])) {
|
||||||
$starred_active = 'active';
|
$starred_active = 'active';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_GET, 'bmark')) {
|
if (!empty($_GET['bmark'])) {
|
||||||
$bookmarked_active = 'active';
|
$bookmarked_active = 'active';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_GET, 'conv')) {
|
if (!empty($_GET['conv'])) {
|
||||||
$conv_active = 'active';
|
$conv_active = 'active';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -249,7 +249,7 @@ function network_query_get_sel_tab(App $a)
|
||||||
$no_active = 'active';
|
$no_active = 'active';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($no_active == 'active' && x($_GET, 'order')) {
|
if ($no_active == 'active' && !empty($_GET['order'])) {
|
||||||
switch($_GET['order']) {
|
switch($_GET['order']) {
|
||||||
case 'post' : $postord_active = 'active'; $no_active=''; break;
|
case 'post' : $postord_active = 'active'; $no_active=''; break;
|
||||||
case 'comment' : $all_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);
|
$parents_str = implode(', ', $parents_arr);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_GET, 'offset')) {
|
if (!empty($_GET['offset'])) {
|
||||||
$date_offset = $_GET['offset'];
|
$date_offset = $_GET['offset'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -968,7 +968,7 @@ function network_tabs(App $a)
|
||||||
$tabs = [
|
$tabs = [
|
||||||
[
|
[
|
||||||
'label' => L10n::t('Commented Order'),
|
'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,
|
'sel' => $all_active,
|
||||||
'title' => L10n::t('Sort by Comment Date'),
|
'title' => L10n::t('Sort by Comment Date'),
|
||||||
'id' => 'commented-order-tab',
|
'id' => 'commented-order-tab',
|
||||||
|
|
@ -976,7 +976,7 @@ function network_tabs(App $a)
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'label' => L10n::t('Posted Order'),
|
'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,
|
'sel' => $postord_active,
|
||||||
'title' => L10n::t('Sort by Post Date'),
|
'title' => L10n::t('Sort by Post Date'),
|
||||||
'id' => 'posted-order-tab',
|
'id' => 'posted-order-tab',
|
||||||
|
|
@ -986,7 +986,7 @@ function network_tabs(App $a)
|
||||||
|
|
||||||
$tabs[] = [
|
$tabs[] = [
|
||||||
'label' => L10n::t('Personal'),
|
'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,
|
'sel' => $conv_active,
|
||||||
'title' => L10n::t('Posts that mention or involve you'),
|
'title' => L10n::t('Posts that mention or involve you'),
|
||||||
'id' => 'personal-tab',
|
'id' => 'personal-tab',
|
||||||
|
|
@ -996,7 +996,7 @@ function network_tabs(App $a)
|
||||||
if (Feature::isEnabled(local_user(), 'new_tab')) {
|
if (Feature::isEnabled(local_user(), 'new_tab')) {
|
||||||
$tabs[] = [
|
$tabs[] = [
|
||||||
'label' => L10n::t('New'),
|
'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,
|
'sel' => $new_active,
|
||||||
'title' => L10n::t('Activity Stream - by date'),
|
'title' => L10n::t('Activity Stream - by date'),
|
||||||
'id' => 'activitiy-by-date-tab',
|
'id' => 'activitiy-by-date-tab',
|
||||||
|
|
@ -1007,7 +1007,7 @@ function network_tabs(App $a)
|
||||||
if (Feature::isEnabled(local_user(), 'link_tab')) {
|
if (Feature::isEnabled(local_user(), 'link_tab')) {
|
||||||
$tabs[] = [
|
$tabs[] = [
|
||||||
'label' => L10n::t('Shared Links'),
|
'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,
|
'sel' => $bookmarked_active,
|
||||||
'title' => L10n::t('Interesting Links'),
|
'title' => L10n::t('Interesting Links'),
|
||||||
'id' => 'shared-links-tab',
|
'id' => 'shared-links-tab',
|
||||||
|
|
@ -1017,7 +1017,7 @@ function network_tabs(App $a)
|
||||||
|
|
||||||
$tabs[] = [
|
$tabs[] = [
|
||||||
'label' => L10n::t('Starred'),
|
'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,
|
'sel' => $starred_active,
|
||||||
'title' => L10n::t('Favourite Posts'),
|
'title' => L10n::t('Favourite Posts'),
|
||||||
'id' => 'starred-posts-tab',
|
'id' => 'starred-posts-tab',
|
||||||
|
|
@ -1025,7 +1025,7 @@ function network_tabs(App $a)
|
||||||
];
|
];
|
||||||
|
|
||||||
// save selected tab, but only if not in file mode
|
// 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', [
|
PConfig::set(local_user(), 'network.view', 'tab.selected', [
|
||||||
$all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active
|
$all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active
|
||||||
]);
|
]);
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,7 @@ function noscrape_init(App $a)
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
$keywords = ((x($a->profile, 'pub_keywords')) ? $a->profile['pub_keywords'] : '');
|
$keywords = defaults($a->profile, 'pub_keywords', '');
|
||||||
$keywords = str_replace(['#',',',' ',',,'], ['',' ',',',','], $keywords);
|
$keywords = str_replace(['#',',',' ',',,'], ['',' ',',',','], $keywords);
|
||||||
$keywords = explode(',', $keywords);
|
$keywords = explode(',', $keywords);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -33,13 +33,13 @@ function oexchange_content(App $a) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$url = ((x($_REQUEST,'url') && strlen($_REQUEST['url']))
|
$url = ((!empty($_REQUEST['url']))
|
||||||
? urlencode(Strings::escapeTags(trim($_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']))) : '');
|
? '&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']))) : '');
|
? '&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']))) : '');
|
? '&tags=' . urlencode(Strings::escapeTags(trim($_REQUEST['tags']))) : '');
|
||||||
|
|
||||||
$s = Network::fetchUrl(System::baseUrl() . '/parse_url?f=&url=' . $url . $title . $description . $tags);
|
$s = Network::fetchUrl(System::baseUrl() . '/parse_url?f=&url=' . $url . $title . $description . $tags);
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ function openid_content(App $a) {
|
||||||
|
|
||||||
Logger::log('mod_openid ' . print_r($_REQUEST,true), Logger::DATA);
|
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());
|
$openid = new LightOpenID($a->getHostName());
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -47,8 +47,8 @@ function parse_url_content(App $a)
|
||||||
|
|
||||||
// Add url scheme if it is missing
|
// Add url scheme if it is missing
|
||||||
$arrurl = parse_url($url);
|
$arrurl = parse_url($url);
|
||||||
if (!x($arrurl, 'scheme')) {
|
if (empty($arrurl['scheme'])) {
|
||||||
if (x($arrurl, 'host')) {
|
if (!empty($arrurl['host'])) {
|
||||||
$url = 'http:' . $url;
|
$url = 'http:' . $url;
|
||||||
} else {
|
} else {
|
||||||
$url = 'http://' . $url;
|
$url = 'http://' . $url;
|
||||||
|
|
|
||||||
|
|
@ -365,7 +365,7 @@ function photos_post(App $a)
|
||||||
return; // NOTREACHED
|
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'])) : '';
|
$desc = !empty($_POST['desc']) ? Strings::escapeTags(trim($_POST['desc'])) : '';
|
||||||
$rawtags = !empty($_POST['newtag']) ? Strings::escapeTags(trim($_POST['newtag'])) : '';
|
$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;
|
||||||
|
|
|
||||||
|
|
@ -373,12 +373,12 @@ function ping_init(App $a)
|
||||||
$sysmsgs = [];
|
$sysmsgs = [];
|
||||||
$sysmsgs_info = [];
|
$sysmsgs_info = [];
|
||||||
|
|
||||||
if (x($_SESSION, 'sysmsg')) {
|
if (!empty($_SESSION['sysmsg'])) {
|
||||||
$sysmsgs = $_SESSION['sysmsg'];
|
$sysmsgs = $_SESSION['sysmsg'];
|
||||||
unset($_SESSION['sysmsg']);
|
unset($_SESSION['sysmsg']);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_SESSION, 'sysmsg_info')) {
|
if (!empty($_SESSION['sysmsg_info'])) {
|
||||||
$sysmsgs_info = $_SESSION['sysmsg_info'];
|
$sysmsgs_info = $_SESSION['sysmsg_info'];
|
||||||
unset($_SESSION['sysmsg_info']);
|
unset($_SESSION['sysmsg_info']);
|
||||||
}
|
}
|
||||||
|
|
@ -483,7 +483,7 @@ function ping_get_notifications($uid)
|
||||||
|
|
||||||
if ($notification["visible"]
|
if ($notification["visible"]
|
||||||
&& !$notification["deleted"]
|
&& !$notification["deleted"]
|
||||||
&& !(x($result, $notification["parent"]) && !empty($result[$notification["parent"]]))
|
&& empty($result[$notification["parent"]])
|
||||||
) {
|
) {
|
||||||
// Should we condense the notifications or show them all?
|
// Should we condense the notifications or show them all?
|
||||||
if (PConfig::get(local_user(), 'system', 'detailed_notif')) {
|
if (PConfig::get(local_user(), 'system', 'detailed_notif')) {
|
||||||
|
|
|
||||||
12
mod/poco.php
12
mod/poco.php
|
|
@ -88,7 +88,7 @@ function poco_init(App $a) {
|
||||||
if (!empty($cid)) {
|
if (!empty($cid)) {
|
||||||
$sql_extra = sprintf(" AND `contact`.`id` = %d ", intval($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']));
|
$update_limit = date(DateTimeFormat::MYSQL, strtotime($_GET['updatedSince']));
|
||||||
}
|
}
|
||||||
if ($global) {
|
if ($global) {
|
||||||
|
|
@ -122,7 +122,7 @@ function poco_init(App $a) {
|
||||||
} else {
|
} else {
|
||||||
$startIndex = 0;
|
$startIndex = 0;
|
||||||
}
|
}
|
||||||
$itemsPerPage = ((x($_GET, 'count') && intval($_GET['count'])) ? intval($_GET['count']) : $totalResults);
|
$itemsPerPage = ((!empty($_GET['count'])) ? intval($_GET['count']) : $totalResults);
|
||||||
|
|
||||||
if ($global) {
|
if ($global) {
|
||||||
Logger::log("Start global query", Logger::DEBUG);
|
Logger::log("Start global query", Logger::DEBUG);
|
||||||
|
|
@ -164,13 +164,13 @@ function poco_init(App $a) {
|
||||||
Logger::log("Query done", Logger::DEBUG);
|
Logger::log("Query done", Logger::DEBUG);
|
||||||
|
|
||||||
$ret = [];
|
$ret = [];
|
||||||
if (x($_GET, 'sorted')) {
|
if (!empty($_GET['sorted'])) {
|
||||||
$ret['sorted'] = false;
|
$ret['sorted'] = false;
|
||||||
}
|
}
|
||||||
if (x($_GET, 'filtered')) {
|
if (!empty($_GET['filtered'])) {
|
||||||
$ret['filtered'] = false;
|
$ret['filtered'] = false;
|
||||||
}
|
}
|
||||||
if (x($_GET, 'updatedSince') && ! $global) {
|
if (!empty($_GET['updatedSince']) && ! $global) {
|
||||||
$ret['updatedSince'] = false;
|
$ret['updatedSince'] = false;
|
||||||
}
|
}
|
||||||
$ret['startIndex'] = (int) $startIndex;
|
$ret['startIndex'] = (int) $startIndex;
|
||||||
|
|
@ -196,7 +196,7 @@ function poco_init(App $a) {
|
||||||
'generation' => false
|
'generation' => false
|
||||||
];
|
];
|
||||||
|
|
||||||
if ((! x($_GET, 'fields')) || ($_GET['fields'] === '@all')) {
|
if (empty($_GET['fields']) || ($_GET['fields'] === '@all')) {
|
||||||
foreach ($fields_ret as $k => $v) {
|
foreach ($fields_ret as $k => $v) {
|
||||||
$fields_ret[$k] = true;
|
$fields_ret[$k] = true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,7 @@ function poke_init(App $a)
|
||||||
return;
|
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);
|
Logger::log('poke: verb ' . $verb . ' contact ' . $contact_id, Logger::DEBUG);
|
||||||
|
|
@ -86,7 +86,7 @@ function poke_init(App $a)
|
||||||
$deny_gid = $item['deny_gid'];
|
$deny_gid = $item['deny_gid'];
|
||||||
}
|
}
|
||||||
} else {
|
} 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_cid = ($private ? '<' . $target['id']. '>' : $a->user['allow_cid']);
|
||||||
$allow_gid = ($private ? '' : $a->user['allow_gid']);
|
$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();
|
$verbs = L10n::getPokeVerbs();
|
||||||
|
|
|
||||||
|
|
@ -242,7 +242,7 @@ function profile_content(App $a, $update = 0)
|
||||||
$sql_extra2 = '';
|
$sql_extra2 = '';
|
||||||
|
|
||||||
if ($update) {
|
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
|
// 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.
|
// items. Otherwise use a timestamp of the last succesful update request.
|
||||||
|
|
|
||||||
|
|
@ -251,7 +251,7 @@ function profiles_post(App $a) {
|
||||||
$marital = Strings::escapeTags(trim($_POST['marital']));
|
$marital = Strings::escapeTags(trim($_POST['marital']));
|
||||||
$howlong = Strings::escapeTags(trim($_POST['howlong']));
|
$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)) {
|
if (! strlen($howlong)) {
|
||||||
$howlong = DBA::NULL_DATETIME;
|
$howlong = DBA::NULL_DATETIME;
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ use Friendica\Util\Network;
|
||||||
use Friendica\Util\Strings;
|
use Friendica\Util\Strings;
|
||||||
|
|
||||||
function post_var($name) {
|
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) {
|
function pubsubhubbub_init(App $a) {
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,7 @@ function redir_init(App $a) {
|
||||||
// for authentification everytime he/she is visiting a profile page of the local
|
// for authentification everytime he/she is visiting a profile page of the local
|
||||||
// contact.
|
// contact.
|
||||||
if ($host == $remotehost
|
if ($host == $remotehost
|
||||||
&& x($_SESSION, 'remote')
|
&& !empty($_SESSION['remote'])
|
||||||
&& is_array($_SESSION['remote']))
|
&& is_array($_SESSION['remote']))
|
||||||
{
|
{
|
||||||
foreach ($_SESSION['remote'] as $v) {
|
foreach ($_SESSION['remote'] as $v) {
|
||||||
|
|
|
||||||
|
|
@ -84,7 +84,7 @@ function register_post(App $a)
|
||||||
|
|
||||||
$using_invites = Config::get('system', 'invitation_only');
|
$using_invites = Config::get('system', 'invitation_only');
|
||||||
$num_invites = Config::get('system', 'number_invites');
|
$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 (intval(Config::get('config', 'register_policy')) === REGISTER_OPEN) {
|
||||||
if ($using_invites && $invite_id) {
|
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
|
// 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(
|
$res = Model\User::sendRegisterOpenEmail(
|
||||||
$user,
|
$user,
|
||||||
Config::get('config', 'sitename'),
|
Config::get('config', 'sitename'),
|
||||||
|
|
@ -195,20 +195,20 @@ function register_content(App $a)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_SESSION, 'theme')) {
|
if (!empty($_SESSION['theme'])) {
|
||||||
unset($_SESSION['theme']);
|
unset($_SESSION['theme']);
|
||||||
}
|
}
|
||||||
if (x($_SESSION, 'mobile-theme')) {
|
if (!empty($_SESSION['mobile-theme'])) {
|
||||||
unset($_SESSION['mobile-theme']);
|
unset($_SESSION['mobile-theme']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$username = x($_REQUEST, 'username') ? $_REQUEST['username'] : '';
|
$username = defaults($_REQUEST, 'username' , '');
|
||||||
$email = x($_REQUEST, 'email') ? $_REQUEST['email'] : '';
|
$email = defaults($_REQUEST, 'email' , '');
|
||||||
$openid_url = x($_REQUEST, 'openid_url') ? $_REQUEST['openid_url'] : '';
|
$openid_url = defaults($_REQUEST, 'openid_url', '');
|
||||||
$nickname = x($_REQUEST, 'nickname') ? $_REQUEST['nickname'] : '';
|
$nickname = defaults($_REQUEST, 'nickname' , '');
|
||||||
$photo = x($_REQUEST, 'photo') ? $_REQUEST['photo'] : '';
|
$photo = defaults($_REQUEST, 'photo' , '');
|
||||||
$invite_id = x($_REQUEST, 'invite_id') ? $_REQUEST['invite_id'] : '';
|
$invite_id = defaults($_REQUEST, 'invite_id' , '');
|
||||||
|
|
||||||
$noid = Config::get('system', 'no_openid');
|
$noid = Config::get('system', 'no_openid');
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,15 +20,15 @@ function removeme_post(App $a)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
|
if (!empty($_SESSION['submanage'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((!x($_POST, 'qxz_password')) || (!strlen(trim($_POST['qxz_password'])))) {
|
if (empty($_POST['qxz_password'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((!x($_POST, 'verify')) || (!strlen(trim($_POST['verify'])))) {
|
if (empty($_POST['verify'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ require_once 'mod/dirfind.php';
|
||||||
function search_saved_searches() {
|
function search_saved_searches() {
|
||||||
|
|
||||||
$o = '';
|
$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",
|
$r = q("SELECT `id`,`term` FROM `search` WHERE `uid` = %d",
|
||||||
intval(local_user())
|
intval(local_user())
|
||||||
|
|
@ -60,10 +60,10 @@ function search_saved_searches() {
|
||||||
|
|
||||||
function search_init(App $a) {
|
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 (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",
|
$r = q("SELECT * FROM `search` WHERE `uid` = %d AND `term` = '%s' LIMIT 1",
|
||||||
intval(local_user()),
|
intval(local_user()),
|
||||||
DBA::escape($search)
|
DBA::escape($search)
|
||||||
|
|
@ -72,7 +72,7 @@ function search_init(App $a) {
|
||||||
DBA::insert('search', ['uid' => local_user(), 'term' => $search]);
|
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]);
|
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) {
|
function search_content(App $a) {
|
||||||
|
|
||||||
if (Config::get('system','block_public') && !local_user() && !remote_user()) {
|
if (Config::get('system','block_public') && !local_user() && !remote_user()) {
|
||||||
|
|
@ -145,16 +137,12 @@ function search_content(App $a) {
|
||||||
|
|
||||||
Nav::setSelected('search');
|
Nav::setSelected('search');
|
||||||
|
|
||||||
$search = '';
|
$search = (!empty($_REQUEST['search']) ? Strings::escapeTags(trim(rawurldecode($_REQUEST['search']))) : '');
|
||||||
if (x($a->data,'search'))
|
|
||||||
$search = Strings::escapeTags(trim($a->data['search']));
|
|
||||||
else
|
|
||||||
$search = ((x($_GET,'search')) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
|
|
||||||
|
|
||||||
$tag = false;
|
$tag = false;
|
||||||
if (x($_GET,'tag')) {
|
if (!empty($_GET['tag'])) {
|
||||||
$tag = true;
|
$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
|
// contruct a wrapper for the search header
|
||||||
|
|
@ -176,7 +164,7 @@ function search_content(App $a) {
|
||||||
return dirfind_content($a);
|
return dirfind_content($a);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_GET,'search-option'))
|
if (!empty($_GET['search-option']))
|
||||||
switch($_GET['search-option']) {
|
switch($_GET['search-option']) {
|
||||||
case 'fulltext':
|
case 'fulltext':
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
132
mod/settings.php
132
mod/settings.php
|
|
@ -146,18 +146,18 @@ function settings_post(App $a)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
|
if (!empty($_SESSION['submanage'])) {
|
||||||
return;
|
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);
|
notice(L10n::t('Permission denied.') . EOL);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$old_page_flags = $a->user['page-flags'];
|
$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');
|
BaseModule::checkFormSecurityTokenRedirectOnError('/settings/oauth', 'settings_oauth');
|
||||||
|
|
||||||
$key = $_POST['remove'];
|
$key = $_POST['remove'];
|
||||||
|
|
@ -166,7 +166,7 @@ function settings_post(App $a)
|
||||||
return;
|
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');
|
BaseModule::checkFormSecurityTokenRedirectOnError('/settings/oauth', 'settings_oauth');
|
||||||
|
|
||||||
$name = defaults($_POST, 'name' , '');
|
$name = defaults($_POST, 'name' , '');
|
||||||
|
|
@ -222,23 +222,23 @@ function settings_post(App $a)
|
||||||
if (($a->argc > 1) && ($a->argv[1] == 'connectors')) {
|
if (($a->argc > 1) && ($a->argv[1] == 'connectors')) {
|
||||||
BaseModule::checkFormSecurityTokenRedirectOnError('/settings/connectors', 'settings_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', 'disable_cw', intval($_POST['disable_cw']));
|
||||||
PConfig::set(local_user(), 'system', 'no_intelligent_shortening', intval($_POST['no_intelligent_shortening']));
|
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(), 'system', 'ostatus_autofriend', intval($_POST['snautofollow']));
|
||||||
PConfig::set(local_user(), 'ostatus', 'default_group', $_POST['group-selection']);
|
PConfig::set(local_user(), 'ostatus', 'default_group', $_POST['group-selection']);
|
||||||
PConfig::set(local_user(), 'ostatus', 'legacy_contact', $_POST['legacy_contact']);
|
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_server = defaults($_POST, 'mail_server', '');
|
||||||
$mail_port = ((x($_POST, 'mail_port')) ? $_POST['mail_port'] : '');
|
$mail_port = defaults($_POST, 'mail_port', '');
|
||||||
$mail_ssl = ((x($_POST, 'mail_ssl')) ? strtolower(trim($_POST['mail_ssl'])) : '');
|
$mail_ssl = (!empty($_POST['mail_ssl']) ? strtolower(trim($_POST['mail_ssl'])) : '');
|
||||||
$mail_user = ((x($_POST, 'mail_user')) ? $_POST['mail_user'] : '');
|
$mail_user = defaults($_POST, 'mail_user', '');
|
||||||
$mail_pass = ((x($_POST, 'mail_pass')) ? trim($_POST['mail_pass']) : '');
|
$mail_pass = (!empty($_POST['mail_pass']) ? trim($_POST['mail_pass']) : '');
|
||||||
$mail_action = ((x($_POST, 'mail_action')) ? trim($_POST['mail_action']) : '');
|
$mail_action = (!empty($_POST['mail_action']) ? trim($_POST['mail_action']) : '');
|
||||||
$mail_movetofolder = ((x($_POST, 'mail_movetofolder')) ? trim($_POST['mail_movetofolder']) : '');
|
$mail_movetofolder = (!empty($_POST['mail_movetofolder']) ? trim($_POST['mail_movetofolder']) : '');
|
||||||
$mail_replyto = ((x($_POST, 'mail_replyto')) ? $_POST['mail_replyto'] : '');
|
$mail_replyto = defaults($_POST, 'mail_replyto', '');
|
||||||
$mail_pubmail = ((x($_POST, 'mail_pubmail')) ? $_POST['mail_pubmail'] : '');
|
$mail_pubmail = defaults($_POST, 'mail_pubmail', '');
|
||||||
|
|
||||||
|
|
||||||
$mail_disabled = ((function_exists('imap_open') && (!Config::get('system', 'imap_disabled'))) ? 0 : 1);
|
$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')) {
|
if (($a->argc > 1) && ($a->argv[1] === 'display')) {
|
||||||
BaseModule::checkFormSecurityTokenRedirectOnError('/settings/display', 'settings_display');
|
BaseModule::checkFormSecurityTokenRedirectOnError('/settings/display', 'settings_display');
|
||||||
|
|
||||||
$theme = x($_POST, 'theme') ? Strings::escapeTags(trim($_POST['theme'])) : $a->user['theme'];
|
$theme = !empty($_POST['theme']) ? Strings::escapeTags(trim($_POST['theme'])) : $a->user['theme'];
|
||||||
$mobile_theme = x($_POST, 'mobile_theme') ? Strings::escapeTags(trim($_POST['mobile_theme'])) : '';
|
$mobile_theme = !empty($_POST['mobile_theme']) ? Strings::escapeTags(trim($_POST['mobile_theme'])) : '';
|
||||||
$nosmile = x($_POST, 'nosmile') ? intval($_POST['nosmile']) : 0;
|
$nosmile = !empty($_POST['nosmile']) ? intval($_POST['nosmile']) : 0;
|
||||||
$first_day_of_week = x($_POST, 'first_day_of_week') ? intval($_POST['first_day_of_week']) : 0;
|
$first_day_of_week = !empty($_POST['first_day_of_week']) ? intval($_POST['first_day_of_week']) : 0;
|
||||||
$noinfo = x($_POST, 'noinfo') ? intval($_POST['noinfo']) : 0;
|
$noinfo = !empty($_POST['noinfo']) ? intval($_POST['noinfo']) : 0;
|
||||||
$infinite_scroll = x($_POST, 'infinite_scroll') ? intval($_POST['infinite_scroll']) : 0;
|
$infinite_scroll = !empty($_POST['infinite_scroll']) ? intval($_POST['infinite_scroll']) : 0;
|
||||||
$no_auto_update = x($_POST, 'no_auto_update') ? intval($_POST['no_auto_update']) : 0;
|
$no_auto_update = !empty($_POST['no_auto_update']) ? intval($_POST['no_auto_update']) : 0;
|
||||||
$bandwidth_saver = x($_POST, 'bandwidth_saver') ? intval($_POST['bandwidth_saver']) : 0;
|
$bandwidth_saver = !empty($_POST['bandwidth_saver']) ? intval($_POST['bandwidth_saver']) : 0;
|
||||||
$smart_threading = x($_POST, 'smart_threading') ? intval($_POST['smart_threading']) : 0;
|
$smart_threading = !empty($_POST['smart_threading']) ? intval($_POST['smart_threading']) : 0;
|
||||||
$nowarn_insecure = x($_POST, 'nowarn_insecure') ? intval($_POST['nowarn_insecure']) : 0;
|
$nowarn_insecure = !empty($_POST['nowarn_insecure']) ? intval($_POST['nowarn_insecure']) : 0;
|
||||||
$browser_update = x($_POST, 'browser_update') ? intval($_POST['browser_update']) : 0;
|
$browser_update = !empty($_POST['browser_update']) ? intval($_POST['browser_update']) : 0;
|
||||||
if ($browser_update != -1) {
|
if ($browser_update != -1) {
|
||||||
$browser_update = $browser_update * 1000;
|
$browser_update = $browser_update * 1000;
|
||||||
if ($browser_update < 10000) {
|
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) {
|
if ($itemspage_network > 100) {
|
||||||
$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) {
|
if ($itemspage_mobile_network > 100) {
|
||||||
$itemspage_mobile_network = 100;
|
$itemspage_mobile_network = 100;
|
||||||
}
|
}
|
||||||
|
|
@ -379,7 +379,7 @@ function settings_post(App $a)
|
||||||
|
|
||||||
BaseModule::checkFormSecurityTokenRedirectOnError('/settings', 'settings');
|
BaseModule::checkFormSecurityTokenRedirectOnError('/settings', 'settings');
|
||||||
|
|
||||||
if (x($_POST,'resend_relocate')) {
|
if (!empty($_POST['resend_relocate'])) {
|
||||||
Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', local_user());
|
Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', local_user());
|
||||||
info(L10n::t("Relocate message has been send to your contacts"));
|
info(L10n::t("Relocate message has been send to your contacts"));
|
||||||
$a->internalRedirect('settings');
|
$a->internalRedirect('settings');
|
||||||
|
|
@ -387,7 +387,7 @@ function settings_post(App $a)
|
||||||
|
|
||||||
Addon::callHooks('settings_post', $_POST);
|
Addon::callHooks('settings_post', $_POST);
|
||||||
|
|
||||||
if (x($_POST, 'password') || x($_POST, 'confirm')) {
|
if (!empty($_POST['password']) || !empty($_POST['confirm'])) {
|
||||||
$newpass = $_POST['password'];
|
$newpass = $_POST['password'];
|
||||||
$confirm = $_POST['confirm'];
|
$confirm = $_POST['confirm'];
|
||||||
|
|
||||||
|
|
@ -397,7 +397,7 @@ function settings_post(App $a)
|
||||||
$err = true;
|
$err = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!x($newpass) || !x($confirm)) {
|
if (empty($newpass) || empty($confirm)) {
|
||||||
notice(L10n::t('Empty passwords are not allowed. Password unchanged.') . EOL);
|
notice(L10n::t('Empty passwords are not allowed. Password unchanged.') . EOL);
|
||||||
$err = true;
|
$err = true;
|
||||||
}
|
}
|
||||||
|
|
@ -423,35 +423,35 @@ function settings_post(App $a)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$username = ((x($_POST, 'username')) ? Strings::escapeTags(trim($_POST['username'])) : '');
|
$username = (!empty($_POST['username']) ? Strings::escapeTags(trim($_POST['username'])) : '');
|
||||||
$email = ((x($_POST, 'email')) ? Strings::escapeTags(trim($_POST['email'])) : '');
|
$email = (!empty($_POST['email']) ? Strings::escapeTags(trim($_POST['email'])) : '');
|
||||||
$timezone = ((x($_POST, 'timezone')) ? Strings::escapeTags(trim($_POST['timezone'])) : '');
|
$timezone = (!empty($_POST['timezone']) ? Strings::escapeTags(trim($_POST['timezone'])) : '');
|
||||||
$language = ((x($_POST, 'language')) ? Strings::escapeTags(trim($_POST['language'])) : '');
|
$language = (!empty($_POST['language']) ? Strings::escapeTags(trim($_POST['language'])) : '');
|
||||||
|
|
||||||
$defloc = ((x($_POST, 'defloc')) ? Strings::escapeTags(trim($_POST['defloc'])) : '');
|
$defloc = (!empty($_POST['defloc']) ? Strings::escapeTags(trim($_POST['defloc'])) : '');
|
||||||
$openid = ((x($_POST, 'openid_url')) ? Strings::escapeTags(trim($_POST['openid_url'])) : '');
|
$openid = (!empty($_POST['openid_url']) ? Strings::escapeTags(trim($_POST['openid_url'])) : '');
|
||||||
$maxreq = ((x($_POST, 'maxreq')) ? intval($_POST['maxreq']) : 0);
|
$maxreq = (!empty($_POST['maxreq']) ? intval($_POST['maxreq']) : 0);
|
||||||
$expire = ((x($_POST, 'expire')) ? intval($_POST['expire']) : 0);
|
$expire = (!empty($_POST['expire']) ? intval($_POST['expire']) : 0);
|
||||||
$def_gid = ((x($_POST, 'group-selection')) ? intval($_POST['group-selection']) : 0);
|
$def_gid = (!empty($_POST['group-selection']) ? intval($_POST['group-selection']) : 0);
|
||||||
|
|
||||||
|
|
||||||
$expire_items = ((x($_POST, 'expire_items')) ? intval($_POST['expire_items']) : 0);
|
$expire_items = (!empty($_POST['expire_items']) ? intval($_POST['expire_items']) : 0);
|
||||||
$expire_notes = ((x($_POST, 'expire_notes')) ? intval($_POST['expire_notes']) : 0);
|
$expire_notes = (!empty($_POST['expire_notes']) ? intval($_POST['expire_notes']) : 0);
|
||||||
$expire_starred = ((x($_POST, 'expire_starred')) ? intval($_POST['expire_starred']) : 0);
|
$expire_starred = (!empty($_POST['expire_starred']) ? intval($_POST['expire_starred']) : 0);
|
||||||
$expire_photos = ((x($_POST, 'expire_photos'))? intval($_POST['expire_photos']) : 0);
|
$expire_photos = (!empty($_POST['expire_photos'])? intval($_POST['expire_photos']) : 0);
|
||||||
$expire_network_only = ((x($_POST, 'expire_network_only'))? intval($_POST['expire_network_only']) : 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);
|
$allow_location = ((!empty($_POST['allow_location']) && (intval($_POST['allow_location']) == 1)) ? 1: 0);
|
||||||
$publish = (((x($_POST, 'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0);
|
$publish = ((!empty($_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);
|
$net_publish = ((!empty($_POST['profile_in_netdirectory']) && (intval($_POST['profile_in_netdirectory']) == 1)) ? 1: 0);
|
||||||
$old_visibility = (((x($_POST, 'visibility')) && (intval($_POST['visibility']) == 1)) ? 1 : 0);
|
$old_visibility = ((!empty($_POST['visibility']) && (intval($_POST['visibility']) == 1)) ? 1 : 0);
|
||||||
$account_type = (((x($_POST, 'account-type')) && (intval($_POST['account-type']))) ? intval($_POST['account-type']) : 0);
|
$account_type = ((!empty($_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);
|
$page_flags = ((!empty($_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!
|
$blockwall = ((!empty($_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!
|
$blocktags = ((!empty($_POST['blocktags']) && (intval($_POST['blocktags']) == 1)) ? 0: 1); // this setting is inverted!
|
||||||
$unkmail = (((x($_POST, 'unkmail')) && (intval($_POST['unkmail']) == 1)) ? 1: 0);
|
$unkmail = ((!empty($_POST['unkmail']) && (intval($_POST['unkmail']) == 1)) ? 1: 0);
|
||||||
$cntunkmail = ((x($_POST, 'cntunkmail')) ? intval($_POST['cntunkmail']) : 0);
|
$cntunkmail = (!empty($_POST['cntunkmail']) ? intval($_POST['cntunkmail']) : 0);
|
||||||
$suggestme = ((x($_POST, 'suggestme')) ? intval($_POST['suggestme']) : 0);
|
$suggestme = (!empty($_POST['suggestme']) ? intval($_POST['suggestme']) : 0);
|
||||||
$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
|
$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
|
||||||
$hidewall = (($_POST['hidewall'] == 1) ? 1: 0);
|
$hidewall = (($_POST['hidewall'] == 1) ? 1: 0);
|
||||||
|
|
||||||
|
|
@ -460,28 +460,28 @@ function settings_post(App $a)
|
||||||
|
|
||||||
$notify = 0;
|
$notify = 0;
|
||||||
|
|
||||||
if (x($_POST, 'notify1')) {
|
if (!empty($_POST['notify1'])) {
|
||||||
$notify += intval($_POST['notify1']);
|
$notify += intval($_POST['notify1']);
|
||||||
}
|
}
|
||||||
if (x($_POST, 'notify2')) {
|
if (!empty($_POST['notify2'])) {
|
||||||
$notify += intval($_POST['notify2']);
|
$notify += intval($_POST['notify2']);
|
||||||
}
|
}
|
||||||
if (x($_POST, 'notify3')) {
|
if (!empty($_POST['notify3'])) {
|
||||||
$notify += intval($_POST['notify3']);
|
$notify += intval($_POST['notify3']);
|
||||||
}
|
}
|
||||||
if (x($_POST, 'notify4')) {
|
if (!empty($_POST['notify4'])) {
|
||||||
$notify += intval($_POST['notify4']);
|
$notify += intval($_POST['notify4']);
|
||||||
}
|
}
|
||||||
if (x($_POST, 'notify5')) {
|
if (!empty($_POST['notify5'])) {
|
||||||
$notify += intval($_POST['notify5']);
|
$notify += intval($_POST['notify5']);
|
||||||
}
|
}
|
||||||
if (x($_POST, 'notify6')) {
|
if (!empty($_POST['notify6'])) {
|
||||||
$notify += intval($_POST['notify6']);
|
$notify += intval($_POST['notify6']);
|
||||||
}
|
}
|
||||||
if (x($_POST, 'notify7')) {
|
if (!empty($_POST['notify7'])) {
|
||||||
$notify += intval($_POST['notify7']);
|
$notify += intval($_POST['notify7']);
|
||||||
}
|
}
|
||||||
if (x($_POST, 'notify8')) {
|
if (!empty($_POST['notify8'])) {
|
||||||
$notify += intval($_POST['notify8']);
|
$notify += intval($_POST['notify8']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -666,7 +666,7 @@ function settings_content(App $a)
|
||||||
return Login::form();
|
return Login::form();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
|
if (!empty($_SESSION['submanage'])) {
|
||||||
notice(L10n::t('Permission denied.') . EOL);
|
notice(L10n::t('Permission denied.') . EOL);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -796,7 +796,7 @@ function settings_content(App $a)
|
||||||
$default_group = PConfig::get(local_user(), 'ostatus', 'default_group');
|
$default_group = PConfig::get(local_user(), 'ostatus', 'default_group');
|
||||||
$legacy_contact = PConfig::get(local_user(), 'ostatus', 'legacy_contact');
|
$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?
|
/// @todo Isn't it supposed to be a $a->internalRedirect() call?
|
||||||
$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . System::baseUrl().'/ostatus_subscribe?url=' . urlencode($legacy_contact) . '">';
|
$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . System::baseUrl().'/ostatus_subscribe?url=' . urlencode($legacy_contact) . '">';
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ function starred_init(App $a) {
|
||||||
Item::update(['starred' => $starred], ['id' => $message_id]);
|
Item::update(['starred' => $starred], ['id' => $message_id]);
|
||||||
|
|
||||||
// See if we've been passed a return path to redirect to
|
// 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) {
|
if ($return_path) {
|
||||||
$rand = '_=' . time();
|
$rand = '_=' . time();
|
||||||
if (strpos($return_path, '?')) {
|
if (strpos($return_path, '?')) {
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ function suggest_init(App $a)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_GET,'ignore') && intval($_GET['ignore'])) {
|
if (!empty($_GET['ignore'])) {
|
||||||
// Check if we should do HTML-based delete confirmation
|
// Check if we should do HTML-based delete confirmation
|
||||||
if ($_REQUEST['confirm']) {
|
if ($_REQUEST['confirm']) {
|
||||||
// <form> can't take arguments in its "action" parameter
|
// <form> can't take arguments in its "action" parameter
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ function tagrm_post(App $a)
|
||||||
$a->internalRedirect($_SESSION['photo_return']);
|
$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']);
|
$a->internalRedirect($_SESSION['photo_return']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -42,10 +42,10 @@ function uimport_content(App $a)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (x($_SESSION, 'theme')) {
|
if (!empty($_SESSION['theme'])) {
|
||||||
unset($_SESSION['theme']);
|
unset($_SESSION['theme']);
|
||||||
}
|
}
|
||||||
if (x($_SESSION, 'mobile-theme')) {
|
if (!empty($_SESSION['mobile-theme'])) {
|
||||||
unset($_SESSION['mobile-theme']);
|
unset($_SESSION['mobile-theme']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ use Friendica\Util\Strings;
|
||||||
|
|
||||||
function wall_attach_post(App $a) {
|
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) {
|
if ($a->argc > 1) {
|
||||||
$nick = $a->argv[1];
|
$nick = $a->argv[1];
|
||||||
|
|
@ -85,7 +85,7 @@ function wall_attach_post(App $a) {
|
||||||
killme();
|
killme();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! x($_FILES,'userfile')) {
|
if (empty($_FILES['userfile'])) {
|
||||||
if ($r_json) {
|
if ($r_json) {
|
||||||
echo json_encode(['error' => L10n::t('Invalid request.')]);
|
echo json_encode(['error' => L10n::t('Invalid request.')]);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -23,11 +23,11 @@ function wall_upload_post(App $a, $desktopmode = true)
|
||||||
{
|
{
|
||||||
Logger::log("wall upload: starting new upload", Logger::DEBUG);
|
Logger::log("wall upload: starting new upload", Logger::DEBUG);
|
||||||
|
|
||||||
$r_json = (x($_GET, 'response') && $_GET['response'] == 'json');
|
$r_json = (!empty($_GET['response']) && $_GET['response'] == 'json');
|
||||||
$album = (x($_GET, 'album') ? Strings::escapeTags(trim($_GET['album'])) : '');
|
$album = (!empty($_GET['album']) ? Strings::escapeTags(trim($_GET['album'])) : '');
|
||||||
|
|
||||||
if ($a->argc > 1) {
|
if ($a->argc > 1) {
|
||||||
if (!x($_FILES, 'media')) {
|
if (empty($_FILES['media'])) {
|
||||||
$nick = $a->argv[1];
|
$nick = $a->argv[1];
|
||||||
$r = q("SELECT `user`.*, `contact`.`id` FROM `user`
|
$r = q("SELECT `user`.*, `contact`.`id` FROM `user`
|
||||||
INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`
|
INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`
|
||||||
|
|
@ -110,7 +110,7 @@ function wall_upload_post(App $a, $desktopmode = true)
|
||||||
killme();
|
killme();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!x($_FILES, 'userfile') && !x($_FILES, 'media')) {
|
if (empty($_FILES['userfile']) && empty($_FILES['media'])) {
|
||||||
if ($r_json) {
|
if ($r_json) {
|
||||||
echo json_encode(['error' => L10n::t('Invalid request.')]);
|
echo json_encode(['error' => L10n::t('Invalid request.')]);
|
||||||
}
|
}
|
||||||
|
|
@ -121,13 +121,13 @@ function wall_upload_post(App $a, $desktopmode = true)
|
||||||
$filename = '';
|
$filename = '';
|
||||||
$filesize = 0;
|
$filesize = 0;
|
||||||
$filetype = '';
|
$filetype = '';
|
||||||
if (x($_FILES, 'userfile')) {
|
if (!empty($_FILES['userfile'])) {
|
||||||
$src = $_FILES['userfile']['tmp_name'];
|
$src = $_FILES['userfile']['tmp_name'];
|
||||||
$filename = basename($_FILES['userfile']['name']);
|
$filename = basename($_FILES['userfile']['name']);
|
||||||
$filesize = intval($_FILES['userfile']['size']);
|
$filesize = intval($_FILES['userfile']['size']);
|
||||||
$filetype = $_FILES['userfile']['type'];
|
$filetype = $_FILES['userfile']['type'];
|
||||||
|
|
||||||
} elseif (x($_FILES, 'media')) {
|
} elseif (!empty($_FILES['media'])) {
|
||||||
if (!empty($_FILES['media']['tmp_name'])) {
|
if (!empty($_FILES['media']['tmp_name'])) {
|
||||||
if (is_array($_FILES['media']['tmp_name'])) {
|
if (is_array($_FILES['media']['tmp_name'])) {
|
||||||
$src = $_FILES['media']['tmp_name'][0];
|
$src = $_FILES['media']['tmp_name'][0];
|
||||||
|
|
|
||||||
|
|
@ -20,8 +20,8 @@ function wallmessage_post(App $a) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$subject = ((x($_REQUEST,'subject')) ? Strings::escapeTags(trim($_REQUEST['subject'])) : '');
|
$subject = (!empty($_REQUEST['subject']) ? Strings::escapeTags(trim($_REQUEST['subject'])) : '');
|
||||||
$body = ((x($_REQUEST,'body')) ? Strings::escapeHtml(trim($_REQUEST['body'])) : '');
|
$body = (!empty($_REQUEST['body']) ? Strings::escapeHtml(trim($_REQUEST['body'])) : '');
|
||||||
|
|
||||||
$recipient = (($a->argc > 1) ? Strings::escapeTags($a->argv[1]) : '');
|
$recipient = (($a->argc > 1) ? Strings::escapeTags($a->argv[1]) : '');
|
||||||
if ((! $recipient) || (! $body)) {
|
if ((! $recipient) || (! $body)) {
|
||||||
|
|
@ -131,8 +131,8 @@ function wallmessage_content(App $a) {
|
||||||
'$subject' => L10n::t('Subject:'),
|
'$subject' => L10n::t('Subject:'),
|
||||||
'$recipname' => $user['username'],
|
'$recipname' => $user['username'],
|
||||||
'$nickname' => $user['nickname'],
|
'$nickname' => $user['nickname'],
|
||||||
'$subjtxt' => ((x($_REQUEST, 'subject')) ? strip_tags($_REQUEST['subject']) : ''),
|
'$subjtxt' => (!empty($_REQUEST['subject']) ? strip_tags($_REQUEST['subject']) : ''),
|
||||||
'$text' => ((x($_REQUEST, 'body')) ? Strings::escapeHtml(htmlspecialchars($_REQUEST['body'])) : ''),
|
'$text' => (!empty($_REQUEST['body']) ? Strings::escapeHtml(htmlspecialchars($_REQUEST['body'])) : ''),
|
||||||
'$readonly' => '',
|
'$readonly' => '',
|
||||||
'$yourmessage' => L10n::t('Your message:'),
|
'$yourmessage' => L10n::t('Your message:'),
|
||||||
'$parent' => '',
|
'$parent' => '',
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ function webfinger_content(App $a)
|
||||||
|
|
||||||
$o .= '<br /><br />';
|
$o .= '<br /><br />';
|
||||||
|
|
||||||
if (x($_GET, 'addr')) {
|
if (!empty($_GET['addr'])) {
|
||||||
$addr = trim($_GET['addr']);
|
$addr = trim($_GET['addr']);
|
||||||
$res = Probe::lrdd($addr);
|
$res = Probe::lrdd($addr);
|
||||||
$o .= '<pre>';
|
$o .= '<pre>';
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,7 @@ text { font:12px Dialog; }
|
||||||
<text x="149" y="1721" style="font:13px Open Sans">($_POST['localconfirm'] == 1)</text>
|
<text x="149" y="1721" style="font:13px Open Sans">($_POST['localconfirm'] == 1)</text>
|
||||||
<text x="149" y="1744" style="font:13px Open Sans">-----------------------------------------------------------------------</text>
|
<text x="149" y="1744" style="font:13px Open Sans">-----------------------------------------------------------------------</text>
|
||||||
<text x="149" y="1767" style="font:13px Open Sans">- if(local_user() && ($a->user['nickname'] == $a-</text>
|
<text x="149" y="1767" style="font:13px Open Sans">- if(local_user() && ($a->user['nickname'] == $a-</text>
|
||||||
<text x="149" y="1790" style="font:13px Open Sans">>argv[1]) && (x($_POST,'dfrn_url')))</text>
|
<text x="149" y="1790" style="font:13px Open Sans">>argv[1]) && !empty($_POST['dfrn_url']))</text>
|
||||||
<text x="149" y="1813" style="font:13px Open Sans">-></text>
|
<text x="149" y="1813" style="font:13px Open Sans">-></text>
|
||||||
<text x="149" y="1859" style="font:13px Open Sans">- $confirm_key comes from $_POST</text>
|
<text x="149" y="1859" style="font:13px Open Sans">- $confirm_key comes from $_POST</text>
|
||||||
<text x="149" y="1905" style="font:13px Open Sans">- get data for contact Karen (contact table) by </text>
|
<text x="149" y="1905" style="font:13px Open Sans">- get data for contact Karen (contact table) by </text>
|
||||||
|
|
@ -104,7 +104,7 @@ text { font:12px Dialog; }
|
||||||
<path d="M866,2206 C861.5820313,2206 858,2209.5820313 858,2214 L858,2444 C858,2448.4179688 861.5820313,2452 866,2452 L1434,2452 C1438.4179688,2452 1442,2448.4179688 1442,2444 L1442,2214 C1442,2209.5820313 1438.4179688,2206 1434,2206 Z" style="fill:rgb(255,255,3);stroke:none" clip-path="url(#clip14)" />
|
<path d="M866,2206 C861.5820313,2206 858,2209.5820313 858,2214 L858,2444 C858,2448.4179688 861.5820313,2452 866,2452 L1434,2452 C1438.4179688,2452 1442,2448.4179688 1442,2444 L1442,2214 C1442,2209.5820313 1438.4179688,2206 1434,2206 Z" style="fill:rgb(255,255,3);stroke:none" clip-path="url(#clip14)" />
|
||||||
<text x="871" y="2228" style="font:13px Open Sans">http://karenhomepage.com/dfrn_request?confirm_key=”ABC123”</text>
|
<text x="871" y="2228" style="font:13px Open Sans">http://karenhomepage.com/dfrn_request?confirm_key=”ABC123”</text>
|
||||||
<text x="871" y="2274" style="font:13px Open Sans">dfrn_request_content() -</text>
|
<text x="871" y="2274" style="font:13px Open Sans">dfrn_request_content() -</text>
|
||||||
<text x="871" y="2297" style="font:13px Open Sans">(elseif((x($_GET,'confirm_key')) && strlen($_GET['confirm_key'])) )</text>
|
<text x="871" y="2297" style="font:13px Open Sans">elseif (!empty($_GET['confirm_key']))</text>
|
||||||
<text x="871" y="2320" style="font:13px Open Sans">----------------------------------------------------------------------------------------------</text>
|
<text x="871" y="2320" style="font:13px Open Sans">----------------------------------------------------------------------------------------------</text>
|
||||||
<text x="871" y="2366" style="font:13px Open Sans">- select the intro by confirm_key (intro table) -> get contact id</text>
|
<text x="871" y="2366" style="font:13px Open Sans">- select the intro by confirm_key (intro table) -> get contact id</text>
|
||||||
<text x="871" y="2389" style="font:13px Open Sans">- use the intro contact id to get the contact in the contact table</text>
|
<text x="871" y="2389" style="font:13px Open Sans">- use the intro contact id to get the contact in the contact table</text>
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 33 KiB |
|
|
@ -549,7 +549,7 @@ class App
|
||||||
|
|
||||||
// Use environment variables for mysql if they are set beforehand
|
// Use environment variables for mysql if they are set beforehand
|
||||||
if (!empty(getenv('MYSQL_HOST'))
|
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
|
&& getenv('MYSQL_PASSWORD') !== false
|
||||||
&& !empty(getenv('MYSQL_DATABASE')))
|
&& !empty(getenv('MYSQL_DATABASE')))
|
||||||
{
|
{
|
||||||
|
|
@ -668,7 +668,7 @@ class App
|
||||||
$this->hostname = Core\Config::get('config', 'hostname');
|
$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() : '' );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -170,7 +170,7 @@ class Nav
|
||||||
// "Home" should also take you home from an authenticated remote profile connection
|
// "Home" should also take you home from an authenticated remote profile connection
|
||||||
$homelink = Profile::getMyURL();
|
$homelink = Profile::getMyURL();
|
||||||
if (! $homelink) {
|
if (! $homelink) {
|
||||||
$homelink = ((x($_SESSION, 'visitor_home')) ? $_SESSION['visitor_home'] : '');
|
$homelink = defaults($_SESSION, 'visitor_home', '');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (($a->module != 'home') && (! (local_user()))) {
|
if (($a->module != 'home') && (! (local_user()))) {
|
||||||
|
|
|
||||||
|
|
@ -308,12 +308,12 @@ class OEmbed
|
||||||
}
|
}
|
||||||
|
|
||||||
$domain = parse_url($url, PHP_URL_HOST);
|
$domain = parse_url($url, PHP_URL_HOST);
|
||||||
if (!x($domain)) {
|
if (empty($domain)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$str_allowed = Config::get('system', 'allowed_oembed', '');
|
$str_allowed = Config::get('system', 'allowed_oembed', '');
|
||||||
if (!x($str_allowed)) {
|
if (empty($str_allowed)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -334,7 +334,7 @@ class OEmbed
|
||||||
throw new Exception('OEmbed failed for URL: ' . $url);
|
throw new Exception('OEmbed failed for URL: ' . $url);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($title)) {
|
if (!empty($title)) {
|
||||||
$o->title = $title;
|
$o->title = $title;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -130,12 +130,12 @@ class BBCode extends BaseObject
|
||||||
|
|
||||||
$type = "";
|
$type = "";
|
||||||
preg_match("/type='(.*?)'/ism", $attributes, $matches);
|
preg_match("/type='(.*?)'/ism", $attributes, $matches);
|
||||||
if (x($matches, 1)) {
|
if (!empty($matches[1])) {
|
||||||
$type = strtolower($matches[1]);
|
$type = strtolower($matches[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
preg_match('/type="(.*?)"/ism', $attributes, $matches);
|
preg_match('/type="(.*?)"/ism', $attributes, $matches);
|
||||||
if (x($matches, 1)) {
|
if (!empty($matches[1])) {
|
||||||
$type = strtolower($matches[1]);
|
$type = strtolower($matches[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -153,12 +153,12 @@ class BBCode extends BaseObject
|
||||||
|
|
||||||
$url = "";
|
$url = "";
|
||||||
preg_match("/url='(.*?)'/ism", $attributes, $matches);
|
preg_match("/url='(.*?)'/ism", $attributes, $matches);
|
||||||
if (x($matches, 1)) {
|
if (!empty($matches[1])) {
|
||||||
$url = $matches[1];
|
$url = $matches[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
preg_match('/url="(.*?)"/ism', $attributes, $matches);
|
preg_match('/url="(.*?)"/ism', $attributes, $matches);
|
||||||
if (x($matches, 1)) {
|
if (!empty($matches[1])) {
|
||||||
$url = $matches[1];
|
$url = $matches[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -168,12 +168,12 @@ class BBCode extends BaseObject
|
||||||
|
|
||||||
$title = "";
|
$title = "";
|
||||||
preg_match("/title='(.*?)'/ism", $attributes, $matches);
|
preg_match("/title='(.*?)'/ism", $attributes, $matches);
|
||||||
if (x($matches, 1)) {
|
if (!empty($matches[1])) {
|
||||||
$title = $matches[1];
|
$title = $matches[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
preg_match('/title="(.*?)"/ism', $attributes, $matches);
|
preg_match('/title="(.*?)"/ism', $attributes, $matches);
|
||||||
if (x($matches, 1)) {
|
if (!empty($matches[1])) {
|
||||||
$title = $matches[1];
|
$title = $matches[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -186,12 +186,12 @@ class BBCode extends BaseObject
|
||||||
|
|
||||||
$image = "";
|
$image = "";
|
||||||
preg_match("/image='(.*?)'/ism", $attributes, $matches);
|
preg_match("/image='(.*?)'/ism", $attributes, $matches);
|
||||||
if (x($matches, 1)) {
|
if (!empty($matches[1])) {
|
||||||
$image = $matches[1];
|
$image = $matches[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
preg_match('/image="(.*?)"/ism', $attributes, $matches);
|
preg_match('/image="(.*?)"/ism', $attributes, $matches);
|
||||||
if (x($matches, 1)) {
|
if (!empty($matches[1])) {
|
||||||
$image = $matches[1];
|
$image = $matches[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -201,12 +201,12 @@ class BBCode extends BaseObject
|
||||||
|
|
||||||
$preview = "";
|
$preview = "";
|
||||||
preg_match("/preview='(.*?)'/ism", $attributes, $matches);
|
preg_match("/preview='(.*?)'/ism", $attributes, $matches);
|
||||||
if (x($matches, 1)) {
|
if (!empty($matches[1])) {
|
||||||
$preview = $matches[1];
|
$preview = $matches[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
preg_match('/preview="(.*?)"/ism', $attributes, $matches);
|
preg_match('/preview="(.*?)"/ism', $attributes, $matches);
|
||||||
if (x($matches, 1)) {
|
if (!empty($matches[1])) {
|
||||||
$preview = $matches[1];
|
$preview = $matches[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -234,7 +234,7 @@ class BBCode extends BaseObject
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$has_title = !empty($item['title']);
|
$has_title = !empty($item['title']);
|
||||||
$plink = (!empty($item['plink']) ? $item['plink'] : '');
|
$plink = defaults($item, 'plink', '');
|
||||||
$post = self::getAttachmentData($body);
|
$post = self::getAttachmentData($body);
|
||||||
|
|
||||||
// if nothing is found, it maybe having an image.
|
// 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
|
// 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.
|
// 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);
|
$sub = Event::getHTML($ev, $simple_html);
|
||||||
|
|
||||||
$text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism", '', $text);
|
$text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism", '', $text);
|
||||||
|
|
|
||||||
|
|
@ -908,7 +908,7 @@ class HTML
|
||||||
public static function micropro($contact, $redirect = false, $class = '', $textmode = false)
|
public static function micropro($contact, $redirect = false, $class = '', $textmode = false)
|
||||||
{
|
{
|
||||||
// Use the contact URL if no address is available
|
// Use the contact URL if no address is available
|
||||||
if (!x($contact, "addr")) {
|
if (empty($contact['addr'])) {
|
||||||
$contact["addr"] = $contact["url"];
|
$contact["addr"] = $contact["url"];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -924,7 +924,7 @@ class HTML
|
||||||
}
|
}
|
||||||
|
|
||||||
// If there is some js available we don't need the url
|
// If there is some js available we don't need the url
|
||||||
if (x($contact, 'click')) {
|
if (!empty($contact['click'])) {
|
||||||
$url = '';
|
$url = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -106,7 +106,7 @@ class Authentication extends BaseObject
|
||||||
|
|
||||||
$masterUid = $user_record['uid'];
|
$masterUid = $user_record['uid'];
|
||||||
|
|
||||||
if ((x($_SESSION, 'submanage')) && intval($_SESSION['submanage'])) {
|
if (!empty($_SESSION['submanage'])) {
|
||||||
$user = DBA::selectFirst('user', ['uid'], ['uid' => $_SESSION['submanage']]);
|
$user = DBA::selectFirst('user', ['uid'], ['uid' => $_SESSION['submanage']]);
|
||||||
if (DBA::isResult($user)) {
|
if (DBA::isResult($user)) {
|
||||||
$masterUid = $user['uid'];
|
$masterUid = $user['uid'];
|
||||||
|
|
|
||||||
|
|
@ -119,11 +119,11 @@ HELP;
|
||||||
$db_data = $this->getOption(['d', 'dbdata'], ($save_db) ? getenv('MYSQL_DATABASE') : '');
|
$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_user = $this->getOption(['U', 'dbuser'], ($save_db) ? getenv('MYSQL_USER') . getenv('MYSQL_USERNAME') : '');
|
||||||
$db_pass = $this->getOption(['P', 'dbpass'], ($save_db) ? getenv('MYSQL_PASSWORD') : '');
|
$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);
|
$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);
|
$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') : '');
|
$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') : '');
|
$tz = $this->getOption(['T', 'tz'], !empty('FRIENDICA_TZ') ? getenv('FRIENDICA_TZ') : '');
|
||||||
$lang = $this->getOption(['L', 'lang'], (!empty('FRIENDICA_LANG')) ? getenv('FRIENDICA_LANG') : '');
|
$lang = $this->getOption(['L', 'lang'], !empty('FRIENDICA_LANG') ? getenv('FRIENDICA_LANG') : '');
|
||||||
|
|
||||||
if (empty($php_path)) {
|
if (empty($php_path)) {
|
||||||
$php_path = $installer->getPHPPath();
|
$php_path = $installer->getPHPPath();
|
||||||
|
|
@ -132,7 +132,7 @@ HELP;
|
||||||
$installer->createConfig(
|
$installer->createConfig(
|
||||||
$php_path,
|
$php_path,
|
||||||
$url_path,
|
$url_path,
|
||||||
((!empty($db_port)) ? $db_host . ':' . $db_port : $db_host),
|
(!empty($db_port) ? $db_host . ':' . $db_port : $db_host),
|
||||||
$db_user,
|
$db_user,
|
||||||
$db_pass,
|
$db_pass,
|
||||||
$db_data,
|
$db_data,
|
||||||
|
|
|
||||||
|
|
@ -643,7 +643,7 @@ class NotificationsManager extends BaseObject
|
||||||
'madeby_zrl' => Contact::magicLink($it['url']),
|
'madeby_zrl' => Contact::magicLink($it['url']),
|
||||||
'madeby_addr' => $it['addr'],
|
'madeby_addr' => $it['addr'],
|
||||||
'contact_id' => $it['contact-id'],
|
'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'],
|
'name' => $it['fname'],
|
||||||
'url' => $it['furl'],
|
'url' => $it['furl'],
|
||||||
'zrl' => Contact::magicLink($it['furl']),
|
'zrl' => Contact::magicLink($it['furl']),
|
||||||
|
|
@ -675,7 +675,7 @@ class NotificationsManager extends BaseObject
|
||||||
'uid' => $_SESSION['uid'],
|
'uid' => $_SESSION['uid'],
|
||||||
'intro_id' => $it['intro_id'],
|
'intro_id' => $it['intro_id'],
|
||||||
'contact_id' => $it['contact-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'],
|
'name' => $it['name'],
|
||||||
'location' => BBCode::convert($it['glocation'], false),
|
'location' => BBCode::convert($it['glocation'], false),
|
||||||
'about' => BBCode::convert($it['gabout'], false),
|
'about' => BBCode::convert($it['gabout'], false),
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ class DatabaseSessionHandler extends BaseObject implements SessionHandlerInterfa
|
||||||
|
|
||||||
public function read($session_id)
|
public function read($session_id)
|
||||||
{
|
{
|
||||||
if (!x($session_id)) {
|
if (empty($session_id)) {
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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?"));
|
notice(L10n::t("Error! No version data in file! This is not a Friendica account file?"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -538,7 +538,7 @@ class DBStructure
|
||||||
$primary_keys = [];
|
$primary_keys = [];
|
||||||
foreach ($structure["fields"] AS $fieldname => $field) {
|
foreach ($structure["fields"] AS $fieldname => $field) {
|
||||||
$sql_rows[] = "`".DBA::escape($fieldname)."` ".self::FieldCommand($field);
|
$sql_rows[] = "`".DBA::escape($fieldname)."` ".self::FieldCommand($field);
|
||||||
if (x($field,'primary') && $field['primary']!='') {
|
if (!empty($field['primary'])) {
|
||||||
$primary_keys[] = $fieldname;
|
$primary_keys[] = $fieldname;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1061,7 +1061,7 @@ class Contact extends BaseObject
|
||||||
$update_contact = ($contact['avatar-date'] < DateTimeFormat::utc('now -7 days'));
|
$update_contact = ($contact['avatar-date'] < DateTimeFormat::utc('now -7 days'));
|
||||||
|
|
||||||
// We force the update if the avatar is empty
|
// We force the update if the avatar is empty
|
||||||
if (!x($contact, 'avatar')) {
|
if (empty($contact['avatar'])) {
|
||||||
$update_contact = true;
|
$update_contact = true;
|
||||||
}
|
}
|
||||||
if (!$update_contact || $no_update) {
|
if (!$update_contact || $no_update) {
|
||||||
|
|
@ -1618,7 +1618,7 @@ class Contact extends BaseObject
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($arr['contact'], 'name')) {
|
if (!empty($arr['contact']['name'])) {
|
||||||
$ret = $arr['contact'];
|
$ret = $arr['contact'];
|
||||||
} else {
|
} else {
|
||||||
$ret = Probe::uri($url, $network, $uid, false);
|
$ret = Probe::uri($url, $network, $uid, false);
|
||||||
|
|
@ -1664,16 +1664,15 @@ class Contact extends BaseObject
|
||||||
}
|
}
|
||||||
|
|
||||||
// do we have enough information?
|
// do we have enough information?
|
||||||
|
if (empty($ret['name']) || empty($ret['poll']) || (empty($ret['url']) && empty($ret['addr']))) {
|
||||||
if (!((x($ret, 'name')) && (x($ret, 'poll')) && ((x($ret, 'url')) || (x($ret, 'addr'))))) {
|
|
||||||
$result['message'] .= L10n::t('The profile address specified does not provide adequate information.') . EOL;
|
$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;
|
$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;
|
$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;
|
$result['message'] .= L10n::t('No browser URL could be matched to this address.') . EOL;
|
||||||
}
|
}
|
||||||
if (strpos($url, '@') !== false) {
|
if (strpos($url, '@') !== false) {
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ class Group extends BaseObject
|
||||||
public static function create($uid, $name)
|
public static function create($uid, $name)
|
||||||
{
|
{
|
||||||
$return = false;
|
$return = false;
|
||||||
if (x($uid) && x($name)) {
|
if (!empty($uid) && !empty($name)) {
|
||||||
$gid = self::getIdByName($uid, $name); // check for dupes
|
$gid = self::getIdByName($uid, $name); // check for dupes
|
||||||
if ($gid !== false) {
|
if ($gid !== false) {
|
||||||
// This could be a problem.
|
// This could be a problem.
|
||||||
|
|
@ -202,7 +202,7 @@ class Group extends BaseObject
|
||||||
*/
|
*/
|
||||||
public static function removeByName($uid, $name) {
|
public static function removeByName($uid, $name) {
|
||||||
$return = false;
|
$return = false;
|
||||||
if (x($uid) && x($name)) {
|
if (!empty($uid) && !empty($name)) {
|
||||||
$gid = self::getIdByName($uid, $name);
|
$gid = self::getIdByName($uid, $name);
|
||||||
|
|
||||||
$return = self::remove($gid);
|
$return = self::remove($gid);
|
||||||
|
|
|
||||||
|
|
@ -1359,15 +1359,15 @@ class Item extends BaseObject
|
||||||
$item['owner-name'] = trim(defaults($item, 'owner-name', ''));
|
$item['owner-name'] = trim(defaults($item, 'owner-name', ''));
|
||||||
$item['owner-link'] = trim(defaults($item, 'owner-link', ''));
|
$item['owner-link'] = trim(defaults($item, 'owner-link', ''));
|
||||||
$item['owner-avatar'] = trim(defaults($item, 'owner-avatar', ''));
|
$item['owner-avatar'] = trim(defaults($item, 'owner-avatar', ''));
|
||||||
$item['received'] = ((x($item, 'received') !== false) ? DateTimeFormat::utc($item['received']) : DateTimeFormat::utcNow());
|
$item['received'] = (isset($item['received']) ? DateTimeFormat::utc($item['received']) : DateTimeFormat::utcNow());
|
||||||
$item['created'] = ((x($item, 'created') !== false) ? DateTimeFormat::utc($item['created']) : $item['received']);
|
$item['created'] = (isset($item['created']) ? DateTimeFormat::utc($item['created']) : $item['received']);
|
||||||
$item['edited'] = ((x($item, 'edited') !== false) ? DateTimeFormat::utc($item['edited']) : $item['created']);
|
$item['edited'] = (isset($item['edited']) ? DateTimeFormat::utc($item['edited']) : $item['created']);
|
||||||
$item['changed'] = ((x($item, 'changed') !== false) ? DateTimeFormat::utc($item['changed']) : $item['created']);
|
$item['changed'] = (isset($item['changed']) ? DateTimeFormat::utc($item['changed']) : $item['created']);
|
||||||
$item['commented'] = ((x($item, 'commented') !== false) ? DateTimeFormat::utc($item['commented']) : $item['created']);
|
$item['commented'] = (isset($item['commented']) ? DateTimeFormat::utc($item['commented']) : $item['created']);
|
||||||
$item['title'] = trim(defaults($item, 'title', ''));
|
$item['title'] = trim(defaults($item, 'title', ''));
|
||||||
$item['location'] = trim(defaults($item, 'location', ''));
|
$item['location'] = trim(defaults($item, 'location', ''));
|
||||||
$item['coord'] = trim(defaults($item, 'coord', ''));
|
$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['deleted'] = 0;
|
||||||
$item['parent-uri'] = trim(defaults($item, 'parent-uri', $item['uri']));
|
$item['parent-uri'] = trim(defaults($item, 'parent-uri', $item['uri']));
|
||||||
$item['post-type'] = defaults($item, 'post-type', self::PT_ARTICLE);
|
$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.
|
// It is mainly used in the "post_local" hook.
|
||||||
unset($item['api_source']);
|
unset($item['api_source']);
|
||||||
|
|
||||||
if (x($item, 'cancel')) {
|
if (!empty($item['cancel'])) {
|
||||||
Logger::log('post cancelled by addon.');
|
Logger::log('post cancelled by addon.');
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
@ -3443,7 +3443,7 @@ class Item extends BaseObject
|
||||||
$filesubtype = 'unkn';
|
$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');
|
$title .= ' ' . $mtch[2] . ' ' . L10n::t('bytes');
|
||||||
|
|
||||||
$icon = '<div class="attachtype icon s22 type-' . $filetype . ' subtype-' . $filesubtype . '"></div>';
|
$icon = '<div class="attachtype icon s22 type-' . $filetype . ' subtype-' . $filesubtype . '"></div>';
|
||||||
|
|
@ -3455,7 +3455,7 @@ class Item extends BaseObject
|
||||||
}
|
}
|
||||||
|
|
||||||
// Map.
|
// Map.
|
||||||
if (strpos($s, '<div class="map">') !== false && x($item, 'coord')) {
|
if (strpos($s, '<div class="map">') !== false && !empty($item['coord'])) {
|
||||||
$x = Map::byCoordinates(trim($item['coord']));
|
$x = Map::byCoordinates(trim($item['coord']));
|
||||||
if ($x) {
|
if ($x) {
|
||||||
$s = preg_replace('/\<div class\=\"map\"\>/', '$0' . $x, $s);
|
$s = preg_replace('/\<div class\=\"map\"\>/', '$0' . $x, $s);
|
||||||
|
|
|
||||||
|
|
@ -97,7 +97,7 @@ class Photo
|
||||||
$photo = DBA::selectFirst(
|
$photo = DBA::selectFirst(
|
||||||
'photo', ['resource-id'], ['uid' => $uid, 'contact-id' => $cid, 'scale' => 4, 'album' => 'Contact Photos']
|
'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'];
|
$hash = $photo['resource-id'];
|
||||||
} else {
|
} else {
|
||||||
$hash = self::newResource();
|
$hash = self::newResource();
|
||||||
|
|
|
||||||
|
|
@ -288,7 +288,7 @@ class Profile
|
||||||
$location = false;
|
$location = false;
|
||||||
|
|
||||||
// This function can also use contact information in $profile
|
// 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)) {
|
if (!is_array($profile) && !count($profile)) {
|
||||||
return $o;
|
return $o;
|
||||||
|
|
@ -357,7 +357,7 @@ class Profile
|
||||||
|
|
||||||
// See issue https://github.com/friendica/friendica/issues/3838
|
// 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
|
// 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');
|
$wallmessage = L10n::t('Message');
|
||||||
|
|
||||||
if (remote_user()) {
|
if (remote_user()) {
|
||||||
|
|
@ -424,23 +424,23 @@ class Profile
|
||||||
// Fetch the account type
|
// Fetch the account type
|
||||||
$account_type = Contact::getAccountType($profile);
|
$account_type = Contact::getAccountType($profile);
|
||||||
|
|
||||||
if (x($profile, 'address')
|
if (!empty($profile['address'])
|
||||||
|| x($profile, 'location')
|
|| !empty($profile['location'])
|
||||||
|| x($profile, 'locality')
|
|| !empty($profile['locality'])
|
||||||
|| x($profile, 'region')
|
|| !empty($profile['region'])
|
||||||
|| x($profile, 'postal-code')
|
|| !empty($profile['postal-code'])
|
||||||
|| x($profile, 'country-name')
|
|| !empty($profile['country-name'])
|
||||||
) {
|
) {
|
||||||
$location = L10n::t('Location:');
|
$location = L10n::t('Location:');
|
||||||
}
|
}
|
||||||
|
|
||||||
$gender = x($profile, 'gender') ? L10n::t('Gender:') : false;
|
$gender = !empty($profile['gender']) ? L10n::t('Gender:') : false;
|
||||||
$marital = x($profile, 'marital') ? L10n::t('Status:') : false;
|
$marital = !empty($profile['marital']) ? L10n::t('Status:') : false;
|
||||||
$homepage = x($profile, 'homepage') ? L10n::t('Homepage:') : false;
|
$homepage = !empty($profile['homepage']) ? L10n::t('Homepage:') : false;
|
||||||
$about = x($profile, 'about') ? L10n::t('About:') : false;
|
$about = !empty($profile['about']) ? L10n::t('About:') : false;
|
||||||
$xmpp = x($profile, 'xmpp') ? L10n::t('XMPP:') : 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;
|
$location = $gender = $marital = $homepage = $about = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -448,7 +448,7 @@ class Profile
|
||||||
$firstname = $split_name['first'];
|
$firstname = $split_name['first'];
|
||||||
$lastname = $split_name['last'];
|
$lastname = $split_name['last'];
|
||||||
|
|
||||||
if (x($profile, 'guid')) {
|
if (!empty($profile['guid'])) {
|
||||||
$diaspora = [
|
$diaspora = [
|
||||||
'guid' => $profile['guid'],
|
'guid' => $profile['guid'],
|
||||||
'podloc' => System::baseUrl(),
|
'podloc' => System::baseUrl(),
|
||||||
|
|
@ -890,7 +890,7 @@ class Profile
|
||||||
}
|
}
|
||||||
|
|
||||||
$tab = false;
|
$tab = false;
|
||||||
if (x($_GET, 'tab')) {
|
if (!empty($_GET['tab'])) {
|
||||||
$tab = Strings::escapeTags(trim($_GET['tab']));
|
$tab = Strings::escapeTags(trim($_GET['tab']));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1001,7 +1001,7 @@ class Profile
|
||||||
*/
|
*/
|
||||||
public static function getMyURL()
|
public static function getMyURL()
|
||||||
{
|
{
|
||||||
if (x($_SESSION, 'my_url')) {
|
if (!empty($_SESSION['my_url'])) {
|
||||||
return $_SESSION['my_url'];
|
return $_SESSION['my_url'];
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
|
|
@ -1173,7 +1173,7 @@ class Profile
|
||||||
*/
|
*/
|
||||||
public static function getThemeUid()
|
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))) {
|
if ((local_user()) && ((PConfig::get(local_user(), 'system', 'always_my_theme')) || (!$uid))) {
|
||||||
return local_user();
|
return local_user();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -412,12 +412,12 @@ class User
|
||||||
$password = !empty($data['password']) ? trim($data['password']) : '';
|
$password = !empty($data['password']) ? trim($data['password']) : '';
|
||||||
$password1 = !empty($data['password1']) ? trim($data['password1']) : '';
|
$password1 = !empty($data['password1']) ? trim($data['password1']) : '';
|
||||||
$confirm = !empty($data['confirm']) ? trim($data['confirm']) : '';
|
$confirm = !empty($data['confirm']) ? trim($data['confirm']) : '';
|
||||||
$blocked = !empty($data['blocked']) ? intval($data['blocked']) : 0;
|
$blocked = !empty($data['blocked']);
|
||||||
$verified = !empty($data['verified']) ? intval($data['verified']) : 0;
|
$verified = !empty($data['verified']);
|
||||||
$language = !empty($data['language']) ? Strings::escapeTags(trim($data['language'])) : 'en';
|
$language = !empty($data['language']) ? Strings::escapeTags(trim($data['language'])) : 'en';
|
||||||
|
|
||||||
$publish = !empty($data['profile_publish_reg']) && intval($data['profile_publish_reg']) ? 1 : 0;
|
$publish = !empty($data['profile_publish_reg']);
|
||||||
$netpublish = strlen(Config::get('system', 'directory')) ? $publish : 0;
|
$netpublish = $publish && Config::get('system', 'directory');
|
||||||
|
|
||||||
if ($password1 != $confirm) {
|
if ($password1 != $confirm) {
|
||||||
throw new Exception(L10n::t('Passwords do not match. Password unchanged.'));
|
throw new Exception(L10n::t('Passwords do not match. Password unchanged.'));
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@ class Contact extends BaseModule
|
||||||
$nets = '';
|
$nets = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!x($a->page, 'aside')) {
|
if (empty($a->page['aside'])) {
|
||||||
$a->page['aside'] = '';
|
$a->page['aside'] = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,8 +28,8 @@ class Feed extends BaseModule
|
||||||
{
|
{
|
||||||
$a = self::getApp();
|
$a = self::getApp();
|
||||||
|
|
||||||
$last_update = x($_GET, 'last_update') ? $_GET['last_update'] : '';
|
$last_update = defaults($_GET, 'last_update', '');
|
||||||
$nocache = x($_GET, 'nocache') && local_user();
|
$nocache = !empty($_GET['nocache']) && local_user();
|
||||||
|
|
||||||
if ($a->argc < 2) {
|
if ($a->argc < 2) {
|
||||||
System::httpExit(400);
|
System::httpExit(400);
|
||||||
|
|
|
||||||
|
|
@ -34,11 +34,11 @@ class Login extends BaseModule
|
||||||
{
|
{
|
||||||
$a = self::getApp();
|
$a = self::getApp();
|
||||||
|
|
||||||
if (x($_SESSION, 'theme')) {
|
if (!empty($_SESSION['theme'])) {
|
||||||
unset($_SESSION['theme']);
|
unset($_SESSION['theme']);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_SESSION, 'mobile-theme')) {
|
if (!empty($_SESSION['mobile-theme'])) {
|
||||||
unset($_SESSION['mobile-theme']);
|
unset($_SESSION['mobile-theme']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -68,7 +68,7 @@ class Login extends BaseModule
|
||||||
self::openIdAuthentication($openid_url, !empty($_POST['remember']));
|
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(
|
self::passwordAuthentication(
|
||||||
trim($_POST['username']),
|
trim($_POST['username']),
|
||||||
trim($_POST['password']),
|
trim($_POST['password']),
|
||||||
|
|
@ -163,7 +163,7 @@ class Login extends BaseModule
|
||||||
$_SESSION['last_login_date'] = DateTimeFormat::utcNow();
|
$_SESSION['last_login_date'] = DateTimeFormat::utcNow();
|
||||||
Authentication::setAuthenticatedSessionForUser($record, true, true);
|
Authentication::setAuthenticatedSessionForUser($record, true, true);
|
||||||
|
|
||||||
if (x($_SESSION, 'return_path')) {
|
if (!empty($_SESSION['return_path'])) {
|
||||||
$return_path = $_SESSION['return_path'];
|
$return_path = $_SESSION['return_path'];
|
||||||
unset($_SESSION['return_path']);
|
unset($_SESSION['return_path']);
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -221,15 +221,15 @@ class Login extends BaseModule
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($_SESSION) && x($_SESSION, 'authenticated')) {
|
if (!empty($_SESSION['authenticated'])) {
|
||||||
if (x($_SESSION, 'visitor_id') && !x($_SESSION, 'uid')) {
|
if (!empty($_SESSION['visitor_id']) && empty($_SESSION['uid'])) {
|
||||||
$contact = DBA::selectFirst('contact', [], ['id' => $_SESSION['visitor_id']]);
|
$contact = DBA::selectFirst('contact', [], ['id' => $_SESSION['visitor_id']]);
|
||||||
if (DBA::isResult($contact)) {
|
if (DBA::isResult($contact)) {
|
||||||
self::getApp()->contact = $contact;
|
self::getApp()->contact = $contact;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_SESSION, 'uid')) {
|
if (!empty($_SESSION['uid'])) {
|
||||||
// already logged in user returning
|
// already logged in user returning
|
||||||
$check = Config::get('system', 'paranoia');
|
$check = Config::get('system', 'paranoia');
|
||||||
// extra paranoia - if the IP changed, log them out
|
// extra paranoia - if the IP changed, log them out
|
||||||
|
|
|
||||||
|
|
@ -28,10 +28,10 @@ class Magic extends BaseModule
|
||||||
|
|
||||||
Logger::log('args: ' . print_r($_REQUEST, true), Logger::DATA);
|
Logger::log('args: ' . print_r($_REQUEST, true), Logger::DATA);
|
||||||
|
|
||||||
$addr = ((x($_REQUEST, 'addr')) ? $_REQUEST['addr'] : '');
|
$addr = defaults($_REQUEST, 'addr', '');
|
||||||
$dest = ((x($_REQUEST, 'dest')) ? $_REQUEST['dest'] : '');
|
$dest = defaults($_REQUEST, 'dest', '');
|
||||||
$test = ((x($_REQUEST, 'test')) ? intval($_REQUEST['test']) : 0);
|
$test = (!empty($_REQUEST['test']) ? intval($_REQUEST['test']) : 0);
|
||||||
$owa = ((x($_REQUEST, 'owa')) ? intval($_REQUEST['owa']) : 0);
|
$owa = (!empty($_REQUEST['owa']) ? intval($_REQUEST['owa']) : 0);
|
||||||
|
|
||||||
// NOTE: I guess $dest isn't just the profile url (could be also
|
// 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
|
// other profile pages e.g. photo). We need to find a solution
|
||||||
|
|
|
||||||
|
|
@ -347,7 +347,7 @@ class Probe
|
||||||
$data['url'] = $uri;
|
$data['url'] = $uri;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($data, 'photo')) {
|
if (!empty($data['photo'])) {
|
||||||
$data['baseurl'] = Network::getUrlMatch(Strings::normaliseLink(defaults($data, 'baseurl', '')), Strings::normaliseLink($data['photo']));
|
$data['baseurl'] = Network::getUrlMatch(Strings::normaliseLink(defaults($data, 'baseurl', '')), Strings::normaliseLink($data['photo']));
|
||||||
} else {
|
} else {
|
||||||
$data['photo'] = System::baseUrl() . '/images/person-300.jpg';
|
$data['photo'] = System::baseUrl() . '/images/person-300.jpg';
|
||||||
|
|
@ -358,7 +358,7 @@ class Probe
|
||||||
$data['name'] = $data['nick'];
|
$data['name'] = $data['nick'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!x($data, 'name')) {
|
if (empty($data['name'])) {
|
||||||
$data['name'] = $data['url'];
|
$data['name'] = $data['url'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,7 @@ class Post extends BaseObject
|
||||||
$this->setTemplate('wall');
|
$this->setTemplate('wall');
|
||||||
$this->toplevel = $this->getId() == $this->getDataValue('parent');
|
$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) {
|
foreach ($_SESSION['remote'] as $visitor) {
|
||||||
if ($visitor['cid'] == $this->getDataValue('contact-id')) {
|
if ($visitor['cid'] == $this->getDataValue('contact-id')) {
|
||||||
$this->visiting = true;
|
$this->visiting = true;
|
||||||
|
|
@ -253,7 +253,7 @@ class Post extends BaseObject
|
||||||
$responses = get_responses($conv_responses, $response_verbs, $this, $item);
|
$responses = get_responses($conv_responses, $response_verbs, $this, $item);
|
||||||
|
|
||||||
foreach ($response_verbs as $value => $verbs) {
|
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)
|
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);
|
Logger::log('[ERROR] Item::setTemplate : Template not available ("' . $name . '").', Logger::DEBUG);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2637,7 +2637,7 @@ class DFRN
|
||||||
if (($item["object-type"] == ACTIVITY_OBJ_EVENT) && !$owner_unknown) {
|
if (($item["object-type"] == ACTIVITY_OBJ_EVENT) && !$owner_unknown) {
|
||||||
Logger::log("Item ".$item["uri"]." seems to contain an event.", Logger::DEBUG);
|
Logger::log("Item ".$item["uri"]." seems to contain an event.", Logger::DEBUG);
|
||||||
$ev = Event::fromBBCode($item["body"]);
|
$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);
|
Logger::log("Event in item ".$item["uri"]." was found.", Logger::DEBUG);
|
||||||
$ev["cid"] = $importer["id"];
|
$ev["cid"] = $importer["id"];
|
||||||
$ev["uid"] = $importer["importer_uid"];
|
$ev["uid"] = $importer["importer_uid"];
|
||||||
|
|
@ -2925,7 +2925,7 @@ class DFRN
|
||||||
public static function autoRedir(App $a, $contact_nick)
|
public static function autoRedir(App $a, $contact_nick)
|
||||||
{
|
{
|
||||||
// prevent looping
|
// prevent looping
|
||||||
if (x($_REQUEST, 'redir') && intval($_REQUEST['redir'])) {
|
if (!empty($_REQUEST['redir'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -3077,10 +3077,10 @@ class DFRN
|
||||||
*/
|
*/
|
||||||
private static function isEditedTimestampNewer($existing, $update)
|
private static function isEditedTimestampNewer($existing, $update)
|
||||||
{
|
{
|
||||||
if (!x($existing, 'edited') || !$existing['edited']) {
|
if (empty($existing['edited'])) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (!x($update, 'edited') || !$update['edited']) {
|
if (empty($update['edited'])) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ class FriendicaSmarty extends Smarty
|
||||||
// setTemplateDir can be set to an array, which Smarty will parse in order.
|
// setTemplateDir can be set to an array, which Smarty will parse in order.
|
||||||
// The order is thus very important here
|
// The order is thus very important here
|
||||||
$template_dirs = ['theme' => "view/theme/$theme/" . self::SMARTY3_TEMPLATE_FOLDER . "/"];
|
$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 . "/"];
|
$template_dirs = $template_dirs + ['extends' => "view/theme/" . $a->theme_info["extends"] . "/" . self::SMARTY3_TEMPLATE_FOLDER . "/"];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,7 @@ class FriendicaSmartyEngine implements ITemplateEngine
|
||||||
|
|
||||||
if (file_exists("{$root}view/theme/$theme/$filename")) {
|
if (file_exists("{$root}view/theme/$theme/$filename")) {
|
||||||
$template_file = "{$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);
|
$template_file = sprintf('%sview/theme/%s}/%s', $root, $a->theme_info['extends'], $filename);
|
||||||
} elseif (file_exists("{$root}/$filename")) {
|
} elseif (file_exists("{$root}/$filename")) {
|
||||||
$template_file = "{$root}/$filename";
|
$template_file = "{$root}/$filename";
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ class Emailer
|
||||||
Addon::callHooks('emailer_send_prepare', $params);
|
Addon::callHooks('emailer_send_prepare', $params);
|
||||||
|
|
||||||
$email_textonly = false;
|
$email_textonly = false;
|
||||||
if (x($params, "uid")) {
|
if (!empty($params['uid'])) {
|
||||||
$email_textonly = PConfig::get($params['uid'], "system", "email_textonly");
|
$email_textonly = PConfig::get($params['uid'], "system", "email_textonly");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -121,7 +121,7 @@ class Network
|
||||||
|
|
||||||
@curl_setopt($ch, CURLOPT_HEADER, true);
|
@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_COOKIEJAR, $opts["cookiejar"]);
|
||||||
curl_setopt($ch, CURLOPT_COOKIEFILE, $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_FOLLOWLOCATION, true);
|
||||||
// @curl_setopt($ch, CURLOPT_MAXREDIRS, 5);
|
// @curl_setopt($ch, CURLOPT_MAXREDIRS, 5);
|
||||||
|
|
||||||
if (x($opts, 'accept_content')) {
|
if (!empty($opts['accept_content'])) {
|
||||||
curl_setopt(
|
curl_setopt(
|
||||||
$ch,
|
$ch,
|
||||||
CURLOPT_HTTPHEADER,
|
CURLOPT_HTTPHEADER,
|
||||||
|
|
@ -156,15 +156,15 @@ class Network
|
||||||
/// @todo We could possibly set this value to "gzip" or something similar
|
/// @todo We could possibly set this value to "gzip" or something similar
|
||||||
curl_setopt($ch, CURLOPT_ENCODING, '');
|
curl_setopt($ch, CURLOPT_ENCODING, '');
|
||||||
|
|
||||||
if (x($opts, 'headers')) {
|
if (!empty($opts['headers'])) {
|
||||||
@curl_setopt($ch, CURLOPT_HTTPHEADER, $opts['headers']);
|
@curl_setopt($ch, CURLOPT_HTTPHEADER, $opts['headers']);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($opts, 'nobody')) {
|
if (!empty($opts['nobody'])) {
|
||||||
@curl_setopt($ch, CURLOPT_NOBODY, $opts['nobody']);
|
@curl_setopt($ch, CURLOPT_NOBODY, $opts['nobody']);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($opts, 'timeout')) {
|
if (!empty($opts['timeout'])) {
|
||||||
@curl_setopt($ch, CURLOPT_TIMEOUT, $opts['timeout']);
|
@curl_setopt($ch, CURLOPT_TIMEOUT, $opts['timeout']);
|
||||||
} else {
|
} else {
|
||||||
$curl_time = Config::get('system', 'curl_timeout', 60);
|
$curl_time = Config::get('system', 'curl_timeout', 60);
|
||||||
|
|
@ -489,7 +489,7 @@ class Network
|
||||||
}
|
}
|
||||||
|
|
||||||
$str_allowed = Config::get('system', 'allowed_email', '');
|
$str_allowed = Config::get('system', 'allowed_email', '');
|
||||||
if (!x($str_allowed)) {
|
if (empty($str_allowed)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -481,7 +481,7 @@ class Temporal
|
||||||
$o .= "<td $today>";
|
$o .= "<td $today>";
|
||||||
$day = str_replace(' ', ' ', sprintf('%2.2d', $d));
|
$day = str_replace(' ', ' ', sprintf('%2.2d', $d));
|
||||||
if ($started) {
|
if ($started) {
|
||||||
if (x($links, $d) !== false) {
|
if (isset($links[$d])) {
|
||||||
$o .= "<a href=\"{$links[$d]}\">$day</a>";
|
$o .= "<a href=\"{$links[$d]}\">$day</a>";
|
||||||
} else {
|
} else {
|
||||||
$o .= $day;
|
$o .= $day;
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ class AutomaticInstallationConsoleTest extends ConsoleTest
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->db_host = getenv('MYSQL_HOST');
|
$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_data = getenv('MYSQL_DATABASE');
|
||||||
$this->db_user = getenv('MYSQL_USERNAME') . getenv('MYSQL_USER');
|
$this->db_user = getenv('MYSQL_USERNAME') . getenv('MYSQL_USER');
|
||||||
$this->db_pass = getenv('MYSQL_PASSWORD');
|
$this->db_pass = getenv('MYSQL_PASSWORD');
|
||||||
|
|
|
||||||
|
|
@ -1,19 +1,19 @@
|
||||||
<!DOCTYPE html >
|
<!DOCTYPE html >
|
||||||
<html itemscope itemtype="http://schema.org/Blog" lang="<?php echo $lang; ?>">
|
<html itemscope itemtype="http://schema.org/Blog" lang="<?php echo $lang; ?>">
|
||||||
<head>
|
<head>
|
||||||
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
|
<title><?php if(!empty($page['title'])) echo $page['title'] ?></title>
|
||||||
<script>var baseurl="<?php echo Friendica\Core\System::baseUrl() ?>";</script>
|
<script>var baseurl="<?php echo Friendica\Core\System::baseUrl() ?>";</script>
|
||||||
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
|
<?php if(!empty($page['htmlhead'])) echo $page['htmlhead'] ?>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<?php if(x($page,'nav')) echo $page['nav']; ?>
|
<?php if(!empty($page['nav'])) echo $page['nav']; ?>
|
||||||
<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
|
<aside><?php if(!empty($page['aside'])) echo $page['aside']; ?></aside>
|
||||||
<section>
|
<section>
|
||||||
<?php if(x($page,'content')) echo $page['content']; ?>
|
<?php if(!empty($page['content'])) echo $page['content']; ?>
|
||||||
<div id="pause"></div> <!-- The pause/resume Ajax indicator -->
|
<div id="pause"></div> <!-- The pause/resume Ajax indicator -->
|
||||||
<div id="page-footer"></div>
|
<div id="page-footer"></div>
|
||||||
</section>
|
</section>
|
||||||
<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
|
<right_aside><?php if(!empty($page['right_aside'])) echo $page['right_aside']; ?></right_aside>
|
||||||
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
|
<footer><?php if(!empty($page['footer'])) echo $page['footer']; ?></footer>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
<!DOCTYPE html >
|
<!DOCTYPE html >
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
|
<title><?php if(!empty($page['title'])) echo $page['title'] ?></title>
|
||||||
<script>var baseurl="<?php echo Friendica\Core\System::baseUrl() ?>";</script>
|
<script>var baseurl="<?php echo Friendica\Core\System::baseUrl() ?>";</script>
|
||||||
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
|
<?php if(!empty($page['htmlhead'])) echo $page['htmlhead'] ?>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important;display:block!important;"><?php if(x($page,'content')) echo $page['content']; ?>
|
<section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important;display:block!important;"><?php if(!empty($page['content'])) echo $page['content']; ?>
|
||||||
<div id="page-footer"></div>
|
<div id="page-footer"></div>
|
||||||
</section>
|
</section>
|
||||||
</body>
|
</body>
|
||||||
|
|
|
||||||
|
|
@ -7,5 +7,5 @@
|
||||||
* only the pure content
|
* only the pure content
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if(x($page,'content')) echo $page['content'];
|
if(!empty($page['content'])) echo $page['content'];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ $uid = Profile::getThemeUid();
|
||||||
$s_colorset = Config::get('duepuntozero', 'colorset');
|
$s_colorset = Config::get('duepuntozero', 'colorset');
|
||||||
$colorset = PConfig::get($uid, 'duepuntozero', 'colorset');
|
$colorset = PConfig::get($uid, 'duepuntozero', 'colorset');
|
||||||
|
|
||||||
if (!x($colorset)) {
|
if (empty($colorset)) {
|
||||||
$colorset = $s_colorset;
|
$colorset = $s_colorset;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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)
|
// 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
|
/// @todo Think about to move js stuff in the footer
|
||||||
if (!$minimal && x($page, 'htmlhead')) {
|
if (!$minimal && !empty($page['htmlhead'])) {
|
||||||
echo $page['htmlhead'];
|
echo $page['htmlhead'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -67,7 +67,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
|
||||||
<body id="top" class="mod-<?php echo $a->module . " " . $is_singleuser_class . " " . $view_mode_class;?>">
|
<body id="top" class="mod-<?php echo $a->module . " " . $is_singleuser_class . " " . $view_mode_class;?>">
|
||||||
<a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
|
<a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
|
||||||
<?php
|
<?php
|
||||||
if (x($page, 'nav') && !$minimal) {
|
if (!empty($page['nav']) && !$minimal) {
|
||||||
echo str_replace(
|
echo str_replace(
|
||||||
"~config.sitename~",
|
"~config.sitename~",
|
||||||
Config::get('config', 'sitename'),
|
Config::get('config', 'sitename'),
|
||||||
|
|
@ -83,7 +83,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
|
||||||
if ($minimal) {
|
if ($minimal) {
|
||||||
?>
|
?>
|
||||||
<section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important; display:block!important;">
|
<section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important; display:block!important;">
|
||||||
<?php if (x($page, 'content')) echo $page['content']; ?>
|
<?php if (!empty($page['content'])) echo $page['content']; ?>
|
||||||
<div id="page-footer"></div>
|
<div id="page-footer"></div>
|
||||||
</section>
|
</section>
|
||||||
<?php
|
<?php
|
||||||
|
|
@ -94,15 +94,15 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<?php
|
<?php
|
||||||
if ((!x($_REQUEST, 'pagename') || $_REQUEST['pagename'] != "lostpass") && ($_SERVER['REQUEST_URI'] != $basepath)) {
|
if ((empty($_REQUEST['pagename']) || $_REQUEST['pagename'] != "lostpass") && ($_SERVER['REQUEST_URI'] != $basepath)) {
|
||||||
echo '
|
echo '
|
||||||
<aside class="col-lg-3 col-md-3 offcanvas-sm offcanvas-xs">';
|
<aside class="col-lg-3 col-md-3 offcanvas-sm offcanvas-xs">';
|
||||||
|
|
||||||
if (x($page, 'aside')) {
|
if (!empty($page['aside'])) {
|
||||||
echo $page['aside'];
|
echo $page['aside'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($page, 'right_aside')) {
|
if (!empty($page['right_aside'])) {
|
||||||
echo $page['right_aside'];
|
echo $page['right_aside'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -113,7 +113,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
|
||||||
<section class="sectiontop ';
|
<section class="sectiontop ';
|
||||||
echo $a->argv[0];
|
echo $a->argv[0];
|
||||||
echo '-content-wrapper">';
|
echo '-content-wrapper">';
|
||||||
if (x($page, 'content')) {
|
if (!empty($page['content'])) {
|
||||||
echo $page['content'];
|
echo $page['content'];
|
||||||
}
|
}
|
||||||
echo '
|
echo '
|
||||||
|
|
@ -124,7 +124,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
|
||||||
} else {
|
} else {
|
||||||
echo '
|
echo '
|
||||||
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12" id="content" style="margin-top:50px;">';
|
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12" id="content" style="margin-top:50px;">';
|
||||||
if (x($page, 'content')) {
|
if (!empty($page['content'])) {
|
||||||
echo $page['content'];
|
echo $page['content'];
|
||||||
}
|
}
|
||||||
echo '
|
echo '
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ function load_page(App $a)
|
||||||
require 'view/theme/frio/none.php';
|
require 'view/theme/frio/none.php';
|
||||||
} else {
|
} else {
|
||||||
$template = 'view/theme/' . $a->getCurrentTheme() . '/'
|
$template = 'view/theme/' . $a->getCurrentTheme() . '/'
|
||||||
. ((x($a->page, 'template')) ? $a->page['template'] : 'default' ) . '.php';
|
. defaults($a->page, 'template', 'default' ) . '.php';
|
||||||
if (file_exists($template)) {
|
if (file_exists($template)) {
|
||||||
require_once $template;
|
require_once $template;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -7,20 +7,20 @@
|
||||||
<!DOCTYPE html >
|
<!DOCTYPE html >
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
|
<title><?php if(!empty($page['title'])) echo $page['title'] ?></title>
|
||||||
<meta name="viewport" content="initial-scale=1.0">
|
<meta name="viewport" content="initial-scale=1.0">
|
||||||
<meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>">
|
<meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>">
|
||||||
<script type="text/javascript">var baseurl="<?php echo Friendica\Core\System::baseUrl() ?>";</script>
|
<script type="text/javascript">var baseurl="<?php echo Friendica\Core\System::baseUrl() ?>";</script>
|
||||||
<script type="text/javascript">var frio="<?php echo "view/theme/frio"; ?>";</script>
|
<script type="text/javascript">var frio="<?php echo "view/theme/frio"; ?>";</script>
|
||||||
<?php $baseurl = Friendica\Core\System::baseUrl(); ?>
|
<?php $baseurl = Friendica\Core\System::baseUrl(); ?>
|
||||||
<?php $frio = "view/theme/frio"; ?>
|
<?php $frio = "view/theme/frio"; ?>
|
||||||
<?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
|
<?php if(!empty($page['htmlhead'])) echo $page['htmlhead']; ?>
|
||||||
</head>
|
</head>
|
||||||
<body id="top">
|
<body id="top">
|
||||||
<?php if($_SERVER['REQUEST_URI'] == "/"){header('Location: /login');} ?>
|
<?php if($_SERVER['REQUEST_URI'] == "/"){header('Location: /login');} ?>
|
||||||
<a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
|
<a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
|
||||||
<?php
|
<?php
|
||||||
if(x($page,'nav')) {
|
if(!empty($page['nav'])) {
|
||||||
echo str_replace("~config.sitename~",Friendica\Core\Config::get('config','sitename'),
|
echo str_replace("~config.sitename~",Friendica\Core\Config::get('config','sitename'),
|
||||||
str_replace("~system.banner~",Friendica\Core\Config::get('system','banner'),
|
str_replace("~system.banner~",Friendica\Core\Config::get('system','banner'),
|
||||||
$page['nav']
|
$page['nav']
|
||||||
|
|
@ -33,8 +33,8 @@
|
||||||
<?php
|
<?php
|
||||||
echo"
|
echo"
|
||||||
<aside class=\"col-lg-3 col-md-3 hidden-sm hidden-xs\">
|
<aside class=\"col-lg-3 col-md-3 hidden-sm hidden-xs\">
|
||||||
"; if(x($page,'aside')) echo $page['aside']; echo"
|
"; if(!empty($page['aside'])) echo $page['aside']; echo"
|
||||||
"; if(x($page,'right_aside')) echo $page['right_aside']; echo"
|
"; if(!empty($page['right_aside'])) echo $page['right_aside']; echo"
|
||||||
"; include('includes/photo_side.php'); echo"
|
"; include('includes/photo_side.php'); echo"
|
||||||
</aside>
|
</aside>
|
||||||
|
|
||||||
|
|
@ -42,7 +42,7 @@
|
||||||
<section class=\"sectiontop\">
|
<section class=\"sectiontop\">
|
||||||
<div class=\"panel "; echo $a->argv[0]; echo "-content-wrapper\">
|
<div class=\"panel "; echo $a->argv[0]; echo "-content-wrapper\">
|
||||||
<div class=\"panel-body\">";
|
<div class=\"panel-body\">";
|
||||||
if(x($page,'content')) echo $page['content']; echo"
|
if(!empty($page['content'])) echo $page['content']; echo"
|
||||||
<div id=\"pause\"></div> <!-- The pause/resume Ajax indicator -->
|
<div id=\"pause\"></div> <!-- The pause/resume Ajax indicator -->
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@ if ($a->module !== 'install') {
|
||||||
// Setting $scheme to '' wasn't working for some reason, so we'll check it's
|
// Setting $scheme to '' wasn't working for some reason, so we'll check it's
|
||||||
// not --- like the mobile theme does instead.
|
// not --- like the mobile theme does instead.
|
||||||
// Allow layouts to over-ride the scheme.
|
// Allow layouts to over-ride the scheme.
|
||||||
if (x($_REQUEST, 'scheme')) {
|
if (!empty($_REQUEST['scheme'])) {
|
||||||
$scheme = $_REQUEST['scheme'];
|
$scheme = $_REQUEST['scheme'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -301,7 +301,7 @@ function frio_remote_nav($a, &$nav)
|
||||||
*/
|
*/
|
||||||
function frio_acl_lookup(App $a, &$results)
|
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
|
// we introduce a new search type, r should do the same query like it's
|
||||||
// done in /src/Module/Contact.php for connections
|
// done in /src/Module/Contact.php for connections
|
||||||
|
|
|
||||||
|
|
@ -1,38 +1,38 @@
|
||||||
<!DOCTYPE html >
|
<!DOCTYPE html >
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
|
<title><?php if(!empty($page['title'])) echo $page['title'] ?></title>
|
||||||
<script>var baseurl="<?php echo Friendica\Core\System::baseUrl() ?>";</script>
|
<script>var baseurl="<?php echo Friendica\Core\System::baseUrl() ?>";</script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
function ScrollToBottom(){
|
function ScrollToBottom(){
|
||||||
window.scrollTo(0,document.body.scrollHeight);
|
window.scrollTo(0,document.body.scrollHeight);
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
|
<?php if(!empty($page['htmlhead'])) echo $page['htmlhead'] ?>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<header>
|
<header>
|
||||||
<?php if(x($page, 'header')) echo $page['header']; ?>
|
<?php if(!empty($page['header'])) echo $page['header']; ?>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<?php if(x($page,'nav')) echo $page['nav']; ?>
|
<?php if(!empty($page['nav'])) echo $page['nav']; ?>
|
||||||
|
|
||||||
<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
|
<aside><?php if(!empty($page['aside'])) echo $page['aside']; ?></aside>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<?php if(x($page,'content')) echo $page['content']; ?>
|
<?php if(!empty($page['content'])) echo $page['content']; ?>
|
||||||
<div id="pause"></div> <!-- The pause/resume Ajax indicator -->
|
<div id="pause"></div> <!-- The pause/resume Ajax indicator -->
|
||||||
<div id="page-footer"></div>
|
<div id="page-footer"></div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
|
<right_aside><?php if(!empty($page['right_aside'])) echo $page['right_aside']; ?></right_aside>
|
||||||
|
|
||||||
<footer id="footer">
|
<footer id="footer">
|
||||||
<?php if(x($page, 'footer')) echo $page['footer']; ?>
|
<?php if(!empty($page['footer'])) echo $page['footer']; ?>
|
||||||
</footer>
|
</footer>
|
||||||
|
|
||||||
<tools id="tools">
|
<tools id="tools">
|
||||||
<?php if (x($page, 'tools')) echo $page['tools']; ?>
|
<?php if (!empty($page['tools'])) echo $page['tools']; ?>
|
||||||
<div id="scrollup" >
|
<div id="scrollup" >
|
||||||
<a class="item-scrollup" href="javascript:scrollTo(0,100000)"><img src="view/theme/smoothly/images/down.png" alt="to bottom" title="to bottom" /></a>
|
<a class="item-scrollup" href="javascript:scrollTo(0,100000)"><img src="view/theme/smoothly/images/down.png" alt="to bottom" title="to bottom" /></a>
|
||||||
<a class="item-scrollup" href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/images/up.png" alt="to top" title="to top" /></a>
|
<a class="item-scrollup" href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/images/up.png" alt="to top" title="to top" /></a>
|
||||||
|
|
@ -40,6 +40,6 @@
|
||||||
</div>
|
</div>
|
||||||
</tools>
|
</tools>
|
||||||
|
|
||||||
<?php if (x($page, 'bottom')) echo $page['bottom']; ?>
|
<?php if (!empty($page['bottom'])) echo $page['bottom']; ?>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -214,10 +214,7 @@ function vier_community_info()
|
||||||
|
|
||||||
//Community_Pages at right_aside
|
//Community_Pages at right_aside
|
||||||
if ($show_pages && local_user()) {
|
if ($show_pages && local_user()) {
|
||||||
$cid = null;
|
$cid = defaults($_GET, 'cid', null);
|
||||||
if (x($_GET, 'cid') && intval($_GET['cid']) != 0) {
|
|
||||||
$cid = $_GET['cid'];
|
|
||||||
}
|
|
||||||
|
|
||||||
//sort by last updated item
|
//sort by last updated item
|
||||||
$lastitem = true;
|
$lastitem = true;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue