diff options
| -rw-r--r-- | boot.php | 5 | ||||
| -rw-r--r-- | mod/contacts.php | 2 | ||||
| -rw-r--r-- | mod/dfrn_notify.php | 28 | ||||
| -rw-r--r-- | mod/dfrn_request.php | 2 | ||||
| -rw-r--r-- | mod/photos.php | 6 | ||||
| -rw-r--r-- | mod/profiles.php | 4 | ||||
| -rw-r--r-- | view/profile.php | 2 |
7 files changed, 38 insertions, 11 deletions
@@ -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); }} diff --git a/mod/contacts.php b/mod/contacts.php index 89e1f24df..2afa81c97 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -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 } diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 6aed53a77..a631434f3 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -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; diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 7ba81681f..39ff920fa 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -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'] diff --git a/mod/photos.php b/mod/photos.php index 7b07f6729..6ef94fb55 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -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)); } } diff --git a/mod/profiles.php b/mod/profiles.php index bfdff5f6b..850a4b8ce 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -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'])); diff --git a/view/profile.php b/view/profile.php index 57130c073..64f8f410a 100644 --- a/view/profile.php +++ b/view/profile.php @@ -56,7 +56,7 @@ <div class="marital"><span class="marital-label"><span class="heart">♥</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>
|