friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

added spaces + used x () 

Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2017-04-01 21:46:57 +02:00
parent 60552260e1
commit 3cea176ef2
No known key found for this signature in database
GPG Key ID: B72F8185C6C7BD78
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -1450,7 +1450,7 @@ function get_app() {
*/ */
function x($s,$k = NULL) { function x($s,$k = NULL) {
if ($k != NULL) { if ($k != NULL) {
if ((is_array($s)) && (array_key_exists($k,$s))) { if ((is_array($s)) && (array_key_exists($k, $s))) {
if ($s[$k]) { if ($s[$k]) {
return (int) 1; return (int) 1;
} }

7
mod/item.php
View File

@ -325,8 +325,9 @@ function item_post(App $a) {
// if using the API, we won't see pubmail_enable - figure out if it should be set // if using the API, we won't see pubmail_enable - figure out if it should be set
if ($api_source && $profile_uid && $profile_uid == local_user() && (! $private)) { if ($api_source && $profile_uid && $profile_uid == local_user() && (! $private)) {
$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1); $mail_disabled = ((function_exists('imap_open') && (! get_config('system', 'imap_disabled'))) ? 0 : 1);
if (! $mail_disabled) { if (! $mail_disabled) {
/// @TODO Check if only pubmail is loaded, * loads all columns
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
intval(local_user()) intval(local_user())
); );
@ -372,7 +373,7 @@ function item_post(App $a) {
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
intval($_SESSION['uid'])); intval($_SESSION['uid']));
} elseif(remote_user()) { } elseif(remote_user()) {
if (is_array($_SESSION['remote'])) { if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) {
foreach ($_SESSION['remote'] as $v) { foreach ($_SESSION['remote'] as $v) {
if ($v['uid'] == $profile_uid) { if ($v['uid'] == $profile_uid) {
$contact_id = $v['cid']; $contact_id = $v['cid'];
@ -544,7 +545,7 @@ function item_post(App $a) {
if ($parent AND ($parent_contact['network'] == NETWORK_OSTATUS)) { if ($parent AND ($parent_contact['network'] == NETWORK_OSTATUS)) {
$contact = '@[url=' . $parent_contact['url'] . ']' . $parent_contact['nick'] . '[/url]'; $contact = '@[url=' . $parent_contact['url'] . ']' . $parent_contact['nick'] . '[/url]';
if (!in_array($contact,$tags)) { if (!in_array($contact, $tags)) {
$body = $contact . ' ' . $body; $body = $contact . ' ' . $body;
$tags[] = $contact; $tags[] = $contact;
} }