mongo checkin, global directory, redir rework, location basics

This commit is contained in:
Mike Macgirvin 2010-08-19 04:59:31 -07:00
parent 6ed5b642a4
commit e0045a43e2
27 changed files with 266 additions and 144 deletions

28
include/directory.php Normal file
View file

@ -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;

View file

@ -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);
}

View file

@ -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')) {

View file

@ -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");

View file

@ -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');

View file

@ -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;