keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

more live update

Browse source
This commit is contained in:
Mike Macgirvin 2010-07-24 15:21:33 -07:00
parent d6dbcf8581
commit 6368bd1656
6 changed files with 105 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
mod/network.php
View file

@ -6,7 +6,7 @@ function network_init(&$a) {
} }
function network_content(&$a) { function network_content(&$a, $update = false) {
if(! local_user()) if(! local_user())
return; return;
@ -15,10 +15,8 @@ function network_content(&$a) {
$contact_id = $a->cid; $contact_id = $a->cid;
$r = q("UPDATE `item` SET `unseen` = 0
WHERE `unseen` = 1 AND `uid` = %d", if(! $update) {
intval($_SESSION['uid'])
);
$tpl = file_get_contents('view/jot-header.tpl'); $tpl = file_get_contents('view/jot-header.tpl');
@ -40,6 +38,13 @@ function network_content(&$a) {
$o .= '<div id="live-network"></div>' . "\r\n"; $o .= '<div id="live-network"></div>' . "\r\n";
}
$r = q("UPDATE `item` SET `unseen` = 0
WHERE `unseen` = 1 AND `uid` = %d",
intval($_SESSION['uid'])
);
$sql_extra = ''; $sql_extra = '';
@ -164,6 +169,9 @@ function network_content(&$a) {
)); ));
} }
} }
if(! $update)
$o .= paginate($a); $o .= paginate($a);
return $o; return $o;
} }

34
mod/profile.php
View file

@ -67,7 +67,7 @@ function profile_init(&$a) {
} }
function profile_content(&$a) { function profile_content(&$a, $update = false) {
require_once("include/bbcode.php"); require_once("include/bbcode.php");
require_once('include/security.php'); require_once('include/security.php');
@ -76,14 +76,7 @@ function profile_content(&$a) {
$tab = 'posts'; $tab = 'posts';
if(x($_GET,'tab'))
$tab = notags(trim($_GET['tab']));
$tpl = file_get_contents('view/profile_tabs.tpl');
$o .= replace_macros($tpl,array(
'$url' => $a->get_baseurl() . '/' . $a->cmd
));
if(remote_user()) { if(remote_user()) {
@ -94,6 +87,23 @@ function profile_content(&$a) {
$contact_id = $_SESSION['cid']; $contact_id = $_SESSION['cid'];
} }
if($update) {
if(! local_user())
return '';
$a->profile['uid'] = $_SESSION['uid'];
}
else {
if(x($_GET,'tab'))
$tab = notags(trim($_GET['tab']));
$tpl = file_get_contents('view/profile_tabs.tpl');
$o .= replace_macros($tpl,array(
'$url' => $a->get_baseurl() . '/' . $a->cmd
));
if($tab == 'profile') { if($tab == 'profile') {
require_once('view/profile_advanced.php'); require_once('view/profile_advanced.php');
return $o; return $o;
@ -119,7 +129,7 @@ function profile_content(&$a) {
if($tab == 'posts' && (! $a->pager['start'])) if($tab == 'posts' && (! $a->pager['start']))
$o .= '<div id="live-profile"></div>' . "\r\n"; $o .= '<div id="live-profile"></div>' . "\r\n";
}
// TODO alter registration and settings and profile to update contact table when names and photos change. // TODO alter registration and settings and profile to update contact table when names and photos change.
@ -129,7 +139,7 @@ function profile_content(&$a) {
// Profile owner - everything is visible // Profile owner - everything is visible
if(local_user() && ($_SESSION['uid'] == $a->profile['profile_uid'])) { if(local_user() && ($_SESSION['uid'] == $a->profile['uid'])) {
$sql_extra = ''; $sql_extra = '';
// Oh - while we're here... reset the Unseen messages // Oh - while we're here... reset the Unseen messages
@ -250,6 +260,10 @@ function profile_content(&$a) {
} }
} }
if($update) {
return $o;
}
$o .= paginate($a); $o .= paginate($a);
return $o; return $o;

14
mod/update_network.php Normal file
View file

@ -0,0 +1,14 @@
<?php
require_once('mod/network.php');
function update_network_content(&$a) {
echo "<html>\r\n";
echo network_content($a,true);
echo "</html>\r\n";
killme();
}

14
mod/update_profile.php Normal file
View file

@ -0,0 +1,14 @@
<?php
require_once('mod/profile.php');
function update_profile_content(&$a) {
echo "<html>\r\n";
echo profile_content($a,true);
echo "</html>\r\n";
killme();
}

8
view/jot-header.tpl
View file

@ -53,8 +53,8 @@ tinyMCE.init({
var src = null; var src = null;
$(document).ready(function() { $(document).ready(function() {
if($('#live-network').length) { src = 'net'; setTimeout(liveUpdate, 30000); } if($('#live-network').length) { src = 'network'; setTimeout(liveUpdate, 30000); }
if($('#live-profile').length) { src = 'wall'; setTimeout(liveUpdate, 30000); } if($('#live-profile').length) { src = 'profile'; setTimeout(liveUpdate, 30000); }
}); });
function liveUpdate() { function liveUpdate() {
@ -64,9 +64,9 @@ tinyMCE.init({
return; return;
} }
// $.get("live_update",function(data) // $.get('update_' + src,function(data)
// { // {
// $(data).find('result').each(function() { // $(data).find('#wall-item-outside-wrapper').each(function() {
// var net = $(this).find('net').text(); // var net = $(this).find('net').text();
// if(net == 0) { net = ''; } // if(net == 0) { net = ''; }
// $('#net-update').html(net); // $('#net-update').html(net);

2
view/wall_item.tpl
View file

@ -13,5 +13,5 @@
$comment $comment
</div> </div>
<div class="wall-item-$indentoutside-wrapper-end" ></div> <div class="wall-item-outside-wrapper-end$indent" ></div>