aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mod/network.php46
-rw-r--r--mod/profile.php68
-rw-r--r--mod/update_network.php14
-rw-r--r--mod/update_profile.php14
-rw-r--r--view/jot-header.tpl8
-rw-r--r--view/wall_item.tpl2
6 files changed, 101 insertions, 51 deletions
diff --git a/mod/network.php b/mod/network.php
index 38d2bbb0c..cbd1f4454 100644
--- a/mod/network.php
+++ b/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;
} \ No newline at end of file
diff --git a/mod/profile.php b/mod/profile.php
index a317568c1..aa13f0a78 100644
--- a/mod/profile.php
+++ b/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;
diff --git a/mod/update_network.php b/mod/update_network.php
new file mode 100644
index 000000000..655bebb96
--- /dev/null
+++ b/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();
+
+} \ No newline at end of file
diff --git a/mod/update_profile.php b/mod/update_profile.php
new file mode 100644
index 000000000..a0cb10f5d
--- /dev/null
+++ b/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();
+
+} \ No newline at end of file
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 8505b53bc..78e0151d8 100644
--- a/view/jot-header.tpl
+++ b/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);
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index 726d1b320..72ee216d5 100644
--- a/view/wall_item.tpl
+++ b/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>