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

Continued:

Browse source 
- converted multiple single-line comments into one multi-line comment (please
  stop abusing programming languages!)
- added more TODO tags for type-hints (upcoming rewrite)
- opps, one space was only fixed in develop branch, not in this PR branch

Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2017-03-24 20:39:00 +01:00
parent db1c2e4041
commit d45e79dfe9
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
1 changed files with 64 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
include/dfrn.php
View file

@ -1456,10 +1456,12 @@ class dfrn {
update_contact_avatar($author["avatar"], $importer["uid"], $contact["id"], update_contact_avatar($author["avatar"], $importer["uid"], $contact["id"],
(strtotime($contact["avatar-date"]) > strtotime($r[0]["avatar-date"]))); (strtotime($contact["avatar-date"]) > strtotime($r[0]["avatar-date"])));
// The generation is a sign for the reliability of the provided data. /*
// It is used in the socgraph.php to prevent that old contact data * The generation is a sign for the reliability of the provided data.
// that was relayed over several servers can overwrite contact * It is used in the socgraph.php to prevent that old contact data
// data that we received directly. * that was relayed over several servers can overwrite contact
* data that we received directly.
*/
$poco["generation"] = 2; $poco["generation"] = 2;
$poco["photo"] = $author["avatar"]; $poco["photo"] = $author["avatar"];
@ -1811,6 +1813,7 @@ class dfrn {
update_contact_avatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true); update_contact_avatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
/// @TODO decide to use dbm::is_result() here
if ($x === false) { if ($x === false) {
return false; return false;
} }
@ -1833,10 +1836,13 @@ class dfrn {
$n, dbesc($f[1]), $n, dbesc($f[1]),
$n, dbesc($f[0]), $n, dbesc($f[0]),
intval($importer["importer_uid"])); intval($importer["importer_uid"]));
if ($x === false)
/// @TODO decide to use dbm::is_result() here
if ($x === false) {
return false; return false;
} }
} }
}
/// @TODO /// @TODO
/// merge with current record, current contents have priority /// merge with current record, current contents have priority
@ -1853,6 +1859,7 @@ class dfrn {
* @param array $item the new item record * @param array $item the new item record
* @param array $importer Record of the importer user mixed with contact of the content * @param array $importer Record of the importer user mixed with contact of the content
* @param int $entrytype Is it a toplevel entry, a comment or a relayed comment? * @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; $changed = false;
@ -1860,8 +1867,9 @@ class dfrn {
if (edited_timestamp_is_newer($current, $item)) { if (edited_timestamp_is_newer($current, $item)) {
// do not accept (ignore) an earlier edit than one we currently have. // 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); return(false);
}
$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s', `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d", $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s', `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
dbesc($item["title"]), dbesc($item["title"]),
@ -1906,6 +1914,7 @@ class dfrn {
* @param array $item the new item record * @param array $item the new item record
* *
* @return int Is it a toplevel entry, a comment or a relayed comment? * @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"]) { if ($item["parent-uri"] != $item["uri"]) {
@ -1946,11 +1955,14 @@ class dfrn {
} }
} }
// Does this have the characteristics of a community or private group action? /*
// If it's an action to a wall post on a community/prvgroup page it's a * Does this have the characteristics of a community or private group action?
// valid community action. Also forum_mode makes it valid for sure. * If it's an action to a wall post on a community/prvgroup page it's a
// If neither, it's not. * valid community action. Also forum_mode makes it valid for sure.
* If neither, it's not.
*/
/// @TODO Maybe merge these if() blocks into one?
if ($is_a_remote_action && $community) { if ($is_a_remote_action && $community) {
if ((!$r[0]["forum_mode"]) && (!$r[0]["wall"])) { if ((!$r[0]["forum_mode"]) && (!$r[0]["wall"])) {
$is_a_remote_action = false; $is_a_remote_action = false;
@ -1963,7 +1975,6 @@ class dfrn {
} else { } else {
return DFRN_REPLY; return DFRN_REPLY;
} }
} else { } else {
return DFRN_TOP_LEVEL; return DFRN_TOP_LEVEL;
} }
@ -1976,6 +1987,7 @@ class dfrn {
* @param array $item the new item record * @param array $item the new item record
* @param array $importer Record of the importer user mixed with contact of the content * @param array $importer Record of the importer user mixed with contact of the content
* @param int $posted_id The record number of item record that was just posted * @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) { private static function do_poke($item, $importer, $posted_id) {
$verb = urldecode(substr($item["verb"],strpos($item["verb"], "#")+1)); $verb = urldecode(substr($item["verb"],strpos($item["verb"], "#")+1));
@ -2032,6 +2044,7 @@ class dfrn {
* @param bool $is_like Is the verb a "like"? * @param bool $is_like Is the verb a "like"?
* *
* @return bool Should the processing of the entries be continued? * @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) {
@ -2141,7 +2154,7 @@ class dfrn {
* *
* @param object $links link elements * @param object $links link elements
* @param array $item the item record * @param array $item the item record
* @todo Add type-hints * @todo set proper type-hints
*/ */
private static function parse_links($links, &$item) { private static function parse_links($links, &$item) {
$rel = ""; $rel = "";
@ -2501,10 +2514,12 @@ class dfrn {
} }
} else { // $entrytype == DFRN_TOP_LEVEL } 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. * The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
// the tgroup delivery code called from item_store will correct it if it's a forum, * but otherwise there's a possible data mixup on the sender's system.
// but we're going to unconditionally correct it here so that the post will always be owned by our contact. * the tgroup delivery code called from item_store will correct it if it's a forum,
* but we're going to unconditionally correct it here so that the post will always be owned by our contact.
*/
logger('Correcting item owner.', LOGGER_DEBUG); logger('Correcting item owner.', LOGGER_DEBUG);
$item["owner-name"] = $importer["senderName"]; $item["owner-name"] = $importer["senderName"];
$item["owner-link"] = $importer["url"]; $item["owner-link"] = $importer["url"];
@ -2535,6 +2550,7 @@ class dfrn {
* @param object $xpath XPath object * @param object $xpath XPath object
* @param object $deletion deletion elements * @param object $deletion deletion elements
* @param array $importer Record of the importer user mixed with contact of the content * @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) {
@ -2685,6 +2701,7 @@ class dfrn {
* @param text $xml The DFRN message * @param text $xml The DFRN message
* @param array $importer Record of the importer user mixed with contact of the content * @param array $importer Record of the importer user mixed with contact of the content
* @param bool $sort_by_date Is used when feeds are polled * @param bool $sort_by_date Is used when feeds are polled
* @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) {