*/
function local_user()
{
- if (x($_SESSION, 'authenticated') && x($_SESSION, 'uid')) {
+ if (!empty($_SESSION['authenticated']) && !empty($_SESSION['uid'])) {
return intval($_SESSION['uid']);
}
return false;
// if (local_user()) {
// return false;
// }
+
+ if (empty($_SESSION)) {
+ return false;
+ }
+
if (x($_SESSION, 'authenticated') && x($_SESSION, 'visitor_id')) {
return intval($_SESSION['visitor_id']);
}
$oauth1 = new FKOAuth1();
// login with oauth
try {
- list($consumer, $token) = $oauth1->verify_request(OAuthRequest::from_request());
+ $request = OAuthRequest::from_request();
+ list($consumer, $token) = $oauth1->verify_request($request);
if (!is_null($token)) {
$oauth1->loginUser($token->uid);
Addon::callHooks('logged_in', $a->user);
// add sparkle links to appropriate permalinks
$author = ['uid' => 0, 'id' => $item['author-id'],
'network' => $item['author-network'], 'url' => $item['author-link']];
- $item['plink'] = Contact::magicLinkbyContact($author, $item['plink']);
+
+ if (!empty($item['plink'])) {
+ $item['plink'] = Contact::magicLinkbyContact($author, $item['plink']);
+ }
}
/**
$profile_owner = $a->profile['uid'];
if (!$update) {
$live_update_div = '<div id="live-display"></div>' . "\r\n"
- . "<script> var profile_uid = " . $_SESSION['uid'] . ";"
+ . "<script> var profile_uid = " . defaults($_SESSION, 'uid', 0) . ";"
. " var profile_page = 1; </script>";
}
} elseif ($mode === 'community') {
$tmp_item = [
'template' => $tpl,
- 'id' => (($preview) ? 'P0' : $item['item_id']),
- 'guid' => (($preview) ? 'Q0' : $item['guid']),
+ 'id' => ($preview ? 'P0' : $item['id']),
+ 'guid' => ($preview ? 'Q0' : $item['guid']),
'network' => $item['network'],
'network_name' => ContactSelector::networkToName($item['network'], $profile_link),
'linktitle' => L10n::t('View %s\'s profile @ %s', $profile_name, $item['author-link']),
$arr = ['item' => $item, 'output' => $tmp_item];
Addon::callHooks('display_item', $arr);
- $threads[$threadsid]['id'] = $item['item_id'];
+ $threads[$threadsid]['id'] = $item['id'];
$threads[$threadsid]['network'] = $item['network'];
$threads[$threadsid]['items'] = [$arr['output']];
$siteurl = System::baseUrl(true);
$thanks = L10n::t('Thank You,');
$sitename = $a->config['sitename'];
- if (!x($a->config['admin_name'])) {
+ if (empty($a->config['admin_name'])) {
$site_admin = L10n::t('%s Administrator', $sitename);
} else {
$site_admin = L10n::t('%1$s, %2$s Administrator', $a->config['admin_name'], $sitename);
}
if ($params['type'] == NOTIFY_MAIL) {
+ $itemlink = $siteurl.'/message/'.$params['item']['id'];
+
$subject = L10n::t('[Friendica:Notify] New mail received at %s', $sitename);
$preamble = L10n::t('%1$s sent you a new private message at %2$s.', $params['source_name'], $sitename);
$sitelink = L10n::t('Please visit %s to view and/or reply to your private messages.');
$tsitelink = sprintf($sitelink, $siteurl.'/message/'.$params['item']['id']);
$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'/message/'.$params['item']['id'].'">'.$sitename.'</a>');
- $itemlink = $siteurl.'/message/'.$params['item']['id'];
}
if ($params['type'] == NOTIFY_COMMENT) {
$item = null;
if ($params['otype'] === 'item' && $parent_id) {
- $item = Item::selectFirstForUser($params['uid'], [], ['id' => $parent_id]);
+ $item = Item::selectFirstForUser($params['uid'], Item::ITEM_FIELDLIST, ['id' => $parent_id]);
}
$item_post_type = item_post_type($item);
+ $itemlink = $item['plink'];
// "a post"
$dest_str = L10n::t('%1$s commented on [url=%2$s]a %3$s[/url]',
}
if ($params['type'] == NOTIFY_TAGSHARE) {
+ $itemlink = $params['link'];
$subject = L10n::t('[Friendica:Notify] %s tagged your post', $params['source_name']);
$preamble = L10n::t('%1$s tagged your post at %2$s', $params['source_name'], $sitename);
$sitelink = L10n::t('Please visit %s to view and/or reply to the conversation.');
$tsitelink = sprintf($sitelink, $siteurl);
$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
- $itemlink = $params['link'];
}
if ($params['type'] == NOTIFY_INTRO) {
+ $itemlink = $params['link'];
$subject = L10n::t('[Friendica:Notify] Introduction received');
$preamble = L10n::t('You\'ve received an introduction from \'%1$s\' at %2$s', $params['source_name'], $sitename);
$sitelink = L10n::t('Please visit %s to approve or reject the introduction.');
$tsitelink = sprintf($sitelink, $siteurl);
$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
- $itemlink = $params['link'];
switch ($params['verb']) {
case ACTIVITY_FRIEND:
}
if ($params['type'] == NOTIFY_SUGGEST) {
+ $itemlink = $params['link'];
$subject = L10n::t('[Friendica:Notify] Friend suggestion received');
$preamble = L10n::t('You\'ve received a friend suggestion from \'%1$s\' at %2$s', $params['source_name'], $sitename);
$sitelink = L10n::t('Please visit %s to approve or reject the suggestion.');
$tsitelink = sprintf($sitelink, $siteurl);
$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
- $itemlink = $params['link'];
}
if ($params['type'] == NOTIFY_CONFIRM) {
if ($params['verb'] == ACTIVITY_FRIEND) { // mutual connection
+ $itemlink = $params['link'];
$subject = L10n::t('[Friendica:Notify] Connection accepted');
$preamble = L10n::t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename);
$sitelink = L10n::t('Please visit %s if you wish to make any changes to this relationship.');
$tsitelink = sprintf($sitelink, $siteurl);
$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
- $itemlink = $params['link'];
} else { // ACTIVITY_FOLLOW
+ $itemlink = $params['link'];
$subject = L10n::t('[Friendica:Notify] Connection accepted');
$preamble = L10n::t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename);
$sitelink = L10n::t('Please visit %s if you wish to make any changes to this relationship.');
$tsitelink = sprintf($sitelink, $siteurl);
$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
- $itemlink = $params['link'];
}
}
if ($params['type'] == NOTIFY_SYSTEM) {
switch($params['event']) {
case "SYSTEM_REGISTER_REQUEST":
+ $itemlink = $params['link'];
$subject = L10n::t('[Friendica System Notify]') . ' ' . L10n::t('registration request');
$preamble = L10n::t('You\'ve received a registration request from \'%1$s\' at %2$s', $params['source_name'], $sitename);
$sitelink = L10n::t('Please visit %s to approve or reject the request.');
$tsitelink = sprintf($sitelink, $params['link']);
$hsitelink = sprintf($sitelink, '<a href="'.$params['link'].'">'.$sitename.'</a><br><br>');
- $itemlink = $params['link'];
break;
case "SYSTEM_DB_UPDATE_FAIL":
break;
$datarray['sitename'] = $sitename;
$datarray['siteurl'] = $siteurl;
$datarray['type'] = $params['type'];
- $datarray['parent'] = $params['parent'];
+ $datarray['parent'] = $parent_id;
$datarray['source_name'] = $params['source_name'];
$datarray['source_link'] = $params['source_link'];
$datarray['source_photo'] = $params['source_photo'];
'$source_name' => $datarray['source_name'],
'$source_link' => $datarray['source_link'],
'$source_photo' => $datarray['source_photo'],
- '$username' => $datarray['to_name'],
+ '$username' => $datarray['username'],
'$hsitelink' => $datarray['hsitelink'],
'$hitemlink' => $datarray['hitemlink'],
'$thanks' => $datarray['thanks'],
'$source_name' => $datarray['source_name'],
'$source_link' => $datarray['source_link'],
'$source_photo' => $datarray['source_photo'],
- '$username' => $datarray['to_name'],
+ '$username' => $datarray['username'],
'$tsitelink' => $datarray['tsitelink'],
'$titemlink' => $datarray['titemlink'],
'$thanks' => $datarray['thanks'],
$data["type"] = "link";
}
+ $data["title"] = defaults($data, "title", "");
+
if ((($data["type"] != "link") && ($data["type"] != "video") && ($data["type"] != "photo")) || ($data["title"] == $data["url"])) {
return "";
}
$text = "[attachment type='".$data["type"]."'";
- if ($data["text"] == "") {
+ if (empty($data["text"])) {
$data["text"] = $data["title"];
}
- if ($data["text"] == "") {
+ if (empty($data["text"])) {
$data["text"] = $data["url"];
}
- if ($data["url"] != "") {
+ if (!empty($data["url"])) {
$text .= " url='".$data["url"]."'";
}
- if ($data["title"] != "") {
+ if (!empty($data["title"])) {
$text .= " title='".$data["title"]."'";
}
$start_month = DateTimeFormat::utc($dstart, 'Y-m-d');
$end_month = DateTimeFormat::utc($dend, 'Y-m-d');
$str = day_translate(DateTimeFormat::utc($dnow, 'F'));
- if (!$ret[$dyear]) {
+ if (empty($ret[$dyear])) {
$ret[$dyear] = [];
}
$ret[$dyear][] = [$str, $end_month, $start_month];
}
$callers = debug_backtrace();
+
+ if (count($callers) > 1) {
+ $function = $callers[1]['function'];
+ } else {
+ $function = '';
+ }
+
$logline = sprintf("%s@%s\t[%s]:%s:%s:%s\t%s\n",
DateTimeFormat::utcNow(DateTimeFormat::ATOM),
$process_id,
$LOGGER_LEVELS[$level],
basename($callers[0]['file']),
$callers[0]['line'],
- $callers[1]['function'],
+ $function,
$msg
);
]);
}
- $id = end(explode('/', $the_url));
+ $url_parts = explode('/', $the_url);
+ $id = end($url_parts);
$as .= replace_macros(get_markup_template('video_top.tpl'), [
'$video' => [
'id' => $id,
* @return string
*/
function item_post_type($item) {
- if (intval($item['event-id'])) {
+ if (!empty($item['event-id'])) {
return L10n::t('event');
- } elseif (strlen($item['resource-id'])) {
+ } elseif (!empty($item['resource-id'])) {
return L10n::t('photo');
- } elseif (strlen($item['verb']) && $item['verb'] !== ACTIVITY_POST) {
+ } elseif (!empty($item['verb']) && $item['verb'] !== ACTIVITY_POST) {
return L10n::t('activity');
} elseif ($item['id'] != $item['parent']) {
return L10n::t('comment');
// Valid profile links contain a path with "/profile/" and no query parameters
if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") &&
strstr(parse_url($_GET['zrl'], PHP_URL_PATH), "/profile/")) {
- if ($_SESSION["visitor_home"] != $_GET["zrl"]) {
+ if (defaults($_SESSION, "visitor_home", "") != $_GET["zrl"]) {
$_SESSION['my_url'] = $_GET['zrl'];
$_SESSION['authenticated'] = 0;
}
if (($length & ASN_LONG_LEN)==ASN_LONG_LEN){
$tempLength = 0;
for ($x=0; $x<($length & (ASN_LONG_LEN-1)); $x++){
- $tempLength = ord($string[$p++]) + ($tempLength * 256);
+ $tempLength = @ord($string[$p++]) + ($tempLength * 256);
}
$length = $tempLength;
}
// Set the user id. This is important if this is a public contact
$importer['importer_uid'] = $user['uid'];
+ $importer = array_merge($importer, $user);
+
logger('Importing post from ' . $msg['author'] . ' to ' . $user['nickname'] . ' with the private envelope.', LOGGER_DEBUG);
// Now we should be able to import it
);
if (!DBM::is_result($r)) {
- $status = 1;
+ logger('No user data found for ' . $a->argv[1] . ' - SQL: ' . $sql_extra);
+ killme();
}
logger("Remote rino version: ".$rino_remote." for ".$r[0]["url"], LOGGER_DATA);
$a->set_pager_itemspage($j->items_page);
}
- if (count($j->results)) {
+ if (!empty($j->results)) {
$id = 0;
if (!$skip) {
$author = "";
preg_match("/author='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
}
preg_match('/author="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
}
$profile = "";
preg_match("/profile='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$profiledata["url"] = $matches[1];
}
preg_match('/profile="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$profiledata["url"] = $matches[1];
}
$avatar = "";
preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$profiledata["photo"] = $matches[1];
}
preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$profiledata["photo"] = $matches[1];
}
$profiledata["nickname"] = $profiledata["name"];
$item_parent_uri = $item['parent-uri'];
} else {
$item_id = (($a->argc > 2) ? $a->argv[2] : 0);
+ $item_parent = $item_id;
if ($a->argc == 2) {
$item_parent = 0;
$guid = $a->argv[2];
// Fetch the item
- $fields = ['uid', 'title', 'body', 'guid', 'contact-id', 'private', 'created', 'app', 'location', 'coord', 'network'];
+ $fields = ['uid', 'title', 'body', 'guid', 'contact-id', 'private', 'created', 'app', 'location', 'coord', 'network',
+ 'event-id', 'resource-id', 'author-link', 'owner-link', 'attach'];
$condition = ['wall' => true, 'private' => false, 'guid' => $guid, 'network' => [NETWORK_DFRN, NETWORK_DIASPORA]];
$item = Item::selectFirst($fields, $condition);
if (!DBM::is_result($item)) {
$str_contact_deny = $user['deny_cid'];
} else {
// use the posted permissions
- $str_group_allow = perms2str($_REQUEST['group_allow']);
- $str_contact_allow = perms2str($_REQUEST['contact_allow']);
- $str_group_deny = perms2str($_REQUEST['group_deny']);
- $str_contact_deny = perms2str($_REQUEST['contact_deny']);
+ $str_group_allow = perms2str(defaults($_REQUEST, 'group_allow', ''));
+ $str_contact_allow = perms2str(defaults($_REQUEST, 'contact_allow', ''));
+ $str_group_deny = perms2str(defaults($_REQUEST, 'group_deny', ''));
+ $str_contact_deny = perms2str(defaults($_REQUEST, 'contact_deny', ''));
}
$title = notags(trim(defaults($_REQUEST, 'title' , '')));
// If this is a comment, set the permissions from the parent.
if ($parent_item) {
-
// for non native networks use the network of the original post as network of the item
if (($parent_item['network'] != NETWORK_DIASPORA)
&& ($parent_item['network'] != NETWORK_OSTATUS)
$conversation = dba::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $datarray['parent-uri']]);
if (DBM::is_result($conversation)) {
- if ($r['conversation-uri'] != '') {
+ if ($conversation['conversation-uri'] != '') {
$datarray['conversation-uri'] = $conversation['conversation-uri'];
}
- if ($r['conversation-href'] != '') {
+ if ($conversation['conversation-href'] != '') {
$datarray['conversation-href'] = $conversation['conversation-href'];
}
}
if ($orig_post) {
$datarray['edit'] = true;
+ } else {
+ $datarray['edit'] = false;
}
// Check for hashtags in the body and repair or add hashtag links
// We set the datarray ID to -1 because in preview mode the dataray
// doesn't have an ID.
$datarray["id"] = -1;
+ $datarray["item_id"] = -1;
+ $datarray["author-network"] = NETWORK_DFRN;
+
$o = conversation($a,[array_merge($contact_record,$datarray)],'search', false, true);
logger('preview: ' . $o);
echo json_encode(['preview' => $o]);
}
// Check if we should do HTML-based delete confirmation
- if ($_REQUEST['confirm']) {
+ if (!empty($_REQUEST['confirm'])) {
// <form> can't take arguments in its "action" parameter
// so add any arguments as hidden inputs
$query = explode_querystring($a->query_string);
}
// Now check how the user responded to the confirmation query
- if ($_REQUEST['canceled']) {
+ if (!empty($_REQUEST['canceled'])) {
goaway($_SESSION['return_url']);
}
WHERE `mail`.`uid` = %d $sql_extra ORDER BY `mail`.`created` ASC",
intval(local_user())
);
+ } else {
+ $messages = false;
}
- if (!count($messages)) {
+ if (!DBM::is_result($messages)) {
notice(L10n::t('Message not available.') . EOL);
return $o;
}
$top_limit = DateTimeFormat::utcNow();
}
- $items = dba::p("SELECT `item`.`parent-uri` AS `uri`, 0 AS `item_id`, `item`.$ordering AS `order_date` FROM `item`
+ $items = dba::p("SELECT `item`.`parent-uri` AS `uri`, 0 AS `item_id`, `item`.$ordering AS `order_date`, `author`.`url` AS `author-link` FROM `item`
STRAIGHT_JOIN (SELECT `oid` FROM `term` WHERE `term` IN
(SELECT SUBSTR(`term`, 2) FROM `search` WHERE `uid` = ? AND `term` LIKE '#%') AND `otype` = ? AND `type` = ? AND `uid` = 0) AS `term`
ON `item`.`id` = `term`.`oid`
// Get the nav tabs for the notification pages
$tabs = $nm->getTabs();
$notif_content = [];
+ $notif_nocontent = '';
// Notification results per page
$perpage = 20;
$dfrn_tpl = get_markup_template('netfriend.tpl');
$knowyou = '';
+ $lbl_knowyou = '';
$dfrn_text = '';
+ $helptext = '';
+ $helptext2 = '';
+ $helptext3 = '';
if ($it['network'] === NETWORK_DFRN || $it['network'] === NETWORK_DIASPORA) {
if ($it['network'] === NETWORK_DFRN) {
if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
header('HTTP/1.1 304 Not Modified');
header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
- header('Etag: ' . $_SERVER['HTTP_IF_NONE_MATCH']);
+ if (!empty($_SERVER['HTTP_IF_NONE_MATCH'])) {
+ header('Etag: ' . $_SERVER['HTTP_IF_NONE_MATCH']);
+ }
header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
header("Cache-Control: max-age=31536000");
if (function_exists('header_remove')) {
if (local_user() && $a->data['user']['uid'] == local_user()) {
$can_post = true;
+ } else {
+ $can_post = false;
}
if ($ret['success']) {
$contact = null;
$remote_contact = false;
$contact_id = 0;
+ $edit = false;
$owner_uid = $a->data['user']['uid'];
if (DBM::is_result($intros)) {
foreach ($intros as $intro) {
$notif = [
+ 'id' => 0,
'href' => System::baseUrl() . '/notifications/intros/' . $intro['id'],
'name' => $intro['name'],
'url' => $intro['url'],
if (DBM::is_result($mails)) {
foreach ($mails as $mail) {
$notif = [
+ 'id' => 0,
'href' => System::baseUrl() . '/message/' . $mail['id'],
'name' => $mail['from-name'],
'url' => $mail['from-url'],
if (DBM::is_result($regs)) {
foreach ($regs as $reg) {
$notif = [
+ 'id' => 0,
'href' => System::baseUrl() . '/admin/users/',
'name' => $reg['name'],
'url' => $reg['url'],
if ($a->argc > 1) {
$user = notags(trim($a->argv[1]));
}
- if (! x($user)) {
+ if (empty($user)) {
$c = q("SELECT * FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1");
- if (! DBM::is_result($c)) {
+ if (!DBM::is_result($c)) {
System::httpExit(401);
}
$system_mode = true;
if (!DBM::is_result($r)) {
$sql_extra3 = sprintf(" AND `thread`.`contact-id` = %d ", intval(intval($a->profile['contact_id'])));
+ } else {
+ $sql_extra3 = "";
}
// check if we serve a mobile device and get the user settings
dba::delete('search', ['uid' => local_user(), 'term' => $search]);
}
+ /// @todo Check if there is a case at all that "aside" is prefilled here
+ if (!isset($a->page['aside'])) {
+ $a->page['aside'] = '';
+ }
+
$a->page['aside'] .= search_saved_searches();
} else {
{
if ($a->argv[0] == 'xrd') {
$uri = urldecode(notags(trim($_GET['uri'])));
- if ($_SERVER['HTTP_ACCEPT'] == 'application/jrd+json') {
+ if (defaults($_SERVER, 'HTTP_ACCEPT', '') == 'application/jrd+json') {
$mode = 'json';
} else {
$mode = 'xml';
}
} else {
$uri = urldecode(notags(trim($_GET['resource'])));
- if ($_SERVER['HTTP_ACCEPT'] == 'application/xrd+xml') {
+ if (defaults($_SERVER, 'HTTP_ACCEPT', '') == 'application/xrd+xml') {
$mode = 'xml';
} else {
$mode = 'json';
$this->callstack['parser'] = [];
$this->config = [];
- $this->page = [];
+
+ $this->page = [
+ 'aside' => '',
+ 'bottom' => '',
+ 'content' => '',
+ 'end' => '',
+ 'footer' => '',
+ 'htmlhead' => '',
+ 'nav' => '',
+ 'page_title' => '',
+ 'right_aside' => '',
+ 'template' => '',
+ 'title' => ''
+ ];
+
$this->pager = [];
$this->query_string = '';
}
}
- $user_theme = defaults($_SESSION, 'theme', $system_theme);
+ if (!empty($_SESSION)) {
+ $user_theme = defaults($_SESSION, 'theme', $system_theme);
+ } else {
+ $user_theme = $system_theme;
+ }
+
// Specific mobile theme override
if (($this->is_mobile || $this->is_tablet) && defaults($_SESSION, 'show-mobile', true)) {
$system_mobile_theme = Config::get('system', 'mobile-theme');
$txt = '{"type":"error"}';
} else { //save in cache
$j = json_decode($txt);
- if ($j->type != "error") {
+ if (!empty($j->type) && $j->type != "error") {
dba::insert('oembed', [
'url' => normalise_link($embedurl),
'maxwidth' => $a->videowidth,
private static function convertAttachment($return, $simplehtml = false, $tryoembed = true)
{
$data = self::getAttachmentData($return);
- if (!$data) {
+ if (empty($data) || empty($data["url"])) {
return $return;
}
$data["title"] = str_replace(["http://", "https://"], "", $data["title"]);
}
- if (((strpos($data["text"], "[img=") !== false) || (strpos($data["text"], "[img]") !== false) || Config::get('system', 'always_show_preview')) && ($data["image"] != "")) {
+ if (((strpos($data["text"], "[img=") !== false) || (strpos($data["text"], "[img]") !== false) || Config::get('system', 'always_show_preview')) && !empty($data["image"])) {
$data["preview"] = $data["image"];
$data["image"] = "";
}
throw new Exception('OEmbed is disabled for this attachment.');
}
} catch (Exception $e) {
+ $data["title"] = defaults($data, 'title', $data['url']);
+
if ($simplehtml != 4) {
$return = sprintf('<div class="type-%s">', $data["type"]);
}
$cid = $zcid = 0;
- if (is_array($_SESSION['remote'])) {
+ if (!empty($_SESSION['remote'])) {
foreach ($_SESSION['remote'] as $visitor) {
if ($visitor['uid'] == $profile_uid) {
$cid = $visitor['cid'];
// Compare the field structure field by field
foreach ($structure["fields"] AS $fieldname => $parameters) {
// Compare the field definition
- $field_definition = $database[$name]["fields"][$fieldname];
+ $field_definition = defaults($database[$name]["fields"], $fieldname, ['Collation' => '']);
// Define the default collation if not given
if (!isset($parameters['Collation']) && !empty($field_definition['Collation'])) {
$profile = $default;
}
- if (($profile["photo"] == "") && isset($default["photo"])) {
+ if (empty($profile["photo"]) && isset($default["photo"])) {
$profile["photo"] = $default["photo"];
}
- if (($profile["name"] == "") && isset($default["name"])) {
+ if (empty($profile["name"]) && isset($default["name"])) {
$profile["name"] = $default["name"];
}
- if (($profile["network"] == "") && isset($default["network"])) {
+ if (empty($profile["network"]) && isset($default["network"])) {
$profile["network"] = $default["network"];
}
- if (($profile["thumb"] == "") && isset($profile["photo"])) {
+ if (empty($profile["thumb"]) && isset($profile["photo"])) {
$profile["thumb"] = $profile["photo"];
}
- if (($profile["micro"] == "") && isset($profile["thumb"])) {
+ if (empty($profile["micro"]) && isset($profile["thumb"])) {
$profile["micro"] = $profile["thumb"];
}
- if ((($profile["addr"] == "") || ($profile["name"] == "")) && ($profile["gid"] != 0)
+ if ((empty($profile["addr"]) || empty($profile["name"])) && (defaults($profile, "gid", 0) != 0)
&& in_array($profile["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])
) {
Worker::add(PRIORITY_LOW, "UpdateGContact", $profile["gid"]);
}
// Show contact details of Diaspora contacts only if connected
- if (($profile["cid"] == 0) && ($profile["network"] == NETWORK_DIASPORA)) {
+ if ((defaults($profile, "cid", 0) == 0) && (defaults($profile, "network", "") == NETWORK_DIASPORA)) {
$profile["location"] = "";
$profile["about"] = "";
$profile["gender"] = "";
$uid = local_user();
}
- if ($contact['uid'] != $uid) {
+ if (empty($contact['uid']) || ($contact['uid'] != $uid)) {
if ($uid == 0) {
$profile_link = self::magicLink($contact['url']);
$menu = ['profile' => [L10n::t('View Profile'), $profile_link, true]];
$contact_record = [
'id' => dba::lastInsertId(),
- 'network' => NETWORK_OSTATUS
+ 'network' => NETWORK_OSTATUS,
+ 'name' => $name,
+ 'url' => $url,
+ 'photo' => $photo
];
+
Contact::updateAvatar($photo, $importer["uid"], $contact_record["id"], true);
/// @TODO Encapsulate this into a function/method
// Bugfix: We had an error in the storing of keywords which lead to the "0"
// This value is still transmitted via poco.
- if ($contact["keywords"] == "0") {
+ if (!empty($contact["keywords"]) && ($contact["keywords"] == "0")) {
unset($contact["keywords"]);
}
- if ($public_contact[0]["keywords"] == "0") {
+ if (!empty($public_contact[0]["keywords"]) && ($public_contact[0]["keywords"] == "0")) {
$public_contact[0]["keywords"] = "";
}
$statistics = json_decode($result["body"]);
- if (is_object($statistics->config)) {
+ if (!empty($statistics->config)) {
if ($statistics->config->instance_with_ssl) {
$server = "https://";
} else {
$server .= $statistics->config->instance_address;
$hostname = $statistics->config->instance_address;
- } else {
- /// @TODO is_object() above means here no object, still $statistics is being used as object
+ } elseif (!empty($statistics)) {
if ($statistics->instance_with_ssl) {
$server = "https://";
} else {
$hostname = $statistics->instance_address;
}
- if (is_object($statistics->users)) {
+ if (!empty($statistics->users)) {
foreach ($statistics->users as $nick => $user) {
$profile_url = $server."/".$user->nickname;
"name" => $user->fullname,
"addr" => $user->nickname."@".$hostname,
"nick" => $user->nickname,
- "about" => $user->bio,
"network" => NETWORK_OSTATUS,
"photo" => System::baseUrl()."/images/person-175.jpg"];
+
+ if (isset($user->bio)) {
+ $contact["about"] = $user->bio;
+ }
+
self::getId($contact);
}
}
$author_owner_fields = ['author-name', 'author-avatar', 'author-link', 'owner-name', 'owner-avatar', 'owner-link'];
foreach ($author_owner_fields as $field) {
- if (isset($fields[$field])) {
+ if (array_key_exists($field, $fields)) {
$fields[$field] = null;
}
}
if (array_key_exists('tag', $fields)) {
$tags = $fields['tag'];
- unset($fields['tag']);
+ $fields['tag'] = null;
} else {
$tags = '';
}
if (array_key_exists('file', $fields)) {
$files = $fields['file'];
- unset($fields['file']);
+ $fields['file'] = null;
} else {
$files = '';
}
if ($item['network'] == NETWORK_PHANTOM) {
logger('Missing network. Called by: '.System::callstack(), LOGGER_DEBUG);
- $contact = Contact::getDetailsByURL($item['author-link'], $item['uid']);
- if (!empty($contact['network'])) {
- $item['network'] = $contact["network"];
- } else {
- $item['network'] = NETWORK_DFRN;
- }
+ $item['network'] = NETWORK_DFRN;
logger("Set network to " . $item["network"] . " for " . $item["uri"], LOGGER_DEBUG);
}
put_item_in_cache($item);
if ($notify) {
+ $item['edit'] = false;
+ $item['parent'] = $parent_id;
Addon::callHooks('post_local', $item);
+ unset($item['edit']);
+ unset($item['parent']);
} else {
Addon::callHooks('post_remote', $item);
}
return;
}
+ $origin = $item['origin'];
+
unset($item['id']);
unset($item['parent']);
unset($item['mention']);
$parents = self::select(['uid', 'origin'], ["`uri` = ? AND `uid` != 0", $item['parent-uri']]);
while ($parent = dba::fetch($parents)) {
$users[$parent['uid']] = $parent['uid'];
- if ($parent['origin'] && !$item['origin']) {
+ if ($parent['origin'] && !$origin) {
$origin_uid = $parent['uid'];
}
}
}
// Prevent the forwarding of posts that are forwarded
- if ($datarray["extid"] == NETWORK_DFRN) {
+ if (!empty($datarray["extid"]) && ($datarray["extid"] == NETWORK_DFRN)) {
logger('Already forwarded', LOGGER_DEBUG);
return false;
}
'type' => 'activity',
'wall' => $item['wall'],
'origin' => 1,
+ 'network' => NETWORK_DFRN,
'gravity' => GRAVITY_ACTIVITY,
'parent' => $item['id'],
'parent-uri' => $item['uri'],
{
$location = '';
- if ($profile['locality']) {
+ if (!empty($profile['locality'])) {
$location .= $profile['locality'];
}
- if ($profile['region'] && ($profile['locality'] != $profile['region'])) {
+ if (!empty($profile['region']) && (defaults($profile, 'locality', '') != $profile['region'])) {
if ($location) {
$location .= ', ';
}
$location .= $profile['region'];
}
- if ($profile['country-name']) {
+ if (!empty($profile['country-name'])) {
if ($location) {
$location .= ', ';
}
$connect = false;
}
+ $profile_url = '';
+
// Is the local user already connected to that user?
if ($connect && local_user()) {
if (isset($profile['url'])) {
'fullname' => $profile['name'],
'firstname' => $firstname,
'lastname' => $lastname,
- 'photo300' => $profile['contact_photo'],
- 'photo100' => $profile['contact_thumb'],
- 'photo50' => $profile['contact_micro'],
+ 'photo300' => defaults($profile, 'contact_photo', ''),
+ 'photo100' => defaults($profile, 'contact_thumb', ''),
+ 'photo50' => defaults($profile, 'contact_micro', ''),
];
} else {
$diaspora = false;
$p['photo'] = proxy_url($p['photo'], false, PROXY_SIZE_SMALL);
}
- $p['url'] = Contact::magicLink($p['url']);
+ $p['url'] = Contact::magicLink(defaults($p, 'url', $profile_url));
$tpl = get_markup_template('profile_vcard.tpl');
$o .= replace_macros($tpl, [
// Make sure to refresh the last login time for the user if the user
// stays logged in for a long time, e.g. with "Remember Me"
$login_refresh = false;
- if (!x($_SESSION['last_login_date'])) {
+ if (empty($_SESSION['last_login_date'])) {
$_SESSION['last_login_date'] = DateTimeFormat::utcNow();
}
if (strcmp(DateTimeFormat::utc('now - 12 hours'), $_SESSION['last_login_date']) > 0) {
/**
* Magic Auth (remote authentication) module.
- *
+ *
* Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/Zotlabs/Module/Magic.php
*/
class Magic extends BaseModule
$test = ((x($_REQUEST, 'test')) ? intval($_REQUEST['test']) : 0);
$owa = ((x($_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
// to be able to redirct to other pages than the contact profile.
$cid = Contact::getIdForURL($dest);
$contact = dba::selectFirst('contact', ['id', 'nurl', 'url'], ['id' => $cid]);
// Redirect if the contact is already authenticated on this site.
- if (array_key_exists('id', $a->contact) && strpos($contact['nurl'], normalise_link(self::getApp()->get_baseurl())) !== false) {
- if($test) {
+ if (!empty($a->contact) && array_key_exists('id', $a->contact) && strpos($contact['nurl'], normalise_link(self::getApp()->get_baseurl())) !== false) {
+ if ($test) {
$ret['success'] = true;
$ret['message'] .= 'Local site - you are already authenticated.' . EOL;
return $ret;
}
}
- if($test) {
+ if ($test) {
$ret['message'] = 'Not authenticated or invalid arguments' . EOL;
return $ret;
}
}
}
+ if (empty($result["network"])) {
+ $result["network"] = NETWORK_PHANTOM;
+ }
+
+ if (empty($result["url"])) {
+ $result["url"] = $uri;
+ }
+
logger($uri." is ".$result["network"], LOGGER_DEBUG);
if (empty($result["baseurl"])) {
}
}
- if (is_array($webfinger["aliases"])) {
+ if (!empty($webfinger["aliases"]) && is_array($webfinger["aliases"])) {
foreach ($webfinger["aliases"] as $alias) {
if (normalise_link($alias) != normalise_link($data["url"]) && ! strstr($alias, "@")) {
$data["alias"] = $alias;
}
}
- if (substr($webfinger["subject"], 0, 5) == "acct:") {
+ if (!empty($webfinger["subject"]) && (substr($webfinger["subject"], 0, 5) == "acct:")) {
$data["addr"] = substr($webfinger["subject"], 5);
}
return false;
}
+ if (!isset($data["baseurl"])) {
+ $data["baseurl"] = "";
+ }
+
if ($vcards->length > 0) {
$vcard = $vcards->item(0);
// We have to discard the guid from the hcard in favour of the guid from lrdd
// Reason: Hubzilla doesn't use the value "uid" in the hcard like Diaspora does.
$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' uid ')]", $vcard); // */
- if (($search->length > 0) && ($data["guid"] == "")) {
+ if (($search->length > 0) && empty($data["guid"])) {
$data["guid"] = $search->item(0)->nodeValue;
}
}
$avatar = [];
- $photos = $xpath->query("//*[contains(concat(' ', @class, ' '), ' photo ') or contains(concat(' ', @class, ' '), ' avatar ')]", $vcard); // */
- foreach ($photos as $photo) {
- $attr = [];
- foreach ($photo->attributes as $attribute) {
- $attr[$attribute->name] = trim($attribute->value);
- }
+ if (!empty($vcard)) {
+ $photos = $xpath->query("//*[contains(concat(' ', @class, ' '), ' photo ') or contains(concat(' ', @class, ' '), ' avatar ')]", $vcard); // */
+ foreach ($photos as $photo) {
+ $attr = [];
+ foreach ($photo->attributes as $attribute) {
+ $attr[$attribute->name] = trim($attribute->value);
+ }
- if (isset($attr["src"]) && isset($attr["width"])) {
- $avatar[$attr["width"]] = $attr["src"];
- }
+ if (isset($attr["src"]) && isset($attr["width"])) {
+ $avatar[$attr["width"]] = $attr["src"];
+ }
- // We don't have a width. So we just take everything that we got.
- // This is a Hubzilla workaround which doesn't send a width.
- if ((sizeof($avatar) == 0) && !empty($attr["src"])) {
- $avatar[] = $attr["src"];
+ // We don't have a width. So we just take everything that we got.
+ // This is a Hubzilla workaround which doesn't send a width.
+ if ((sizeof($avatar) == 0) && !empty($attr["src"])) {
+ $avatar[] = $attr["src"];
+ }
}
}
return false;
}
- if (is_array($webfinger["aliases"])) {
+ if (!empty($webfinger["aliases"]) && is_array($webfinger["aliases"])) {
foreach ($webfinger["aliases"] as $alias) {
if (normalise_link($alias) != normalise_link($data["url"]) && ! strstr($alias, "@")) {
$data["alias"] = $alias;
$data["network"] = NETWORK_DIASPORA;
// The Diaspora handle must always be lowercase
- $data["addr"] = strtolower($data["addr"]);
+ if (!empty($data["addr"])) {
+ $data["addr"] = strtolower($data["addr"]);
+ }
// We have to overwrite the detected value for "notify" since Hubzilla doesn't send it
$data["notify"] = $data["baseurl"] . "/receive/users/" . $data["guid"];
{
$data = [];
- if (is_array($webfinger["aliases"])) {
+ if (!empty($webfinger["aliases"]) && is_array($webfinger["aliases"])) {
foreach ($webfinger["aliases"] as $alias) {
if (strstr($alias, "@") && !strstr(normalise_link($alias), "http://")) {
$data["addr"] = str_replace('acct:', '', $alias);
}
}
- if (is_string($webfinger["subject"]) && strstr($webfinger["subject"], "@")
+ if (!empty($webfinger["subject"]) && strstr($webfinger["subject"], "@")
&& !strstr(normalise_link($webfinger["subject"]), "http://")
) {
$data["addr"] = str_replace('acct:', '', $webfinger["subject"]);
return false;
}
$feed = $ret['body'];
+ $dummy1 = null;
+ $dummy2 = null;
+ $dummy2 = null;
$feed_data = Feed::import($feed, $dummy1, $dummy2, $dummy3, true);
if (!$feed_data) {
return false;
}
- if ($feed_data["header"]["author-name"] != "") {
+ if (!empty($feed_data["header"]["author-name"])) {
$data["name"] = $feed_data["header"]["author-name"];
}
- if ($feed_data["header"]["author-nick"] != "") {
+ if (!empty($feed_data["header"]["author-nick"])) {
$data["nick"] = $feed_data["header"]["author-nick"];
}
- if ($feed_data["header"]["author-avatar"] != "") {
+ if (!empty($feed_data["header"]["author-avatar"])) {
$data["photo"] = self::fixAvatar($feed_data["header"]["author-avatar"], $data["url"]);
}
- if ($feed_data["header"]["author-id"] != "") {
+ if (!empty($feed_data["header"]["author-id"])) {
$data["alias"] = $feed_data["header"]["author-id"];
}
- if ($feed_data["header"]["author-location"] != "") {
+ if (!empty($feed_data["header"]["author-location"])) {
$data["location"] = $feed_data["header"]["author-location"];
}
- if ($feed_data["header"]["author-about"] != "") {
+ if (!empty($feed_data["header"]["author-about"])) {
$data["about"] = $feed_data["header"]["author-about"];
}
// OStatus has serious issues when the the url doesn't fit (ssl vs. non ssl)
// So we take the value that we just fetched, although the other one worked as well
- if ($feed_data["header"]["author-link"] != "") {
+ if (!empty($feed_data["header"]["author-link"])) {
$data["url"] = $feed_data["header"]["author-link"];
}
return self::feed($feed_url, false);
}
- if ($feed_data["header"]["author-name"] != "") {
+ if (!empty($feed_data["header"]["author-name"])) {
$data["name"] = $feed_data["header"]["author-name"];
}
- if ($feed_data["header"]["author-nick"] != "") {
+ if (!empty($feed_data["header"]["author-nick"])) {
$data["nick"] = $feed_data["header"]["author-nick"];
}
- if ($feed_data["header"]["author-avatar"] != "") {
+ if (!empty($feed_data["header"]["author-avatar"])) {
$data["photo"] = $feed_data["header"]["author-avatar"];
}
- if ($feed_data["header"]["author-id"] != "") {
+ if (!empty($feed_data["header"]["author-id"])) {
$data["alias"] = $feed_data["header"]["author-id"];
}
$data["url"] = $url;
$data["poll"] = $url;
- if ($feed_data["header"]["author-link"] != "") {
+ if (!empty($feed_data["header"]["author-link"])) {
$data["baseurl"] = $feed_data["header"]["author-link"];
} else {
$data["baseurl"] = $data["url"];
$headers=[];
$h = explode("\n", $a->get_curl_headers());
foreach ($h as $l) {
- list($k,$v) = array_map("trim", explode(":", trim($l), 2));
- $headers[$k] = $v;
+ $data = array_map("trim", explode(":", trim($l), 2));
+ if (count($data) > 1) {
+ list($k,$v) = $data;
+ $headers[$k] = $v;
+ }
}
if (array_key_exists('Content-Type', $headers))
$type = $headers['Content-Type'];
}
foreach ($items as $item) {
+ // These values aren't sent when sending from the queue.
+ /// @todo Check if we can set these values from the queue or if they are needed at all.
+ $item["entry:comment-allow"] = defaults($item, "entry:comment-allow", true);
+ $item["entry:cid"] = defaults($item, "entry:cid", 0);
+
$entry = self::entry($doc, "text", $item, $owner, $item["entry:comment-allow"], $item["entry:cid"]);
$root->appendChild($entry);
}
$guid = "";
preg_match("/guid='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$guid = $matches[1];
}
preg_match('/guid="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$guid = $matches[1];
}
$profile = "";
preg_match("/profile='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$profile = $matches[1];
}
preg_match('/profile="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$profile = $matches[1];
}
} else {
logger("Test Atom/RSS feed", LOGGER_DEBUG);
}
- if ($xml == "") {
+ if (empty($xml)) {
logger('XML is empty.', LOGGER_DEBUG);
return;
}
// Is it RDF?
if ($xpath->query('/rdf:RDF/rss:channel')->length > 0) {
- $author["author-link"] = $xpath->evaluate('/rdf:RDF/rss:channel/rss:link/text()')->item(0)->nodeValue;
- $author["author-name"] = $xpath->evaluate('/rdf:RDF/rss:channel/rss:title/text()')->item(0)->nodeValue;
+ $author["author-link"] = XML::getFirstNodeValue($xpath, '/rdf:RDF/rss:channel/rss:link/text()');
+ $author["author-name"] = XML::getFirstNodeValue($xpath, '/rdf:RDF/rss:channel/rss:title/text()');
- if ($author["author-name"] == "") {
- $author["author-name"] = $xpath->evaluate('/rdf:RDF/rss:channel/rss:description/text()')->item(0)->nodeValue;
+ if (empty($author["author-name"])) {
+ $author["author-name"] = XML::getFirstNodeValue($xpath, '/rdf:RDF/rss:channel/rss:description/text()');
}
$entries = $xpath->query('/rdf:RDF/rss:item');
}
// Is it Atom?
if ($xpath->query('/atom:feed')->length > 0) {
- $alternate = $xpath->query("atom:link[@rel='alternate']")->item(0)->attributes;
+ $alternate = XML::getFirstAttributes($xpath, "atom:link[@rel='alternate']");
if (is_object($alternate)) {
foreach ($alternate AS $attribute) {
if ($attribute->name == "href") {
}
}
- if ($author["author-link"] == "") {
- $author["author-link"] = $author["author-id"];
- }
- if ($author["author-link"] == "") {
- $self = $xpath->query("atom:link[@rel='self']")->item(0)->attributes;
+ if (empty($author["author-link"])) {
+ $self = XML::getFirstAttributes($xpath, "atom:link[@rel='self']");
if (is_object($self)) {
foreach ($self AS $attribute) {
if ($attribute->name == "href") {
}
}
- if ($author["author-link"] == "") {
- $author["author-link"] = $xpath->evaluate('/atom:feed/atom:id/text()')->item(0)->nodeValue;
+ if (empty($author["author-link"])) {
+ $author["author-link"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:id/text()');
}
- $author["author-avatar"] = $xpath->evaluate('/atom:feed/atom:logo/text()')->item(0)->nodeValue;
+ $author["author-avatar"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:logo/text()');
- $author["author-name"] = $xpath->evaluate('/atom:feed/atom:title/text()')->item(0)->nodeValue;
+ $author["author-name"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:title/text()');
- if ($author["author-name"] == "") {
- $author["author-name"] = $xpath->evaluate('/atom:feed/atom:subtitle/text()')->item(0)->nodeValue;
+ if (empty($author["author-name"])) {
+ $author["author-name"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:subtitle/text()');
}
- if ($author["author-name"] == "") {
- $author["author-name"] = $xpath->evaluate('/atom:feed/atom:author/atom:name/text()')->item(0)->nodeValue;
+ if (empty($author["author-name"])) {
+ $author["author-name"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:author/atom:name/text()');
}
- $value = $xpath->evaluate('atom:author/poco:displayName/text()')->item(0)->nodeValue;
+ $value = XML::getFirstNodeValue($xpath, 'atom:author/poco:displayName/text()');
if ($value != "") {
$author["author-name"] = $value;
}
if ($simulate) {
- $author["author-id"] = $xpath->evaluate('/atom:feed/atom:author/atom:uri/text()')->item(0)->nodeValue;
+ $author["author-id"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:author/atom:uri/text()');
- $value = $xpath->evaluate('atom:author/poco:preferredUsername/text()')->item(0)->nodeValue;
+ $value = XML::getFirstNodeValue($xpath, 'atom:author/poco:preferredUsername/text()');
if ($value != "") {
$author["author-nick"] = $value;
}
if ($value != "") {
$author["author-about"] = $value;
}
- $avatar = $xpath->evaluate("atom:author/atom:link[@rel='avatar']")->item(0)->attributes;
+ $avatar = XML::getFirstAttributes($xpath, "atom:author/atom:link[@rel='avatar']");
if (is_object($avatar)) {
foreach ($avatar AS $attribute) {
if ($attribute->name == "href") {
// Is it RSS?
if ($xpath->query('/rss/channel')->length > 0) {
- $author["author-link"] = $xpath->evaluate('/rss/channel/link/text()')->item(0)->nodeValue;
+ $author["author-link"] = XML::getFirstNodeValue($xpath, '/rss/channel/link/text()');
- $author["author-name"] = $xpath->evaluate('/rss/channel/title/text()')->item(0)->nodeValue;
- $author["author-avatar"] = $xpath->evaluate('/rss/channel/image/url/text()')->item(0)->nodeValue;
+ $author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/title/text()');
+ $author["author-avatar"] = XML::getFirstNodeValue($xpath, '/rss/channel/image/url/text()');
- if ($author["author-name"] == "") {
- $author["author-name"] = $xpath->evaluate('/rss/channel/copyright/text()')->item(0)->nodeValue;
+ if (empty($author["author-name"])) {
+ $author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/copyright/text()');
}
- if ($author["author-name"] == "") {
- $author["author-name"] = $xpath->evaluate('/rss/channel/description/text()')->item(0)->nodeValue;
+ if (empty($author["author-name"])) {
+ $author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/description/text()');
}
- $author["edited"] = $author["created"] = $xpath->query('/rss/channel/pubDate/text()')->item(0)->nodeValue;
+ $author["edited"] = $author["created"] = XML::getFirstNodeValue($xpath, '/rss/channel/pubDate/text()');
- $author["app"] = $xpath->evaluate('/rss/channel/generator/text()')->item(0)->nodeValue;
+ $author["app"] = XML::getFirstNodeValue($xpath, '/rss/channel/generator/text()');
$entries = $xpath->query('/rss/channel/item');
}
if (!$simulate) {
$author["author-link"] = $contact["url"];
- if ($author["author-name"] == "") {
+ if (empty($author["author-name"])) {
$author["author-name"] = $contact["name"];
}
$author["author-avatar"] = $contact["thumb"];
$item = array_merge($header, $author);
- $alternate = $xpath->query("atom:link[@rel='alternate']", $entry)->item(0)->attributes;
+ $alternate = XML::getFirstAttributes($xpath, "atom:link[@rel='alternate']", $entry);
if (!is_object($alternate)) {
- $alternate = $xpath->query("atom:link", $entry)->item(0)->attributes;
+ $alternate = XML::getFirstAttributes($xpath, "atom:link", $entry);
}
if (is_object($alternate)) {
foreach ($alternate AS $attribute) {
}
}
}
- if ($item["plink"] == "") {
+ if (empty($item["plink"])) {
$item["plink"] = XML::getFirstNodeValue($xpath, 'link/text()', $entry);
}
- if ($item["plink"] == "") {
+ if (empty($item["plink"])) {
$item["plink"] = XML::getFirstNodeValue($xpath, 'rss:link/text()', $entry);
}
$item["uri"] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry);
- if ($item["uri"] == "") {
+ if (empty($item["uri"])) {
$item["uri"] = XML::getFirstNodeValue($xpath, 'guid/text()', $entry);
}
- if ($item["uri"] == "") {
+ if (empty($item["uri"])) {
$item["uri"] = $item["plink"];
}
$item["title"] = XML::getFirstNodeValue($xpath, 'atom:title/text()', $entry);
- if ($item["title"] == "") {
+ if (empty($item["title"])) {
$item["title"] = XML::getFirstNodeValue($xpath, 'title/text()', $entry);
}
- if ($item["title"] == "") {
+ if (empty($item["title"])) {
$item["title"] = XML::getFirstNodeValue($xpath, 'rss:title/text()', $entry);
}
$published = XML::getFirstNodeValue($xpath, 'atom:published/text()', $entry);
- if ($published == "") {
+ if (empty($published)) {
$published = XML::getFirstNodeValue($xpath, 'pubDate/text()', $entry);
}
- if ($published == "") {
+ if (empty($published)) {
$published = XML::getFirstNodeValue($xpath, 'dc:date/text()', $entry);
}
$updated = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $entry);
- if ($updated == "") {
+ if (empty($updated)) {
$updated = $published;
}
if ($published != "") {
}
$creator = XML::getFirstNodeValue($xpath, 'author/text()', $entry);
- if ($creator == "") {
+ if (empty($creator)) {
$creator = XML::getFirstNodeValue($xpath, 'atom:author/atom:name/text()', $entry);
}
- if ($creator == "") {
+ if (empty($creator)) {
$creator = XML::getFirstNodeValue($xpath, 'dc:creator/text()', $entry);
}
if ($creator != "") {
$type = $attribute->textContent;
}
}
- if (strlen($item["attach"])) {
+ if (!empty($item["attach"])) {
$item["attach"] .= ',';
+ } else {
+ $item["attach"] = '';
}
$attachments[] = ["link" => $href, "type" => $type, "length" => $length];
$tags .= $taglink;
}
- $body = trim($xpath->evaluate('atom:content/text()', $entry)->item(0)->nodeValue);
+ $body = trim(XML::getFirstNodeValue($xpath, 'atom:content/text()', $entry));
- if ($body == "") {
- $body = trim($xpath->evaluate('content:encoded/text()', $entry)->item(0)->nodeValue);
+ if (empty($body)) {
+ $body = trim(XML::getFirstNodeValue($xpath, 'content:encoded/text()', $entry));
}
- if ($body == "") {
- $body = trim($xpath->evaluate('description/text()', $entry)->item(0)->nodeValue);
+ if (empty($body)) {
+ $body = trim(XML::getFirstNodeValue($xpath, 'description/text()', $entry));
}
- if ($body == "") {
- $body = trim($xpath->evaluate('atom:summary/text()', $entry)->item(0)->nodeValue);
+ if (empty($body)) {
+ $body = trim(XML::getFirstNodeValue($xpath, 'atom:summary/text()', $entry));
}
// remove the content of the title if it is identically to the body
$aliaslink = $author["author-link"];
- $alternate = $xpath->query("atom:author/atom:link[@rel='alternate']", $context)->item(0)->attributes;
- if (is_object($alternate)) {
- foreach ($alternate as $attributes) {
+ $alternate_item = $xpath->query("atom:author/atom:link[@rel='alternate']", $context)->item(0);
+ if (is_object($alternate_item)) {
+ foreach ($alternate_item->attributes as $attributes) {
if (($attributes->name == "href") && ($attributes->textContent != "")) {
$author["author-link"] = $attributes->textContent;
}
}
}
+ $author["author-id"] = Contact::getIdForURL($author["author-link"]);
+
$author["contact-id"] = $contact["id"];
$contact = null;
$author["author-name"] = $displayname;
}
- $author["owner-name"] = $author["author-name"];
- $author["owner-link"] = $author["author-link"];
- $author["owner-avatar"] = $author["author-avatar"];
+ $author["owner-id"] = $author["author-id"];
// Only update the contacts if it is an OStatus contact
if (DBM::is_result($contact) && ($contact['id'] > 0) && !$onlyfetch && ($contact["network"] == NETWORK_OSTATUS)) {
dba::update('contact', $fields, ['id' => $cid], $old_contact);
// Update the avatar
- Contact::updateAvatar($author["author-avatar"], 0, $cid);
+ if (!empty($author["author-avatar"])) {
+ Contact::updateAvatar($author["author-avatar"], 0, $cid);
+ }
}
$contact["generation"] = 2;
$contact["hide"] = false; // OStatus contacts are never hidden
- $contact["photo"] = $author["author-avatar"];
+ if (!empty($author["author-avatar"])) {
+ $contact["photo"] = $author["author-avatar"];
+ }
$gcid = GContact::update($contact);
GContact::link($gcid, $contact["uid"], $contact["id"]);
$xpath->registerNamespace('statusnet', NAMESPACE_STATUSNET);
$hub = "";
- $hub_attributes = $xpath->query("/atom:feed/atom:link[@rel='hub']")->item(0)->attributes;
- if (is_object($hub_attributes)) {
- foreach ($hub_attributes as $hub_attribute) {
- if ($hub_attribute->name == "href") {
- $hub = $hub_attribute->textContent;
- logger("Found hub ".$hub, LOGGER_DEBUG);
+ $hub_items = $xpath->query("/atom:feed/atom:link[@rel='hub']")->item(0);
+ if (is_object($hub_items)) {
+ $hub_attributes = $hub_items->attributes;
+ if (is_object($hub_attributes)) {
+ foreach ($hub_attributes as $hub_attribute) {
+ if ($hub_attribute->name == "href") {
+ $hub = $hub_attribute->textContent;
+ logger("Found hub ".$hub, LOGGER_DEBUG);
+ }
}
}
}
$author = self::fetchAuthor($xpath, $entry, $importer, $contact, $stored);
}
- $value = XML::getFirstNodeValue($xpath, 'atom:author/poco:preferredUsername/text()', $context);
+ $value = XML::getFirstNodeValue($xpath, 'atom:author/poco:preferredUsername/text()', $entry);
if ($value != "") {
$nickname = $value;
} else {
}
if ($item["verb"] == NAMESPACE_OSTATUS."/unfollow") {
+ $dummy = null;
Contact::removeFollower($importer, $contact, $item, $dummy);
continue;
}
foreach ($category->attributes as $attributes) {
if ($attributes->name == "term") {
$term = $attributes->textContent;
- if (strlen($item["tag"])) {
+ if (!empty($item["tag"])) {
$item["tag"] .= ',';
+ } else {
+ $item["tag"] = '';
}
+
$item["tag"] .= "#[url=".System::baseUrl()."/search?tag=".$term."]".$term."[/url]";
}
}
$link_data = self::processLinks($links, $item);
}
- $orig_body = $xpath->query('atom:content/text()', $activityobjects)->item(0)->nodeValue;
- $orig_created = $xpath->query('atom:published/text()', $activityobjects)->item(0)->nodeValue;
- $orig_edited = $xpath->query('atom:updated/text()', $activityobjects)->item(0)->nodeValue;
+ $orig_body = XML::getFirstNodeValue($xpath, 'atom:content/text()', $activityobjects);
+ $orig_created = XML::getFirstNodeValue($xpath, 'atom:published/text()', $activityobjects);
+ $orig_edited = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $activityobjects);
$orig_author = self::fetchAuthor($xpath, $activityobjects, $importer, $dummy, false);
$item["author-name"] = $orig_author["author-name"];
$item["author-link"] = $orig_author["author-link"];
- $item["author-avatar"] = $orig_author["author-avatar"];
+ $item["author-id"] = $orig_author["author-id"];
$item["body"] = HTML::toBBCode($orig_body);
$item["created"] = $orig_created;
$item["uri"] = $orig_uri;
- $item["verb"] = $xpath->query('activity:verb/text()', $activityobjects)->item(0)->nodeValue;
+ $item["verb"] = XML::getFirstNodeValue($xpath, 'activity:verb/text()', $activityobjects);
- $item["object-type"] = $xpath->query('activity:object-type/text()', $activityobjects)->item(0)->nodeValue;
+ $item["object-type"] = XML::getFirstNodeValue($xpath, 'activity:object-type/text()', $activityobjects);
$inreplyto = $xpath->query('thr:in-reply-to', $activityobjects);
if (is_object($inreplyto->item(0))) {
foreach ($links as $link) {
$attribute = self::readAttributes($link);
- if (($attribute['rel'] != "") && ($attribute['href'] != "")) {
+ if (!empty($attribute['rel']) && !empty($attribute['href'])) {
switch ($attribute['rel']) {
case "alternate":
$item["plink"] = $attribute['href'];
if ($filetype == 'image') {
$link_data['add_body'] .= "\n[img]".$attribute['href'].'[/img]';
} else {
- if (strlen($item["attach"])) {
+ if (!empty($item["attach"])) {
$item["attach"] .= ',';
+ } else {
+ $item["attach"] = '';
}
if (!isset($attribute['length'])) {
$attribute['length'] = "0";
}
- $item["attach"] .= '[attach]href="'.$attribute['href'].'" length="'.$attribute['length'].'" type="'.$attribute['type'].'" title="'.$attribute['title'].'"[/attach]';
+ $item["attach"] .= '[attach]href="'.$attribute['href'].'" length="'.$attribute['length'].'" type="'.$attribute['type'].'" title="'.defaults($attribute, 'title', '').'"[/attach]';
}
break;
case "related":
}
break;
case "self":
- if ($item["plink"] == '') {
+ if (empty($item["plink"])) {
$item["plink"] = $attribute['href'];
}
$link_data['self'] = $attribute['href'];
}
$contact = self::contactEntry($repeated_item['author-link'], $owner);
+ $contact['account-type'] = $contact['contact-type'];
$title = $owner["nick"]." repeated a notice by ".$contact["nick"];
if (isset($parent_item)) {
$conversation = dba::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $parent_item]);
if (DBM::is_result($conversation)) {
- if ($r['conversation-uri'] != '') {
+ if ($conversation['conversation-uri'] != '') {
$conversation_uri = $conversation['conversation-uri'];
}
- if ($r['conversation-href'] != '') {
+ if ($conversation['conversation-href'] != '') {
$conversation_href = $conversation['conversation-href'];
}
}
$contact_type = -1;
$generation = 0;
- $name = $entry->displayName;
+ if (!empty($entry->displayName)) {
+ $name = $entry->displayName;
+ }
if (isset($entry->urls)) {
foreach ($entry->urls as $url) {
GContact::update($contact);
- if (trim($noscrape["updated"]) != "") {
+ if (!empty($noscrape["updated"])) {
$fields = ['last_contact' => DateTimeFormat::utcNow()];
dba::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
if (!$serverret["success"] || ($serverret["body"] == "") || empty($xmlobj) || !is_object($xmlobj)) {
// Workaround for bad configured servers (known nginx problem)
- if (!in_array($serverret["debug"]["http_code"], ["403", "404"])) {
+ if (!empty($serverret["debug"]) && !in_array($serverret["debug"]["http_code"], ["403", "404"])) {
$failure = true;
}
$possible_failure = true;
if (!empty($data->channels_total)) {
$registered_users = $data->channels_total;
}
- switch ($data->register_policy) {
- case "REGISTER_OPEN":
- $register_policy = REGISTER_OPEN;
- break;
- case "REGISTER_APPROVE":
- $register_policy = REGISTER_APPROVE;
- break;
- case "REGISTER_CLOSED":
- default:
- $register_policy = REGISTER_CLOSED;
- break;
+ if (!empty($data->register_policy)) {
+ switch ($data->register_policy) {
+ case "REGISTER_OPEN":
+ $register_policy = REGISTER_OPEN;
+ break;
+ case "REGISTER_APPROVE":
+ $register_policy = REGISTER_APPROVE;
+ break;
+ case "REGISTER_CLOSED":
+ default:
+ $register_policy = REGISTER_CLOSED;
+ break;
+ }
}
} else {
// Test for Hubzilla, Redmatrix or Friendica
$network = NETWORK_DIASPORA;
}
- if ($data->registrations_open) {
+ if (!empty($data->registrations_open) && $data->registrations_open) {
$register_policy = REGISTER_OPEN;
} else {
$register_policy = REGISTER_CLOSED;
if (isset($data->version)) {
$network = NETWORK_DFRN;
- $noscrape = defaults($data->no_scrape_url, '');
+ if (!empty($data->no_scrape_url)) {
+ $noscrape = $data->no_scrape_url;
+ }
$version = $data->version;
$site_name = $data->site_name;
$info = $data->info;
if ($serverdata) {
$servers = json_decode($serverdata);
- if (is_array($servers->pods)) {
+ if (!empty($servers->pods)) {
foreach ($servers->pods as $server) {
Worker::add(PRIORITY_LOW, "DiscoverPoCo", "server", "https://".$server->host);
}
$a = get_app();
$parts = parse_url($url);
- $path_parts = explode('/', $parts['path']);
+ $path_parts = explode('/', defaults($parts, 'path', ''));
foreach ($path_parts as $part) {
if (strlen($part) <> mb_strlen($part)) {
$parts2[] = rawurlencode($part);
$newurl = $curl_info['redirect_url'];
- if (($new_location_info['path'] == '') && ($new_location_info['host'] != '')) {
+ if (empty($new_location_info['path']) && !empty($new_location_info['host'])) {
$newurl = $new_location_info['scheme'] . '://' . $new_location_info['host'] . $old_location_info['path'];
}
$i = 0;
$path = "";
do {
- $path1 = $pathparts1[$i];
- $path2 = $pathparts2[$i];
+ $path1 = defaults($pathparts1, $i, '');
+ $path2 = defaults($pathparts2, $i, '');
if ($path1 == $path2) {
$path .= $path1."/";
if ($do_oembed) {
$oembed_data = OEmbed::fetchURL($url);
- if (!in_array($oembed_data->type, ["error", "rich", ""])) {
- $siteinfo["type"] = $oembed_data->type;
- }
-
- if (($oembed_data->type == "link") && ($siteinfo["type"] != "photo")) {
- if (isset($oembed_data->title)) {
- $siteinfo["title"] = trim($oembed_data->title);
+ if (!empty($oembed_data->type)) {
+ if (!in_array($oembed_data->type, ["error", "rich", ""])) {
+ $siteinfo["type"] = $oembed_data->type;
}
- if (isset($oembed_data->description)) {
- $siteinfo["text"] = trim($oembed_data->description);
- }
- if (isset($oembed_data->thumbnail_url)) {
- $siteinfo["image"] = $oembed_data->thumbnail_url;
+
+ if (($oembed_data->type == "link") && ($siteinfo["type"] != "photo")) {
+ if (isset($oembed_data->title)) {
+ $siteinfo["title"] = trim($oembed_data->title);
+ }
+ if (isset($oembed_data->description)) {
+ $siteinfo["text"] = trim($oembed_data->description);
+ }
+ if (isset($oembed_data->thumbnail_url)) {
+ $siteinfo["image"] = $oembed_data->thumbnail_url;
+ }
}
}
}
}
}
- $attr["content"] = trim(html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8"));
+ if (!empty($attr["content"])) {
+ $attr["content"] = trim(html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8"));
- if ($attr["content"] != "") {
switch (strtolower($attr["name"])) {
case "fulltitle":
$siteinfo["title"] = trim($attr["content"]);
}
}
- $attr["content"] = trim(html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8"));
+ if (!empty($attr["content"])) {
+ $attr["content"] = trim(html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8"));
- if ($attr["content"] != "") {
switch (strtolower($attr["property"])) {
case "og:image":
$siteinfo["image"] = $attr["content"];
"height" => $photodata[1]];
}
}
- } elseif ($siteinfo["image"] != "") {
+ } elseif (!empty($siteinfo["image"])) {
$src = self::completeUrl($siteinfo["image"], $url);
unset($siteinfo["image"]);
return $first_item->nodeValue;
}
+
+ public static function getFirstAttributes($xpath, $element, $context = null)
+ {
+ $result = $xpath->query($element, $context);
+ if (!is_object($result)) {
+ return false;
+ }
+
+ $first_item = $result->item(0);
+ if (!is_object($first_item)) {
+ return false;
+ }
+
+ return $first_item->attributes;
+ }
}
$condition = ['id' => [$item_id, $parent_id], 'visible' => true, 'moderated' => false];
$params = ['order' => ['id']];
- $itemdata = Item::select(Item::ITEM_FIELDLIST, $condition, $params);
+ $itemdata = Item::select([], $condition, $params);
$items = [];
while ($item = Item::fetch($itemdata)) {
use Friendica\Database\DBM;
use Friendica\Model\Queue as QueueModel;
use Friendica\Model\PushSubscriber;
+use Friendica\Model\User;
use Friendica\Protocol\DFRN;
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\PortableContact;
$data = $q_item['content'];
$public = $q_item['batch'];
- $owner = $user;
+ $owner = User::getOwnerDataById($user['uid']);
$deliver_status = 0;
?>
<html>
<head>
- <title><?php if (x($page, 'title')) echo $page['title'] ?></title>
- <meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>">
+ <title><?php if (!empty($page['title'])) echo $page['title'] ?></title>
+ <meta request="<?php echo htmlspecialchars(defaults($_REQUEST, 'pagename', '')) ?>">
<script type="text/javascript">var baseurl = "<?php echo System::baseUrl(); ?>";</script>
<script type="text/javascript">var frio = "<?php echo 'view/theme/frio'; ?>";</script>
<?php
$a->set_template_engine('smarty3');
- if (!empty($a->argv[0]) && !empty($a->argv[1])) {
- if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] || $a->argv[0] === "network" && local_user()) {
+ if (!empty($a->argv[0])) {
+ if ($a->argv[0] . defaults($a->argv, 1, '') === "profile".$a->user['nickname'] || $a->argv[0] === "network" && local_user()) {
vier_community_info();
$a->page['htmlhead'] .= "<link rel='stylesheet' type='text/css' href='view/theme/vier/wide.css' media='screen and (min-width: 1300px)'/>\n";
projects / friendica.git / commitdiff