remove some cruft

1 files changed, 5 insertions, 69 deletions

diff --git a/mod/network.php b/mod/network.php
index 8375dada2..b108b763f 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -1,6 +1,11 @@
 <?php
 
 require_once('include/items.php');
+require_once('include/group.php');
+require_once('include/contact_widgets.php');
+require_once('include/conversation.php');
+require_once('include/acl_selectors.php');
+
 
 function network_init(&$a) {
 	if(! local_user()) {
@@ -12,63 +17,7 @@ function network_init(&$a) {
 	$a->profile_uid = local_user();
 	head_set_icon($channel['xchan_photo_s']);
 	
-	$is_a_date_query = false;
-
-	if($a->argc > 1) {
-		for($x = 1; $x < $a->argc; $x ++) {
-			if(is_a_date_arg($a->argv[$x])) {
-				$is_a_date_query = true;
-				break;
-			}
-		}
-	}
     
-    // convert query string to array and remove first element (wich is friendica args)
-    $query_array = array();
-    parse_str($a->query_string, $query_array);
-    array_shift($query_array);
-    
-	// fetch last used tab and redirect if needed
-	$sel_tabs = network_query_get_sel_tab($a);
-	$last_sel_tabs = get_pconfig(local_user(), 'network.view','tab.selected');
-	if (is_array($last_sel_tabs)){
-		$tab_urls = array(
-			'/network?f=&order=comment',//all
-			'/network?f=&order=post',		//postord
-			'/network?f=&conv=1',			//conv
-			'/network/new',					//new
-			'/network?f=&star=1',			//starred
-			'/network?f=&spam=1',			//spam
-		);
-		
-		// redirect if current selected tab is 'no_active' and
-		// last selected tab is _not_ 'all_active'. 
-		// and this isn't a date query
-
-		if ($sel_tabs[0] == 'active' && $last_sel_tabs[0]!='active' && (! $is_a_date_query)) {
-			$k = array_search('active', $last_sel_tabs);
-          
-            // merge tab querystring with request querystring
-            $dest_qa = array();
-            list($dest_url,$dest_qs) = explode("?", $tab_urls[$k]);
-            parse_str( $dest_qs, $dest_qa);
-            $dest_qa = array_merge($query_array, $dest_qa);
-            $dest_qs = build_querystring($dest_qa);
-            
-            // groups filter is in form of "network/nnn". Add it to $dest_url, if it's possible
-            if ($a->argc==2 && is_numeric($a->argv[1]) && strpos($dest_url, "/",1)===false){
-                $dest_url .= "/".$a->argv[1];
-            }
-
-//			goaway($a->get_baseurl() . $dest_url."?".$dest_qs);
-		}
-	}
-	
-		  
-	require_once('include/group.php');
-	require_once('include/contact_widgets.php');
-	require_once('include/items.php');
-
 	if(! x($a->page,'aside'))
 		$a->page['aside'] = '';
 
@@ -247,7 +196,6 @@ function network_query_get_sel_tab($a) {
 
 function network_content(&$a, $update = 0, $load = false) {
 
-	require_once('include/conversation.php');
 
 	if(! local_user()) {
 		$_SESSION['return_url'] = $a->query_string;
@@ -255,7 +203,6 @@ function network_content(&$a, $update = 0, $load = false) {
 	}
 
 
-
 	$arr = array('query' => $a->query_string);
 
 	call_hooks('network_content_init', $arr);
@@ -359,17 +306,6 @@ function network_content(&$a, $update = 0, $load = false) {
 
 
 
-	
-	// save selected tab, but only if not in search or file mode
-//	if(!x($_GET,'search') && !x($_GET,'file')) {
-//		set_pconfig( local_user(), 'network.view','tab.selected',array($all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) );
-//	}
-
-
-	$contact_id = $a->cid;
-
-	require_once('include/acl_selectors.php');
-
 	$cid = ((x($_GET,'cid')) ? intval($_GET['cid']) : 0);
 	$star = ((x($_GET,'star')) ? intval($_GET['star']) : 0);
 	$order = ((x($_GET,'order')) ? notags($_GET['order']) : 'comment');