convert update script arg passing to js - remembering the browser prefetch issues

3 files changed, 19 insertions, 30 deletions

diff --git a/include/main.js b/include/main.js
index df7de2e76..9e657f335 100644
--- a/include/main.js
+++ b/include/main.js
@@ -108,7 +108,10 @@
 		prev = 'live-' + src;
 
 		in_progress = true;
-		$.get('update_' + src + '?p=' + profile_uid + '&msie=' + ((msie) ? 1 : 0),function(data) {
+		var udargs = '/' + netargs;
+		var update_url = 'update_' + src + udargs + '?p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0);
+
+		$.get(update_url,function(data) {
 			in_progress = false;
 			$('.wall-item-outside-wrapper',data).each(function() {
 				var ident = $(this).attr('id');
diff --git a/mod/network.php b/mod/network.php
index 4dc5d4b4c..696d00dcc 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -40,34 +40,21 @@ function network_content(&$a, $update = 0) {
 
 	$nouveau = false;
 
-	if($update && (x($_SESSION,'netargs'))) {
-		$nouveau = $_SESSION['netargs']['nouveau'];
-		$group   = $_SESSION['netargs']['group'];
-		if(strlen($group))
+	if(($a->argc > 2) && $a->argv[2] === 'new')
+		$nouveau = true;
+
+	if($a->argc > 1) {
+		if($a->argv[1] === 'new')
+			$nouveau = true;
+		else {
+			$group = intval($a->argv[1]);
 			$group_acl = array('allow_gid' => '<' . $group . '>');
-		$a->pager['page'] = $_SESSION['netargs']['page'];
-		$a->set_pager_itemspage(50);
+		}
 	}
 
-
 	if(! $update) {
 		$o .= '<script>	$(document).ready(function() { $(\'#nav-network-link\').addClass(\'nav-selected\'); });</script>';
 
-		if(($a->argc > 2) && $a->argv[2] === 'new')
-			$nouveau = true;
-
-			// pull out the group here because the updater might have different args
-		if($a->argc > 1) {
-			if($a->argv[1] === 'new')
-				$nouveau = true;
-			else {
-				$group = intval($a->argv[1]);
-				$group_acl = array('allow_gid' => '<' . $group . '>');
-			}
-		}
-
-
-		$_SESSION['netargs'] = array('nouveau' => $nouveau, 'group' => $group, 'page' => $a->pager['page']);
 		$_SESSION['return_url'] = $a->cmd;
 
 		$geotag = (($a->user['allow_location']) ? load_view_file('view/jot_geotag.tpl') : '');
@@ -118,10 +105,10 @@ function network_content(&$a, $update = 0) {
 		// filtering by group and also you aren't writing a comment (the last
 		// criteria is discovered in javascript).
 
-//		if($a->pager['start'] == 0 && $a->argc == 1) {
 			$o .= '<div id="live-network"></div>' . "\r\n";
-			$o .= "<script> var profile_uid = " . $_SESSION['uid'] . "; </script>\r\n";
-//		}
+			$o .= "<script> var profile_uid = " . $_SESSION['uid'] 
+				. "; var netargs = '" . substr($a->cmd,8) 
+				. "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
 
 	}
 
diff --git a/mod/profile.php b/mod/profile.php
index 3a393eea0..46d13298e 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -82,7 +82,6 @@ function profile_content(&$a, $update = 0) {
 
 	$is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
 	
-
 	if(! $update) {
 		if(x($_GET,'tab'))
 			$tab = notags(trim($_GET['tab']));
@@ -161,11 +160,11 @@ function profile_content(&$a, $update = 0) {
 		// This is ugly, but we can't pass the profile_uid through the session to the ajax updater,
 		// because browser prefetching might change it on us. We have to deliver it with the page.
 
-		if($tab === 'posts' && (! $a->pager['start'])) {
+		if($tab === 'posts') {
 			$o .= '<div id="live-profile"></div>' . "\r\n";
-			$o .= "<script> var profile_uid = " . $a->profile['profile_uid'] . "; </script>\r\n";
+			$o .= "<script> var profile_uid = " . $a->profile['profile_uid'] 
+				. "; var netargs = ''; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
 		}
-
 	}
 
 	// Construct permissions