Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into themetests

Browse source
This commit is contained in:
Fabio Comuni 2011-02-17 14:14:06 +01:00
parent dc15e8640d c948ab8f21
commit 3d69e2a50c
30 changed files with 318 additions and 197 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
boot.php
View file

@ -2449,3 +2449,16 @@ function feed_salmonlinks($nick) {
return $salmon; return $salmon;
}} }}
if(! function_exists('get_plink')) {
function get_plink($item) {
$a = get_app();
$plink = (((x($item,'plink')) && (! $item['private'])) ? '<div class="wall-item-links-wrapper"><a href="'
. $item['plink'] . '" title="' . t('link to source') . '"><img src="' . $a->get_baseurl() . '/images/remote-link.gif" alt="' . t('link to source') . '" /></a></div>' : '');
return $plink;
}}
if(! function_exists('unamp')) {
function unamp($s) {
return str_replace('&amp;', '&', $s);
}}

BIN
images/remote-link.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 357 B

9
include/items.php
View file

@ -246,7 +246,7 @@ function get_atom_elements($feed,$item) {
$res['uri'] = unxmlify($item->get_id()); $res['uri'] = unxmlify($item->get_id());
$res['title'] = unxmlify($item->get_title()); $res['title'] = unxmlify($item->get_title());
$res['body'] = unxmlify($item->get_content()); $res['body'] = unxmlify($item->get_content());
$res['plink'] = unxmlify($item->get_link(0));
// look for a photo. We should check media size and find the best one, // look for a photo. We should check media size and find the best one,
// but for now let's just find any author photo // but for now let's just find any author photo
@ -350,7 +350,7 @@ function get_atom_elements($feed,$item) {
'[youtube]$1[/youtube]', $res['body']); '[youtube]$1[/youtube]', $res['body']);
$res['body'] = oembed_html2bbcode($res['body']); $res['body'] = oembed_html2bbcode($res['body']);
$config = HTMLPurifier_Config::createDefault(); $config = HTMLPurifier_Config::createDefault();
$config->set('Cache.DefinitionImpl', null); $config->set('Cache.DefinitionImpl', null);
@ -363,7 +363,7 @@ function get_atom_elements($feed,$item) {
$res['body'] = html2bbcode($res['body']); $res['body'] = html2bbcode($res['body']);
} }
$allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow'); $allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow');
if($allow && $allow[0]['data'] == 1) if($allow && $allow[0]['data'] == 1)
$res['last-child'] = 1; $res['last-child'] = 1;
@ -591,6 +591,7 @@ function item_store($arr,$force_parent = false) {
$arr['object'] = ((x($arr,'object')) ? trim($arr['object']) : ''); $arr['object'] = ((x($arr,'object')) ? trim($arr['object']) : '');
$arr['target-type'] = ((x($arr,'target-type')) ? notags(trim($arr['target-type'])) : ''); $arr['target-type'] = ((x($arr,'target-type')) ? notags(trim($arr['target-type'])) : '');
$arr['target'] = ((x($arr,'target')) ? trim($arr['target']) : ''); $arr['target'] = ((x($arr,'target')) ? trim($arr['target']) : '');
$arr['plink'] = ((x($arr,'plink')) ? notags(trim($arr['plink'])) : '');
$arr['allow_cid'] = ((x($arr,'allow_cid')) ? trim($arr['allow_cid']) : ''); $arr['allow_cid'] = ((x($arr,'allow_cid')) ? trim($arr['allow_cid']) : '');
$arr['allow_gid'] = ((x($arr,'allow_gid')) ? trim($arr['allow_gid']) : ''); $arr['allow_gid'] = ((x($arr,'allow_gid')) ? trim($arr['allow_gid']) : '');
$arr['deny_cid'] = ((x($arr,'deny_cid')) ? trim($arr['deny_cid']) : ''); $arr['deny_cid'] = ((x($arr,'deny_cid')) ? trim($arr['deny_cid']) : '');
@ -1418,7 +1419,7 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
$o .= '<updated>' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '</updated>' . "\r\n"; $o .= '<updated>' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '</updated>' . "\r\n";
$o .= '<dfrn:env>' . base64url_encode($item['body'], true) . '</dfrn:env>' . "\r\n"; $o .= '<dfrn:env>' . base64url_encode($item['body'], true) . '</dfrn:env>' . "\r\n";
$o .= '<content type="' . $type . '" >' . xmlify(($type === 'html') ? bbcode($item['body']) : $item['body']) . '</content>' . "\r\n"; $o .= '<content type="' . $type . '" >' . xmlify(($type === 'html') ? bbcode($item['body']) : $item['body']) . '</content>' . "\r\n";
$o .= '<link rel="alternate" href="' . xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']) . '" />' . "\r\n"; $o .= '<link rel="alternate" type="text/html" href="' . xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']) . '" />' . "\r\n";
if($comment) if($comment)
$o .= '<dfrn:comment-allow>' . intval($item['last-child']) . '</dfrn:comment-allow>' . "\r\n"; $o .= '<dfrn:comment-allow>' . intval($item['last-child']) . '</dfrn:comment-allow>' . "\r\n";

