Browse Source

more live update

pull/1/head
Mike Macgirvin 11 years ago
parent
commit
6368bd1656
  1. 46
      mod/network.php
  2. 68
      mod/profile.php
  3. 14
      mod/update_network.php
  4. 14
      mod/update_profile.php
  5. 8
      view/jot-header.tpl
  6. 2
      view/wall_item.tpl

46
mod/network.php

@ -6,7 +6,7 @@ function network_init(&$a) {
}
function network_content(&$a) {
function network_content(&$a, $update = false) {
if(! local_user())
return;
@ -15,31 +15,36 @@ function network_content(&$a) {
$contact_id = $a->cid;
$r = q("UPDATE `item` SET `unseen` = 0
WHERE `unseen` = 1 AND `uid` = %d",
intval($_SESSION['uid'])
);
if(! $update) {
$tpl = file_get_contents('view/jot-header.tpl');
$tpl = file_get_contents('view/jot-header.tpl');
$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
require_once('view/acl_selectors.php');
$tpl = file_get_contents("view/jot.tpl");
require_once('view/acl_selectors.php');
$o .= replace_macros($tpl,array(
'$return_path' => $a->cmd,
'$baseurl' => $a->get_baseurl(),
'$visitor' => 'block',
'$lockstate' => 'unlock',
'$acl' => populate_acl(),
'$profile_uid' => $_SESSION['uid']
));
$tpl = file_get_contents("view/jot.tpl");
$o .= replace_macros($tpl,array(
'$return_path' => $a->cmd,
'$baseurl' => $a->get_baseurl(),
'$visitor' => 'block',
'$lockstate' => 'unlock',
'$acl' => populate_acl(),
'$profile_uid' => $_SESSION['uid']
));
$o .= '<div id="live-network"></div>' . "\r\n";
}
$r = q("UPDATE `item` SET `unseen` = 0
WHERE `unseen` = 1 AND `uid` = %d",
intval($_SESSION['uid'])
);
$o .= '<div id="live-network"></div>' . "\r\n";
$sql_extra = '';
@ -164,6 +169,9 @@ function network_content(&$a) {
));
}
}
$o .= paginate($a);
if(! $update)
$o .= paginate($a);
return $o;
}

68
mod/profile.php

@ -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/security.php');
@ -76,14 +76,7 @@ function profile_content(&$a) {
$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()) {
@ -94,32 +87,49 @@ function profile_content(&$a) {
$contact_id = $_SESSION['cid'];
}
if($tab == 'profile') {
require_once('view/profile_advanced.php');
return $o;
if($update) {
if(! local_user())
return '';
$a->profile['uid'] = $_SESSION['uid'];
}
if(can_write_wall($a,$a->profile['profile_uid'])) {
$tpl = file_get_contents('view/jot-header.tpl');
$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
require_once('view/acl_selectors.php');
else {
if(x($_GET,'tab'))
$tab = notags(trim($_GET['tab']));
$tpl = file_get_contents("view/jot.tpl");
$tpl = file_get_contents('view/profile_tabs.tpl');
$o .= replace_macros($tpl,array(
'$baseurl' => $a->get_baseurl(),
'$return_path' => $a->cmd,
'$visitor' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? 'block' : 'none'),
'$lockstate' => 'unlock',
'$acl' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? populate_acl() : ''),
'$profile_uid' => $a->profile['profile_uid']
'$url' => $a->get_baseurl() . '/' . $a->cmd
));
}
if($tab == 'posts' && (! $a->pager['start']))
$o .= '<div id="live-profile"></div>' . "\r\n";
if($tab == 'profile') {
require_once('view/profile_advanced.php');
return $o;
}
if(can_write_wall($a,$a->profile['profile_uid'])) {
$tpl = file_get_contents('view/jot-header.tpl');
$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
require_once('view/acl_selectors.php');
$tpl = file_get_contents("view/jot.tpl");
$o .= replace_macros($tpl,array(
'$baseurl' => $a->get_baseurl(),
'$return_path' => $a->cmd,
'$visitor' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? 'block' : 'none'),
'$lockstate' => 'unlock',
'$acl' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? populate_acl() : ''),
'$profile_uid' => $a->profile['profile_uid']
));
}
if($tab == 'posts' && (! $a->pager['start']))
$o .= '<div id="live-profile"></div>' . "\r\n";
}
// 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
if(local_user() && ($_SESSION['uid'] == $a->profile['profile_uid'])) {
if(local_user() && ($_SESSION['uid'] == $a->profile['uid'])) {
$sql_extra = '';
// Oh - while we're here... reset the Unseen messages
@ -250,6 +260,10 @@ function profile_content(&$a) {
}
}
if($update) {
return $o;
}
$o .= paginate($a);
return $o;

14
mod/update_network.php

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

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

@ -53,8 +53,8 @@ tinyMCE.init({
var src = null;
$(document).ready(function() {
if($('#live-network').length) { src = 'net'; setTimeout(liveUpdate, 30000); }
if($('#live-profile').length) { src = 'wall'; setTimeout(liveUpdate, 30000); }
if($('#live-network').length) { src = 'network'; setTimeout(liveUpdate, 30000); }
if($('#live-profile').length) { src = 'profile'; setTimeout(liveUpdate, 30000); }
});
function liveUpdate() {
@ -64,9 +64,9 @@ tinyMCE.init({
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();
// if(net == 0) { net = ''; }
// $('#net-update').html(net);

2
view/wall_item.tpl

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