From 444d6866b6ebaebc2a4c3d6386f2d47f3cb9fed7 Mon Sep 17 00:00:00 2001 From: Harvie Date: Fri, 24 Dec 2010 03:36:58 +0100 Subject: [PATCH] Even more transport cleanup --- .../function.get_threaded_children.php | 40 +++++-------------- wwwroot/inc/transports.inc | 1 + 2 files changed, 12 insertions(+), 29 deletions(-) diff --git a/wwwroot/inc/smarty/node_methodz/function.get_threaded_children.php b/wwwroot/inc/smarty/node_methodz/function.get_threaded_children.php index 7a7cc33..15e46c2 100644 --- a/wwwroot/inc/smarty/node_methodz/function.get_threaded_children.php +++ b/wwwroot/inc/smarty/node_methodz/function.get_threaded_children.php @@ -61,38 +61,20 @@ else $security = ""; $result=$db->query($q); - while ($result->next()) { -$child = $result->getRecord(); -if($child['external_link']=='transport') { - $child['node_status']='linked'; - /*$transport = preg_split('/[:@]/',trim($child['node_content'])); - require_once(INCLUDE_DIR.'transports.inc'); - transport_load($transport[0]); - global $transports; - $child['node_name']=$transport[0].':'.$transport[1].'@defaulthost'; - $child['node_content']=$transport[0].':'.$transport[1].'@defaulthost:
'.$transports[$transport[0]]['get_node_content']($transport[1]);*/ - $child = array_merge($child, transport_translate($child['node_content'])); -} + while ($result->next()) { + $child = $result->getRecord(); + if($child['external_link']=='transport') $child = array_merge($child, transport_translate($child['node_content'])); + if($child['synapse_creator']!='') $child['node_status']='linked'; -if($child['synapse_creator']!='') { - $child['node_status']='linked'; -/* if($child['transport']!='') { - require_once(INCLUDE_DIR.'transports.inc'); - transport_load($child['transport']); - global $transports; - $child['node_content']=$child['transport'].':'.$child['node_id'].'@default:\n
'.$transports[$child['transport']]['get_node_content']($child['node_id']); - $child['node_name']=$child['transport'].':'.$child['node_id']; - } */ -} + $get_children_array[]=$child; + } -$get_children_array[]=$child; - } - global $time_1, $time_2; - $time_2=$result->getString('node_created'); - $time_1=$get_children_array[0]['node_created']; + global $time_1, $time_2; + $time_2=$result->getString('node_created'); + $time_1=$get_children_array[0]['node_created']; - $smarty->assign('get_threaded_children',$get_children_array); + $smarty->assign('get_threaded_children',$get_children_array); - } +} ?> diff --git a/wwwroot/inc/transports.inc b/wwwroot/inc/transports.inc index 318096d..a5dbbc3 100644 --- a/wwwroot/inc/transports.inc +++ b/wwwroot/inc/transports.inc @@ -13,6 +13,7 @@ function transport_translate($transport_handle) { $domain='defaulthost'; if(isset($transport[2])) $domain=$transport[2]; $transport=$transport[0]; + $node['node_status']='linked'; $node['node_name']="$transport:$id@$domain"; $node['url']=$transports[$transport]['get_node_url']($id); $node['node_content']=$node['url'].'
'.$transports[$transport]['get_node_content']($id); -- 2.30.2