aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mod/dfrn_poll.php16
-rw-r--r--view/profile.php2
-rw-r--r--view/style.css5
3 files changed, 14 insertions, 9 deletions
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 8d93700d6..409ffce56 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -6,6 +6,8 @@ require_once('include/auth.php');
function dfrn_poll_init(&$a) {
+ $dfrn_id = '';
+
if(x($_GET,'dfrn_id'))
$dfrn_id = $a->config['dfrn_poll_dfrn_id'] = $_GET['dfrn_id'];
if(x($_GET,'type'))
@@ -13,13 +15,7 @@ function dfrn_poll_init(&$a) {
if(x($_GET,'last_update'))
$last_update = $a->config['dfrn_poll_last_update'] = $_GET['last_update'];
-
-
- if(! x($dfrn_id))
- return;
-
-
- if(($dfrn_id == '*') && ($a->argc > 1)) {
+ if(($dfrn_id == '') && ($a->argc > 1)) {
$o = get_feed_for($a,'*', $a->argv[1],$last_update);
echo $o;
killme();
@@ -140,6 +136,10 @@ function dfrn_poll_post(&$a) {
function dfrn_poll_content(&$a) {
+
+ $dfrn_id = '';
+ $type = 'data';
+
if(x($_GET,'dfrn_id'))
$dfrn_id = $a->config['dfrn_poll_dfrn_id'] = $_GET['dfrn_id'];
if(x($_GET,'type'))
@@ -148,7 +148,7 @@ function dfrn_poll_content(&$a) {
$last_update = $a->config['dfrn_poll_last_update'] = $_GET['last_update'];
- if($dfrn_id != '*') {
+ if($dfrn_id != '') {
// initial communication from external contact
$hash = random_string();
diff --git a/view/profile.php b/view/profile.php
index 8ec9ab599..57130c073 100644
--- a/view/profile.php
+++ b/view/profile.php
@@ -53,7 +53,7 @@
</div>
<?php } ?>
<?php if(strlen($profile['marital'])) { ?>
-<div class="marital"><span class="marital-label">Status: </span><span class="marital-text"><?php echo $profile['marital']; ?></span></div>
+<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>
diff --git a/view/style.css b/view/style.css
index 77f3d12c9..fa7fa58c0 100644
--- a/view/style.css
+++ b/view/style.css
@@ -39,6 +39,11 @@ img.photo {
margin-left: 280px;
}
+.heart {
+ color: #FF0000;
+ font-size: 120%;
+}
+
aside {
position: absolute;
left: 0px;