strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Coding Standards

Browse source 
Guess who got phpcs configured.
Updated phpcs.xml based on Developer_Intro document.
This commit is contained in:
Adam Magness 2017-11-08 17:02:50 -05:00
commit d7dc51ecc1
7 changed files with 1404 additions and 1008 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Core/Config.php
View file

@ -1,15 +1,15 @@
<?php
namespace Friendica\Core;
use Friendica\Database\DBM;
use dba;
/**
* System Configuration Class
*
* @file include/Core/Config.php
*
* @brief Contains the class with methods for system configuration
*/
namespace Friendica\Core;
use Friendica\Database\DBM;
use dba;
/**
* @brief Arbitrary sytem configuration storage
@ -87,7 +87,6 @@ class Config {
$a = get_app();
if (!$refresh) {
// Do we have the cached value? Then return it
if (isset(self::$cache[$family][$key])) {
if (self::$cache[$family][$key] === '!<unset>!') {
@ -108,7 +107,6 @@ class Config {
self::$in_db[$family][$key] = true;
return $val;
} elseif (isset($a->config[$family][$key])) {
// Assign the value (mostly) from the .htconfig.php to the cache
self::$cache[$family][$key] = $a->config[$family][$key];
self::$in_db[$family][$key] = false;

232
src/Core/NotificationsManager.php
View file

@ -1,10 +1,10 @@
<?php
namespace Friendica\Core;
/**
* @file src/Core/NotificationsManager.php
* @brief Methods for read and write notifications from/to database
* or for formatting notifications
*/
namespace Friendica\Core;
use Friendica\Core\Pconfig;
use Friendica\Core\System;
@ -19,10 +19,15 @@ require_once 'include/Contact.php';
* @brief Methods for read and write notifications from/to database
* or for formatting notifications
*/
class NotificationsManager {
class NotificationsManager
{
private $a;
public function __construct() {
/**
* Constructor
*/
public function __construct()
{
$this->a = get_app();
}
@ -38,14 +43,15 @@ class NotificationsManager {
* - msg_html: message as html string
* - msg_plain: message as plain text string
*/
private function _set_extra($notes) {
private function _set_extra($notes)
{
$rets = array();
foreach($notes as $n) {
$local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']);
foreach ($notes as $n) {
$local_time = datetime_convert('UTC', date_default_timezone_get(), $n['date']);
$n['timestamp'] = strtotime($local_time);
$n['date_rel'] = relative_date($n['date']);
$n['msg_html'] = bbcode($n['msg'], false, false, false, false);
$n['msg_plain'] = explode("\n",trim(html2plain($n['msg_html'], 0)))[0];
$n['msg_plain'] = explode("\n", trim(html2plain($n['msg_html'], 0)))[0];
$rets[] = $n;
}
@ -57,15 +63,17 @@ class NotificationsManager {
* @brief Get all notifications for local_user()
*
* @param array $filter optional Array "column name"=>value: filter query by columns values
* @param string $order optional Space separated list of column to sort by. prepend name with "+" to sort ASC, "-" to sort DESC. Default to "-date"
* @param string $order optional Space separated list of column to sort by.
* Prepend name with "+" to sort ASC, "-" to sort DESC. Default to "-date"
* @param string $limit optional Query limits
*
* @return array of results or false on errors
*/
public function getAll($filter = array(), $order="-date", $limit="") {
public function getAll($filter = array(), $order = "-date", $limit = "")
{
$filter_str = array();
$filter_sql = "";
foreach($filter as $column => $value) {
foreach ($filter as $column => $value) {
$filter_str[] = sprintf("`%s` = '%s'", $column, dbesc($value));
}
if (count($filter_str)>0) {
@ -74,29 +82,31 @@ class NotificationsManager {
$aOrder = explode(" ", $order);
$asOrder = array();
foreach($aOrder as $o) {
foreach ($aOrder as $o) {
$dir = "asc";
if ($o[0]==="-") {
$dir = "desc";
$o = substr($o,1);
$o = substr($o, 1);
}
if ($o[0]==="+") {
$dir = "asc";
$o = substr($o,1);
$o = substr($o, 1);
}
$asOrder[] = "$o $dir";
}
$order_sql = implode(", ", $asOrder);
if($limit!="")
if ($limit != "") {
$limit = " LIMIT ".$limit;
$r = q("SELECT * FROM `notify` WHERE `uid` = %d $filter_sql ORDER BY $order_sql $limit",
}
$r = q(
"SELECT * FROM `notify` WHERE `uid` = %d $filter_sql ORDER BY $order_sql $limit",
intval(local_user())
);
if (DBM::is_result($r))
if (DBM::is_result($r)) {
return $this->_set_extra($r);
}
return false;
}
@ -104,11 +114,13 @@ class NotificationsManager {
/**
* @brief Get one note for local_user() by $id value
*
* @param int $id
* @param int $id identity
* @return array note values or null if not found
*/
public function getByID($id) {
$r = q("SELECT * FROM `notify` WHERE `id` = %d AND `uid` = %d LIMIT 1",
public function getByID($id)
{
$r = q(
"SELECT * FROM `notify` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($id),
intval(local_user())
);
@ -121,12 +133,14 @@ class NotificationsManager {
/**
* @brief set seen state of $note of local_user()
*
* @param array $note
* @param array $note note array
* @param bool $seen optional true or false, default true
* @return bool true on success, false on errors
*/
public function setSeen($note, $seen = true) {
return q("UPDATE `notify` SET `seen` = %d WHERE ( `link` = '%s' OR ( `parent` != 0 AND `parent` = %d AND `otype` = '%s' )) AND `uid` = %d",
public function setSeen($note, $seen = true)
{
return q(
"UPDATE `notify` SET `seen` = %d WHERE ( `link` = '%s' OR ( `parent` != 0 AND `parent` = %d AND `otype` = '%s' )) AND `uid` = %d",
intval($seen),
dbesc($note['link']),
intval($note['parent']),
@ -141,8 +155,10 @@ class NotificationsManager {
* @param bool $seen optional true or false. default true
* @return bool true on success, false on error
*/
public function setAllSeen($seen = true) {
return q("UPDATE `notify` SET `seen` = %d WHERE `uid` = %d",
public function setAllSeen($seen = true)
{
return q(
"UPDATE `notify` SET `seen` = %d WHERE `uid` = %d",
intval($seen),
intval(local_user())
);
@ -153,7 +169,8 @@ class NotificationsManager {
*
* @return array with with notifications TabBar data
*/
public function getTabs() {
public function getTabs()
{
$tabs = array(
array(
'label' => t('System'),
@ -210,13 +227,12 @@ class NotificationsManager {
* string 'ago' => T relative date of the notification
* bool 'seen' => Is the notification marked as "seen"
*/
private function formatNotifs($notifs, $ident = "") {
private function formatNotifs($notifs, $ident = "")
{
$notif = array();
$arr = array();
if (DBM::is_result($notifs)) {
foreach ($notifs as $it) {
// Because we use different db tables for the notification query
// we have sometimes $it['unseen'] and sometimes $it['seen].
@ -257,11 +273,10 @@ class NotificationsManager {
: sprintf(t("%s commented on %s's post"), $it['author-name'], $it['pname']));
$default_item_when = datetime_convert('UTC', date_default_timezone_get(), $it['created'], 'r');
$default_item_ago = relative_date($it['created']);
}
// Transform the different types of notification in an usable array
switch ($it['verb']){
switch ($it['verb']) {
case ACTIVITY_LIKE:
$notif = array(
'label' => 'like',
@ -362,7 +377,6 @@ class NotificationsManager {
}
return $arr;
}
/**
@ -372,13 +386,16 @@ class NotificationsManager {
* which aren't marked as "seen"
* @return int Number of network notifications
*/
private function networkTotal($seen = 0) {
private function networkTotal($seen = 0)
{
$sql_seen = "";
if($seen === 0)
if ($seen === 0) {
$sql_seen = " AND `item`.`unseen` = 1 ";
}
$r = q("SELECT COUNT(*) AS `total`
$r = q(
"SELECT COUNT(*) AS `total`
FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
WHERE `item`.`visible` = 1 AND `pitem`.`parent` != 0 AND
`item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0
@ -386,8 +403,9 @@ class NotificationsManager {
intval(local_user())
);
if (DBM::is_result($r))
if (DBM::is_result($r)) {
return $r[0]['total'];
}
return 0;
}
@ -406,17 +424,20 @@ class NotificationsManager {
* int 'total' => Total number of available network notifications
* array 'notifications' => Network notifications
*/
public function networkNotifs($seen = 0, $start = 0, $limit = 80) {
public function networkNotifs($seen = 0, $start = 0, $limit = 80)
{
$ident = 'network';
$total = $this->networkTotal($seen);
$notifs = array();
$sql_seen = "";
if($seen === 0)
if ($seen === 0) {
$sql_seen = " AND `item`.`unseen` = 1 ";
}
$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
$r = q(
"SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
@ -429,8 +450,9 @@ class NotificationsManager {
intval($limit)
);
if (DBM::is_result($r))
if (DBM::is_result($r)) {
$notifs = $this->formatNotifs($r, $ident);
}
$arr = array (
'notifications' => $notifs,
@ -448,18 +470,22 @@ class NotificationsManager {
* which aren't marked as "seen"
* @return int Number of system notifications
*/
private function systemTotal($seen = 0) {
private function systemTotal($seen = 0)
{
$sql_seen = "";
if($seen === 0)
if ($seen === 0) {
$sql_seen = " AND `seen` = 0 ";
}
$r = q("SELECT COUNT(*) AS `total` FROM `notify` WHERE `uid` = %d $sql_seen",
$r = q(
"SELECT COUNT(*) AS `total` FROM `notify` WHERE `uid` = %d $sql_seen",
intval(local_user())
);
if (DBM::is_result($r))
if (DBM::is_result($r)) {
return $r[0]['total'];
}
return 0;
}
@ -478,24 +504,28 @@ class NotificationsManager {
* int 'total' => Total number of available system notifications
* array 'notifications' => System notifications
*/
public function systemNotifs($seen = 0, $start = 0, $limit = 80) {
public function systemNotifs($seen = 0, $start = 0, $limit = 80)
{
$ident = 'system';
$total = $this->systemTotal($seen);
$notifs = array();
$sql_seen = "";
if($seen === 0)
if ($seen === 0) {
$sql_seen = " AND `seen` = 0 ";
}
$r = q("SELECT `id`, `url`, `photo`, `msg`, `date`, `seen` FROM `notify`
$r = q(
"SELECT `id`, `url`, `photo`, `msg`, `date`, `seen` FROM `notify`
WHERE `uid` = %d $sql_seen ORDER BY `date` DESC LIMIT %d, %d ",
intval(local_user()),
intval($start),
intval($limit)
);
if (DBM::is_result($r))
if (DBM::is_result($r)) {
$notifs = $this->formatNotifs($r, $ident);
}
$arr = array (
'notifications' => $notifs,
@ -511,12 +541,14 @@ class NotificationsManager {
*
* @return string The additional sql query
*/
private function _personal_sql_extra() {
private function _personal_sql_extra()
{
$myurl = System::baseUrl(true) . '/profile/'. $this->a->user['nickname'];
$myurl = substr($myurl,strpos($myurl,'://')+3);
$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
$diasp_url = str_replace('/profile/','/u/',$myurl);
$sql_extra = sprintf(" AND ( `item`.`author-link` regexp '%s' OR `item`.`tag` regexp '%s' OR `item`.`tag` regexp '%s' ) ",
$myurl = substr($myurl, strpos($myurl, '://') + 3);
$myurl = str_replace(array('www.','.'), array('','\\.'), $myurl);
$diasp_url = str_replace('/profile/', '/u/', $myurl);
$sql_extra = sprintf(
" AND ( `item`.`author-link` regexp '%s' OR `item`.`tag` regexp '%s' OR `item`.`tag` regexp '%s' ) ",
dbesc($myurl . '$'),
dbesc($myurl . '\\]'),
dbesc($diasp_url . '\\]')
@ -532,14 +564,17 @@ class NotificationsManager {
* which aren't marked as "seen"
* @return int Number of personal notifications
*/
private function personalTotal($seen = 0) {
private function personalTotal($seen = 0)
{
$sql_seen = "";
$sql_extra = $this->_personal_sql_extra();
if($seen === 0)
if ($seen === 0) {
$sql_seen = " AND `item`.`unseen` = 1 ";
}
$r = q("SELECT COUNT(*) AS `total`
$r = q(
"SELECT COUNT(*) AS `total`
FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
WHERE `item`.`visible` = 1
$sql_extra
@ -548,8 +583,9 @@ class NotificationsManager {
intval(local_user())
);
if (DBM::is_result($r))
if (DBM::is_result($r)) {
return $r[0]['total'];
}
return 0;
}
@ -568,17 +604,20 @@ class NotificationsManager {
* int 'total' => Total number of available personal notifications
* array 'notifications' => Personal notifications
*/
public function personalNotifs($seen = 0, $start = 0, $limit = 80) {
public function personalNotifs($seen = 0, $start = 0, $limit = 80)
{
$ident = 'personal';
$total = $this->personalTotal($seen);
$sql_extra = $this->_personal_sql_extra();
$notifs = array();
$sql_seen = "";
if($seen === 0)
if ($seen === 0) {
$sql_seen = " AND `item`.`unseen` = 1 ";
}
$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
$r = q(
"SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
@ -586,14 +625,15 @@ class NotificationsManager {
$sql_extra
$sql_seen
AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0
ORDER BY `item`.`created` DESC LIMIT %d, %d " ,
ORDER BY `item`.`created` DESC LIMIT %d, %d ",
intval(local_user()),
intval($start),
intval($limit)
);
if (DBM::is_result($r))
if (DBM::is_result($r)) {
$notifs = $this->formatNotifs($r, $ident);
}
$arr = array (
'notifications' => $notifs,
@ -611,21 +651,25 @@ class NotificationsManager {
* which aren't marked as "seen"
* @return int Number of home notifications
*/
private function homeTotal($seen = 0) {
private function homeTotal($seen = 0)
{
$sql_seen = "";
if($seen === 0)
if ($seen === 0) {
$sql_seen = " AND `item`.`unseen` = 1 ";
}
$r = q("SELECT COUNT(*) AS `total` FROM `item`
$r = q(
"SELECT COUNT(*) AS `total` FROM `item`
WHERE `item`.`visible` = 1 AND
`item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1
$sql_seen",
intval(local_user())
);
if (DBM::is_result($r))
if (DBM::is_result($r)) {
return $r[0]['total'];
}
return 0;
}
@ -644,16 +688,19 @@ class NotificationsManager {
* int 'total' => Total number of available home notifications
* array 'notifications' => Home notifications
*/
public function homeNotifs($seen = 0, $start = 0, $limit = 80) {
public function homeNotifs($seen = 0, $start = 0, $limit = 80)
{
$ident = 'home';
$total = $this->homeTotal($seen);
$notifs = array();
$sql_seen = "";
if($seen === 0)
if ($seen === 0) {
$sql_seen = " AND `item`.`unseen` = 1 ";
}
$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
$r = q(
"SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
@ -666,8 +713,9 @@ class NotificationsManager {
intval($limit)
);
if (DBM::is_result($r))
if (DBM::is_result($r)) {
$notifs = $this->formatNotifs($r, $ident);
}
$arr = array (
'notifications' => $notifs,
@ -685,19 +733,23 @@ class NotificationsManager {
* which aren't marked as ignored
* @return int Number of introductions
*/
private function introTotal($all = false) {
private function introTotal($all = false)
{
$sql_extra = "";
if(!$all)
if (!$all) {
$sql_extra = " AND `ignore` = 0 ";
}
$r = q("SELECT COUNT(*) AS `total` FROM `intro`
$r = q(
"SELECT COUNT(*) AS `total` FROM `intro`
WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ",
intval($_SESSION['uid'])
);
if (DBM::is_result($r))
if (DBM::is_result($r)) {
return $r[0]['total'];
}
return 0;
}
@ -722,11 +774,13 @@ class NotificationsManager {
$notifs = array();
$sql_extra = "";
if(!$all)
if (!$all) {
$sql_extra = " AND `ignore` = 0 ";
}
/// @todo Fetch contact details by "get_contact_details_by_url" instead of queries to contact, fcontact and gcontact
$r = q("SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*,
$r = q(
"SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*,
`fcontact`.`name` AS `fname`, `fcontact`.`url` AS `furl`,
`fcontact`.`photo` AS `fphoto`, `fcontact`.`request` AS `frequest`,
`gcontact`.`location` AS `glocation`, `gcontact`.`about` AS `gabout`,
@ -743,8 +797,9 @@ class NotificationsManager {
intval($limit)
);
if (DBM::is_result($r))
if (DBM::is_result($r)) {
$notifs = $this->formatIntros($r);
}
$arr = array (
'ident' => $ident,
@ -761,16 +816,16 @@ class NotificationsManager {
* @param array $intros The array from the db query
* @return array with the introductions
*/
private function formatIntros($intros) {
private function formatIntros($intros)
{
$knowyou = '';
foreach($intros as $it) {
foreach ($intros as $it) {
// There are two kind of introduction. Contacts suggested by other contacts and normal connection requests.
// We have to distinguish between these two because they use different data.
// Contact suggestions
if($it['fid']) {
if ($it['fid']) {
$return_addr = bin2hex($this->a->user['nickname'] . '@' . $this->a->get_hostname() . (($this->a->path) ? '/' . $this->a->path : ''));
$intro = array(
@ -779,12 +834,11 @@ class NotificationsManager {
'intro_id' => $it['intro_id'],
'madeby' => $it['name'],
'contact_id' => $it['contact-id'],
'photo' => ((x($it,'fphoto')) ? proxy_url($it['fphoto'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"),
'photo' => ((x($it, 'fphoto')) ? proxy_url($it['fphoto'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"),
'name' => $it['fname'],
'url' => zrl($it['furl']),
'hidden' => $it['hidden'] == 1,
'post_newfriend' => (intval(PConfig::get(local_user(),'system','post_newfriend')) ? '1' : 0),
'post_newfriend' => (intval(PConfig::get(local_user(), 'system', 'post_newfriend')) ? '1' : 0),
'knowyou' => $knowyou,
'note' => $it['note'],
'request' => $it['frequest'] . '?addr=' . $return_addr,
@ -793,11 +847,10 @@ class NotificationsManager {
// Normal connection requests
} else {
$it = $this->getMissingIntroData($it);
// Don't show these data until you are connected. Diaspora is doing the same.
if($it['gnetwork'] === NETWORK_DIASPORA) {
if ($it['gnetwork'] === NETWORK_DIASPORA) {
$it['glocation'] = "";
$it['gabout'] = "";
$it['ggender'] = "";
@ -809,14 +862,14 @@ class NotificationsManager {
'uid' => $_SESSION['uid'],
'intro_id' => $it['intro_id'],
'contact_id' => $it['contact-id'],
'photo' => ((x($it,'photo')) ? proxy_url($it['photo'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"),
'photo' => ((x($it, 'photo')) ? proxy_url($it['photo'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"),
'name' => $it['name'],
'location' => bbcode($it['glocation'], false, false),
'about' => bbcode($it['gabout'], false, false),
'keywords' => $it['gkeywords'],
'gender' => $it['ggender'],
'hidden' => $it['hidden'] == 1,
'post_newfriend' => (intval(PConfig::get(local_user(),'system','post_newfriend')) ? '1' : 0),
'post_newfriend' => (intval(PConfig::get(local_user(), 'system', 'post_newfriend')) ? '1' : 0),
'url' => $it['url'],
'zrl' => zrl($it['url']),
'addr' => $it['gaddr'],
@ -840,7 +893,8 @@ class NotificationsManager {
*
* @return array The array with the intro data
*/
private function getMissingIntroData($arr) {
private function getMissingIntroData($arr)
{
// If the network and the addr isn't available from the gcontact
// table entry, take the one of the contact table entry
if ($arr['gnetwork'] == "") {

32
src/Database/DBM.php
View file

@ -1,13 +1,18 @@
<?php
/**
* @file src/Database/DBM.php
*/
namespace Friendica\Database;
use dba;
/**
* @brief This class contain functions for the database management
*
* This class contains functions that doesn't need to know if pdo, mysqli or whatever is used.
*/
class DBM {
class DBM
{
/**
* @brief Return a list of database processes
*
@ -15,7 +20,8 @@ class DBM {
* 'list' => List of processes, separated in their different states
* 'amount' => Number of concurrent database processes
*/
public static function processlist() {
public static function processlist()
{
$r = q("SHOW PROCESSLIST");
$s = array();
@ -33,8 +39,9 @@ class DBM {
$statelist = "";
foreach ($states AS $state => $usage) {
if ($statelist != "")
if ($statelist != "") {
$statelist .= ", ";
}
$statelist .= $state.": ".$usage;
}
return(array("list" => $statelist, "amount" => $processes));
@ -43,10 +50,12 @@ class DBM {
/**
* Checks if $array is a filled array with at least one entry.
*
* @param $array mixed A filled array with at least one entry
* @return Whether $array is a filled array or an object with rows
* @param mixed $array A filled array with at least one entry
*
* @return boolean Whether $array is a filled array or an object with rows
*/
public static function is_result($array) {
public static function is_result($array)
{
// It could be a return value from an update statement
if (is_bool($array)) {
return $array;
@ -66,8 +75,8 @@ class DBM {
* @param string $key Array key
* @param boolean $add_quotation add quotation marks for string values
*/
private static function esc_array_callback(&$value, $key, $add_quotation) {
private static function esc_array_callback(&$value, $key, $add_quotation)
{
if (!$add_quotation) {
if (is_bool($value)) {
$value = ($value ? '1' : '0');
@ -92,7 +101,8 @@ class DBM {
* @param mixed $arr Array with values to be escaped
* @param boolean $add_quotation add quotation marks for string values
*/
public static function esc_array(&$arr, $add_quotation = false) {
public static function esc_array(&$arr, $add_quotation = false)
{
array_walk($arr, 'self::esc_array_callback', $add_quotation);
}
@ -100,9 +110,11 @@ class DBM {
* Checks Converts any date string into a SQL compatible date string
*
* @param string $date a date string in any format
*
* @return string SQL style date string
*/
public static function date($date = 'now') {
public static function date($date = 'now')
{
$timestamp = strtotime($date);
// Don't allow lower date strings as '0001-01-01 00:00:00'

51
src/ParseUrl.php
View file

@ -1,10 +1,8 @@
<?php
/**
* @file include/ParseUrl.php
* @brief Get informations about a given URL
*/
namespace Friendica;
use Friendica\Core\Config;
@ -15,16 +13,15 @@ use dba;
use DomXPath;
use DOMDocument;
require_once("include/network.php");
require_once("include/Photo.php");
require_once("include/oembed.php");
require_once("include/xml.php");
require_once "include/network.php";
require_once "include/Photo.php";
require_once "include/oembed.php";
/**
* @brief Class with methods for extracting certain content from an url
*/
class ParseUrl {
class ParseUrl
{
/**
* @brief Search for chached embeddable data of an url otherwise fetch it
*
@ -47,14 +44,18 @@ class ParseUrl {
* @see ParseUrl::getSiteinfo() for more information about scraping
* embeddable content
*/
public static function getSiteinfoCached($url, $no_guessing = false, $do_oembed = true) {
public static function getSiteinfoCached($url, $no_guessing = false, $do_oembed = true)
{
if ($url == "") {
return false;
}
$r = q("SELECT * FROM `parsed_url` WHERE `url` = '%s' AND `guessing` = %d AND `oembed` = %d",
dbesc(normalise_link($url)), intval(!$no_guessing), intval($do_oembed));
$r = q(
"SELECT * FROM `parsed_url` WHERE `url` = '%s' AND `guessing` = %d AND `oembed` = %d",
dbesc(normalise_link($url)),
intval(!$no_guessing),
intval($do_oembed)
);
if ($r) {
$data = $r[0]["content"];
@ -67,9 +68,14 @@ class ParseUrl {
$data = self::getSiteinfo($url, $no_guessing, $do_oembed);
dba::insert('parsed_url', array('url' => normalise_link($url), 'guessing' => !$no_guessing,
dba::insert(
'parsed_url',
array(
'url' => normalise_link($url), 'guessing' => !$no_guessing,
'oembed' => $do_oembed, 'content' => serialize($data),
'created' => datetime_convert()), true);
'created' => datetime_convert()),
true
);
return $data;
}
@ -113,8 +119,8 @@ class ParseUrl {
* </body>
* @endverbatim
*/
public static function getSiteinfo($url, $no_guessing = false, $do_oembed = true, $count = 1) {
public static function getSiteinfo($url, $no_guessing = false, $do_oembed = true, $count = 1)
{
$a = get_app();
$siteinfo = array();
@ -158,7 +164,6 @@ class ParseUrl {
$body = $data["body"];
if ($do_oembed) {
$oembed_data = oembed_fetch_url($url);
if (!in_array($oembed_data->type, array("error", "rich", ""))) {
@ -364,7 +369,6 @@ class ParseUrl {
"width" => $photodata[0],
"height" => $photodata[1]);
}
}
} elseif ($siteinfo["image"] != "") {
$src = self::completeUrl($siteinfo["image"], $url);
@ -433,7 +437,8 @@ class ParseUrl {
* @param string $string Tags
* @return array with formatted Hashtags
*/
public static function convertTagsToArray($string) {
public static function convertTagsToArray($string)
{
$arr_tags = str_getcsv($string);
if (count($arr_tags)) {
// add the # sign to every tag
@ -451,7 +456,8 @@ class ParseUrl {
* @param string $tag The pure tag name
* @param int $k Counter for internal use
*/
private static function arrAddHashes(&$tag, $k) {
private static function arrAddHashes(&$tag, $k)
{
$tag = "#" . $tag;
}
@ -469,7 +475,8 @@ class ParseUrl {
*
* @return string The url with a scheme
*/
private static function completeUrl($url, $scheme) {
private static function completeUrl($url, $scheme)
{
$urlarr = parse_url($url);
// If the url does allready have an scheme
@ -486,7 +493,7 @@ class ParseUrl {
$complete .= ":".$schemearr["port"];
}
if (strpos($urlarr["path"],"/") !== 0) {
if (strpos($urlarr["path"], "/") !== 0) {
$complete .= "/";
}

528
src/Protocol/DFRN.php
View file

@ -1,5 +1,4 @@
<?php
namespace Friendica\Protocol;
/**
* @file include/dfrn.php
* @brief The implementation of the dfrn protocol
@ -7,6 +6,7 @@ namespace Friendica\Protocol;
* @see https://github.com/friendica/friendica/wiki/Protocol and
* https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
*/
namespace Friendica\Protocol;
use Friendica\App;
use Friendica\Core\Config;
@ -20,24 +20,24 @@ use DomXPath;
use ostatus;
use xml;
require_once("include/Contact.php");
require_once("include/enotify.php");
require_once("include/threads.php");
require_once("include/socgraph.php");
require_once("include/items.php");
require_once("include/tags.php");
require_once("include/files.php");
require_once("include/event.php");
require_once("include/text.php");
require_once("include/oembed.php");
require_once("include/html2bbcode.php");
require_once("include/bbcode.php");
require_once "include/Contact.php";
require_once "include/enotify.php";
require_once "include/threads.php";
require_once "include/socgraph.php";
require_once "include/items.php";
require_once "include/tags.php";
require_once "include/files.php";
require_once "include/event.php";
require_once "include/text.php";
require_once "include/oembed.php";
require_once "include/html2bbcode.php";
require_once "include/bbcode.php";
/**
* @brief This class contain functions to create and send DFRN XML files
*
*/
class DFRN {
class DFRN
{
const DFRN_TOP_LEVEL = 0; // Top level posting
const DFRN_REPLY = 1; // Regular reply that is stored locally
@ -54,8 +54,8 @@ class DFRN {
* @return string DFRN entries
* @todo Add type-hints
*/
public static function entries($items,$owner) {
public static function entries($items, $owner)
{
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
@ -86,8 +86,8 @@ class DFRN {
*
* @return string DFRN feed entries
*/
public static function feed($dfrn_id, $owner_nick, $last_update, $direction = 0, $onlyheader = false) {
public static function feed($dfrn_id, $owner_nick, $last_update, $direction = 0, $onlyheader = false)
{
$a = get_app();
$sitefeed = ((strlen($owner_nick)) ? false : true); // not yet implemented, need to rewrite huge chunks of following logic
@ -115,7 +115,8 @@ class DFRN {
$sql_extra = " AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' ";
$r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type`
$r = q(
"SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type`
FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
WHERE `contact`.`self` AND `user`.`nickname` = '%s' LIMIT 1",
dbesc($owner_nick)
@ -132,9 +133,8 @@ class DFRN {
$sql_post_table = "";
if (! $public_feed) {
$sql_extra = '';
switch($direction) {
switch ($direction) {
case (-1):
$sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($dfrn_id));
$my_id = $dfrn_id;
@ -152,7 +152,8 @@ class DFRN {
break; // NOTREACHED
}
$r = q("SELECT * FROM `contact` WHERE NOT `blocked` AND `contact`.`uid` = %d $sql_extra LIMIT 1",
$r = q(
"SELECT * FROM `contact` WHERE NOT `blocked` AND `contact`.`uid` = %d $sql_extra LIMIT 1",
intval($owner_id)
);
@ -161,7 +162,7 @@ class DFRN {
}
$contact = $r[0];
require_once('include/security.php');
include_once 'include/security.php';
$groups = init_groups_visitor($contact['id']);
if (count($groups)) {
@ -172,7 +173,8 @@ class DFRN {
$gs = '<<>>' ; // Impossible to match
}
$sql_extra = sprintf("
$sql_extra = sprintf(
"
AND ( `allow_cid` = '' OR `allow_cid` REGEXP '<%d>' )
AND ( `deny_cid` = '' OR NOT `deny_cid` REGEXP '<%d>' )
AND ( `allow_gid` = '' OR `allow_gid` REGEXP '%s' )
@ -196,8 +198,13 @@ class DFRN {
}
if (isset($category)) {
$sql_post_table = sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
dbesc(protect_sprintf($category)), intval(TERM_OBJ_POST), intval(TERM_CATEGORY), intval($owner_id));
$sql_post_table = sprintf(
"INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
dbesc(protect_sprintf($category)),
intval(TERM_OBJ_POST),
intval(TERM_CATEGORY),
intval($owner_id)
);
//$sql_extra .= file_tag_file_query('item',$category,'category');
}
@ -207,9 +214,10 @@ class DFRN {
}
}
$check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
$check_date = datetime_convert('UTC', 'UTC', $last_update, 'Y-m-d H:i:s');
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
$r = q(
"SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`network`, `contact`.`photo`, `contact`.`url`,
`contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`,
`contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
@ -263,7 +271,6 @@ class DFRN {
}
foreach ($items as $item) {
// prevent private email from leaking.
if ($item['network'] == NETWORK_MAIL) {
continue;
@ -283,7 +290,6 @@ class DFRN {
$entry = self::entry($doc, $type, $item, $owner, true);
$root->appendChild($entry);
}
$atom = trim($doc->saveXML());
@ -301,14 +307,16 @@ class DFRN {
*
* @return string DFRN feed entry
*/
public static function itemFeed($item_id, $conversation = false) {
public static function itemFeed($item_id, $conversation = false)
{
if ($conversation) {
$condition = '`item`.`parent`';
} else {
$condition = '`item`.`id`';
}
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
$r = q(
"SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`network`, `contact`.`photo`, `contact`.`url`,
`contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`,
`contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
@ -330,7 +338,8 @@ class DFRN {
$items = $r;
$item = $r[0];
$r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type`
$r = q(
"SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type`
FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
WHERE `contact`.`self` AND `user`.`uid` = %d LIMIT 1",
intval($item['uid'])
@ -383,7 +392,8 @@ class DFRN {
* @return string DFRN mail
* @todo Add type-hints
*/
public static function mail($item, $owner) {
public static function mail($item, $owner)
{
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
@ -418,7 +428,8 @@ class DFRN {
* @return string DFRN suggestions
* @todo Add type-hints
*/
public static function fsuggest($item, $owner) {
public static function fsuggest($item, $owner)
{
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
@ -446,18 +457,22 @@ class DFRN {
* @return string DFRN relocations
* @todo Add type-hints
*/
public static function relocate($owner, $uid) {
public static function relocate($owner, $uid)
{
/* get site pubkey. this could be a new installation with no site keys*/
$pubkey = Config::get('system','site_pubkey');
$pubkey = Config::get('system', 'site_pubkey');
if (! $pubkey) {
$res = new_keypair(1024);
Config::set('system','site_prvkey', $res['prvkey']);
Config::set('system','site_pubkey', $res['pubkey']);
Config::set('system', 'site_prvkey', $res['prvkey']);
Config::set('system', 'site_pubkey', $res['pubkey']);
}
$rp = q("SELECT `resource-id` , `scale`, type FROM `photo`
WHERE `profile` = 1 AND `uid` = %d ORDER BY scale;", $uid);
$rp = q(
"SELECT `resource-id` , `scale`, type FROM `photo`
WHERE `profile` = 1 AND `uid` = %d ORDER BY scale;",
$uid
);
$photos = array();
$ext = Photo::supportedTypes();
@ -504,7 +519,8 @@ class DFRN {
* @return object XML root object
* @todo Add type-hints
*/
private static function add_header($doc, $owner, $authorelement, $alternatelink = "", $public = false) {
private static function add_header($doc, $owner, $authorelement, $alternatelink = "", $public = false)
{
if ($alternatelink == "") {
$alternatelink = $owner['url'];
@ -578,12 +594,14 @@ class DFRN {
* @return object XML author object
* @todo Add type-hints
*/
private static function add_author($doc, $owner, $authorelement, $public) {
private static function add_author($doc, $owner, $authorelement, $public)
{
// Is the profile hidden or shouldn't be published in the net? Then add the "hide" element
$r = q("SELECT `id` FROM `profile` INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
$r = q(
"SELECT `id` FROM `profile` INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
WHERE (`hidewall` OR NOT `net-publish`) AND `user`.`uid` = %d",
intval($owner['uid']));
intval($owner['uid'])
);
if (DBM::is_result($r)) {
$hidewall = true;
} else {
@ -629,17 +647,20 @@ class DFRN {
$birthday = feed_birthday($owner['uid'], $owner['timezone']);
if ($birthday)
if ($birthday) {
xml::add_element($doc, $author, "dfrn:birthday", $birthday);
}
// Only show contact details when we are allowed to
$r = q("SELECT `profile`.`about`, `profile`.`name`, `profile`.`homepage`, `user`.`nickname`,
$r = q(
"SELECT `profile`.`about`, `profile`.`name`, `profile`.`homepage`, `user`.`nickname`,
`user`.`timezone`, `profile`.`locality`, `profile`.`region`, `profile`.`country-name`,
`profile`.`pub_keywords`, `profile`.`xmpp`, `profile`.`dob`
FROM `profile`
INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
WHERE `profile`.`is-default` AND NOT `user`.`hidewall` AND `user`.`uid` = %d",
intval($owner['uid']));
intval($owner['uid'])
);
if (DBM::is_result($r)) {
$profile = $r[0];
@ -672,7 +693,6 @@ class DFRN {
foreach ($keywords AS $keyword) {
xml::add_element($doc, $author, "poco:tags", trim($keyword));
}
}
if (trim($profile["xmpp"]) != "") {
@ -713,12 +733,13 @@ class DFRN {
* @param object $doc XML document
* @param string $element Element name for the author
* @param string $contact_url Link of the contact
* @param array $items Item elements
* @param array $item Item elements
*
* @return object XML author object
* @todo Add type-hints
*/
private static function add_entry_author($doc, $element, $contact_url, $item) {
private static function add_entry_author($doc, $element, $contact_url, $item)
{
$contact = get_contact_details_by_url($contact_url, $item["uid"]);
@ -759,8 +780,8 @@ class DFRN {
* @return object XML activity object
* @todo Add type-hints
*/
private static function create_activity($doc, $element, $activity) {
private static function create_activity($doc, $element, $activity)
{
if ($activity) {
$entry = $doc->createElement($element);
@ -822,12 +843,13 @@ class DFRN {
* @return object XML attachment object
* @todo Add type-hints
*/
private static function get_attachment($doc, $root, $item) {
$arr = explode('[/attach],',$item['attach']);
private static function get_attachment($doc, $root, $item)
{
$arr = explode('[/attach],', $item['attach']);
if (count($arr)) {
foreach ($arr as $r) {
$matches = false;
$cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches);
$cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|', $r, $matches);
if ($cnt) {
$attributes = array("rel" => "enclosure",
"href" => $matches[1],
@ -861,8 +883,8 @@ class DFRN {
* @return object XML entry object
* @todo Add type-hints
*/
private static function entry($doc, $type, $item, $owner, $comment = false, $cid = 0, $single = false) {
private static function entry($doc, $type, $item, $owner, $comment = false, $cid = 0, $single = false)
{
$mentioned = array();
if (!$item['parent']) {
@ -870,7 +892,7 @@ class DFRN {
}
if ($item['deleted']) {
$attributes = array("ref" => $item['uri'], "when" => datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME));
$attributes = array("ref" => $item['uri'], "when" => datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00', ATOM_TIME));
return xml::create_element($doc, "at:deleted-entry", "", $attributes);
}
@ -892,7 +914,7 @@ class DFRN {
}
if ($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) {
$body = fix_private_photos($item['body'],$owner['uid'],$item,$cid);
$body = fix_private_photos($item['body'], $owner['uid'], $item, $cid);
} else {
$body = $item['body'];
}
@ -950,8 +972,8 @@ class DFRN {
xml::add_element($doc, $entry, "id", $item["uri"]);
xml::add_element($doc, $entry, "title", $item["title"]);
xml::add_element($doc, $entry, "published", datetime_convert("UTC","UTC",$item["created"]."+00:00",ATOM_TIME));
xml::add_element($doc, $entry, "updated", datetime_convert("UTC","UTC",$item["edited"]."+00:00",ATOM_TIME));
xml::add_element($doc, $entry, "published", datetime_convert("UTC", "UTC", $item["created"] . "+00:00", ATOM_TIME));
xml::add_element($doc, $entry, "updated", datetime_convert("UTC", "UTC", $item["edited"] . "+00:00", ATOM_TIME));
// "dfrn:env" is used to read the content
xml::add_element($doc, $entry, "dfrn:env", base64url_encode($body, true));
@ -961,8 +983,14 @@ class DFRN {
xml::add_element($doc, $entry, "content", (($type == 'html') ? $htmlbody : $body), array("type" => $type));
// We save this value in "plink". Maybe we should read it from there as well?
xml::add_element($doc, $entry, "link", "", array("rel" => "alternate", "type" => "text/html",
"href" => System::baseUrl()."/display/".$item["guid"]));
xml::add_element(
$doc,
$entry,
"link",
"",
array("rel" => "alternate", "type" => "text/html",
"href" => System::baseUrl() . "/display/" . $item["guid"])
);
// "comment-allow" is some old fashioned stuff for old Friendica versions.
// It is included in the rewritten code for completeness
@ -1042,18 +1070,32 @@ class DFRN {
}
foreach ($mentioned AS $mention) {
$r = q("SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
$r = q(
"SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
intval($owner["uid"]),
dbesc(normalise_link($mention)));
dbesc(normalise_link($mention))
);
if (DBM::is_result($r) && ($r[0]["forum"] || $r[0]["prv"])) {
xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
xml::add_element(
$doc,
$entry,
"link",
"",
array("rel" => "mentioned",
"ostatus:object-type" => ACTIVITY_OBJ_GROUP,
"href" => $mention));
"href" => $mention)
);
} else {
xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
xml::add_element(
$doc,
$entry,
"link",
"",
array("rel" => "mentioned",
"ostatus:object-type" => ACTIVITY_OBJ_PERSON,
"href" => $mention));
"href" => $mention)
);
}
}
@ -1070,7 +1112,8 @@ class DFRN {
*
* @return string encrypted data
*/
private static function aes_encrypt($data, $key) {
private static function aes_encrypt($data, $key)
{
return openssl_encrypt($data, 'aes-128-ecb', $key, OPENSSL_RAW_DATA);
}
@ -1082,7 +1125,8 @@ class DFRN {
*
* @return string decrypted data
*/
public static function aes_decrypt($encrypted, $key) {
public static function aes_decrypt($encrypted, $key)
{
return openssl_decrypt($encrypted, 'aes-128-ecb', $key, OPENSSL_RAW_DATA);
}
@ -1090,15 +1134,15 @@ class DFRN {
* @brief Delivers the atom content to the contacts
*
* @param array $owner Owner record
* @param array $contactr Contact record of the receiver
* @param array $contact Contact record of the receiver
* @param string $atom Content that will be transmitted
* @param bool $dissolve (to be documented)
*
* @return int Deliver status. -1 means an error.
* @todo Add array type-hint for $owner, $contact
*/
public static function deliver($owner,$contact,$atom, $dissolve = false) {
public static function deliver($owner, $contact, $atom, $dissolve = false)
{
$a = get_app();
$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
@ -1115,7 +1159,7 @@ class DFRN {
logger("Local rino version: ". $rino, LOGGER_DEBUG);
$ssl_val = intval(Config::get('system','ssl_policy'));
$ssl_val = intval(Config::get('system', 'ssl_policy'));
$ssl_policy = '';
switch ($ssl_val) {
@ -1154,7 +1198,7 @@ class DFRN {
return 3;
}
if (strpos($xml,'<?xml') === false) {
if (strpos($xml, '<?xml') === false) {
logger('dfrn_deliver: no valid XML returned');
logger('dfrn_deliver: returned XML: ' . $xml, LOGGER_DATA);
return 3;
@ -1184,8 +1228,10 @@ class DFRN {
if ($perm) {
if ((($perm == 'rw') && (! intval($contact['writable'])))
|| (($perm == 'r') && (intval($contact['writable'])))) {
q("update contact set writable = %d where id = %d",
|| (($perm == 'r') && (intval($contact['writable'])))
) {
q(
"update contact set writable = %d where id = %d",
intval(($perm == 'rw') ? 1 : 0),
intval($contact['id'])
);
@ -1195,18 +1241,19 @@ class DFRN {
if (($contact['duplex'] && strlen($contact['pubkey']))
|| ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
|| ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))) {
openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']);
|| ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))
) {
openssl_public_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['pubkey']);
openssl_public_decrypt($challenge, $postvars['challenge'], $contact['pubkey']);
} else {
openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']);
openssl_private_decrypt($challenge,$postvars['challenge'],$contact['prvkey']);
openssl_private_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['prvkey']);
openssl_private_decrypt($challenge, $postvars['challenge'], $contact['prvkey']);
}
$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
if (strpos($final_dfrn_id,':') == 1) {
$final_dfrn_id = substr($final_dfrn_id,2);
if (strpos($final_dfrn_id, ':') == 1) {
$final_dfrn_id = substr($final_dfrn_id, 2);
}
if ($final_dfrn_id != $orig_id) {
@ -1226,7 +1273,7 @@ class DFRN {
$postvars['data'] = $atom;
$postvars['perm'] = 'rw';
} else {
$postvars['data'] = str_replace('<dfrn:comment-allow>1','<dfrn:comment-allow>0',$atom);
$postvars['data'] = str_replace('<dfrn:comment-allow>1', '<dfrn:comment-allow>0', $atom);
$postvars['perm'] = 'r';
}
@ -1281,19 +1328,18 @@ class DFRN {
if ($dfrn_version >= 2.1) {
if (($contact['duplex'] && strlen($contact['pubkey']))
|| ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
|| ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))) {
openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']);
|| ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))
) {
openssl_public_encrypt($key, $postvars['key'], $contact['pubkey']);
} else {
openssl_private_encrypt($key,$postvars['key'],$contact['prvkey']);
openssl_private_encrypt($key, $postvars['key'], $contact['prvkey']);
}
} else {
if (($contact['duplex'] && strlen($contact['prvkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
openssl_private_encrypt($key,$postvars['key'],$contact['prvkey']);
openssl_private_encrypt($key, $postvars['key'], $contact['prvkey']);
} else {
openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']);
openssl_public_encrypt($key, $postvars['key'], $contact['pubkey']);
}
}
logger('md5 rawkey ' . md5($postvars['key']));
@ -1302,7 +1348,7 @@ class DFRN {
}
logger('dfrn_deliver: ' . "SENDING: " . print_r($postvars,true), LOGGER_DATA);
logger('dfrn_deliver: ' . "SENDING: " . print_r($postvars, true), LOGGER_DATA);
$xml = post_url($contact['notify'], $postvars);
@ -1313,11 +1359,11 @@ class DFRN {
return -9; // timed out
}
if (($curl_stat == 503) && (stristr($a->get_curl_headers(),'retry-after'))) {
if (($curl_stat == 503) && (stristr($a->get_curl_headers(), 'retry-after'))) {
return -10;
}
if (strpos($xml,'<?xml') === false) {
if (strpos($xml, '<?xml') === false) {
logger('dfrn_deliver: phase 2: no valid XML returned');
logger('dfrn_deliver: phase 2: returned XML: ' . $xml, LOGGER_DATA);
return 3;
@ -1325,7 +1371,7 @@ class DFRN {
if ($contact['term-date'] > NULL_DATE) {
logger("dfrn_deliver: $url back from the dead - removing mark for death");
require_once('include/Contact.php');
include_once 'include/Contact.php';
unmark_for_death($contact);
}
@ -1349,14 +1395,16 @@ class DFRN {
* @param string $birthday Birthday of the contact
* @todo Add array type-hint for $contact
*/
private static function birthday_event($contact, $birthday) {
private static function birthday_event($contact, $birthday)
{
// Check for duplicates
$r = q("SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1",
$r = q(
"SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1",
intval($contact["uid"]),
intval($contact["id"]),
dbesc(datetime_convert("UTC","UTC", $birthday)),
dbesc("birthday"));
dbesc(datetime_convert("UTC", "UTC", $birthday)),
dbesc("birthday")
);
if (DBM::is_result($r)) {
return;
@ -1367,14 +1415,15 @@ class DFRN {
$bdtext = sprintf(t("%s\'s birthday"), $contact["name"]);
$bdtext2 = sprintf(t("Happy Birthday %s"), " [url=".$contact["url"]."]".$contact["name"]."[/url]") ;
$r = q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`)
$r = q(
"INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`)
VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s') ",
intval($contact["uid"]),
intval($contact["id"]),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
dbesc(datetime_convert("UTC","UTC", $birthday)),
dbesc(datetime_convert("UTC","UTC", $birthday." + 1 day ")),
dbesc(datetime_convert("UTC", "UTC", $birthday)),
dbesc(datetime_convert("UTC", "UTC", $birthday . " + 1 day ")),
dbesc($bdtext),
dbesc($bdtext2),
dbesc("birthday")
@ -1393,16 +1442,20 @@ class DFRN {
* @return Returns an array with relevant data of the author
* @todo Find good type-hints for all parameter
*/
private static function fetchauthor($xpath, $context, $importer, $element, $onlyfetch, $xml = "") {
private static function fetchauthor($xpath, $context, $importer, $element, $onlyfetch, $xml = "")
{
$author = array();
$author["name"] = $xpath->evaluate($element."/atom:name/text()", $context)->item(0)->nodeValue;
$author["link"] = $xpath->evaluate($element."/atom:uri/text()", $context)->item(0)->nodeValue;
$r = q("SELECT `id`, `uid`, `url`, `network`, `avatar-date`, `name-date`, `uri-date`, `addr`,
$r = q(
"SELECT `id`, `uid`, `url`, `network`, `avatar-date`, `name-date`, `uri-date`, `addr`,
`name`, `nick`, `about`, `location`, `keywords`, `xmpp`, `bdyear`, `bd`, `hidden`, `contact-type`
FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` != '%s'",
intval($importer["uid"]), dbesc(normalise_link($author["link"])), dbesc(NETWORK_STATUSNET));
intval($importer["uid"]),
dbesc(normalise_link($author["link"])),
dbesc(NETWORK_STATUSNET)
);
if (DBM::is_result($r)) {
$contact = $r[0];
@ -1591,19 +1644,34 @@ class DFRN {
if ($update) {
logger("Update contact data for contact " . $contact["id"] . " (" . $contact["nick"] . ")", LOGGER_DEBUG);
q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s',
q(
"UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s',
`addr` = '%s', `keywords` = '%s', `bdyear` = '%s', `bd` = '%s', `hidden` = %d,
`xmpp` = '%s', `name-date` = '%s', `uri-date` = '%s'
WHERE `id` = %d AND `network` = '%s'",
dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["about"]), dbesc($contact["location"]),
dbesc($contact["addr"]), dbesc($contact["keywords"]), dbesc($contact["bdyear"]),
dbesc($contact["bd"]), intval($contact["hidden"]), dbesc($contact["xmpp"]),
dbesc(DBM::date($contact["name-date"])), dbesc(DBM::date($contact["uri-date"])),
intval($contact["id"]), dbesc($contact["network"]));
dbesc($contact["name"]),
dbesc($contact["nick"]),
dbesc($contact["about"]),
dbesc($contact["location"]),
dbesc($contact["addr"]),
dbesc($contact["keywords"]),
dbesc($contact["bdyear"]),
dbesc($contact["bd"]),
intval($contact["hidden"]),
dbesc($contact["xmpp"]),
dbesc(DBM::date($contact["name-date"])),
dbesc(DBM::date($contact["uri-date"])),
intval($contact["id"]),
dbesc($contact["network"])
);
}
update_contact_avatar($author["avatar"], $importer["uid"], $contact["id"],
(strtotime($contact["avatar-date"]) > strtotime($r[0]["avatar-date"])));
update_contact_avatar(
$author["avatar"],
$importer["uid"],
$contact["id"],
(strtotime($contact["avatar-date"]) > strtotime($r[0]["avatar-date"]))
);
/*
* The generation is a sign for the reliability of the provided data.
@ -1634,7 +1702,8 @@ class DFRN {
* @return string XML string
* @todo Find good type-hints for all parameter
*/
private static function transform_activity($xpath, $activity, $element) {
private static function transform_activity($xpath, $activity, $element)
{
if (!is_object($activity)) {
return "";
}
@ -1686,8 +1755,8 @@ class DFRN {
* @param array $importer Record of the importer user mixed with contact of the content
* @todo Find good type-hints for all parameter
*/
private static function process_mail($xpath, $mail, $importer) {
private static function process_mail($xpath, $mail, $importer)
{
logger("Processing mails");
/// @TODO Rewrite this to one statement
@ -1737,7 +1806,8 @@ class DFRN {
* @param array $importer Record of the importer user mixed with contact of the content
* @todo Find good type-hints for all parameter
*/
private static function process_suggestion($xpath, $suggestion, $importer) {
private static function process_suggestion($xpath, $suggestion, $importer)
{
$a = get_app();
logger("Processing suggestions");
@ -1754,7 +1824,8 @@ class DFRN {
// Does our member already have a friend matching this description?
$r = q("SELECT `id` FROM `contact` WHERE `name` = '%s' AND `nurl` = '%s' AND `uid` = %d LIMIT 1",
$r = q(
"SELECT `id` FROM `contact` WHERE `name` = '%s' AND `nurl` = '%s' AND `uid` = %d LIMIT 1",
dbesc($suggest["name"]),
dbesc(normalise_link($suggest["url"])),
intval($suggest["uid"])
@ -1774,7 +1845,8 @@ class DFRN {
// Do we already have an fcontact record for this person?
$fid = 0;
$r = q("SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
$r = q(
"SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
dbesc($suggest["url"]),
dbesc($suggest["name"]),
dbesc($suggest["request"])
@ -1783,7 +1855,8 @@ class DFRN {
$fid = $r[0]["id"];
// OK, we do. Do we already have an introduction for this person ?
$r = q("SELECT `id` FROM `intro` WHERE `uid` = %d AND `fid` = %d LIMIT 1",
$r = q(
"SELECT `id` FROM `intro` WHERE `uid` = %d AND `fid` = %d LIMIT 1",
intval($suggest["uid"]),
intval($fid)
);
@ -1800,14 +1873,16 @@ class DFRN {
}
}
if (!$fid) {
$r = q("INSERT INTO `fcontact` (`name`,`url`,`photo`,`request`) VALUES ('%s', '%s', '%s', '%s')",
$r = q(
"INSERT INTO `fcontact` (`name`,`url`,`photo`,`request`) VALUES ('%s', '%s', '%s', '%s')",
dbesc($suggest["name"]),
dbesc($suggest["url"]),
dbesc($suggest["photo"]),
dbesc($suggest["request"])
);
}
$r = q("SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
$r = q(
"SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
dbesc($suggest["url"]),
dbesc($suggest["name"]),
dbesc($suggest["request"])
@ -1826,7 +1901,8 @@ class DFRN {
$hash = random_string();
$r = q("INSERT INTO `intro` (`uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked`)
$r = q(
"INSERT INTO `intro` (`uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked`)
VALUES(%d, %d, %d, '%s', '%s', '%s', %d)",
intval($suggest["uid"]),
intval($fid),
@ -1837,7 +1913,8 @@ class DFRN {
intval(0)
);
notification(array(
notification(
array(
"type" => NOTIFY_SUGGEST,
"notify_flags" => $importer["notify-flags"],
"language" => $importer["language"],
@ -1850,11 +1927,10 @@ class DFRN {
"source_link" => $importer["url"],
"source_photo" => $importer["photo"],
"verb" => ACTIVITY_REQ_FRIEND,
"otype" => "intro"
));
"otype" => "intro")
);
return true;
}
/**
@ -1865,8 +1941,8 @@ class DFRN {
* @param array $importer Record of the importer user mixed with contact of the content
* @todo Find good type-hints for all parameter
*/
private static function process_relocation($xpath, $relocation, $importer) {
private static function process_relocation($xpath, $relocation, $importer)
{
logger("Processing relocations");
/// @TODO Rewrite this to one statement
@ -1895,9 +1971,11 @@ class DFRN {
}
// update contact
$r = q("SELECT `photo`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d;",
$r = q(
"SELECT `photo`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d;",
intval($importer["id"]),
intval($importer["importer_uid"]));
intval($importer["importer_uid"])
);
if (!DBM::is_result($r)) {
logger("Query failed to execute, no result returned in " . __FUNCTION__);
@ -1909,7 +1987,8 @@ class DFRN {
// Update the gcontact entry
$relocate["server_url"] = preg_replace("=(https?://)(.*)/profile/(.*)=ism", "$1$2", $relocate["url"]);
$x = q("UPDATE `gcontact` SET
$x = q(
"UPDATE `gcontact` SET
`name` = '%s',
`photo` = '%s',
`url` = '%s',
@ -1927,10 +2006,12 @@ class DFRN {
dbesc($relocate["addr"]),
dbesc($relocate["notify"]),
dbesc($relocate["server_url"]),
dbesc(normalise_link($old["url"])));
dbesc(normalise_link($old["url"]))
);
// Update the contact table. We try to find every entry.
$x = q("UPDATE `contact` SET
$x = q(
"UPDATE `contact` SET
`name` = '%s',
`avatar` = '%s',
`url` = '%s',
@ -1954,7 +2035,8 @@ class DFRN {
dbesc($relocate["sitepubkey"]),
intval($importer["id"]),
intval($importer["importer_uid"]),
dbesc(normalise_link($old["url"])));
dbesc(normalise_link($old["url"]))
);
update_contact_avatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
@ -1970,16 +2052,23 @@ class DFRN {
//'owner-avatar' => array($old["photo"], $relocate["photo"]),
//'author-avatar' => array($old["photo"], $relocate["photo"]),
);
foreach ($fields as $n=>$f) {
$r = q("SELECT `id` FROM `item` WHERE `%s` = '%s' AND `uid` = %d LIMIT 1",
$n, dbesc($f[0]),
intval($importer["importer_uid"]));
foreach ($fields as $n => $f) {
$r = q(
"SELECT `id` FROM `item` WHERE `%s` = '%s' AND `uid` = %d LIMIT 1",
$n,
dbesc($f[0]),
intval($importer["importer_uid"])
);
if (DBM::is_result($r)) {
$x = q("UPDATE `item` SET `%s` = '%s' WHERE `%s` = '%s' AND `uid` = %d",
$n, dbesc($f[1]),
$n, dbesc($f[0]),
intval($importer["importer_uid"]));
$x = q(
"UPDATE `item` SET `%s` = '%s' WHERE `%s` = '%s' AND `uid` = %d",
$n,
dbesc($f[1]),
$n,
dbesc($f[0]),
intval($importer["importer_uid"])
);
if ($x === false) {
return false;
@ -2004,13 +2093,13 @@ class DFRN {
* @param int $entrytype Is it a toplevel entry, a comment or a relayed comment?
* @todo set proper type-hints (array?)
*/
private static function update_content($current, $item, $importer, $entrytype) {
private static function update_content($current, $item, $importer, $entrytype)
{
$changed = false;
if (edited_timestamp_is_newer($current, $item)) {
// do not accept (ignore) an earlier edit than one we currently have.
if (datetime_convert("UTC","UTC",$item["edited"]) < $current["edited"]) {
if (datetime_convert("UTC", "UTC", $item["edited"]) < $current["edited"]) {
return false;
}
@ -2027,18 +2116,20 @@ class DFRN {
$changed = true;
if ($entrytype == DFRN_REPLY_RC) {
Worker::add(PRIORITY_HIGH, "notifier","comment-import", $current["id"]);
Worker::add(PRIORITY_HIGH, "notifier", "comment-import", $current["id"]);
}
}
// update last-child if it changes
if ($item["last-child"] && ($item["last-child"] != $current["last-child"])) {
$r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
$r = q(
"UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
dbesc(datetime_convert()),
dbesc($item["parent-uri"]),
intval($importer["importer_uid"])
);
$r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` IN (0, %d)",
$r = q(
"UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` IN (0, %d)",
intval($item["last-child"]),
dbesc(datetime_convert()),
dbesc($item["uri"]),
@ -2057,7 +2148,8 @@ class DFRN {
* @return int Is it a toplevel entry, a comment or a relayed comment?
* @todo set proper type-hints (array?)
*/
private static function get_entry_type($importer, $item) {
private static function get_entry_type($importer, $item)
{
if ($item["parent-uri"] != $item["uri"]) {
$community = false;
@ -2074,13 +2166,15 @@ class DFRN {
$is_a_remote_action = false;
$r = q("SELECT `item`.`parent-uri` FROM `item`
$r = q(
"SELECT `item`.`parent-uri` FROM `item`
WHERE `item`.`uri` = '%s'
LIMIT 1",
dbesc($item["parent-uri"])
);
if (DBM::is_result($r)) {
$r = q("SELECT `item`.`forum_mode`, `item`.`wall` FROM `item`
$r = q(
"SELECT `item`.`forum_mode`, `item`.`wall` FROM `item`
INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uri` = '%s' AND (`item`.`parent-uri` = '%s' OR `item`.`thr-parent` = '%s')
AND `item`.`uid` = %d
@ -2117,7 +2211,6 @@ class DFRN {
} else {
return DFRN_TOP_LEVEL;
}
}
/**
@ -2128,15 +2221,15 @@ class DFRN {
* @param int $posted_id The record number of item record that was just posted
* @todo set proper type-hints (array?)
*/
private static function do_poke($item, $importer, $posted_id) {
$verb = urldecode(substr($item["verb"],strpos($item["verb"], "#")+1));
private static function do_poke($item, $importer, $posted_id)
{
$verb = urldecode(substr($item["verb"], strpos($item["verb"], "#")+1));
if (!$verb) {
return;
}
$xo = parse_xml_string($item["object"],false);
$xo = parse_xml_string($item["object"], false);
if (($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) {
// somebody was poked/prodded. Was it me?
foreach ($xo->link as $l) {
$atts = $l->attributes();
@ -2150,9 +2243,9 @@ class DFRN {
}
if ($Blink && link_compare($Blink, System::baseUrl() . "/profile/" . $importer["nickname"])) {
// send a notification
notification(array(
notification(
array(
"type" => NOTIFY_POKE,
"notify_flags" => $importer["notify-flags"],
"language" => $importer["language"],
@ -2168,8 +2261,8 @@ class DFRN {
"verb" => $item["verb"],
"otype" => "person",
"activity" => $verb,
"parent" => $item["parent"]
));
"parent" => $item["parent"])
);
}
}
}
@ -2185,8 +2278,8 @@ class DFRN {
* @return bool Should the processing of the entries be continued?
* @todo set proper type-hints (array?)
*/
private static function process_verbs($entrytype, $importer, &$item, &$is_like) {
private static function process_verbs($entrytype, $importer, &$item, &$is_like)
{
logger("Process verb ".$item["verb"]." and object-type ".$item["object-type"]." for entrytype ".$entrytype, LOGGER_DEBUG);
if (($entrytype == DFRN_TOP_LEVEL)) {
@ -2223,13 +2316,15 @@ class DFRN {
|| ($item["verb"] == ACTIVITY_DISLIKE)
|| ($item["verb"] == ACTIVITY_ATTEND)
|| ($item["verb"] == ACTIVITY_ATTENDNO)
|| ($item["verb"] == ACTIVITY_ATTENDMAYBE)) {
|| ($item["verb"] == ACTIVITY_ATTENDMAYBE)
) {
$is_like = true;
$item["type"] = "activity";
$item["gravity"] = GRAVITY_LIKE;
// only one like or dislike per person
// splitted into two queries for performance issues
$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `parent-uri` = '%s' AND NOT `deleted` LIMIT 1",
$r = q(
"SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `parent-uri` = '%s' AND NOT `deleted` LIMIT 1",
intval($item["uid"]),
dbesc($item["author-link"]),
dbesc($item["verb"]),
@ -2239,7 +2334,8 @@ class DFRN {
return false;
}
$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `thr-parent` = '%s' AND NOT `deleted` LIMIT 1",
$r = q(
"SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `thr-parent` = '%s' AND NOT `deleted` LIMIT 1",
intval($item["uid"]),
dbesc($item["author-link"]),
dbesc($item["verb"]),
@ -2254,11 +2350,12 @@ class DFRN {
if (($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
$xo = parse_xml_string($item["object"],false);
$xt = parse_xml_string($item["target"],false);
$xo = parse_xml_string($item["object"], false);
$xt = parse_xml_string($item["target"], false);
if ($xt->type == ACTIVITY_OBJ_NOTE) {
$r = q("SELECT `id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
$r = q(
"SELECT `id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($xt->id),
intval($importer["importer_uid"])
);
@ -2291,7 +2388,8 @@ class DFRN {
* @param array $item the item record
* @todo set proper type-hints
*/
private static function parse_links($links, &$item) {
private static function parse_links($links, &$item)
{
$rel = "";
$href = "";
$type = "";
@ -2343,8 +2441,8 @@ class DFRN {
* @param array $importer Record of the importer user mixed with contact of the content
* @todo Add type-hints
*/
private static function process_entry($header, $xpath, $entry, $importer, $xml) {
private static function process_entry($header, $xpath, $entry, $importer, $xml)
{
logger("Processing entries");
$item = $header;
@ -2358,14 +2456,16 @@ class DFRN {
$item["edited"] = $xpath->query("atom:updated/text()", $entry)->item(0)->nodeValue;
$current = q("SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
$current = q(
"SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($item["uri"]),
intval($importer["importer_uid"])
);
// Is there an existing item?
if (DBM::is_result($current) && edited_timestamp_is_newer($current[0], $item) &&
(datetime_convert("UTC","UTC",$item["edited"]) < $current[0]["edited"])) {
if (DBM::is_result($current) && edited_timestamp_is_newer($current[0], $item)
&& (datetime_convert("UTC", "UTC", $item["edited"]) < $current[0]["edited"])
) {
logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
return;
}
@ -2389,16 +2489,15 @@ class DFRN {
$item["created"] = $xpath->query("atom:published/text()", $entry)->item(0)->nodeValue;
$item["body"] = $xpath->query("dfrn:env/text()", $entry)->item(0)->nodeValue;
$item["body"] = str_replace(array(' ',"\t","\r","\n"), array('','','',''),$item["body"]);
$item["body"] = str_replace(array(' ',"\t","\r","\n"), array('','','',''), $item["body"]);
// make sure nobody is trying to sneak some html tags by us
$item["body"] = notags(base64url_decode($item["body"]));
$item["body"] = limit_body_size($item["body"]);
/// @todo Do we really need this check for HTML elements? (It was copied from the old function)
if ((strpos($item['body'],'<') !== false) && (strpos($item['body'],'>') !== false)) {
$item['body'] = reltoabs($item['body'],$base_url);
if ((strpos($item['body'], '<') !== false) && (strpos($item['body'], '>') !== false)) {
$item['body'] = reltoabs($item['body'], $base_url);
$item['body'] = html2bb_video($item['body']);
@ -2595,7 +2694,8 @@ class DFRN {
$ev['private'] = $item['private'];
$ev["guid"] = $item["guid"];
$r = q("SELECT `id` FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
$r = q(
"SELECT `id` FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($item["uri"]),
intval($importer["uid"])
);
@ -2630,12 +2730,12 @@ class DFRN {
$parent = 0;
if ($posted_id) {
logger("Reply from contact ".$item["contact-id"]." was stored with id ".$posted_id, LOGGER_DEBUG);
$item["id"] = $posted_id;
$r = q("SELECT `parent`, `parent-uri` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
$r = q(
"SELECT `parent`, `parent-uri` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($posted_id),
intval($importer["importer_uid"])
);
@ -2645,13 +2745,15 @@ class DFRN {
}
if (!$is_like) {
$r1 = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d",
$r1 = q(
"UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d",
dbesc(datetime_convert()),
intval($importer["importer_uid"]),
intval($r[0]["parent"])
);
$r2 = q("UPDATE `item` SET `last-child` = 1, `changed` = '%s' WHERE `uid` = %d AND `id` = %d",
$r2 = q(
"UPDATE `item` SET `last-child` = 1, `changed` = '%s' WHERE `uid` = %d AND `id` = %d",
dbesc(datetime_convert()),
intval($importer["importer_uid"]),
intval($posted_id)
@ -2666,7 +2768,7 @@ class DFRN {
return true;
}
} else { // $entrytype == DFRN_TOP_LEVEL
if (!link_compare($item["owner-link"],$importer["url"])) {
if (!link_compare($item["owner-link"], $importer["url"])) {
/*
* The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
* but otherwise there's a possible data mixup on the sender's system.
@ -2705,8 +2807,8 @@ class DFRN {
* @param array $importer Record of the importer user mixed with contact of the content
* @todo set proper type-hints
*/
private static function process_deletion($xpath, $deletion, $importer) {
private static function process_deletion($xpath, $deletion, $importer)
{
logger("Processing deletions");
foreach ($deletion->attributes AS $attributes) {
@ -2728,7 +2830,8 @@ class DFRN {
}
/// @todo Only select the used fields
$r = q("SELECT `item`.*, `contact`.`self` FROM `item` INNER JOIN `contact` on `item`.`contact-id` = `contact`.`id`
$r = q(
"SELECT `item`.*, `contact`.`self` FROM `item` INNER JOIN `contact` on `item`.`contact-id` = `contact`.`id`
WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d AND NOT `item`.`file` LIKE '%%[%%' LIMIT 1",
dbesc($uri),
intval($importer["uid"]),
@ -2738,7 +2841,6 @@ class DFRN {
logger("Item with uri " . $uri . " from contact " . $importer["id"] . " for user " . $importer["uid"] . " wasn't found.", LOGGER_DEBUG);
return;
} else {
$item = $r[0];
$entrytype = self::get_entry_type($importer, $item);
@ -2756,16 +2858,16 @@ class DFRN {
if (($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
$xo = parse_xml_string($item["object"],false);
$xt = parse_xml_string($item["target"],false);
$xo = parse_xml_string($item["object"], false);
$xt = parse_xml_string($item["target"], false);
if ($xt->type == ACTIVITY_OBJ_NOTE) {
$i = q("SELECT `id`, `contact-id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
$i = q(
"SELECT `id`, `contact-id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($xt->id),
intval($importer["importer_uid"])
);
if (DBM::is_result($i)) {
// For tags, the owner cannot remove the tag on the author's copy of the post.
$owner_remove = (($item["contact-id"] == $i[0]["contact-id"]) ? true: false);
@ -2776,7 +2878,7 @@ class DFRN {
return;
}
if ($author_remove || $owner_remove) {
$tags = explode(',',$i[0]["tag"]);
$tags = explode(',', $i[0]["tag"]);
$newtags = array();
if (count($tags)) {
foreach ($tags as $tag) {
@ -2785,7 +2887,8 @@ class DFRN {
}
}
}
q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
q(
"UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
dbesc(implode(',', $newtags)),
intval($i[0]["id"])
);
@ -2796,7 +2899,8 @@ class DFRN {
}
if ($entrytype == DFRN_TOP_LEVEL) {
$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
$r = q(
"UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
`body` = '', `title` = ''
WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
dbesc($when),
@ -2808,7 +2912,8 @@ class DFRN {
create_files_from_itemuri($uri, $importer["uid"]);
update_thread_uri($uri, $importer["uid"]);
} else {
$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
$r = q(
"UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
`body` = '', `title` = ''
WHERE `uri` = '%s' AND `uid` IN (0, %d)",
dbesc($when),
@ -2821,19 +2926,22 @@ class DFRN {
update_thread_uri($uri, $importer["importer_uid"]);
if ($item["last-child"]) {
// ensure that last-child is set in case the comment that had it just got wiped.
q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
q(
"UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
dbesc(datetime_convert()),
dbesc($item["parent-uri"]),
intval($item["uid"])
);
// who is the last child now?
$r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `moderated` = 0 AND `uid` = %d
$r = q(
"SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `moderated` = 0 AND `uid` = %d
ORDER BY `created` DESC LIMIT 1",
dbesc($item["parent-uri"]),
intval($importer["uid"])
);
if (DBM::is_result($r)) {
q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d",
q(
"UPDATE `item` SET `last-child` = 1 WHERE `id` = %d",
intval($r[0]["id"])
);
}
@ -2842,7 +2950,7 @@ class DFRN {
if ($entrytype == DFRN_REPLY_RC) {
logger("Notifying followers about deletion of post " . $item["id"], LOGGER_DEBUG);
Worker::add(PRIORITY_HIGH, "notifier","drop", $item["id"]);
Worker::add(PRIORITY_HIGH, "notifier", "drop", $item["id"]);
}
}
}
@ -2857,8 +2965,8 @@ class DFRN {
* @return integer Import status
* @todo set proper type-hints
*/
public static function import($xml, $importer, $sort_by_date = false) {
public static function import($xml, $importer, $sort_by_date = false)
{
if ($xml == "") {
return 400;
}

852
src/Protocol/Diaspora.php
View file

@ -1,6 +1,4 @@
<?php
namespace Friendica\Protocol;
/**
* @file include/diaspora.php
* @brief The implementation of the diaspora protocol
@ -9,6 +7,7 @@ namespace Friendica\Protocol;
* This implementation here interprets the old and the new protocol and sends the new one.
* In the future we will remove most stuff from "valid_posting" and interpret only the new protocol.
*/
namespace Friendica\Protocol;
use Friendica\App;
use Friendica\Core\System;
@ -36,7 +35,8 @@ require_once 'include/queue_fn.php';
* @brief This class contain functions to create and send Diaspora XML files
*
*/
class Diaspora {
class Diaspora
{
/**
* @brief Return a list of relay servers
@ -45,26 +45,32 @@ class Diaspora {
*
* @return array of relay servers
*/
public static function relay_list() {
public static function relay_list()
{
$serverdata = Config::get("system", "relay_server");
if ($serverdata == "")
if ($serverdata == "") {
return array();
}
$relay = array();
$servers = explode(",", $serverdata);
foreach ($servers AS $server) {
foreach ($servers as $server) {
$server = trim($server);
$addr = "relay@".str_replace("http://", "", normalise_link($server));
$batch = $server."/receive/public";
$relais = q("SELECT `batch`, `id`, `name`,`network` FROM `contact` WHERE `uid` = 0 AND `batch` = '%s' AND `addr` = '%s' AND `nurl` = '%s' LIMIT 1",
dbesc($batch), dbesc($addr), dbesc(normalise_link($server)));
$relais = q(
"SELECT `batch`, `id`, `name`,`network` FROM `contact` WHERE `uid` = 0 AND `batch` = '%s' AND `addr` = '%s' AND `nurl` = '%s' LIMIT 1",
dbesc($batch),
dbesc($addr),
dbesc(normalise_link($server))
);
if (!$relais) {
$r = q("INSERT INTO `contact` (`uid`, `created`, `name`, `nick`, `addr`, `url`, `nurl`, `batch`, `network`, `rel`, `blocked`, `pending`, `writable`, `name-date`, `uri-date`, `avatar-date`)
$r = q(
"INSERT INTO `contact` (`uid`, `created`, `name`, `nick`, `addr`, `url`, `nurl`, `batch`, `network`, `rel`, `blocked`, `pending`, `writable`, `name-date`, `uri-date`, `avatar-date`)
VALUES (0, '%s', '%s', 'relay', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, '%s', '%s', '%s')",
datetime_convert(),
dbesc($addr),
@ -80,11 +86,13 @@ class Diaspora {
);
$relais = q("SELECT `batch`, `id`, `name`,`network` FROM `contact` WHERE `uid` = 0 AND `batch` = '%s' LIMIT 1", dbesc($batch));
if ($relais)
if ($relais) {
$relay[] = $relais[0];
} else
}
} else {
$relay[] = $relais[0];
}
}
return $relay;
}
@ -100,19 +108,21 @@ class Diaspora {
*
* @return string the repaired signature
*/
private static function repair_signature($signature, $handle = "", $level = 1) {
if ($signature == "")
private static function repair_signature($signature, $handle = "", $level = 1)
{
if ($signature == "") {
return ($signature);
}
if (base64_encode(base64_decode(base64_decode($signature))) == base64_decode($signature)) {
$signature = base64_decode($signature);
logger("Repaired double encoded signature from Diaspora/Hubzilla handle ".$handle." - level ".$level, LOGGER_DEBUG);
// Do a recursive call to be able to fix even multiple levels
if ($level < 10)
if ($level < 10) {
$signature = self::repair_signature($signature, $handle, ++$level);
}
}
return($signature);
}
@ -124,8 +134,8 @@ class Diaspora {
*
* @return string verified data
*/
private static function verify_magic_envelope($envelope) {
private static function verify_magic_envelope($envelope)
{
$basedom = parse_xml_string($envelope);
if (!is_object($basedom)) {
@ -151,8 +161,9 @@ class Diaspora {
$sig = base64url_decode($children->sig);
$key_id = $children->sig->attributes()->key_id[0];
if ($key_id != "")
if ($key_id != "") {
$handle = base64url_decode($key_id);
}
$b64url_data = base64url_encode($data);
$msg = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data);
@ -179,7 +190,8 @@ class Diaspora {
*
* @return string encrypted data
*/
private static function aes_encrypt($key, $iv, $data) {
private static function aes_encrypt($key, $iv, $data)
{
return openssl_encrypt($data, 'aes-256-cbc', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA, str_pad($iv, 16, "\0"));
}
@ -192,8 +204,9 @@ class Diaspora {
*
* @return string decrypted data
*/
private static function aes_decrypt($key, $iv, $encrypted) {
return openssl_decrypt($encrypted,'aes-256-cbc', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA,str_pad($iv, 16, "\0"));
private static function aes_decrypt($key, $iv, $encrypted)
{
return openssl_decrypt($encrypted, 'aes-256-cbc', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA, str_pad($iv, 16, "\0"));
}
/**
@ -207,7 +220,8 @@ class Diaspora {
* 'author' -> author diaspora handle
* 'key' -> author public key (converted to pkcs#8)
*/
public static function decode_raw($importer, $raw) {
public static function decode_raw($importer, $raw)
{
$data = json_decode($raw);
// Is it a private post? Then decrypt the outer Salmon
@ -280,8 +294,8 @@ class Diaspora {
* 'author' -> author diaspora handle
* 'key' -> author public key (converted to pkcs#8)
*/
public static function decode($importer, $xml) {
public static function decode($importer, $xml)
{
$public = false;
$basedom = parse_xml_string($xml);
@ -293,7 +307,7 @@ class Diaspora {
if ($children->header) {
$public = true;
$author_link = str_replace('acct:','',$children->header->author_id);
$author_link = str_replace('acct:', '', $children->header->author_id);
} else {
// This happens with posts from a relais
if (!$importer) {
@ -307,7 +321,7 @@ class Diaspora {
$ciphertext = base64_decode($encrypted_header->ciphertext);
$outer_key_bundle = '';
openssl_private_decrypt($encrypted_aes_key_bundle,$outer_key_bundle,$importer['prvkey']);
openssl_private_decrypt($encrypted_aes_key_bundle, $outer_key_bundle, $importer['prvkey']);
$j_outer_key_bundle = json_decode($outer_key_bundle);
@ -322,19 +336,20 @@ class Diaspora {
$inner_iv = base64_decode($idom->iv);
$inner_aes_key = base64_decode($idom->aes_key);
$author_link = str_replace('acct:','',$idom->author_id);
$author_link = str_replace('acct:', '', $idom->author_id);
}
$dom = $basedom->children(NAMESPACE_SALMON_ME);
// figure out where in the DOM tree our data is hiding
if ($dom->provenance->data)
if ($dom->provenance->data) {
$base = $dom->provenance;
elseif ($dom->env->data)
} elseif ($dom->env->data) {
$base = $dom->env;
elseif ($dom->data)
} elseif ($dom->data) {
$base = $dom;
}
if (!$base) {
logger('unable to locate salmon data in xml');
@ -348,7 +363,7 @@ class Diaspora {
// unpack the data
// strip whitespace so our data element will return to one big base64 blob
$data = str_replace(array(" ","\t","\r","\n"),array("","","",""),$base->data);
$data = str_replace(array(" ", "\t", "\r", "\n"), array("", "", "", ""), $base->data);
// stash away some other stuff for later
@ -366,12 +381,10 @@ class Diaspora {
$data = base64url_decode($data);
if ($public)
if ($public) {
$inner_decrypted = $data;
else {
} else {
// Decode the encrypted blob
$inner_encrypted = base64_decode($data);
$inner_decrypted = self::aes_decrypt($inner_aes_key, $inner_iv, $inner_encrypted);
}
@ -392,7 +405,7 @@ class Diaspora {
http_status_exit(400);
}
$verify = rsa_verify($signed_data,$signature,$key);
$verify = rsa_verify($signed_data, $signature, $key);
if (!$verify) {
logger('Message did not verify. Discarding.');
@ -414,8 +427,8 @@ class Diaspora {
*
* @return int The message id of the generated message, "true" or "false" if there was an error
*/
public static function dispatch_public($msg) {
public static function dispatch_public($msg)
{
$enabled = intval(Config::get("system", "diaspora_enabled"));
if (!$enabled) {
logger("diaspora is disabled");
@ -453,7 +466,8 @@ class Diaspora {
}
// Now distribute it to the followers
$r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN
$r = q(
"SELECT `user`.* FROM `user` WHERE `user`.`uid` IN
(SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s')
AND NOT `account_expired` AND NOT `account_removed`",
dbesc(NETWORK_DIASPORA),
@ -485,8 +499,8 @@ class Diaspora {
*
* @return int The message id of the generated message, "true" or "false" if there was an error
*/
public static function dispatch($importer, $msg, $fields = null) {
public static function dispatch($importer, $msg, $fields = null)
{
// The sender is the handle of the contact that sent the message.
// This will often be different with relayed messages (for example "like" and "comment")
$sender = $msg["author"];
@ -565,8 +579,8 @@ class Diaspora {
*
* @return bool|array If the posting is valid then an array with an SimpleXML object is returned
*/
private static function valid_posting($msg) {
private static function valid_posting($msg)
{
$data = parse_xml_string($msg["message"]);
if (!is_object($data)) {
@ -579,8 +593,9 @@ class Diaspora {
// Is this the new or the old version?
if ($data->getName() == "XML") {
$oldXML = true;
foreach ($data->post->children() as $child)
foreach ($data->post->children() as $child) {
$element = $child;
}
} else {
$oldXML = false;
$element = $data;
@ -596,14 +611,15 @@ class Diaspora {
if (in_array($type, array("signed_retraction", "relayable_retraction")))
$type = "retraction";
if ($type == "request")
if ($type == "request") {
$type = "contact";
}
$fields = new SimpleXMLElement("<".$type."/>");
$signed_data = "";
foreach ($element->children() AS $fieldname => $entry) {
foreach ($element->children() as $fieldname => $entry) {
if ($oldXML) {
// Translation for the old XML structure
if ($fieldname == "diaspora_handle") {
@ -641,11 +657,11 @@ class Diaspora {
}
}
if (($fieldname == "author_signature") && ($entry != ""))
if (($fieldname == "author_signature") && ($entry != "")) {
$author_signature = base64_decode($entry);
elseif (($fieldname == "parent_author_signature") && ($entry != ""))
} elseif (($fieldname == "parent_author_signature") && ($entry != "")) {
$parent_author_signature = base64_decode($entry);
elseif (!in_array($fieldname, array("author_signature", "parent_author_signature", "target_author_signature"))) {
} elseif (!in_array($fieldname, array("author_signature", "parent_author_signature", "target_author_signature"))) {
if ($signed_data != "") {
$signed_data .= ";";
$signed_data_parent .= ";";
@ -653,17 +669,20 @@ class Diaspora {
$signed_data .= $entry;
}
if (!in_array($fieldname, array("parent_author_signature", "target_author_signature")) ||
($orig_type == "relayable_retraction"))
if (!in_array($fieldname, array("parent_author_signature", "target_author_signature"))
|| ($orig_type == "relayable_retraction")
) {
xml::copy($entry, $fields, $fieldname);
}
}
// This is something that shouldn't happen at all.
if (in_array($type, array("status_message", "reshare", "profile")))
if (in_array($type, array("status_message", "reshare", "profile"))) {
if ($msg["author"] != $fields->author) {
logger("Message handle is not the same as envelope sender. Quitting this message.");
return false;
}
}
// Only some message types have signatures. So we quit here for the other types.
if (!in_array($type, array("comment", "like"))) {
@ -705,14 +724,16 @@ class Diaspora {
*
* @return string The public key
*/
private static function key($handle) {
private static function key($handle)
{
$handle = strval($handle);
logger("Fetching diaspora key for: ".$handle);
$r = self::person_by_handle($handle);
if ($r)
if ($r) {
return $r["pubkey"];
}
return "";
}
@ -724,24 +745,27 @@ class Diaspora {
*
* @return array the queried data
*/
public static function person_by_handle($handle) {
$r = q("SELECT * FROM `fcontact` WHERE `network` = '%s' AND `addr` = '%s' LIMIT 1",
public static function person_by_handle($handle)
{
$r = q(
"SELECT * FROM `fcontact` WHERE `network` = '%s' AND `addr` = '%s' LIMIT 1",
dbesc(NETWORK_DIASPORA),
dbesc($handle)
);
if ($r) {
$person = $r[0];
logger("In cache ".print_r($r,true), LOGGER_DEBUG);
logger("In cache " . print_r($r, true), LOGGER_DEBUG);
// update record occasionally so it doesn't get stale
$d = strtotime($person["updated"]." +00:00");
if ($d < strtotime("now - 14 days"))
if ($d < strtotime("now - 14 days")) {
$update = true;
}
if ($person["guid"] == "")
if ($person["guid"] == "") {
$update = true;
}
}
if (!$person || $update) {
logger("create or refresh", LOGGER_DEBUG);
@ -765,10 +789,11 @@ class Diaspora {
*
* @return string The id of the fcontact entry
*/
private static function add_fcontact($arr, $update = false) {
private static function add_fcontact($arr, $update = false)
{
if ($update) {
$r = q("UPDATE `fcontact` SET
$r = q(
"UPDATE `fcontact` SET
`name` = '%s',
`photo` = '%s',
`request` = '%s',
@ -800,7 +825,8 @@ class Diaspora {
dbesc($arr["network"])
);
} else {
$r = q("INSERT INTO `fcontact` (`url`,`name`,`photo`,`request`,`nick`,`addr`, `guid`,
$r = q(
"INSERT INTO `fcontact` (`url`,`name`,`photo`,`request`,`nick`,`addr`, `guid`,
`batch`, `notify`,`poll`,`confirm`,`network`,`alias`,`pubkey`,`updated`)
VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')",
dbesc($arr["url"]),
@ -832,22 +858,27 @@ class Diaspora {
*
* @return string the handle
*/
public static function handle_from_contact($contact_id, $gcontact_id = 0) {
public static function handle_from_contact($contact_id, $gcontact_id = 0)
{
$handle = false;
logger("contact id is ".$contact_id." - gcontact id is ".$gcontact_id, LOGGER_DEBUG);
if ($gcontact_id != 0) {
$r = q("SELECT `addr` FROM `gcontact` WHERE `id` = %d AND `addr` != ''",
intval($gcontact_id));
$r = q(
"SELECT `addr` FROM `gcontact` WHERE `id` = %d AND `addr` != ''",
intval($gcontact_id)
);
if (DBM::is_result($r)) {
return strtolower($r[0]["addr"]);
}
}
$r = q("SELECT `network`, `addr`, `self`, `url`, `nick` FROM `contact` WHERE `id` = %d",
intval($contact_id));
$r = q(
"SELECT `network`, `addr`, `self`, `url`, `nick` FROM `contact` WHERE `id` = %d",
intval($contact_id)
);
if (DBM::is_result($r)) {
$contact = $r[0];
@ -857,8 +888,9 @@ class Diaspora {
if ($contact['addr'] != "") {
$handle = $contact['addr'];
} else {
$baseurl_start = strpos($contact['url'],'://') + 3;
$baseurl_length = strpos($contact['url'],'/profile') - $baseurl_start; // allows installations in a subdirectory--not sure how Diaspora will handle
$baseurl_start = strpos($contact['url'], '://') + 3;
// allows installations in a subdirectory--not sure how Diaspora will handle
$baseurl_length = strpos($contact['url'], '/profile') - $baseurl_start;
$baseurl = substr($contact['url'], $baseurl_start, $baseurl_length);
$handle = $contact['nick'].'@'.$baseurl;
}
@ -875,10 +907,12 @@ class Diaspora {
*
* @return string the contact url or null
*/
public static function url_from_contact_guid($fcontact_guid) {
public static function url_from_contact_guid($fcontact_guid)
{
logger("fcontact guid is ".$fcontact_guid, LOGGER_DEBUG);
$r = q("SELECT `url` FROM `fcontact` WHERE `url` != '' AND `network` = '%s' AND `guid` = '%s'",
$r = q(
"SELECT `url` FROM `fcontact` WHERE `url` != '' AND `network` = '%s' AND `guid` = '%s'",
dbesc(NETWORK_DIASPORA),
dbesc($fcontact_guid)
);
@ -898,10 +932,11 @@ class Diaspora {
*
* @return The contact id
*/
private static function contact_by_handle($uid, $handle) {
private static function contact_by_handle($uid, $handle)
{
// First do a direct search on the contact table
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1",
$r = q(
"SELECT * FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1",
intval($uid),
dbesc($handle)
);
@ -927,7 +962,8 @@ class Diaspora {
$handle_parts = explode("@", $handle);
$nurl_sql = "%%://".$handle_parts[1]."%%/profile/".$handle_parts[0];
$r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` LIKE '%s' LIMIT 1",
$r = q(
"SELECT * FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` LIKE '%s' LIMIT 1",
dbesc(NETWORK_DFRN),
intval($uid),
dbesc($nurl_sql)
@ -957,8 +993,11 @@ class Diaspora {
* Normally this should have handled by getting a request - but this could get lost
*/
if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
dba::update('contact', array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
array('id' => $contact["id"], 'uid' => $contact["uid"]));
dba::update(
'contact',
array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
array('id' => $contact["id"], 'uid' => $contact["uid"])
);
$contact["rel"] = CONTACT_IS_FRIEND;
logger("defining user ".$contact["nick"]." as friend");
@ -994,7 +1033,8 @@ class Diaspora {
*
* @return array The contact data
*/
private static function allowed_contact_by_handle($importer, $handle, $is_comment = false) {
private static function allowed_contact_by_handle($importer, $handle, $is_comment = false)
{
$contact = self::contact_by_handle($importer["uid"], $handle);
if (!$contact) {
logger("A Contact for handle ".$handle." and user ".$importer["uid"]." was not found");
@ -1021,8 +1061,10 @@ class Diaspora {
*
* @return int|bool message id if the message already was stored into the system - or false.
*/
private static function message_exists($uid, $guid) {
$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
private static function message_exists($uid, $guid)
{
$r = q(
"SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($uid),
dbesc($guid)
);
@ -1040,17 +1082,24 @@ class Diaspora {
*
* @param array $item The item array
*/
private static function fetch_guid($item) {
private static function fetch_guid($item)
{
$expression = "=diaspora://.*?/post/([0-9A-Za-z\-_@.:]{15,254}[0-9A-Za-z])=ism";
preg_replace_callback($expression,
preg_replace_callback(
$expression,
function ($match) use ($item) {
return self::fetch_guid_sub($match, $item);
}, $item["body"]);
},
$item["body"]
);
preg_replace_callback("&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi",
preg_replace_callback(
"&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi",
function ($match) use ($item) {
return self::fetch_guid_sub($match, $item);
}, $item["body"]);
},
$item["body"]
);
}
/**
@ -1062,8 +1111,10 @@ class Diaspora {
*
* @return the replaced string
*/
public static function replace_people_guid($body, $author_link) {
$return = preg_replace_callback("&\[url=/people/([^\[\]]*)\](.*)\[\/url\]&Usi",
public static function replace_people_guid($body, $author_link)
{
$return = preg_replace_callback(
"&\[url=/people/([^\[\]]*)\](.*)\[\/url\]&Usi",
function ($match) use ($author_link) {
// $match
// 0 => '[url=/people/0123456789abcdef]Foo Bar[/url]'
@ -1080,7 +1131,9 @@ class Diaspora {
}
return $return;
}, $body);
},
$body
);
return $return;
}
@ -1091,10 +1144,12 @@ class Diaspora {
* @param array $match array containing a link that has to be checked for a message link
* @param array $item The item array
*/
private static function fetch_guid_sub($match, $item) {
if (!self::store_by_guid($match[1], $item["author-link"]))
private static function fetch_guid_sub($match, $item)
{
if (!self::store_by_guid($match[1], $item["author-link"])) {
self::store_by_guid($match[1], $item["owner-link"]);
}
}
/**
* @brief Fetches an item with a given guid from a given server
@ -1105,7 +1160,8 @@ class Diaspora {
*
* @return int the message id of the stored message or false
*/
private static function store_by_guid($guid, $server, $uid = 0) {
private static function store_by_guid($guid, $server, $uid = 0)
{
$serverparts = parse_url($server);
$server = $serverparts["scheme"]."://".$serverparts["host"];
@ -1113,8 +1169,9 @@ class Diaspora {
$msg = self::message($guid, $server);
if (!$msg)
if (!$msg) {
return false;
}
logger("Successfully fetched item ".$guid." from ".$server, LOGGER_DEBUG);
@ -1134,10 +1191,11 @@ class Diaspora {
* 'author' => The author handle
* 'key' => The public key of the author
*/
private static function message($guid, $server, $level = 0) {
if ($level > 5)
private static function message($guid, $server, $level = 0)
{
if ($level > 5) {
return false;
}
// This will work for new Diaspora servers and Friendica servers from 3.5
$source_url = $server."/fetch/post/".urlencode($guid);
@ -1148,12 +1206,14 @@ class Diaspora {
if ($envelope) {
logger("Envelope was fetched.", LOGGER_DEBUG);
$x = self::verify_magic_envelope($envelope);
if (!$x)
if (!$x) {
logger("Envelope could not be verified.", LOGGER_DEBUG);
else
} else {
logger("Envelope was verified.", LOGGER_DEBUG);
} else
}
} else {
$x = false;
}
// This will work for older Diaspora and Friendica servers
if (!$x) {
@ -1161,14 +1221,16 @@ class Diaspora {
logger("Fetch post from ".$source_url, LOGGER_DEBUG);
$x = fetch_url($source_url);
if (!$x)
if (!$x) {
return false;
}
}
$source_xml = parse_xml_string($x);
if (!is_object($source_xml))
if (!is_object($source_xml)) {
return false;
}
if ($source_xml->post->reshare) {
// Reshare of a reshare - old Diaspora version
@ -1183,10 +1245,11 @@ class Diaspora {
$author = "";
// Fetch the author - for the old and the new Diaspora version
if ($source_xml->post->status_message->diaspora_handle)
if ($source_xml->post->status_message->diaspora_handle) {
$author = (string)$source_xml->post->status_message->diaspora_handle;
elseif ($source_xml->author && ($source_xml->getName() == "status_message"))
} elseif ($source_xml->author && ($source_xml->getName() == "status_message")) {
$author = (string)$source_xml->author;
}
// If this isn't a "status_message" then quit
if (!$author) {
@ -1211,12 +1274,16 @@ class Diaspora {
*
* @return array the item record
*/
private static function parent_item($uid, $guid, $author, $contact) {
$r = q("SELECT `id`, `parent`, `body`, `wall`, `uri`, `guid`, `private`, `origin`,
private static function parent_item($uid, $guid, $author, $contact)
{
$r = q(
"SELECT `id`, `parent`, `body`, `wall`, `uri`, `guid`, `private`, `origin`,
`author-name`, `author-link`, `author-avatar`,
`owner-name`, `owner-link`, `owner-avatar`
FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($uid), dbesc($guid));
intval($uid),
dbesc($guid)
);
if (!$r) {
$result = self::store_by_guid($guid, $contact["url"], $uid);
@ -1229,11 +1296,14 @@ class Diaspora {
if ($result) {
logger("Fetched missing item ".$guid." - result: ".$result, LOGGER_DEBUG);
$r = q("SELECT `id`, `body`, `wall`, `uri`, `private`, `origin`,
$r = q(
"SELECT `id`, `body`, `wall`, `uri`, `private`, `origin`,
`author-name`, `author-link`, `author-avatar`,
`owner-name`, `owner-link`, `owner-avatar`
FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($uid), dbesc($guid));
intval($uid),
dbesc($guid)
);
}
}
@ -1257,10 +1327,13 @@ class Diaspora {
* 'cid' => contact id
* 'network' => network type
*/
private static function author_contact_by_url($contact, $person, $uid) {
$r = q("SELECT `id`, `network`, `url` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
dbesc(normalise_link($person["url"])), intval($uid));
private static function author_contact_by_url($contact, $person, $uid)
{
$r = q(
"SELECT `id`, `network`, `url` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
dbesc(normalise_link($person["url"])),
intval($uid)
);
if ($r) {
$cid = $r[0]["id"];
$network = $r[0]["network"];
@ -1283,7 +1356,8 @@ class Diaspora {
*
* @return bool is it a hubzilla server?
*/
public static function is_redmatrix($url) {
public static function is_redmatrix($url)
{
return(strstr($url, "/channel/"));
}
@ -1292,18 +1366,20 @@ class Diaspora {
*
* @param string $addr The user handle
* @param string $guid message guid
* @param string $parent_guid optional parent guid
*
* @return string the post link
*/
private static function plink($addr, $guid, $parent_guid = '') {
private static function plink($addr, $guid, $parent_guid = '')
{
$r = q("SELECT `url`, `nick`, `network` FROM `fcontact` WHERE `addr`='%s' LIMIT 1", dbesc($addr));
// Fallback
if (!DBM::is_result($r)) {
if ($parent_guid != '') {
return "https://".substr($addr,strpos($addr,"@") + 1)."/posts/".$parent_guid."#".$guid;
return "https://".substr($addr, strpos($addr, "@") + 1) . "/posts/" . $parent_guid . "#" . $guid;
} else {
return "https://".substr($addr,strpos($addr,"@") + 1)."/posts/".$guid;
return "https://".substr($addr, strpos($addr, "@") + 1) . "/posts/" . $guid;
}
}
@ -1323,9 +1399,9 @@ class Diaspora {
}
if ($parent_guid != '') {
return "https://".substr($addr,strpos($addr,"@")+1)."/posts/".$parent_guid."#".$guid;
return "https://".substr($addr, strpos($addr, "@") + 1) . "/posts/" . $parent_guid . "#" . $guid;
} else {
return "https://".substr($addr,strpos($addr,"@")+1)."/posts/".$guid;
return "https://".substr($addr, strpos($addr, "@") + 1) . "/posts/" . $guid;
}
}
@ -1337,7 +1413,8 @@ class Diaspora {
*
* @return bool Success
*/
private static function receiveAccountMigration($importer, $data) {
private static function receiveAccountMigration($importer, $data)
{
$old_handle = notags(unxmlify($data->author));
$new_handle = notags(unxmlify($data->profile->author));
$signature = notags(unxmlify($data->signature));
@ -1392,16 +1469,23 @@ class Diaspora {
'owner-link' => array($contact["url"], $data["url"]),
'author-link' => array($contact["url"], $data["url"]),
);
foreach ($fields as $n=>$f) {
$r = q("SELECT `id` FROM `item` WHERE `%s` = '%s' AND `uid` = %d LIMIT 1",
$n, dbesc($f[0]),
intval($importer["uid"]));
foreach ($fields as $n => $f) {
$r = q(
"SELECT `id` FROM `item` WHERE `%s` = '%s' AND `uid` = %d LIMIT 1",
$n,
dbesc($f[0]),
intval($importer["uid"])
);
if (DBM::is_result($r)) {
$x = q("UPDATE `item` SET `%s` = '%s' WHERE `%s` = '%s' AND `uid` = %d",
$n, dbesc($f[1]),
$n, dbesc($f[0]),
intval($importer["uid"]));
$x = q(
"UPDATE `item` SET `%s` = '%s' WHERE `%s` = '%s' AND `uid` = %d",
$n,
dbesc($f[1]),
$n,
dbesc($f[0]),
intval($importer["uid"])
);
if ($x === false) {
return false;
@ -1422,8 +1506,8 @@ class Diaspora {
*
* @return bool Success
*/
private static function receive_account_deletion($importer, $data) {
private static function receive_account_deletion($importer, $data)
{
/// @todo Account deletion should remove the contact from the global contacts as well
$author = notags(unxmlify($data->author));
@ -1448,8 +1532,8 @@ class Diaspora {
*
* @return string The constructed uri or the one from our database
*/
private static function get_uri_from_guid($author, $guid, $onlyfound = false) {
private static function get_uri_from_guid($author, $guid, $onlyfound = false)
{
$r = q("SELECT `uri` FROM `item` WHERE `guid` = '%s' LIMIT 1", dbesc($guid));
if (DBM::is_result($r)) {
return $r[0]["uri"];
@ -1463,13 +1547,13 @@ class Diaspora {
/**
* @brief Fetch the guid from our database with a given uri
*
* @param string $author Author handle
* @param string $uri Message uri
* @param string $uid Author handle
*
* @return string The post guid
*/
private static function get_guid_from_uri($uri, $uid) {
private static function get_guid_from_uri($uri, $uid)
{
$r = q("SELECT `guid` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($uri), intval($uid));
if (DBM::is_result($r)) {
return $r[0]["guid"];
@ -1485,7 +1569,8 @@ class Diaspora {
*
* @return array|boolean the origin owner of that post - or false
*/
private static function importer_for_guid($guid) {
private static function importer_for_guid($guid)
{
$item = dba::fetch_first("SELECT `uid` FROM `item` WHERE `origin` AND `guid` = ? LIMIT 1", $guid);
if (DBM::is_result($item)) {
@ -1508,7 +1593,8 @@ class Diaspora {
*
* @return int The message id of the generated comment or "false" if there was an error
*/
private static function receive_comment($importer, $sender, $data, $xml) {
private static function receive_comment($importer, $sender, $data, $xml)
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
$parent_guid = notags(unxmlify($data->parent_guid));
@ -1559,11 +1645,11 @@ class Diaspora {
$datarray["author-name"] = $person["name"];
$datarray["author-link"] = $person["url"];
$datarray["author-avatar"] = ((x($person,"thumb")) ? $person["thumb"] : $person["photo"]);
$datarray["author-avatar"] = ((x($person, "thumb")) ? $person["thumb"] : $person["photo"]);
$datarray["owner-name"] = $contact["name"];
$datarray["owner-link"] = $contact["url"];
$datarray["owner-avatar"] = ((x($contact,"thumb")) ? $contact["thumb"] : $contact["photo"]);
$datarray["owner-avatar"] = ((x($contact, "thumb")) ? $contact["thumb"] : $contact["photo"]);
$datarray["guid"] = $guid;
$datarray["uri"] = self::get_uri_from_guid($author, $guid);
@ -1605,7 +1691,6 @@ class Diaspora {
// If we are the origin of the parent we store the original data and notify our followers
if ($message_id && $parent_item["origin"]) {
// Formerly we stored the signed text, the signature and the author in different fields.
// We now store the raw data so that we are more flexible.
dba::insert('sign', array('iid' => $message_id, 'signed_text' => json_encode($data)));
@ -1629,7 +1714,8 @@ class Diaspora {
*
* @return bool "true" if it was successful
*/
private static function receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation) {
private static function receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation)
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
$subject = notags(unxmlify($data->subject));
@ -1661,7 +1747,8 @@ class Diaspora {
dba::lock('mail');
$r = q("SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
$r = q(
"SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
dbesc($msg_guid),
intval($importer["uid"])
);
@ -1670,7 +1757,8 @@ class Diaspora {
return false;
}
q("INSERT INTO `mail` (`uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`)
q(
"INSERT INTO `mail` (`uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`)
VALUES (%d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s','%s','%s')",
intval($importer["uid"]),
dbesc($msg_guid),
@ -1692,7 +1780,8 @@ class Diaspora {
dba::update('conv', array('updated' => datetime_convert()), array('id' => $conversation["id"]));
notification(array(
notification(
array(
"type" => NOTIFY_MAIL,
"notify_flags" => $importer["notify-flags"],
"language" => $importer["language"],
@ -1718,7 +1807,8 @@ class Diaspora {
*
* @return bool Success
*/
private static function receive_conversation($importer, $msg, $data) {
private static function receive_conversation($importer, $msg, $data)
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
$subject = notags(unxmlify($data->subject));
@ -1733,19 +1823,22 @@ class Diaspora {
}
$contact = self::allowed_contact_by_handle($importer, $msg["author"], true);
if (!$contact)
if (!$contact) {
return false;
}
$conversation = null;
$c = q("SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
$c = q(
"SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($importer["uid"]),
dbesc($guid)
);
if ($c)
$conversation = $c[0];
else {
$r = q("INSERT INTO `conv` (`uid`, `guid`, `creator`, `created`, `updated`, `subject`, `recips`)
$r = q(
"INSERT INTO `conv` (`uid`, `guid`, `creator`, `created`, `updated`, `subject`, `recips`)
VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s')",
intval($importer["uid"]),
dbesc($guid),
@ -1755,22 +1848,26 @@ class Diaspora {
dbesc($subject),
dbesc($participants)
);
if ($r)
$c = q("SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
if ($r) {
$c = q(
"SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($importer["uid"]),
dbesc($guid)
);
}
if ($c)
if ($c) {
$conversation = $c[0];
}
}
if (!$conversation) {
logger("unable to create conversation.");
return false;
}
foreach ($messages as $mesg)
foreach ($messages as $mesg) {
self::receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation);
}
return true;
}
@ -1802,7 +1899,8 @@ class Diaspora {
*
* @return string The XML
*/
private static function construct_like_object($importer, $parent_item) {
private static function construct_like_object($importer, $parent_item)
{
$objtype = ACTIVITY_OBJ_NOTE;
$link = '<link rel="alternate" type="text/html" href="'.System::baseUrl()."/display/".$importer["nickname"]."/".$parent_item["id"].'" />';
$parent_body = $parent_item["body"];
@ -1826,7 +1924,8 @@ class Diaspora {
*
* @return int The message id of the generated like or "false" if there was an error
*/
private static function receive_like($importer, $sender, $data) {
private static function receive_like($importer, $sender, $data)
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
$parent_guid = notags(unxmlify($data->parent_guid));
@ -1835,20 +1934,24 @@ class Diaspora {
// likes on comments aren't supported by Diaspora - only on posts
// But maybe this will be supported in the future, so we will accept it.
if (!in_array($parent_type, array("Post", "Comment")))
if (!in_array($parent_type, array("Post", "Comment"))) {
return false;
}
$contact = self::allowed_contact_by_handle($importer, $sender, true);
if (!$contact)
if (!$contact) {
return false;
}
$message_id = self::message_exists($importer["uid"], $guid);
if ($message_id)
if ($message_id) {
return true;
}
$parent_item = self::parent_item($importer["uid"], $parent_guid, $author, $contact);
if (!$parent_item)
if (!$parent_item) {
return false;
}
$person = self::person_by_handle($author);
if (!is_array($person)) {
@ -1861,10 +1964,11 @@ class Diaspora {
// "positive" = "false" would be a Dislike - wich isn't currently supported by Diaspora
// We would accept this anyhow.
if ($positive == "true")
if ($positive == "true") {
$verb = ACTIVITY_LIKE;
else
} else {
$verb = ACTIVITY_DISLIKE;
}
$datarray = array();
@ -1876,11 +1980,11 @@ class Diaspora {
$datarray["author-name"] = $person["name"];
$datarray["author-link"] = $person["url"];
$datarray["author-avatar"] = ((x($person,"thumb")) ? $person["thumb"] : $person["photo"]);
$datarray["author-avatar"] = ((x($person, "thumb")) ? $person["thumb"] : $person["photo"]);
$datarray["owner-name"] = $contact["name"];
$datarray["owner-link"] = $contact["url"];
$datarray["owner-avatar"] = ((x($contact,"thumb")) ? $contact["thumb"] : $contact["photo"]);
$datarray["owner-avatar"] = ((x($contact, "thumb")) ? $contact["thumb"] : $contact["photo"]);
$datarray["guid"] = $guid;
$datarray["uri"] = self::get_uri_from_guid($author, $guid);
@ -1915,7 +2019,6 @@ class Diaspora {
// If we are the origin of the parent we store the original data and notify our followers
if ($message_id && $origin) {
// Formerly we stored the signed text, the signature and the author in different fields.
// We now store the raw data so that we are more flexible.
dba::insert('sign', array('iid' => $message_id, 'signed_text' => json_encode($data)));
@ -1935,7 +2038,8 @@ class Diaspora {
*
* @return bool Success?
*/
private static function receive_message($importer, $data) {
private static function receive_message($importer, $data)
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
$conversation_guid = notags(unxmlify($data->conversation_guid));
@ -1949,7 +2053,8 @@ class Diaspora {
$conversation = null;
$c = q("SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
$c = q(
"SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($importer["uid"]),
dbesc($conversation_guid)
);
@ -1974,7 +2079,8 @@ class Diaspora {
dba::lock('mail');
$r = q("SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
$r = q(
"SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
dbesc($guid),
intval($importer["uid"])
);
@ -1983,7 +2089,8 @@ class Diaspora {
return false;
}
q("INSERT INTO `mail` (`uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`)
q(
"INSERT INTO `mail` (`uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`)
VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s','%s','%s')",
intval($importer["uid"]),
dbesc($guid),
@ -2015,7 +2122,8 @@ class Diaspora {
*
* @return bool always true
*/
private static function receive_participation($importer, $data) {
private static function receive_participation($importer, $data)
{
// I'm not sure if we can fully support this message type
return true;
}
@ -2028,8 +2136,10 @@ class Diaspora {
*
* @return bool always true
*/
private static function receive_photo($importer, $data) {
// There doesn't seem to be a reason for this function, since the photo data is transmitted in the status message as well
private static function receive_photo($importer, $data)
{
// There doesn't seem to be a reason for this function,
// since the photo data is transmitted in the status message as well
return true;
}
@ -2041,7 +2151,8 @@ class Diaspora {
*
* @return bool always true
*/
private static function receive_poll_participation($importer, $data) {
private static function receive_poll_participation($importer, $data)
{
// We don't support polls by now
return true;
}
@ -2054,12 +2165,14 @@ class Diaspora {
*
* @return bool Success
*/
private static function receive_profile($importer, $data) {
private static function receive_profile($importer, $data)
{
$author = strtolower(notags(unxmlify($data->author)));
$contact = self::contact_by_handle($importer["uid"], $author);
if (!$contact)
if (!$contact) {
return false;
}
$name = unxmlify($data->first_name).((strlen($data->last_name)) ? " ".unxmlify($data->last_name) : "");
$image_url = unxmlify($data->image_url);
@ -2076,20 +2189,23 @@ class Diaspora {
$keywords = array();
foreach ($tags as $tag) {
$tag = trim(strtolower($tag));
if ($tag != "")
if ($tag != "") {
$keywords[] = $tag;
}
}
$keywords = implode(", ", $keywords);
$handle_parts = explode("@", $author);
$nick = $handle_parts[0];
if ($name === "")
if ($name === "") {
$name = $handle_parts[0];
}
if ( preg_match("|^https?://|", $image_url) === 0)
if (preg_match("|^https?://|", $image_url) === 0) {
$image_url = "http://".$handle_parts[1].$image_url;
}
update_contact_avatar($image_url, $importer["uid"], $contact["id"]);
@ -2097,16 +2213,19 @@ class Diaspora {
$birthday = str_replace("1000", "1901", $birthday);
if ($birthday != "")
if ($birthday != "") {
$birthday = datetime_convert("UTC", "UTC", $birthday, "Y-m-d");
}
// this is to prevent multiple birthday notifications in a single year
// if we already have a stored birthday and the 'm-d' part hasn't changed, preserve the entry, which will preserve the notify year
if (substr($birthday,5) === substr($contact["bd"],5))
if (substr($birthday, 5) === substr($contact["bd"], 5)) {
$birthday = $contact["bd"];
}
$r = q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `name-date` = '%s', `bd` = '%s',
$r = q(
"UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `name-date` = '%s', `bd` = '%s',
`location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `id` = %d AND `uid` = %d",
dbesc($name),
dbesc($nick),
@ -2142,30 +2261,34 @@ class Diaspora {
* @param array $importer Array of the importer user
* @param array $contact The contact that send the request
*/
private static function receive_request_make_friend($importer, $contact) {
private static function receive_request_make_friend($importer, $contact)
{
$a = get_app();
if ($contact["rel"] == CONTACT_IS_SHARING) {
dba::update('contact', array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
array('id' => $contact["id"], 'uid' => $importer["uid"]));
dba::update(
'contact',
array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
array('id' => $contact["id"], 'uid' => $importer["uid"])
);
}
// send notification
$r = q("SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
$r = q(
"SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
intval($importer["uid"])
);
if ($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(PConfig::get($importer["uid"], "system", "post_newfriend"))) {
$self = q("SELECT * FROM `contact` WHERE `self` AND `uid` = %d LIMIT 1",
$self = q(
"SELECT * FROM `contact` WHERE `self` AND `uid` = %d LIMIT 1",
intval($importer["uid"])
);
// they are not CONTACT_IS_FOLLOWER anymore but that's what we have in the array
if ($self && $contact["rel"] == CONTACT_IS_FOLLOWER) {
$arr = array();
$arr["protocol"] = PROTOCOL_DIASPORA;
$arr["uri"] = $arr["parent-uri"] = item_new_uri($a->get_hostname(), $importer["uid"]);
@ -2196,11 +2319,12 @@ class Diaspora {
$arr["deny_gid"] = $user[0]["deny_gid"];
$i = item_store($arr);
if ($i)
if ($i) {
Worker::add(PRIORITY_HIGH, "notifier", "activity", $i);
}
}
}
}
/**
* @brief Creates a XML object for a "new friend" message
@ -2209,7 +2333,8 @@ class Diaspora {
*
* @return string The XML
*/
private static function construct_new_friend_object($contact) {
private static function construct_new_friend_object($contact)
{
$objtype = ACTIVITY_OBJ_PERSON;
$link = '<link rel="alternate" type="text/html" href="'.$contact["url"].'" />'."\n".
'<link rel="photo" type="image/jpeg" href="'.$contact["thumb"].'" />'."\n";
@ -2230,7 +2355,8 @@ class Diaspora {
*
* @return bool Success
*/
private static function receive_contact_request($importer, $data) {
private static function receive_contact_request($importer, $data)
{
$author = unxmlify($data->author);
$recipient = unxmlify($data->recipient);
@ -2252,7 +2378,7 @@ class Diaspora {
$sharing = true;
}
$contact = self::contact_by_handle($importer["uid"],$author);
$contact = self::contact_by_handle($importer["uid"], $author);
// perhaps we were already sharing with this person. Now they're sharing with us.
// That makes us friends.
@ -2262,7 +2388,7 @@ class Diaspora {
self::receive_request_make_friend($importer, $contact);
// refetch the contact array
$contact = self::contact_by_handle($importer["uid"],$author);
$contact = self::contact_by_handle($importer["uid"], $author);
// If we are now friends, we are sending a share message.
// Normally we needn't to do so, but the first message could have been vanished.
@ -2304,7 +2430,8 @@ class Diaspora {
$batch = (($ret["batch"]) ? $ret["batch"] : implode("/", array_slice(explode("/", $ret["url"]), 0, 3))."/receive/public");
$r = q("INSERT INTO `contact` (`uid`, `network`,`addr`,`created`,`url`,`nurl`,`batch`,`name`,`nick`,`photo`,`pubkey`,`notify`,`poll`,`blocked`,`priority`)
$r = q(
"INSERT INTO `contact` (`uid`, `network`,`addr`,`created`,`url`,`nurl`,`batch`,`name`,`nick`,`photo`,`pubkey`,`notify`,`poll`,`blocked`,`priority`)
VALUES (%d, '%s', '%s', '%s', '%s','%s','%s','%s','%s','%s','%s','%s','%s',%d,%d)",
intval($importer["uid"]),
dbesc($ret["network"]),
@ -2325,7 +2452,7 @@ class Diaspora {
// find the contact record we just created
$contact_record = self::contact_by_handle($importer["uid"],$author);
$contact_record = self::contact_by_handle($importer["uid"], $author);
if (!$contact_record) {
logger("unable to locate newly created contact record.");
@ -2336,18 +2463,19 @@ class Diaspora {
$def_gid = get_default_group($importer['uid'], $ret["network"]);
if (intval($def_gid))
if (intval($def_gid)) {
group_add_member($importer["uid"], "", $contact_record["id"], $def_gid);
}
update_contact_avatar($ret["photo"], $importer['uid'], $contact_record["id"], true);
if ($importer["page-flags"] == PAGE_NORMAL) {
logger("Sending intra message for author ".$author.".", LOGGER_DEBUG);
$hash = random_string().(string)time(); // Generate a confirm_key
$ret = q("INSERT INTO `intro` (`uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
$ret = q(
"INSERT INTO `intro` (`uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
VALUES (%d, %d, %d, %d, '%s', '%s', '%s')",
intval($importer["uid"]),
intval($contact_record["id"]),
@ -2358,25 +2486,26 @@ class Diaspora {
dbesc(datetime_convert())
);
} else {
// automatic friend approval
logger("Does an automatic friend approval for author ".$author.".", LOGGER_DEBUG);
update_contact_avatar($contact_record["photo"],$importer["uid"],$contact_record["id"]);
update_contact_avatar($contact_record["photo"], $importer["uid"], $contact_record["id"]);
// technically they are sharing with us (CONTACT_IS_SHARING),
// but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX
// we are going to change the relationship and make them a follower.
if (($importer["page-flags"] == PAGE_FREELOVE) && $sharing && $following)
if (($importer["page-flags"] == PAGE_FREELOVE) && $sharing && $following) {
$new_relation = CONTACT_IS_FRIEND;
elseif (($importer["page-flags"] == PAGE_FREELOVE) && $sharing)
} elseif (($importer["page-flags"] == PAGE_FREELOVE) && $sharing) {
$new_relation = CONTACT_IS_SHARING;
else
} else {
$new_relation = CONTACT_IS_FOLLOWER;
}
$r = q("UPDATE `contact` SET `rel` = %d,
$r = q(
"UPDATE `contact` SET `rel` = %d,
`name-date` = '%s',
`uri-date` = '%s',
`blocked` = 0,
@ -2412,13 +2541,15 @@ class Diaspora {
*
* @return array The fetched item
*/
private static function original_item($guid, $orig_author, $author) {
private static function original_item($guid, $orig_author, $author)
{
// Do we already have this item?
$r = q("SELECT `body`, `tag`, `app`, `created`, `object-type`, `uri`, `guid`,
$r = q(
"SELECT `body`, `tag`, `app`, `created`, `object-type`, `uri`, `guid`,
`author-name`, `author-link`, `author-avatar`
FROM `item` WHERE `guid` = '%s' AND `visible` AND NOT `deleted` AND `body` != '' LIMIT 1",
dbesc($guid));
dbesc($guid)
);
if (DBM::is_result($r)) {
logger("reshared message ".$guid." already exists on system.");
@ -2454,10 +2585,12 @@ class Diaspora {
}
if ($item_id) {
$r = q("SELECT `body`, `tag`, `app`, `created`, `object-type`, `uri`, `guid`,
$r = q(
"SELECT `body`, `tag`, `app`, `created`, `object-type`, `uri`, `guid`,
`author-name`, `author-link`, `author-avatar`
FROM `item` WHERE `id` = %d AND `visible` AND NOT `deleted` AND `body` != '' LIMIT 1",
intval($item_id));
intval($item_id)
);
if (DBM::is_result($r)) {
// If it is a reshared post from another network then reformat to avoid display problems with two share elements
@ -2468,7 +2601,6 @@ class Diaspora {
return $r[0];
}
}
}
return false;
@ -2483,7 +2615,8 @@ class Diaspora {
*
* @return int the message id
*/
private static function receive_reshare($importer, $data, $xml) {
private static function receive_reshare($importer, $data, $xml)
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
@ -2517,7 +2650,7 @@ class Diaspora {
$datarray["author-name"] = $contact["name"];
$datarray["author-link"] = $contact["url"];
$datarray["author-avatar"] = ((x($contact,"thumb")) ? $contact["thumb"] : $contact["photo"]);
$datarray["author-avatar"] = ((x($contact, "thumb")) ? $contact["thumb"] : $contact["photo"]);
$datarray["owner-name"] = $datarray["author-name"];
$datarray["owner-link"] = $datarray["author-link"];
@ -2532,8 +2665,14 @@ class Diaspora {
$datarray["protocol"] = PROTOCOL_DIASPORA;
$datarray["source"] = $xml;
$prefix = share_header($original_item["author-name"], $original_item["author-link"], $original_item["author-avatar"],
$original_item["guid"], $original_item["created"], $orig_url);
$prefix = share_header(
$original_item["author-name"],
$original_item["author-link"],
$original_item["author-avatar"],
$original_item["guid"],
$original_item["created"],
$orig_url
);
$datarray["body"] = $prefix.$original_item["body"]."[/share]";
$datarray["tag"] = $original_item["tag"];
@ -2565,7 +2704,8 @@ class Diaspora {
*
* @return bool success
*/
private static function item_retraction($importer, $contact, $data) {
private static function item_retraction($importer, $contact, $data)
{
$author = notags(unxmlify($data->author));
$target_guid = notags(unxmlify($data->target_guid));
$target_type = notags(unxmlify($data->target_type));
@ -2605,10 +2745,18 @@ class Diaspora {
continue;
}
// Currently we don't have a central deletion function that we could use in this case. The function "item_drop" doesn't work for that case
dba::update('item', array('deleted' => true, 'title' => '', 'body' => '',
'edited' => datetime_convert(), 'changed' => datetime_convert()),
array('id' => $item["id"]));
// Currently we don't have a central deletion function that we could use in this case.
// The function "item_drop" doesn't work for that case
dba::update(
'item',
array(
'deleted' => true,
'title' => '',
'body' => '',
'edited' => datetime_convert(),
'changed' => datetime_convert()),
array('id' => $item["id"])
);
// Delete the thread - if it is a starting post and not a comment
if ($target_type != 'Comment') {
@ -2636,7 +2784,8 @@ class Diaspora {
*
* @return bool Success
*/
private static function receive_retraction($importer, $sender, $data) {
private static function receive_retraction($importer, $sender, $data)
{
$target_type = notags(unxmlify($data->target_type));
$contact = self::contact_by_handle($importer["uid"], $sender);
@ -2678,7 +2827,8 @@ class Diaspora {
*
* @return int The message id of the newly created item
*/
private static function receive_status_message($importer, $data, $xml) {
private static function receive_status_message($importer, $data, $xml)
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
@ -2698,7 +2848,7 @@ class Diaspora {
$address = array();
if ($data->location) {
foreach ($data->location->children() AS $fieldname => $data) {
foreach ($data->location->children() as $fieldname => $data) {
$address[$fieldname] = notags(unxmlify($data));
}
}
@ -2709,7 +2859,7 @@ class Diaspora {
// Attach embedded pictures to the body
if ($data->photo) {
foreach ($data->photo AS $photo) {
foreach ($data->photo as $photo) {
$body = "[img]".unxmlify($photo->remote_photo_path).
unxmlify($photo->remote_photo_name)."[/img]\n".$body;
}
@ -2739,7 +2889,7 @@ class Diaspora {
$datarray["author-name"] = $contact["name"];
$datarray["author-link"] = $contact["url"];
$datarray["author-avatar"] = ((x($contact,"thumb")) ? $contact["thumb"] : $contact["photo"]);
$datarray["author-avatar"] = ((x($contact, "thumb")) ? $contact["thumb"] : $contact["photo"]);
$datarray["owner-name"] = $datarray["author-name"];
$datarray["owner-link"] = $datarray["author-link"];
@ -2790,11 +2940,12 @@ class Diaspora {
/**
* @brief returnes the handle of a contact
*
* @param array $me contact array
* @param array $contact contact array
*
* @return string the handle in the format user@domain.tld
*/
private static function my_handle($contact) {
private static function my_handle($contact)
{
if ($contact["addr"] != "") {
return $contact["addr"];
}
@ -2807,7 +2958,7 @@ class Diaspora {
$nick = $contact["nick"];
}
return $nick."@".substr(System::baseUrl(), strpos(System::baseUrl(),"://") + 3);
return $nick."@".substr(System::baseUrl(), strpos(System::baseUrl(), "://") + 3);
}
@ -2822,8 +2973,8 @@ class Diaspora {
*
* @return string The encrypted data
*/
public static function encode_private_data($msg, $user, $contact, $prvkey, $pubkey) {
public static function encode_private_data($msg, $user, $contact, $prvkey, $pubkey)
{
logger("Message: ".$msg, LOGGER_DATA);
// without a public key nothing will work
@ -2844,8 +2995,10 @@ class Diaspora {
$encrypted_key_bundle = "";
openssl_public_encrypt($json, $encrypted_key_bundle, $pubkey);
$json_object = json_encode(array("aes_key" => base64_encode($encrypted_key_bundle),
"encrypted_magic_envelope" => base64_encode($ciphertext)));
$json_object = json_encode(
array("aes_key" => base64_encode($encrypted_key_bundle),
"encrypted_magic_envelope" => base64_encode($ciphertext))
);
return $json_object;
}
@ -2858,8 +3011,8 @@ class Diaspora {
*
* @return string The envelope
*/
public static function build_magic_envelope($msg, $user) {
public static function build_magic_envelope($msg, $user)
{
$b64url_data = base64url_encode($msg);
$data = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data);
@ -2870,8 +3023,9 @@ class Diaspora {
$signable_data = $data.".".base64url_encode($type).".".base64url_encode($encoding).".".base64url_encode($alg);
// Fallback if the private key wasn't transmitted in the expected field
if ($user['uprvkey'] == "")
if ($user['uprvkey'] == "") {
$user['uprvkey'] = $user['prvkey'];
}
$signature = rsa_sign($signable_data, $user["uprvkey"]);
$sig = base64url_encode($signature);
@ -2900,8 +3054,8 @@ class Diaspora {
*
* @return string The message that will be transmitted to other servers
*/
private static function build_message($msg, $user, $contact, $prvkey, $pubkey, $public = false) {
private static function build_message($msg, $user, $contact, $prvkey, $pubkey, $public = false)
{
// The message is put into an envelope with the sender's signature
$envelope = self::build_magic_envelope($msg, $user);
@ -2921,7 +3075,8 @@ class Diaspora {
*
* @return string The signature
*/
private static function signature($owner, $message) {
private static function signature($owner, $message)
{
$sigmsg = $message;
unset($sigmsg["author_signature"]);
unset($sigmsg["parent_author_signature"]);
@ -2943,13 +3098,14 @@ class Diaspora {
*
* @return int Result of the transmission
*/
public static function transmit($owner, $contact, $envelope, $public_batch, $queue_run=false, $guid = "") {
public static function transmit($owner, $contact, $envelope, $public_batch, $queue_run = false, $guid = "")
{
$a = get_app();
$enabled = intval(Config::get("system", "diaspora_enabled"));
if (!$enabled)
if (!$enabled) {
return 200;
}
$logid = random_string(4);
$dest_url = (($public_batch) ? $contact["batch"] : $contact["notify"]);
@ -2979,7 +3135,8 @@ class Diaspora {
if (!$return_code || (($return_code == 503) && (stristr($a->get_curl_headers(), "retry-after")))) {
logger("queue message");
$r = q("SELECT `id` FROM `queue` WHERE `cid` = %d AND `network` = '%s' AND `content` = '%s' AND `batch` = %d LIMIT 1",
$r = q(
"SELECT `id` FROM `queue` WHERE `cid` = %d AND `network` = '%s' AND `content` = '%s' AND `batch` = %d LIMIT 1",
intval($contact["id"]),
dbesc(NETWORK_DIASPORA),
dbesc($envelope),
@ -3011,8 +3168,8 @@ class Diaspora {
*
* @return string The post XML
*/
public static function build_post_xml($type, $message) {
public static function build_post_xml($type, $message)
{
$data = array($type => $message);
return xml::from_array($data, $xml);
@ -3031,24 +3188,26 @@ class Diaspora {
*
* @return int Result of the transmission
*/
private static function build_and_transmit($owner, $contact, $type, $message, $public_batch = false, $guid = "", $spool = false) {
private static function build_and_transmit($owner, $contact, $type, $message, $public_batch = false, $guid = "", $spool = false)
{
$msg = self::build_post_xml($type, $message);
logger('message: '.$msg, LOGGER_DATA);
logger('send guid '.$guid, LOGGER_DEBUG);
// Fallback if the private key wasn't transmitted in the expected field
if ($owner['uprvkey'] == "")
if ($owner['uprvkey'] == "") {
$owner['uprvkey'] = $owner['prvkey'];
}
$envelope = self::build_message($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch);
if ($spool) {
add_to_queue($contact['id'], NETWORK_DIASPORA, $envelope, $public_batch);
return true;
} else
} else {
$return_code = self::transmit($owner, $contact, $envelope, $public_batch, false, $guid);
}
logger("guid: ".$item["guid"]." result ".$return_code, LOGGER_DEBUG);
@ -3064,8 +3223,8 @@ class Diaspora {
*
* @return int The result of the transmission
*/
public static function sendAccountMigration($owner, $contact, $uid) {
public static function sendAccountMigration($owner, $contact, $uid)
{
$old_handle = PConfig::get($uid, 'system', 'previous_addr');
$profile = self::createProfileData($uid);
@ -3089,8 +3248,8 @@ class Diaspora {
*
* @return int The result of the transmission
*/
public static function send_share($owner, $contact) {
public static function send_share($owner, $contact)
{
/**
* @todo support the different possible combinations of "following" and "sharing"
* Currently, Diaspora only interprets the "sharing" field
@ -3130,8 +3289,8 @@ class Diaspora {
*
* @return int The result of the transmission
*/
public static function send_unshare($owner, $contact) {
public static function send_unshare($owner, $contact)
{
$message = array("author" => self::my_handle($owner),
"recipient" => $contact["addr"],
"following" => "false",
@ -3150,39 +3309,50 @@ class Diaspora {
*
* @return array|bool Reshare details or "false" if no reshare
*/
public static function is_reshare($body, $complete = true) {
public static function is_reshare($body, $complete = true)
{
$body = trim($body);
// Skip if it isn't a pure repeated messages
// Does it start with a share?
if ((strpos($body, "[share") > 0) && $complete)
if ((strpos($body, "[share") > 0) && $complete) {
return(false);
}
// Does it end with a share?
if (strlen($body) > (strrpos($body, "[/share]") + 8))
if (strlen($body) > (strrpos($body, "[/share]") + 8)) {
return(false);
}
$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$1", $body);
// Skip if there is no shared message in there
if ($body == $attributes)
if ($body == $attributes) {
return(false);
}
// If we don't do the complete check we quit here
if (!$complete)
if (!$complete) {
return true;
}
$guid = "";
preg_match("/guid='(.*?)'/ism", $attributes, $matches);
if ($matches[1] != "")
if ($matches[1] != "") {
$guid = $matches[1];
}
preg_match('/guid="(.*?)"/ism', $attributes, $matches);
if ($matches[1] != "")
if ($matches[1] != "") {
$guid = $matches[1];
}
if ($guid != "") {
$r = q("SELECT `contact-id` FROM `item` WHERE `guid` = '%s' AND `network` IN ('%s', '%s') LIMIT 1",
dbesc($guid), NETWORK_DFRN, NETWORK_DIASPORA);
$r = q(
"SELECT `contact-id` FROM `item` WHERE `guid` = '%s' AND `network` IN ('%s', '%s') LIMIT 1",
dbesc($guid),
NETWORK_DFRN,
NETWORK_DIASPORA
);
if ($r) {
$ret= array();
$ret["root_handle"] = self::handle_from_contact($r[0]["contact-id"]);
@ -3193,31 +3363,37 @@ class Diaspora {
$profile = "";
preg_match("/profile='(.*?)'/ism", $attributes, $matches);
if ($matches[1] != "")
if ($matches[1] != "") {
$profile = $matches[1];
}
preg_match('/profile="(.*?)"/ism', $attributes, $matches);
if ($matches[1] != "")
if ($matches[1] != "") {
$profile = $matches[1];
}
$ret= array();
$ret["root_handle"] = preg_replace("=https?://(.*)/u/(.*)=ism", "$2@$1", $profile);
if (($ret["root_handle"] == $profile) || ($ret["root_handle"] == ""))
if (($ret["root_handle"] == $profile) || ($ret["root_handle"] == "")) {
return(false);
}
$link = "";
preg_match("/link='(.*?)'/ism", $attributes, $matches);
if ($matches[1] != "")
if ($matches[1] != "") {
$link = $matches[1];
}
preg_match('/link="(.*?)"/ism', $attributes, $matches);
if ($matches[1] != "")
if ($matches[1] != "") {
$link = $matches[1];
}
$ret["root_guid"] = preg_replace("=https?://(.*)/posts/(.*)=ism", "$2", $link);
if (($ret["root_guid"] == $link) || (trim($ret["root_guid"]) == ""))
if (($ret["root_guid"] == $link) || (trim($ret["root_guid"]) == "")) {
return(false);
}
return($ret);
}
@ -3229,8 +3405,8 @@ class Diaspora {
*
* @return array with event data
*/
private static function build_event($event_id) {
private static function build_event($event_id)
{
$r = q("SELECT `guid`, `uid`, `start`, `finish`, `nofinish`, `summary`, `desc`, `location`, `adjust` FROM `event` WHERE `id` = %d", intval($event_id));
if (!DBM::is_result($r)) {
return array();
@ -3306,8 +3482,8 @@ class Diaspora {
* 'type' -> Message type ("status_message" or "reshare")
* 'message' -> Array of XML elements of the status
*/
public static function build_status($item, $owner) {
public static function build_status($item, $owner)
{
$cachekey = "diaspora:build_status:".$item['guid'];
$result = Cache::get($cachekey);
@ -3340,17 +3516,19 @@ class Diaspora {
$body = html_entity_decode(bb2diaspora($body));
// Adding the title
if (strlen($title))
if (strlen($title)) {
$body = "## ".html_entity_decode($title)."\n\n".$body;
}
if ($item["attach"]) {
$cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism', $item["attach"], $matches, PREG_SET_ORDER);
if (cnt) {
$body .= "\n".t("Attachments:")."\n";
foreach ($matches as $mtch)
foreach ($matches as $mtch) {
$body .= "[".$mtch[3]."](".$mtch[1].")\n";
}
}
}
$location = array();
@ -3406,8 +3584,8 @@ class Diaspora {
*
* @return int The result of the transmission
*/
public static function send_status($item, $owner, $contact, $public_batch = false) {
public static function send_status($item, $owner, $contact, $public_batch = false)
{
$status = self::build_status($item, $owner);
return self::build_and_transmit($owner, $contact, $status["type"], $status["message"], $public_batch, $item["guid"]);
@ -3421,12 +3599,15 @@ class Diaspora {
*
* @return array The data for a "like"
*/
private static function construct_like($item, $owner) {
$p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
dbesc($item["thr-parent"]));
if (!DBM::is_result($p))
private static function construct_like($item, $owner)
{
$p = q(
"SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
dbesc($item["thr-parent"])
);
if (!DBM::is_result($p)) {
return false;
}
$parent = $p[0];
@ -3455,10 +3636,13 @@ class Diaspora {
*/
private static function construct_attend($item, $owner) {
$p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
dbesc($item["thr-parent"]));
if (!DBM::is_result($p))
$p = q(
"SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
dbesc($item["thr-parent"])
);
if (!DBM::is_result($p)) {
return false;
}
$parent = $p[0];
@ -3492,8 +3676,8 @@ class Diaspora {
*
* @return array The data for a comment
*/
private static function construct_comment($item, $owner) {
private static function construct_comment($item, $owner)
{
$cachekey = "diaspora:construct_comment:".$item['guid'];
$result = Cache::get($cachekey);
@ -3501,13 +3685,15 @@ class Diaspora {
return $result;
}
$p = q("SELECT `guid` FROM `item` WHERE `parent` = %d AND `id` = %d LIMIT 1",
$p = q(
"SELECT `guid` FROM `item` WHERE `parent` = %d AND `id` = %d LIMIT 1",
intval($item["parent"]),
intval($item["parent"])
);
if (!DBM::is_result($p))
if (!DBM::is_result($p)) {
return false;
}
$parent = $p[0];
@ -3541,8 +3727,8 @@ class Diaspora {
*
* @return int The result of the transmission
*/
public static function send_followup($item,$owner,$contact,$public_batch = false) {
public static function send_followup($item, $owner, $contact, $public_batch = false)
{
if (in_array($item['verb'], array(ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE))) {
$message = self::construct_attend($item, $owner);
$type = "event_participation";
@ -3554,8 +3740,9 @@ class Diaspora {
$type = "comment";
}
if (!$message)
if (!$message) {
return false;
}
$message["author_signature"] = self::signature($owner, $message);
@ -3570,8 +3757,8 @@ class Diaspora {
*
* @return string The message
*/
private static function message_from_signature($item, $signature) {
private static function message_from_signature($item, $signature)
{
// Split the signed text
$signed_parts = explode(";", $signature['signed_text']);
@ -3620,8 +3807,8 @@ class Diaspora {
*
* @return int The result of the transmission
*/
public static function send_relay($item, $owner, $contact, $public_batch = false) {
public static function send_relay($item, $owner, $contact, $public_batch = false)
{
if ($item["deleted"]) {
return self::send_retraction($item, $owner, $contact, $public_batch, true);
} elseif (in_array($item["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
@ -3634,8 +3821,10 @@ class Diaspora {
// fetch the original signature
$r = q("SELECT `signed_text`, `signature`, `signer` FROM `sign` WHERE `iid` = %d LIMIT 1",
intval($item["id"]));
$r = q(
"SELECT `signed_text`, `signature`, `signer` FROM `sign` WHERE `iid` = %d LIMIT 1",
intval($item["id"])
);
if (!$r) {
logger("Couldn't fetch signatur for item ".$item["guid"]." (".$item["id"].")", LOGGER_DEBUG);
@ -3646,9 +3835,9 @@ class Diaspora {
// Old way - is used by the internal Friendica functions
/// @todo Change all signatur storing functions to the new format
if ($signature['signed_text'] && $signature['signature'] && $signature['signer'])
if ($signature['signed_text'] && $signature['signature'] && $signature['signer']) {
$message = self::message_from_signature($item, $signature);
else {// New way
} else {// New way
$msg = json_decode($signature['signed_text'], true);
$message = array();
@ -3665,9 +3854,10 @@ class Diaspora {
$message[$field] = $data;
}
} else
} else {
logger("Signature text for item ".$item["guid"]." (".$item["id"].") couldn't be extracted: ".$signature['signed_text'], LOGGER_DEBUG);
}
}
$message["parent_author_signature"] = self::signature($owner, $message);
@ -3687,8 +3877,8 @@ class Diaspora {
*
* @return int The result of the transmission
*/
public static function send_retraction($item, $owner, $contact, $public_batch = false, $relay = false) {
public static function send_retraction($item, $owner, $contact, $public_batch = false, $relay = false)
{
$itemaddr = self::handle_from_contact($item["contact-id"], $item["gcontact-id"]);
$msg_type = "retraction";
@ -3719,11 +3909,12 @@ class Diaspora {
*
* @return int The result of the transmission
*/
public static function send_mail($item, $owner, $contact) {
public static function send_mail($item, $owner, $contact)
{
$myaddr = self::my_handle($owner);
$r = q("SELECT * FROM `conv` WHERE `id` = %d AND `uid` = %d LIMIT 1",
$r = q(
"SELECT * FROM `conv` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($item["convid"]),
intval($item["uid"])
);
@ -3778,8 +3969,10 @@ class Diaspora {
*
* @return array The profile data
*/
private static function createProfileData($uid) {
$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.*, `user`.`prvkey` AS `uprvkey`, `contact`.`addr`
private static function createProfileData($uid)
{
$r = q(
"SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.*, `user`.`prvkey` AS `uprvkey`, `contact`.`addr`
FROM `profile`
INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
INNER JOIN `contact` ON `profile`.`uid` = `contact`.`uid`
@ -3794,8 +3987,8 @@ class Diaspora {
$profile = $r[0];
$handle = $profile["addr"];
$first = ((strpos($profile['name'],' ')
? trim(substr($profile['name'],0,strpos($profile['name'],' '))) : $profile['name']));
$first = ((strpos($profile['name'], ' ')
? trim(substr($profile['name'], 0, strpos($profile['name'], ' '))) : $profile['name']));
$last = (($first === $profile['name']) ? '' : trim(substr($profile['name'], strlen($first))));
$large = System::baseUrl().'/photo/custom/300/'.$profile['uid'].'.jpg';
$medium = System::baseUrl().'/photo/custom/100/'.$profile['uid'].'.jpg';
@ -3805,8 +3998,9 @@ class Diaspora {
if ($searchable === 'true') {
$dob = '1000-00-00';
if (($profile['dob']) && ($profile['dob'] > '0001-01-01'))
$dob = ((intval($profile['dob'])) ? intval($profile['dob']) : '1000') .'-'. datetime_convert('UTC','UTC',$profile['dob'],'m-d');
if (($profile['dob']) && ($profile['dob'] > '0001-01-01')) {
$dob = ((intval($profile['dob'])) ? intval($profile['dob']) : '1000') .'-'. datetime_convert('UTC', 'UTC', $profile['dob'],'m-d');
}
$about = $profile['about'];
$about = strip_tags(bbcode($about));
@ -3814,16 +4008,17 @@ class Diaspora {
$location = formatted_location($profile);
$tags = '';
if ($profile['pub_keywords']) {
$kw = str_replace(',',' ',$profile['pub_keywords']);
$kw = str_replace(' ',' ',$kw);
$arr = explode(' ',$profile['pub_keywords']);
$kw = str_replace(',', ' ', $profile['pub_keywords']);
$kw = str_replace(' ', ' ', $kw);
$arr = explode(' ', $profile['pub_keywords']);
if (count($arr)) {
for ($x = 0; $x < 5; $x ++) {
if (trim($arr[$x]))
if (trim($arr[$x])) {
$tags .= '#'. trim($arr[$x]) .' ';
}
}
}
}
$tags = trim($tags);
}
@ -3847,20 +4042,25 @@ class Diaspora {
*
* @param int $uid The user id
*/
public static function send_profile($uid, $recips = false) {
if (!$uid)
public static function send_profile($uid, $recips = false)
{
if (!$uid) {
return;
}
if (!$recips)
$recips = q("SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'
if (!$recips) {
$recips = q(
"SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'
AND `uid` = %d AND `rel` != %d",
dbesc(NETWORK_DIASPORA),
intval($uid),
intval(CONTACT_IS_SHARING)
);
if (!$recips)
}
if (!$recips) {
return;
}
$message = self::createProfileData($uid);
@ -3878,8 +4078,8 @@ class Diaspora {
*
* @return bool Success
*/
public static function store_like_signature($contact, $post_id) {
public static function store_like_signature($contact, $post_id)
{
// Is the contact the owner? Then fetch the private key
if (!$contact['self'] || ($contact['uid'] == 0)) {
logger("No owner post, so not storing signature", LOGGER_DEBUG);
@ -3925,8 +4125,8 @@ class Diaspora {
*
* @return bool Success
*/
public static function store_comment_signature($item, $contact, $uprvkey, $message_id) {
public static function store_comment_signature($item, $contact, $uprvkey, $message_id)
{
if ($uprvkey == "") {
logger('No private key, so not storing comment signature', LOGGER_DEBUG);
return false;

17
vendor/pear/text_languagedetect/phpcs.xml vendored
View file

@ -4,5 +4,22 @@
<!-- we keep the old php4-style variable names for now -->
<exclude name="PEAR.NamingConventions.ValidFunctionName.PublicUnderscore"/>
<exclude name="PEAR.NamingConventions.ValidVariableName.PublicUnderscore"/>
<exclude name="PEAR.NamingConventions.ValidVariableName.PrivateNoUnderscore"/>
<exclude name="PEAR.NamingConventions.ValidFunctionName.PrivateNoUnderscore"/>
<exclude name="PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps"/>
<exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps"/>
</rule>
<description>PSR2 with tabs instead of spaces.</description>
<arg name="tab-width" value="4"/>
<rule ref="PSR2">
<exclude name="Generic.WhiteSpace.DisallowTabIndent"/>
<exclude name="Generic.Commenting.DocComment.MissingShort"/>
</rule>
<rule ref="Generic.WhiteSpace.DisallowSpaceIndent"/>
<rule ref="Generic.WhiteSpace.ScopeIndent">
<properties>
<property name="indent" value="4"/>
<property name="tabIndent" value="true"/>
</properties>
</rule>
</ruleset>