clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only some code cleanup

This commit is contained in:
Michael Vogel 2014-06-15 23:33:25 +02:00
parent 52474847cb
commit a05ed41fb2
4 changed files with 50 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/delivery.php
View File

@ -469,10 +469,6 @@ function delivery_run(&$argv, &$argc){
//if($reply_to) //if($reply_to)
// $headers .= 'Reply-to: ' . $reply_to . "\n"; // $headers .= 'Reply-to: ' . $reply_to . "\n";
// for testing purposes: Collect exported mails
// $file = tempnam("/tmp/friendica/", "mail-out-");
// file_put_contents($file, json_encode($it));
$headers .= 'Message-Id: <' . iri2msgid($it['uri']). '>' . "\n"; $headers .= 'Message-Id: <' . iri2msgid($it['uri']). '>' . "\n";
//logger("Mail: uri: ".$it['uri']." parent-uri ".$it['parent-uri'], LOGGER_DEBUG); //logger("Mail: uri: ".$it['uri']." parent-uri ".$it['parent-uri'], LOGGER_DEBUG);

8
include/email.php
View File

@ -82,10 +82,6 @@ function email_get_msg($mbox,$uid, $reply) {
if(! $struc) if(! $struc)
return $ret; return $ret;
// for testing purposes: Collect imported mails
// $file = tempnam("/tmp/friendica2/", "mail-in-");
// file_put_contents($file, json_encode($struc));
if(! $struc->parts) { if(! $struc->parts) {
$ret['body'] = email_get_part($mbox,$uid,$struc,0, 'html'); $ret['body'] = email_get_part($mbox,$uid,$struc,0, 'html');
$html = $ret['body']; $html = $ret['body'];
@ -138,10 +134,6 @@ function email_get_part($mbox,$uid,$p,$partno, $subtype) {
? @imap_fetchbody($mbox,$uid,$partno, FT_UID|FT_PEEK) ? @imap_fetchbody($mbox,$uid,$partno, FT_UID|FT_PEEK)
: @imap_body($mbox,$uid,FT_UID|FT_PEEK); : @imap_body($mbox,$uid,FT_UID|FT_PEEK);
// for testing purposes: Collect imported mails
// $file = tempnam("/tmp/friendica2/", "mail-body-");
// file_put_contents($file, $data);
// Any part may be encoded, even plain text messages, so check everything. // Any part may be encoded, even plain text messages, so check everything.
if ($p->encoding==4) if ($p->encoding==4)
$data = quoted_printable_decode($data); $data = quoted_printable_decode($data);

106
include/items.php Executable file → Normal file
View File

@ -874,21 +874,15 @@ function get_atom_elements($feed, $item, $contact = array()) {
call_hooks('parse_atom', $arr); call_hooks('parse_atom', $arr);
//if (($res["title"] != "") or (strpos($res["body"], "RT @") > 0)) {
//if (strpos($res["body"], "RT @") !== false) {
/*if (strpos($res["body"], "@") !== false) {
$debugfile = tempnam("/var/www/virtual/pirati.ca/phptmp/", "item-res2-");
file_put_contents($debugfile, serialize($arr));
}*/
return $res; return $res;
} }
function add_page_info($url, $no_photos = false, $photo = "") { function add_page_info($url, $no_photos = false, $photo = "") {
require_once("mod/parse_url.php"); require_once("mod/parse_url.php");
$data = parseurl_getsiteinfo($url, true);
logger('add_page_info: fetch page info for '.$url.' '.print_r($data, true), LOGGER_DEBUG); $data = parseurl_getsiteinfo($url, true);
logger('add_page_info: fetch page info for '.$url.' '.print_r($data, true), LOGGER_DEBUG);
// It maybe is a rich content, but if it does have everything that a link has, // It maybe is a rich content, but if it does have everything that a link has,
// then treat it that way // then treat it that way
@ -896,53 +890,53 @@ function add_page_info($url, $no_photos = false, $photo = "") {
is_string($data["text"]) AND (sizeof($data["images"]) > 0)) is_string($data["text"]) AND (sizeof($data["images"]) > 0))
$data["type"] = "link"; $data["type"] = "link";
if ((($data["type"] != "link") AND ($data["type"] != "video") AND ($data["type"] != "photo")) OR ($data["title"] == $url)) if ((($data["type"] != "link") AND ($data["type"] != "video") AND ($data["type"] != "photo")) OR ($data["title"] == $url))
return(""); return("");
if ($no_photos AND ($data["type"] == "photo")) if ($no_photos AND ($data["type"] == "photo"))
return(""); return("");
if (($data["type"] != "photo") AND is_string($data["title"])) if (($data["type"] != "photo") AND is_string($data["title"]))
$text .= "[bookmark=".$url."]".trim($data["title"])."[/bookmark]"; $text .= "[bookmark=".$url."]".trim($data["title"])."[/bookmark]";
if (($data["type"] != "video") AND ($photo != "")) if (($data["type"] != "video") AND ($photo != ""))
$text .= '[img]'.$photo.'[/img]'; $text .= '[img]'.$photo.'[/img]';
elseif (($data["type"] != "video") AND (sizeof($data["images"]) > 0)) { elseif (($data["type"] != "video") AND (sizeof($data["images"]) > 0)) {
$imagedata = $data["images"][0]; $imagedata = $data["images"][0];
$text .= '[img]'.$imagedata["src"].'[/img]'; $text .= '[img]'.$imagedata["src"].'[/img]';
} }
if (($data["type"] != "photo") AND is_string($data["text"])) if (($data["type"] != "photo") AND is_string($data["text"]))
$text .= "[quote]".$data["text"]."[/quote]"; $text .= "[quote]".$data["text"]."[/quote]";
return("\n[class=type-".$data["type"]."]".$text."[/class]"); return("\n[class=type-".$data["type"]."]".$text."[/class]");
} }
function add_page_info_to_body($body, $texturl = false, $no_photos = false) { function add_page_info_to_body($body, $texturl = false, $no_photos = false) {
logger('add_page_info_to_body: fetch page info for body '.$body, LOGGER_DEBUG); logger('add_page_info_to_body: fetch page info for body '.$body, LOGGER_DEBUG);
$URLSearchString = "^\[\]"; $URLSearchString = "^\[\]";
// Adding these spaces is a quick hack due to my problems with regular expressions :) // Adding these spaces is a quick hack due to my problems with regular expressions :)
preg_match("/[^!#@]\[url\]([$URLSearchString]*)\[\/url\]/ism", " ".$body, $matches); preg_match("/[^!#@]\[url\]([$URLSearchString]*)\[\/url\]/ism", " ".$body, $matches);
if (!$matches) if (!$matches)
preg_match("/[^!#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", " ".$body, $matches); preg_match("/[^!#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", " ".$body, $matches);
// Convert urls without bbcode elements // Convert urls without bbcode elements
if (!$matches AND $texturl) { if (!$matches AND $texturl) {
preg_match("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", " ".$body, $matches); preg_match("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", " ".$body, $matches);
// Yeah, a hack. I really hate regular expressions :) // Yeah, a hack. I really hate regular expressions :)
if ($matches) if ($matches)
$matches[1] = $matches[2]; $matches[1] = $matches[2];
} }
if ($matches) if ($matches)
$body .= add_page_info($matches[1], $no_photos); $body .= add_page_info($matches[1], $no_photos);
return $body; return $body;
} }
function encode_rel_links($links) { function encode_rel_links($links) {
@ -985,7 +979,7 @@ function item_store($arr,$force_parent = false) {
if (isset($arr["ostatus_conversation"])) { if (isset($arr["ostatus_conversation"])) {
$ostatus_conversation = $arr["ostatus_conversation"]; $ostatus_conversation = $arr["ostatus_conversation"];
unset($arr["ostatus_conversation"]); unset($arr["ostatus_conversation"]);
} }
if(x($arr, 'gravity')) if(x($arr, 'gravity'))
@ -1247,7 +1241,7 @@ function item_store($arr,$force_parent = false) {
if(count($r)) { if(count($r)) {
logger('item_store: Send notification for contact '.$arr['contact-id'].' and post '.$current_post, LOGGER_DEBUG); logger('item_store: Send notification for contact '.$arr['contact-id'].' and post '.$current_post, LOGGER_DEBUG);
$u = q("SELECT * FROM user WHERE uid = %d LIMIT 1", $u = q("SELECT * FROM user WHERE uid = %d LIMIT 1",
intval($arr['uid'])); intval($arr['uid']));
$item = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d", $item = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d",
intval($current_post), intval($current_post),
@ -1292,7 +1286,7 @@ function item_store($arr,$force_parent = false) {
if((! $parent_id) || ($arr['parent-uri'] === $arr['uri'])) if((! $parent_id) || ($arr['parent-uri'] === $arr['uri']))
$parent_id = $current_post; $parent_id = $current_post;
if(strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid)) if(strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid))
$private = 1; $private = 1;
else else
$private = $arr['private']; $private = $arr['private'];
@ -1315,14 +1309,14 @@ function item_store($arr,$force_parent = false) {
if ($ostatus_conversation) if ($ostatus_conversation)
complete_conversation($current_post, $ostatus_conversation); complete_conversation($current_post, $ostatus_conversation);
$arr['id'] = $current_post; $arr['id'] = $current_post;
$arr['parent'] = $parent_id; $arr['parent'] = $parent_id;
$arr['allow_cid'] = $allow_cid; $arr['allow_cid'] = $allow_cid;
$arr['allow_gid'] = $allow_gid; $arr['allow_gid'] = $allow_gid;
$arr['deny_cid'] = $deny_cid; $arr['deny_cid'] = $deny_cid;
$arr['deny_gid'] = $deny_gid; $arr['deny_gid'] = $deny_gid;
$arr['private'] = $private; $arr['private'] = $private;
$arr['deleted'] = $parent_deleted; $arr['deleted'] = $parent_deleted;
// update the commented timestamp on the parent // update the commented timestamp on the parent
@ -1800,10 +1794,10 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
*/ */
function edited_timestamp_is_newer($existing, $update) { function edited_timestamp_is_newer($existing, $update) {
if (!x($existing,'edited') || !$existing['edited']) { if (!x($existing,'edited') || !$existing['edited']) {
return true; return true;
} }
if (!x($update,'edited') || !$update['edited']) { if (!x($update,'edited') || !$update['edited']) {
return false; return false;
} }
$existing_edited = datetime_convert('UTC', 'UTC', $existing['edited']); $existing_edited = datetime_convert('UTC', 'UTC', $existing['edited']);
$update_edited = datetime_convert('UTC', 'UTC', $update['edited']); $update_edited = datetime_convert('UTC', 'UTC', $update['edited']);
@ -1996,7 +1990,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
$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' ) ", VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
intval($contact['uid']), intval($contact['uid']),
intval($contact['id']), intval($contact['id']),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc(datetime_convert('UTC','UTC', $birthday)), dbesc(datetime_convert('UTC','UTC', $birthday)),
@ -2158,7 +2152,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
logger('consume_feed: feed item count = ' . $feed->get_item_quantity()); logger('consume_feed: feed item count = ' . $feed->get_item_quantity());
// in inverse date order // in inverse date order
if ($datedir) if ($datedir)
$items = array_reverse($feed->get_items()); $items = array_reverse($feed->get_items());
else else
@ -3594,16 +3588,16 @@ function local_delivery($importer,$data) {
$links = parse_xml_string("<links>".unxmlify($xo->link)."</links>",false); $links = parse_xml_string("<links>".unxmlify($xo->link)."</links>",false);
foreach($links->link as $l) { foreach($links->link as $l) {
$atts = $l->attributes(); $atts = $l->attributes();
switch($atts['rel']) { switch($atts['rel']) {
case "alternate": case "alternate":
$Blink = $atts['href']; $Blink = $atts['href'];
break; break;
default: default:
break; break;
} }
} }
if($Blink && link_compare($Blink,$a->get_baseurl() . '/profile/' . $importer['nickname'])) { if($Blink && link_compare($Blink,$a->get_baseurl() . '/profile/' . $importer['nickname'])) {
// send a notification // send a notification
@ -4457,7 +4451,7 @@ function posted_dates($uid,$wall) {
$start_month = datetime_convert('','',$dstart,'Y-m-d'); $start_month = datetime_convert('','',$dstart,'Y-m-d');
$end_month = datetime_convert('','',$dend,'Y-m-d'); $end_month = datetime_convert('','',$dend,'Y-m-d');
$str = day_translate(datetime_convert('','',$dnow,'F Y')); $str = day_translate(datetime_convert('','',$dnow,'F Y'));
$ret[] = array($str,$end_month,$start_month); $ret[] = array($str,$end_month,$start_month);
$dnow = datetime_convert('','',$dnow . ' -1 month', 'Y-m-d'); $dnow = datetime_convert('','',$dnow . ' -1 month', 'Y-m-d');
} }
return $ret; return $ret;

4
include/notifier.php
View File

@ -786,10 +786,6 @@ function notifier_run(&$argv, &$argc){
//if($reply_to) //if($reply_to)
// $headers .= 'Reply-to: ' . $reply_to . "\n"; // $headers .= 'Reply-to: ' . $reply_to . "\n";
// for testing purposes: Collect exported mails
//$file = tempnam("/tmp/friendica/", "mail-out2-");
//file_put_contents($file, json_encode($it));
$headers .= 'Message-Id: <' . iri2msgid($it['uri']) . '>' . "\n"; $headers .= 'Message-Id: <' . iri2msgid($it['uri']) . '>' . "\n";
if($it['uri'] !== $it['parent-uri']) { if($it['uri'] !== $it['parent-uri']) {