keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

post branch fixes

Browse source
This commit is contained in:
Mike Macgirvin 2010-08-09 22:58:58 -07:00
parent d11c1c63c0
commit 6fa5557994
7 changed files with 38 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
boot.php
View file

@ -504,5 +504,8 @@ function expand_acl($s) {
if(! function_exists('sanitise_acl')) {
function sanitise_acl(&$item) {
$item = '<' . intval(notags(trim($item))) . '>';
if(intval($item))
$item = '<' . intval(notags(trim($item))) . '>';
else
unset($item);
}}

2
mod/contacts.php
View file

@ -142,7 +142,7 @@ function contacts_content(&$a) {
intval($_SESSION['uid'])
);
notice("Contact has been removed." . EOL );
notice( t('Contact has been removed.') . EOL );
goaway($a->get_baseurl() . '/contacts');
return; // NOTREACHED
}

28
mod/dfrn_notify.php
View file

@ -23,7 +23,7 @@ function dfrn_notify_post(&$a) {
// find the local user who owns this relationship.
$r = q("SELECT `id`, `uid` FROM `contact` WHERE `issued-id` = '%s' LIMIT 1",
$r = q("SELECT * FROM `contact` WHERE `issued-id` = '%s' LIMIT 1",
dbesc($dfrn_id)
);
if(! count($r)) {
@ -47,9 +47,6 @@ function dfrn_notify_post(&$a) {
$feed->init();
$ismail = false;
$photo_time = $feed->get_feed_tags( NAMESPACE_DFRN, 'icon-updated');
if($photo_time)
$avatar_update = $photo_time[0]['data'];
$rawmail = $feed->get_feed_tags( NAMESPACE_DFRN, 'mail' );
if(isset($rawmail[0]['child'][NAMESPACE_DFRN])) {
@ -75,6 +72,29 @@ function dfrn_notify_post(&$a) {
. "`) VALUES ('" . implode("', '", array_values($msg)) . "')" );
// send email notification if requested.
$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
intval($importer['uid'])
);
require_once('bbcode.php');
if((count($r)) && ($r[0]['notify_flags'] & NOTIFY_MAIL)) {
$tpl = file_get_contents('view/mail_received_eml.tpl');
$email_tpl = replace_macros($tpl, array(
'$sitename' => $a->config['sitename'],
'$siteurl' => $a->get_baseurl(),
'$username' => $r[0]['username'],
'$email' => $r[0]['email'],
'$from' => $msg['from-name'],
'$fn' => $r[0]['name'],
'$title' => $msg['title'],
'$body' => strip_tags(bbcode($msg['body']))
);
$res = mail($r[0]['email'], t("New mail received at ") . $a->config['sitename'],
$email_tpl,t("From: Administrator@") . $_SERVER[SERVER_NAME] );
if(!$res) {
notice( t("Email notification failed.") . EOL );
}
}
xml_status(0);
return;

2
mod/dfrn_request.php
View file

@ -283,7 +283,7 @@ function dfrn_request_post(&$a) {
// find the contact record we just created
if($r) {
$r = q("SELECT `id` FROM `contact`
WHERE `uid` = '%s' AND `url` = '%s' AND `issued-id` = '%s' LIMIT 1",
WHERE `uid` = %d AND `url` = '%s' AND `issued-id` = '%s' LIMIT 1",
intval($uid),
$parms['url'],
$parms['issued-id']

6
mod/photos.php
View file

@ -128,13 +128,13 @@ function photos_post(&$a) {
// send the notification upstream/downstream as the case may be
if($rr['visible'])
proc_close(proc_open("php include/notifier.php \"$url\" \"drop\" \"$drop_id\" ",
proc_close(proc_open("php include/notifier.php \"$url\" \"drop\" \"$drop_id\" & ",
array(),$foo));
}
}
}
goaway($a->get_baseurl() . '/photos/' . $a->data['user']['uid']);
goaway($a->get_baseurl() . '/photos/' . $a->data['user']['nickname']);
return; // NOTREACHED
}
@ -164,7 +164,7 @@ function photos_post(&$a) {
// send the notification upstream/downstream as the case may be
if($i[0]['visible'])
proc_close(proc_open("php include/notifier.php \"$url\" \"drop\" \"$drop_id\" ",
proc_close(proc_open("php include/notifier.php \"$url\" \"drop\" \"$drop_id\" & ",
array(),$foo));
}
}

4
mod/profiles.php
View file

@ -52,7 +52,11 @@ function profiles_post(&$a) {
$region = notags(trim($_POST['region']));
$postal_code = notags(trim($_POST['postal_code']));
$country_name = notags(trim($_POST['country_name']));
$marital = notags(trim(implode(', ',$_POST['marital'])));
if($marital != $orig[0]['marital'])
$maritalchanged = true;
$sexual = notags(trim($_POST['sexual']));
$homepage = notags(trim($_POST['homepage']));
$politic = notags(trim($_POST['politic']));

2
view/profile.php
View file

@ -56,7 +56,7 @@
<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span> Status: </span><span class="marital-text"><?php echo $profile['marital']; ?></span></div>
<?php } ?>
<?php if(strlen($profile['url'])) { ?>
<div class="homepage"><span class="homepage-label">Status: </span><span class="homepage-url"><?php echo $profile['homepage']; ?></span></div>
<div class="homepage"><span class="homepage-label">Homepage: </span><span class="homepage-url"><?php echo $profile['homepage']; ?></span></div>
<?php } ?>
<?php echo $page['aside'] ?>
</aside>