aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--templates/sidebar.block.watchlist.php46
-rw-r--r--watch.php10
2 files changed, 50 insertions, 6 deletions
diff --git a/templates/sidebar.block.watchlist.php b/templates/sidebar.block.watchlist.php
index eaf68dc..5b476ea 100644
--- a/templates/sidebar.block.watchlist.php
+++ b/templates/sidebar.block.watchlist.php
@@ -3,19 +3,61 @@
//No specific services
$watching = $userservice->getWatchNames($userid);
+$watchedBy = $userservice->getWatchNames($userid, true);
+
+$closeContacts = array(); // people in my contacts list and whose I am also in the contacts list
+foreach($watching as $watchuser) {
+ if(in_array($watchuser, $watchedBy)) {
+ $closeContacts[] = $watchuser;
+ }
+}
+
?>
-<h2><?php echo T_('Watching'); ?></h2>
+<?php if(count($closeContacts)>0):?>
+<h2 title="<?php echo T_('Close contacts are mutual contacts');?>"><?php echo ' &harr '. T_('Close contacts'); ?></h2>
<div id="watching">
<ul>
<?php foreach($watching as $watchuser): ?>
- <li><a href="<?php echo createURL('bookmarks', $watchuser); ?>"><?php echo $watchuser; ?></a> &rarr;</li>
+ <li><a href="<?php echo createURL('bookmarks', $watchuser); ?>"><?php echo $watchuser; ?></a> </li>
<?php endforeach; ?>
+ </ul>
+</div>
+<?php endif; ?>
+
+
+<h2><?php echo ' &rarr '. T_('Watching'); ?></h2>
+<div id="watching">
+ <ul>
+ <?php if($userservice->isLoggedOn() && $currentUser->getUsername() == $user): ?>
<li>
<form action="<?php echo createURL('watch', '');?>" method="post">
<input type="text" name="contact" value="<?php echo T_('Add a contact...');?>" onfocus="if (this.value == '<?php echo T_('Add a contact...');?>') this.value = '';" onblur="if (this.value == '') this.value = '<?php echo T_('Add a contact...');?>';" title="<?php echo T_('Type a username to add it to your contacts.') ?>" />
</form>
</li>
+ <?php endif; ?>
+
+ <?php if(count($watching) == 0):?>
+ <li><?php echo T_("Nobody");?></li>
+ <?php endif; ?>
+
+ <?php foreach($watching as $watchuser): ?>
+ <li><a href="<?php echo createURL('bookmarks', $watchuser); ?>"><?php echo $watchuser; ?></a>
+ <?php if($userservice->isLoggedOn() && $currentUser->getUsername() == $user): ?>
+ - <a href="<?php echo createUrl('watch','?contact='.$watchuser); ?>" title="<?php echo T_('Remove this contact'); ?>">x<a/>
+ </li>
+ <?php endif; ?>
+ <?php endforeach; ?>
+
+ </ul>
+</div>
+
+<h2><?php echo ' &larr '. T_('Watched by'); ?></h2>
+<div id="watching">
+ <ul>
+ <?php foreach($watchedBy as $watchuser): ?>
+ <li><a href="<?php echo createURL('bookmarks', $watchuser); ?>"><?php echo $watchuser; ?></a> </li>
+ <?php endforeach; ?>
</ul>
</div>
diff --git a/watch.php b/watch.php
index 63c4cda..01a6bcc 100644
--- a/watch.php
+++ b/watch.php
@@ -24,14 +24,16 @@ require_once('header.inc.php');
/* Service creation: only useful services are created */
//No specific services
-/* Managing current logged user */
-$currentUser = $userservice->getCurrentObjectUser();
+isset($_POST['contact']) ? define('POST_CONTACT', $_POST['contact']): define('POST_CONTACT', '');
+isset($_GET['contact']) ? define('GET_CONTACT', $_GET['contact']): define('GET_CONTACT', '');
/* Managing path info */
@list($url, $user) = isset($_SERVER['PATH_INFO']) ? explode('/', $_SERVER['PATH_INFO']) : NULL;
-if($user=='' && $_POST['contact'] != '') {
- $user = $_POST['contact'];
+if($user=='' && POST_CONTACT != '') {
+ $user = POST_CONTACT;
+} elseif($user=='' && GET_CONTACT != '') {
+ $user = GET_CONTACT;
}
if ($userservice->isLoggedOn() && $user) {