From 21b3dc9c27be50e73944eaec97001ad1279400f1 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 25 Jul 2012 19:45:45 -0700
Subject: tie the main slider to ajax updates and buildCmd

---
 mod/network.php | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'mod/network.php')

diff --git a/mod/network.php b/mod/network.php
index 7e1bfdcda..2f93dd3bc 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -488,7 +488,7 @@ function network_content(&$a, $update = 0, $load = false) {
 
 
 			$a->page['htmlhead'] .= "<script>\r\n" 
-				. "var network_cmd = " . '"' . $a->get_baseurl() . '/network/' . '"' . ";\r\n"
+				. "var network_cmd = " . '"' . $a->get_baseurl() . '/update_network' . '"' . ";\r\n"
 				. "var network_uid = " . ((local_user()) ? local_user() : 0) . ";\r\n"
 				. "var network_gid = " . (($gid) ? $gid : 0) . ";\r\n"
 				. "var network_cid = " . (($_GET['cid']) ? $_GET['cid'] : 0) . ";\r\n"
@@ -508,21 +508,23 @@ function network_content(&$a, $update = 0, $load = false) {
 				. 'var network_dend = "' . $datequery . '"' . ";\r\n"
 				. 'var network_dbegin = "' . $datequery2 . '"' . ";\r\n"
 
-				. 'function buildCmd() { var bCmd = network_cmd + "?f=" ;
+				. 'function buildCmd() {
+					var udargs = ((page_load) ? "/load" : "");
+					var bCmd = network_cmd + udargs + "?f=" ;
 					if(network_uid) bCmd = bCmd + "&p=" + network_uid;
-					if(network_cmin) bCmd = bCmd + "&cmin=" + network_cmin;
-					if(network_cmax) bCmd = bCmd + "&cmax=" + network_cmax;
-					if(network_gid) { bCmd = bCmd + "&gid=" + network_gid; } else
-					if(network_cid) { bCmd = bCmd + "&cid=" + network_cid; }
-					if(network_star) bCmd = bCmd + "&star=" + network_star;
-					if(network_liked) bCmd = bCmd + "&liked=" + network_liked;
-					if(network_conv) bCmd = bCmd + "&conv=" + network_conv;
-					if(network_spam) bCmd = bCmd + "&spam=" + network_spam;
-					if(network_new) bCmd = bCmd + "&new=" + network_new;
-					if(network_search) bCmd = bCmd + "&search=" + network_search;
-					if(network_file) bCmd = bCmd + "&file=" + network_file;
-					if(network_dend) bCmd = bCmd + "&dend=" + network_dend;
-					if(network_dbegin) bCmd = bCmd + "&dbegin=" + network_dbegin;
+					if(network_cmin != 0) bCmd = bCmd + "&cmin=" + network_cmin;
+					if(network_cmax != 99) bCmd = bCmd + "&cmax=" + network_cmax;
+					if(network_gid != 0) { bCmd = bCmd + "&gid=" + network_gid; } else
+					if(network_cid != 0) { bCmd = bCmd + "&cid=" + network_cid; }
+					if(network_star != 0) bCmd = bCmd + "&star=" + network_star;
+					if(network_liked != 0) bCmd = bCmd + "&liked=" + network_liked;
+					if(network_conv!= 0) bCmd = bCmd + "&conv=" + network_conv;
+					if(network_spam != 0) bCmd = bCmd + "&spam=" + network_spam;
+					if(network_new != 0) bCmd = bCmd + "&new=" + network_new;
+					if(network_search != "") bCmd = bCmd + "&search=" + network_search;
+					if(network_file != "") bCmd = bCmd + "&file=" + network_file;
+					if(network_dend != "") bCmd = bCmd + "&dend=" + network_dend;
+					if(network_dbegin != "") bCmd = bCmd + "&dbegin=" + network_dbegin;
 					if(network_page != 1) bCmd = bCmd + "&page=" + network_page;
 
 					return(bCmd);
-- 
cgit v1.2.3