35
mod/dfrn_notify.php
View file

@ -210,10 +210,23 @@ function dfrn_notify_post(&$a) {
= html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$msg['body'])))); = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$msg['body']))));
// load the template for private message notifications // load the template for private message notifications
$tpl = load_view_file('view/mail_received_eml.tpl'); $tpl = load_view_file('view/mail_received_html_body_eml.tpl');
$email_html_body_tpl = replace_macros($tpl,array(
'$siteName' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $importer['thumb'], // thumbnail url for sender icon
'$email' => $importer['email'], // email address to send to
'$url' => $importer['url'], // full url for the site
'$from' => $msg['from-name'], // name of the person sending the message
'$title' => stripslashes($msg['title']), // subject of the message
'$htmlversion' => $msg['htmlversion'], // html version of the message
'$mimeboundary' => $msg['mimeboundary'], // mime message divider
'$hostname' => $a->get_hostname() // name of this host
));
// import the data into the template // load the template for private message notifications
$email_tpl = replace_macros($tpl, array( $tpl = load_view_file('view/mail_received_text_body_eml.tpl');
$email_text_body_tpl = replace_macros($tpl,array(
'$siteName' => $a->config['sitename'], // name of this site '$siteName' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site '$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $importer['thumb'], // thumbnail url for sender icon '$thumb' => $importer['thumb'], // thumbnail url for sender icon
@ -222,11 +235,25 @@ function dfrn_notify_post(&$a) {
'$from' => $msg['from-name'], // name of the person sending the message '$from' => $msg['from-name'], // name of the person sending the message
'$title' => stripslashes($msg['title']), // subject of the message '$title' => stripslashes($msg['title']), // subject of the message
'$textversion' => $msg['textversion'], // text version of the message '$textversion' => $msg['textversion'], // text version of the message
'$htmlversion' => $msg['htmlversion'], // html version of the message
'$mimeboundary' => $msg['mimeboundary'], // mime message divider '$mimeboundary' => $msg['mimeboundary'], // mime message divider
'$hostname' => $a->get_hostname() // name of this host '$hostname' => $a->get_hostname() // name of this host
)); ));
// load the template for private message notifications
$tpl = load_view_file('view/mail_received_eml.tpl');
// import the data into the template
$email_tpl = replace_macros($tpl, array(
'$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$email' => $importer['email'], // email address to send to
'$from' => $msg['from-name'], // name of the person sending the message
'$title' => stripslashes($msg['title']), // subject of the message
'$mimeboundary' => $msg['mimeboundary'], // mime message divider
'$hostname' => $a->get_hostname(), // name of this host
'$htmlbody' => chunk_split(base64_encode($email_html_body_tpl)),
'$textbody' => chunk_split(base64_encode($email_text_body_tpl))
));
logger("message headers: " . $msg['headers']); logger("message headers: " . $msg['headers']);
logger("message body: " . $mail_tpl); logger("message body: " . $mail_tpl);

1
mod/display.php
View file

@ -272,6 +272,7 @@ function display_content(&$a) {
'$owner_url' => $owner_url, '$owner_url' => $owner_url,
'$owner_photo' => $owner_photo, '$owner_photo' => $owner_photo,
'$owner_name' => $owner_name, '$owner_name' => $owner_name,
'$plink' => get_plink($item),
'$drop' => $drop, '$drop' => $drop,
'$vote' => $likebuttons, '$vote' => $likebuttons,
'$like' => $like, '$like' => $like,

42
mod/follow.php
View file

@ -19,15 +19,15 @@ function follow_post(&$a) {
if(count($links)) { if(count($links)) {
foreach($links as $link) { foreach($links as $link) {
if($link['@attributes']['rel'] === NAMESPACE_DFRN) if($link['@attributes']['rel'] === NAMESPACE_DFRN)
$dfrn = $link['@attributes']['href']; $dfrn = unamp($link['@attributes']['href']);
if($link['@attributes']['rel'] === 'salmon') if($link['@attributes']['rel'] === 'salmon')
$notify = $link['@attributes']['href']; $notify = unamp($link['@attributes']['href']);
if($link['@attributes']['rel'] === NAMESPACE_FEED) if($link['@attributes']['rel'] === NAMESPACE_FEED)
$poll = $link['@attributes']['href']; $poll = unamp($link['@attributes']['href']);
if($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard') if($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard')
$hcard = $link['@attributes']['href']; $hcard = unamp($link['@attributes']['href']);
if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
$profile = $link['@attributes']['href']; $profile = unamp($link['@attributes']['href']);
} }
@ -43,10 +43,10 @@ function follow_post(&$a) {
if(strpos($link['@attributes']['href'],'@') === false) { if(strpos($link['@attributes']['href'],'@') === false) {
if(isset($profile)) { if(isset($profile)) {
if($link['@attributes']['href'] !== $profile) if($link['@attributes']['href'] !== $profile)
$alias = $link['@attributes']['href']; $alias = unamp($link['@attributes']['href']);
} }
else else
$profile = $link['@attributes']['href']; $profile = unamp($link['@attributes']['href']);
} }
} }
} }
@ -103,7 +103,7 @@ function follow_post(&$a) {
$ret = scrape_feed($url); $ret = scrape_feed($url);
if(count($ret) && ($ret['feed_atom'] || $ret['feed_rss'])) { if(count($ret) && ($ret['feed_atom'] || $ret['feed_rss'])) {
$poll = ((x($ret,'feed_atom')) ? $ret['feed_atom'] : $ret['feed_rss']); $poll = ((x($ret,'feed_atom')) ? unamp($ret['feed_atom']) : unamp($ret['feed_rss']));
$vcard = array(); $vcard = array();
require_once('simplepie/simplepie.inc'); require_once('simplepie/simplepie.inc');
$feed = new SimplePie(); $feed = new SimplePie();
@ -116,27 +116,35 @@ function follow_post(&$a) {
$vcard['photo'] = $feed->get_image_url(); $vcard['photo'] = $feed->get_image_url();
$author = $feed->get_author(); $author = $feed->get_author();
if($author) { if($author) {
$vcard['fn'] = trim($author->get_name()); $vcard['fn'] = unxmlify(trim($author->get_name()));
$vcard['nick'] = strtolower($vcard['fn']); if(! $vcard['fn'])
$vcard['fn'] = trim(unxmlify($author->get_email()));
if(strpos($vcard['fn'],'@') !== false)
$vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@'));
$vcard['nick'] = strtolower(notags(unxmlify($vcard['fn'])));
if(strpos($vcard['nick'],' ')) if(strpos($vcard['nick'],' '))
$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' '))); $vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
$email = $author->get_email(); $email = unxmlify($author->get_email());
} }
else { else {
$item = $feed->get_item(0); $item = $feed->get_item(0);
if($item) { if($item) {
$author = $item->get_author(); $author = $item->get_author();
if($author) { if($author) {
$vcard['fn'] = trim($author->get_name()); $vcard['fn'] = trim(unxmlify($author->get_name()));
$vcard['nick'] = strtolower($vcard['fn']); if(! $vcard['fn'])
$vcard['fn'] = trim(unxmlify($author->get_email()));
if(strpos($vcard['fn'],'@') !== false)
$vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@'));
$vcard['nick'] = strtolower(unxmlify($vcard['fn']));
if(strpos($vcard['nick'],' ')) if(strpos($vcard['nick'],' '))
$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' '))); $vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
$email = $author->get_email(); $email = unxmlify($author->get_email());
} }
if(! $vcard['photo']) { if(! $vcard['photo']) {
$rawmedia = $item->get_item_tags('http://search.yahoo.com/mrss/','thumbnail'); $rawmedia = $item->get_item_tags('http://search.yahoo.com/mrss/','thumbnail');
if($rawmedia && $rawmedia[0]['attribs']['']['url']) if($rawmedia && $rawmedia[0]['attribs']['']['url'])
$vcard['photo'] = $rawmedia[0]['attribs']['']['url']; $vcard['photo'] = unxmlify($rawmedia[0]['attribs']['']['url']);
} }
} }
} }
@ -150,6 +158,9 @@ function follow_post(&$a) {
logger('follow: poll=' . $poll . ' notify=' . $notify . ' profile=' . $profile . ' vcard=' . print_r($vcard,true)); logger('follow: poll=' . $poll . ' notify=' . $notify . ' profile=' . $profile . ' vcard=' . print_r($vcard,true));
$vcard['fn'] = notags($vcard['fn']);
$vcard['nick'] = notags($vcard['nick']);
// do we have enough information? // do we have enough information?
if(! ((x($vcard['fn'])) && ($poll) && ($profile))) { if(! ((x($vcard['fn'])) && ($poll) && ($profile))) {
@ -157,6 +168,7 @@ function follow_post(&$a) {
goaway($_SESSION['return_url']); goaway($_SESSION['return_url']);
} }
if(! $notify) { if(! $notify) {
notice( t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL); notice( t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL);
} }

18
mod/item.php
View file

@ -35,7 +35,9 @@ function item_post(&$a) {
); );
if(! count($r)) { if(! count($r)) {
notice( t('Unable to locate original post.') . EOL); notice( t('Unable to locate original post.') . EOL);
goaway($a->get_baseurl() . "/" . $_POST['return'] ); if(x($_POST,'return'))
goaway($a->get_baseurl() . "/" . $_POST['return'] );
killme();
} }
$parent_item = $r[0]; $parent_item = $r[0];
if($parent_item['contact-id'] && $uid) { if($parent_item['contact-id'] && $uid) {
@ -53,7 +55,9 @@ function item_post(&$a) {
if(! can_write_wall($a,$profile_uid)) { if(! can_write_wall($a,$profile_uid)) {
notice( t('Permission denied.') . EOL) ; notice( t('Permission denied.') . EOL) ;
return; if(x($_POST,'return'))
goaway($a->get_baseurl() . "/" . $_POST['return'] );
killme();
} }
$user = null; $user = null;
@ -92,8 +96,9 @@ function item_post(&$a) {
if(! strlen($body)) { if(! strlen($body)) {
notice( t('Empty post discarded.') . EOL ); notice( t('Empty post discarded.') . EOL );
goaway($a->get_baseurl() . "/" . $_POST['return'] ); if(x($_POST,'return'))
goaway($a->get_baseurl() . "/" . $_POST['return'] );
killme();
} }
// get contact info for poster // get contact info for poster
@ -429,10 +434,11 @@ function item_post(&$a) {
} }
} }
$r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `changed` = '%s', `last-child` = 1, `visible` = 1 $r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `plink` = '%s', `changed` = '%s', `last-child` = 1, `visible` = 1
WHERE `id` = %d LIMIT 1", WHERE `id` = %d LIMIT 1",
intval($parent), intval($parent),
dbesc(($parent == $post_id) ? $uri : $parent_item['uri']), dbesc(($parent == $post_id) ? $uri : $parent_item['uri']),
dbesc($a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id),
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval($post_id) intval($post_id)
); );
@ -544,7 +550,7 @@ function item_content(&$a) {
// generate a resource-id and therefore aren't intimately linked to the item. // generate a resource-id and therefore aren't intimately linked to the item.
if(strlen($item['resource-id'])) { if(strlen($item['resource-id'])) {
$q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ", q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ",
dbesc($item['resource-id']), dbesc($item['resource-id']),
intval($item['uid']) intval($item['uid'])
); );

43
mod/message.php
View file

@ -2,11 +2,6 @@
require_once('include/acl_selectors.php'); require_once('include/acl_selectors.php');
function message_init(&$a) {
}
function message_post(&$a) { function message_post(&$a) {
if(! local_user()) { if(! local_user()) {
@ -69,6 +64,43 @@ function message_post(&$a) {
if(count($r)) if(count($r))
$post_id = $r[0]['id']; $post_id = $r[0]['id'];
/**
*
* When a photo was uploaded into the message using the (profile wall) ajax
* uploader, The permissions are initially set to disallow anybody but the
* owner from seeing it. This is because the permissions may not yet have been
* set for the post. If it's private, the photo permissions should be set
* appropriately. But we didn't know the final permissions on the post until
* now. So now we'll look for links of uploaded messages that are in the
* post and set them to the same permissions as the post itself.
*
*/
$match = null;
if(preg_match_all("/\[img\](.+?)\[\/img\]/",$body,$match)) {
$images = $match[1];
if(count($images)) {
foreach($images as $image) {
if(! stristr($image,$a->get_baseurl() . '/photo/'))
continue;
$image_uri = substr($image,strrpos($image,'/') + 1);
$image_uri = substr($image_uri,0, strpos($image_uri,'-'));
$r = q("UPDATE `photo` SET `allow_cid` = '%s'
WHERE `resource-id` = '%s' AND `album` = '%s' AND `uid` = %d ",
dbesc('<' . $recipient . '>'),
dbesc($image_uri),
dbesc( t('Wall Photos')),
intval(local_user())
);
}
}
}
$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
if($post_id) { if($post_id) {
@ -80,7 +112,6 @@ function message_post(&$a) {
notice( t('Message could not be sent.') . EOL ); notice( t('Message could not be sent.') . EOL );
} }
return; return;
} }
function message_content(&$a) { function message_content(&$a) {

1
mod/network.php
View file

@ -425,6 +425,7 @@ function network_content(&$a, $update = 0) {
'$owner_url' => $owner_url, '$owner_url' => $owner_url,
'$owner_photo' => $owner_photo, '$owner_photo' => $owner_photo,
'$owner_name' => $owner_name, '$owner_name' => $owner_name,
'$plink' => get_plink($item),
'$drop' => $drop, '$drop' => $drop,
'$vote' => $likebuttons, '$vote' => $likebuttons,
'$like' => $like, '$like' => $like,

1
mod/profile.php
View file

@ -371,6 +371,7 @@ function profile_content(&$a, $update = 0) {
'$lock' => $lock, '$lock' => $lock,
'$location' => $location, '$location' => $location,
'$indent' => $indent, '$indent' => $indent,
'$plink' => get_plink($item),
'$drop' => $drop, '$drop' => $drop,
'$like' => $like, '$like' => $like,
'$vote' => $likebuttons, '$vote' => $likebuttons,

1
simplepie/simplepie.inc
View file

@ -9226,6 +9226,7 @@ class SimplePie_Misc
function absolutize_url($relative, $base) function absolutize_url($relative, $base)
{ {
return $relative;
$iri = SimplePie_IRI::absolutize(new SimplePie_IRI($base), $relative); $iri = SimplePie_IRI::absolutize(new SimplePie_IRI($base), $relative);
return $iri->get_iri(); return $iri->get_iri();
} }

48
view/de/mail_received_eml.tpl
View file

@ -1,47 +1,13 @@
--$mimeboundary --$mimeboundary
Content-Type: text/plain; charset=utf-8 Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: base64
Du hast eine neue private Nachricht von '$from' auf '$siteName' erhhalten. $textbody
$title
$textversion
Bitte melde dich unter $siteurl an um deine privaten Nachrichte zu lesen und zu
beantworten.
Viele Grüße,
$siteName Administrator
--$mimeboundary --$mimeboundary
Content-Type: text/html; charset=utf-8 Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: base64
$htmlbody
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>
<title>Friendika Nachricht</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
</head>
<body>
<table style="border:1px solid #ccc">
<tbody>
<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$hostname/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
<tr><td style="padding-top:22px;" colspan="2">Du hast eine neue private Nachricht von '$from' auf '$siteName' erhhalten.</td></tr>
<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
<tr><td style="padding-right:22px;">$htmlversion</td></tr>
<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Bitte melde dich unter $siteurl an um deine privaten Nachrichte zu lesen und zu beantworten.</td></tr>
<tr><td></td><td>Viele Grüße,</td></tr>
<tr><td></td><td>$siteName Administrator</td></tr>
</tbody>
</table>
</body>
</html>
--$mimeboundary-- --$mimeboundary--

25
view/de/mail_received_html_body_eml.tpl Normal file
View file

@ -0,0 +1,25 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>
<title>Friendika Nachricht</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
</head>
<body>
<table style="border:1px solid #ccc">
<tbody>
<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
<tr><td style="padding-top:22px;" colspan="2">Du hast eine neue private Nachricht von '$from' auf '$siteName' erhhalten.</td></tr>
<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
<tr><td style="padding-right:22px;">$htmlversion</td></tr>
<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Bitte melde dich unter <a href="$siteurl"$siteurl</a> an um deine privaten Nachrichte zu lesen und zu beantworten.</td></tr>
<tr><td></td><td>Viele Grüße,</td></tr>
<tr><td></td><td>$siteName Administrator</td></tr>
</tbody>
</table>
</body>
</html>

11
view/de/mail_received_text_body_eml.tpl Normal file
View file

@ -0,0 +1,11 @@
Du hast eine neue private Nachricht von '$from' auf '$siteName' erhhalten.
$title
$textversion
Bitte melde dich unter $siteurl an um deine privaten Nachrichte zu lesen und zu
beantworten.
Viele Gr٤e,
$siteName Administrator

1
view/de/wallwall_item.tpl
View file

@ -21,6 +21,7 @@
<div class="wall-item-title" id="wall-item-title-$id">$title</div> <div class="wall-item-title" id="wall-item-title-$id">$title</div>
<div class="wall-item-body" id="wall-item-body-$id" >$body</div> <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
</div> </div>
$plink
$drop $drop
</div> </div>
<div class="wall-item-wrapper-end"></div> <div class="wall-item-wrapper-end"></div>

47
view/en/mail_received_eml.tpl
View file

@ -1,47 +1,14 @@
--$mimeboundary --$mimeboundary
Content-Type: text/plain; charset=utf-8 Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: base64
$from sent you a new private message at $siteName. $textbody
$title
$textversion
Please login at $siteurl to read and reply to your private messages.
Thank you,
$siteName administrator
--$mimeboundary --$mimeboundary
Content-Type: text/html; charset=utf-8 Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: base64
$htmlbody
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>
<title>Friendika Message</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
</head>
<body>
<table style="border:1px solid #ccc">
<tbody>
<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$hostname/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
<tr><td style="padding-top:22px;" colspan="2">$from sent you a new private message at $siteName.</td></tr>
<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
<tr><td style="padding-right:22px;">$htmlversion</td></tr>
<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Please login at $siteurl to read and reply to your private messages.</td></tr>
<tr><td></td><td>Thank You,</td></tr>
<tr><td></td><td>$siteName Administrator</td></tr>
</tbody>
</table>
</body>
</html>
--$mimeboundary-- --$mimeboundary--

25
view/en/mail_received_html_body_eml.tpl Normal file
View file

@ -0,0 +1,25 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>
<title>Friendika Message</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
</head>
<body>
<table style="border:1px solid #ccc">
<tbody>
<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
<tr><td style="padding-top:22px;" colspan="2">$from sent you a new private message at $siteName.</td></tr>
<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
<tr><td style="padding-right:22px;">$htmlversion</td></tr>
<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Please login at <a href="$siteurl">$siteurl</a> to read and reply to your private messages.</td></tr>
<tr><td></td><td>Thank You,</td></tr>
<tr><td></td><td>$siteName Administrator</td></tr>
</tbody>
</table>
</body>
</html>

10
view/en/mail_received_text_body_eml.tpl Normal file
View file

@ -0,0 +1,10 @@
$from sent you a new private message at $siteName.
$title
$textversion
Please login at $siteurl to read and reply to your private messages.
Thank you,
$siteName administrator

1
view/en/wallwall_item.tpl
View file

@ -21,6 +21,7 @@
<div class="wall-item-title" id="wall-item-title-$id">$title</div> <div class="wall-item-title" id="wall-item-title-$id">$title</div>
<div class="wall-item-body" id="wall-item-body-$id" >$body</div> <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
</div> </div>
$plink
$drop $drop
</div> </div>
<div class="wall-item-wrapper-end"></div> <div class="wall-item-wrapper-end"></div>

47
view/fr/mail_received_eml.tpl
View file

@ -1,46 +1,13 @@
--$mimeboundary --$mimeboundary
Content-Type: text/plain; charset=utf-8 Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: base64
$from t'a envoyŽ un message ˆ $siteName. $textbody
$title
$textversion
Ouvrez une session svp ˆ $siteurl pour lire et rŽpondre ˆ vos messages privŽs.
Merci,
$siteName Administrateur
--$mimeboundary --$mimeboundary
Content-Type: text/html; charset=utf-8 Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: base64
$htmlbody
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>
<title>Friendika Message</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
</head>
<body>
<table style="border:1px solid #ccc">
<tbody>
<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$hostname/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
<tr><td style="padding-top:22px;" colspan="2">$from t'a envoyŽ un message ˆ $siteName.</td></tr>
<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
<tr><td style="padding-right:22px;">$htmlversion</td></tr>
<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Ouvrez une session svp ˆ $siteurl pour lire et rŽpondre ˆ vos messages privŽs.</td></tr>
<tr><td></td><td>Merci,</td></tr>
<tr><td></td><td>$siteName Administrateur</td></tr>
</tbody>
</table>
</body>
</html>
--$mimeboundary-- --$mimeboundary--

25
view/fr/mail_received_html_body_eml.tpl Normal file
View file

@ -0,0 +1,25 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>
<title>Friendika Message</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
</head>
<body>
<table style="border:1px solid #ccc">
<tbody>
<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
<tr><td style="padding-top:22px;" colspan="2">$from t'a envoyŽ un message ˆ $siteName.</td></tr>
<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
<tr><td style="padding-right:22px;">$htmlversion</td></tr>
<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Ouvrez une session svp ˆ <a href="$siteurl">$siteurl</a> pour lire et rŽpondre ˆ vos messages privŽs.</td></tr>
<tr><td></td><td>Merci,</td></tr>
<tr><td></td><td>$siteName Administrateur</td></tr>
</tbody>
</table>
</body>
</html>

10
view/fr/mail_received_text_body_eml.tpl Normal file
View file

@ -0,0 +1,10 @@
$from t'a envoyŽ un message ˆ $siteName.
$title
$textversion
Ouvrez une session svp ˆ $siteurl pour lire et rŽpondre ˆ vos messages privŽs.
Merci,
$siteName Administrateur

1
view/fr/wallwall_item.tpl
View file

@ -21,6 +21,7 @@
<div class="wall-item-title" id="wall-item-title-$id">$title</div> <div class="wall-item-title" id="wall-item-title-$id">$title</div>
<div class="wall-item-body" id="wall-item-body-$id" >$body</div> <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
</div> </div>
$plink
$drop $drop
</div> </div>
<div class="wall-item-wrapper-end"></div> <div class="wall-item-wrapper-end"></div>

49
view/it/mail_received_eml.tpl
View file

@ -1,46 +1,13 @@
--$mimeboundary --$mimeboundary
Content-Type: text/plain; charset=utf-8 Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: base64
Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'. $textbody
$title
$textversion
Accedi a $siteurl per leggere e rispondere ai tuoi messaggi privati.
Grazie,
L'amministratore di $siteName
--$mimeboundary --$mimeboundary
Content-Type: text/html; charset=utf-8 Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: base64
$htmlbody
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> --$mimeboundary--
<html>
<head>
<title>Friendika Messsaggio</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
</head>
<body>
<table style="border:1px solid #ccc">
<tbody>
<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$hostname/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
<tr><td style="padding-top:22px;" colspan="2">Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.</td></tr>
<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
<tr><td style="padding-right:22px;">$htmlversion</td></tr>
<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Accedi a $siteurl per leggere e rispondere ai tuoi messaggi privati.</td></tr>
<tr><td></td><td>Grazie,</td></tr>
<tr><td></td><td>L'amministratore di $siteName</td></tr>
</tbody>
</table>
</body>
</html>
--$mimeboundary--

25
view/it/mail_received_html_body_eml.tpl Normal file
View file

@ -0,0 +1,25 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>
<title>Friendika Messsaggio</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
</head>
<body>
<table style="border:1px solid #ccc">
<tbody>
<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
<tr><td style="padding-top:22px;" colspan="2">Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.</td></tr>
<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
<tr><td style="padding-right:22px;">$htmlversion</td></tr>
<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Accedi a <a href="$siteurl">$siteurl</a> per leggere e rispondere ai tuoi messaggi privati.</td></tr>
<tr><td></td><td>Grazie,</td></tr>
<tr><td></td><td>L'amministratore di $siteName</td></tr>
</tbody>
</table>
</body>
</html>

10
view/it/mail_received_text_body_eml.tpl Normal file
View file

@ -0,0 +1,10 @@
Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.
$title
$textversion
Accedi a $siteurl per leggere e rispondere ai tuoi messaggi privati.
Grazie,
L'amministratore di $siteName

1
view/it/wallwall_item.tpl
View file

@ -21,6 +21,7 @@
<div class="wall-item-title" id="wall-item-title-$id">$title</div> <div class="wall-item-title" id="wall-item-title-$id">$title</div>
<div class="wall-item-body" id="wall-item-body-$id" >$body</div> <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
</div> </div>
$plink
$drop $drop
</div> </div>
<div class="wall-item-wrapper-end"></div> <div class="wall-item-wrapper-end"></div>

7
view/theme/duepuntozero/style.css
View file

@ -833,6 +833,13 @@ input#dfrn-url {
.wall-item-like-buttons img { .wall-item-like-buttons img {
cursor: pointer; cursor: pointer;
} }
.wall-item-links-wrapper {
float: left;
margin-bottom: 5px;
margin-left: 5px;
}
.wall-item-delete-wrapper { .wall-item-delete-wrapper {
float: right; float: right;
margin-top: 5px; margin-top: 5px;

7
view/theme/loozah/style.css
View file

@ -962,6 +962,13 @@ input#dfrn-url {
.wall-item-like-buttons img { .wall-item-like-buttons img {
cursor: pointer; cursor: pointer;
} }
.wall-item-links-wrapper {
float: left;
margin-top: 100px;
margin-left: 10px;
}
.wall-item-delete-wrapper { .wall-item-delete-wrapper {
float: right; float: right;
margin-top: 20px; margin-top: 20px;

1
view/wall_item.tpl
View file

@ -16,6 +16,7 @@
<div class="wall-item-title" id="wall-item-title-$id">$title</div> <div class="wall-item-title" id="wall-item-title-$id">$title</div>
<div class="wall-item-body" id="wall-item-body-$id" >$body</div> <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
</div> </div>
$plink
$drop $drop
</div> </div>
<div class="wall-item-wrapper-end"></div> <div class="wall-item-wrapper-end"></div>