mongo checkin, global directory, redir rework, location basics

6 files changed, 123 insertions, 5 deletions

diff --git a/include/directory.php b/include/directory.php
new file mode 100644
index 000000000..5f835dc4b
--- /dev/null
+++ b/include/directory.php
@@ -0,0 +1,28 @@
+<?php
+
+	require_once("boot.php");
+
+	$a = new App;
+
+	@include(".htconfig.php");
+	require_once("dba.php");
+	$db = new dba($db_host, $db_user, $db_pass, $db_data);
+		unset($db_host, $db_user, $db_pass, $db_data);
+
+
+	if($argc != 2)
+		exit;
+
+	load_config('system');
+
+	$a->set_baseurl(get_config('system','url'));
+
+	$dir = get_config('system','directory_submit_url');
+
+	if(! strlen($dir))
+		exit;
+
+	fetch_url($dir . '?url=' . bin2hex($argv[1]));
+
+	exit;
+
diff --git a/include/main.js b/include/main.js
index f1c6cee12..c136488dd 100644
--- a/include/main.js
+++ b/include/main.js
@@ -31,3 +31,90 @@
 		}
 	}
 
+	var src = null;
+	var prev = null;
+	var livetime = null;
+	var msie = false;
+
+	$(document).ready(function() {
+		$.ajaxSetup({cache: false});
+		msie = $.browser.msie ;
+ 		NavUpdate(); 
+
+
+
+	});
+
+	function NavUpdate() {
+
+		if($('#live-network').length) { src = 'network'; liveUpdate(); }
+		if($('#live-profile').length) { src = 'profile'; liveUpdate(); }
+
+		$.get("ping",function(data) {
+			$(data).find('result').each(function() {
+				var net = $(this).find('net').text();
+				if(net == 0) { net = ''; }
+				$('#net-update').html(net);
+				var home = $(this).find('home').text();
+				if(home == 0) { home = ''; }
+				$('#home-update').html(home);
+				var mail = $(this).find('mail').text();
+				if(mail == 0) { mail = ''; }
+				$('#mail-update').html(mail);
+				var intro = $(this).find('intro').text();
+				if(intro == 0) { intro = ''; }
+				$('#notify-update').html(intro);
+			});
+		}) ;
+		setTimeout(NavUpdate,30000);
+
+	}
+
+	function liveUpdate() {
+		if(src == null) { return; }
+		if($('.comment-edit-text-full').length) {
+			livetime = setTimeout(liveUpdate, 10000);
+			return;
+		}
+		prev = 'live-' + src;
+
+		$.get('update_' + src + '?msie=' + ((msie) ? 1 : 0),function(data) {
+			$('.wall-item-outside-wrapper',data).each(function() {
+				var ident = $(this).attr('id');
+				if($('#' + ident).length == 0) { 
+                                        $('img',this).each(function() {
+                                                $(this).attr('src',$(this).attr('dst'));
+                                        });
+					$('#' + prev).after($(this));
+				}
+				else { 
+
+					$('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago')); 
+					$('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
+                                        $('#' + ident + ' ' + '.my-comment-photo').each(function() {
+                                                $(this).attr('src',$(this).attr('dst'));
+                                        });
+
+
+				}
+				prev = ident; 
+			});
+		});
+
+	}
+
+	function confirmDelete() { 
+		return confirm("Delete this item?");
+	}
+
+	function imgbright(node) {
+		$(node).attr("src",$(node).attr("src").replace('hide','show'));
+		$(node).css('width',24);
+		$(node).css('height',24);
+	}
+
+	function imgdull(node) {
+		$(node).attr("src",$(node).attr("src").replace('show','hide'));
+		$(node).css('width',16);
+		$(node).css('height',16);
+	}
diff --git a/include/nav.php b/include/nav.php
index 2e59ad2ac..4833ed7db 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -12,7 +12,7 @@ if(x($_SESSION['uid'])) {
 		$a->page['nav'] .= '<a id="nav-register-link" class="nav-commlink" href="register" >' 
 			. t('Register') . "</a>\r\n";
 
-	$a->page['nav'] .= '<a id="nav-directory-link" class="nav-link" href="directory">' . t('Site Directory') . "</a>\r\n";
+	$a->page['nav'] .= '<a id="nav-directory-link" class="nav-link" href="directory">' . t('Directory') . "</a>\r\n";
 
 	if(x($_SESSION,'uid')) {
 
diff --git a/include/notifier.php b/include/notifier.php
index 149ce765c..ff18dd9b4 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -8,7 +8,7 @@
 
 	@include(".htconfig.php");
 	require_once("dba.php");
-	$db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
+	$db = new dba($db_host, $db_user, $db_pass, $db_data);
 		unset($db_host, $db_user, $db_pass, $db_data);
 
 	require_once("session.php");
diff --git a/include/poller.php b/include/poller.php
index 1a323971f..fcd74fd69 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -7,7 +7,7 @@ $a = new App;
 
 @include('.htconfig.php');
 require_once('dba.php');
-$db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
+$db = new dba($db_host, $db_user, $db_pass, $db_data);
 	unset($db_host, $db_user, $db_pass, $db_data);
 
 require_once('session.php');
diff --git a/include/security.php b/include/security.php
index a71391dba..29334549b 100644
--- a/include/security.php
+++ b/include/security.php
@@ -6,9 +6,12 @@ function can_write_wall(&$a,$owner) {
         if((local_user()) && ($_SESSION['uid'] == $owner))
                 return true;
 
-        $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `id` = %d AND `blocked` = 0 AND `pending` = 0 LIMIT 1",
+        $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `id` = %d AND `blocked` = 0 AND `pending` = 0 
+		AND `readonly` = 0  AND `rel` IN ( %d , %d ) LIMIT 1",
                 intval($owner),
-                intval($_SESSION['visitor_id'])
+                intval($_SESSION['visitor_id']),
+		intval(DIRECTION_OUT),
+		intval(DIRECTION_BOTH)
         );
         if(count($r))
                 return true;