X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fincludes%2Fplc_functions.php;h=d5de8a556d5a760d65c17b27b75b1d3ec601c5e0;hb=d7cc4e048eea83c6bb75bef519723a918a9c44d0;hp=9a5eff5599daf33b778b00e244a964935a5b9a9f;hpb=ca6e72138a20a68200f98f4efe713d39cc2c56af;p=plewww.git diff --git a/planetlab/includes/plc_functions.php b/planetlab/includes/plc_functions.php index 9a5eff5..d5de8a5 100644 --- a/planetlab/includes/plc_functions.php +++ b/planetlab/includes/plc_functions.php @@ -9,6 +9,7 @@ function my_is_int ($x) { return (is_numeric($x) ? intval($x) == $x : false); } + //////////////////////////////////////////////////////////// roles & other checks on global $plc function plc_is_admin () { global $plc; @@ -46,7 +47,7 @@ function href ($url,$text) { return "" . $text . ""; // l_object_t($object_id,text) -> an tag that shows text and links to the above // l_object_add () -> the url to that object-afding page -function l_actions () { return "/db/actions.php"; } +function l_actions () { return "/db/common/actions.php"; } // some complex node actions are kept separate, e.g. the ones related to getbootmedium function l_actions_download () { return "/db/nodes/node_downloads.php"; } @@ -57,6 +58,7 @@ function l_node_t ($node_id,$text) { return href (l_node($node_id),$text); } function l_node_obj($node) { return href(l_node($node['node_id']),$node['hostname']); } function l_node_add () { return "/db/nodes/node_add.php"; } function l_nodes_site ($site_id) { return "/db/nodes/index.php?site_id=$site_id"; } +function l_nodes_slice ($slice_id) { return "/db/nodes/index.php?slice_id=$slice_id"; } function l_interface ($interface_id) { return "/db/nodes/interface.php?id=$interface_id"; } function l_interface_t ($interface_id,$text) { @@ -67,6 +69,7 @@ function l_sites () { return "/db/sites/index.php"; } function l_sites_peer ($peer_id) { return "/db/sites/index.php?peerscope=$peer_id"; } function l_site ($site_id) { return "/db/sites/index.php?id=$site_id"; } function l_site_t ($site_id,$text) { return href (l_site($site_id),$text); } +function l_site_obj($site) { return href (l_site($site['site_id']),$site['name']); } function l_slices () { return "/db/slices/index.php"; } function l_slices_peer ($peer_id) { return "/db/slices/index.php?peerscope=$peer_id"; } @@ -74,6 +77,7 @@ function l_slice ($slice_id) { return "/db/slices/index.php?id=$slice_id"; } function l_slice_t ($slice_id,$text) { return href (l_slice($slice_id),$text); } function l_slice_add () { return "/db/slices/slice_add.php"; } function l_slices_site($site_id) { return "/db/slices/index.php?site_id=$site_id"; } +function l_slices_local() { return "/db/slices/index.php?peerscope=local"; } // from an object function l_slice_obj ($slice) { return l_slice_t ($slice['slice_id'],$slice['name']); } @@ -86,10 +90,11 @@ function l_persons_peer ($peer_id) { return "/db/persons/index.php?peerscope=$pe function l_person ($person_id) { return "/db/persons/index.php?id=$person_id"; } function l_person_t ($person_id,$text) { return href (l_person($person_id),$text); } function l_persons_site ($site_id) { return "/db/persons/index.php?site_id=$site_id"; } +function l_person_obj ($person) { return l_person_t($person['person_id'],$person['email']); } function l_tags () { return "/db/tags/index.php"; } function l_tag ($tag_type_id) { return "/db/tags/index.php?id=$tag_type_id"; } -function l_tag_obj ($tag) { return href(l_tag($tag['tag-type_id']),$tag['tagname']); } +function l_tag_obj ($tag) { return href(l_tag($tag['tag_type_id']),$tag['tagname']); } function l_nodegroups () { return "/db/tags/nodegroups.php"; } function l_nodegroup ($nodegroup_id) { return "/db/tags/nodegroup.php?id=$nodegroup_id"; } @@ -105,35 +110,72 @@ function l_peer_t($peer_id,$text) { return href(l_peer($peer_id),$text); } function l_comon($id_name,$id_value) { return "/db/nodes/comon.php?$id_name=$id_value"; } function l_sirius() { return "/db/sirius/index.php"; } -function l_about() { return "/db/about.php"; } +function l_about() { return "/db/common/about.php"; } function l_doc_plcapi() { return "/db/doc/PLCAPI.php"; } function l_doc_nmapi() { return "/db/doc/NMAPI.php"; } -function l_admin() { return "/db/adminsearch.php"; } +function l_admin() { return "/db/common/adminsearch.php"; } -function l_login() { return "/db/login.php"; } -function l_logout() { return "/planetlab/logout.php"; } -function l_sulogout() { return "/planetlab/sulogout.php"; } +function l_login() { return "/db/common/login.php"; } +function l_logout() { return "/planetlab/common/logout.php"; } +function l_sulogout() { return "/planetlab/common/sulogout.php"; } function l_reset_password() { return "/db/persons/reset_password.php"; } function l_person_register() { return "/db/persons/register.php"; } function l_site_register() { return "/db/sites/register.php"; } function l_sites_pending() { return "/db/sites/join_request.php"; } -function tabs_events() { return array('image'=>'/planetlab/icons/event.png','height'=>18);} -function tabs_comon() { return array('image'=>'/planetlab/icons/comon.png','height'=>18);} - -// returns array ['url' => path, 'values' => hash (key=>value)* ] -function split_url ($full_url) { - list($url,$args) = explode("?",$full_url); - $values=array(); - if ($args) { - $pairs=explode("&",$args); - foreach ($pairs as $pair) { - list ($name,$value) = explode("=",$pair); - $values[$name]=$value; - } - } - return array("url"=>$url,"values"=>$values); -} + +//////////////////////////////////////////////////////////// nav tabs +function tab_nodes () { return array ('label'=>'All nodes','url'=>l_nodes(), + 'bubble'=>'Display nodes from all peers'); } +function tab_nodes_local () { return array ('label'=>'Local nodes', 'url'=>l_nodes_peer('local'), + 'bubble'=>'Display local nodes only'); } +function tab_nodes_site($site_id){ return array ('label'=>'Site nodes', 'url'=>l_nodes_site($site_id), + 'bubble'=>'Display nodes on that site'); } +function tab_nodes_slice($slice_id){ return array ('label'=>'Slice nodes', 'url'=>l_nodes_slice($slice_id), + 'bubble'=>'Display nodes for that slice'); } +function tab_nodes_mysite () { return array ('label'=>'My nodes', 'url'=>l_nodes_site(plc_my_site_id()), + 'bubble'=>'Display nodes on my site'); } +function tab_node($node) { return array ('label'=>'Node '.$node['hostname'], 'url'=>l_node($node['node_id']), + 'bubble'=>'Details for ' . $node['hostname']); } +////////// +function tab_site($site) { return array ('label'=>'Site '.$site['login_base'], 'url'=>l_site($site['site_id']), + 'bubble'=>'Details for ' . $site['name']); } +function tab_mysite() { return array ('label'=>'My site', 'url'=>l_site(plc_my_site_id()), + 'bubble'=>'Details for site ' . plc_my_site_id()); } +function tab_sites () { return array ('label'=>'All sites' , 'url'=>l_sites(), 'bubble'=> 'Display all sites'); } +function tab_sites_local () { return array ('label'=>'Local sites' , 'url'=>l_sites_peer('local'), + 'bubble'=> 'Display local sites'); } +////////// +function tab_slices() { return array ('label'=>'All slices', 'url'=>l_slices(), + 'bubble' => 'Display all slices'); } +function tab_slices_mysite () { return array ('label'=>'My site slices', 'url'=>l_slices_site(plc_my_site_id()), + 'bubble'=>'Display all slices on my site'); } +function tab_slices_mine () { return array ('label'=>'My site slices', 'url'=>l_slices_site(plc_my_site_id()), + 'bubble'=>'Display all slices on my site'); } +function tab_slices_local () { return array ('label'=>'Local slices', 'url'=>l_slices_local(), + 'bubble'=>'Display all slices on my site'); } +function tab_slice($slice) { return array ('label'=>'Slice '.$slice['name'], 'url'=>l_slice($slice['slice_id']), + 'bubble' => 'Details for ' . $slice['name']); } +////////// +function tab_persons() { return array ('label'=>'All accounts', 'url'=>l_persons(), + 'bubble'=>'Display users from all peers'); } +function tab_persons_local() { return array ('label'=>'Local accounts', 'url'=>l_persons_peer('local'), + 'bubble'=>'Display local users'); } +function tab_persons_mysite() { return array ('label'=>'My accounts' , 'url'=>l_persons_site(plc_my_site_id()), + 'bubble'=>'Display accounts on site ' . plc_my_site_id()); } +function tab_person($person) { return array ('label'=>'Account '.$person['email'], 'url'=>l_person($person['person_id']), + 'bubble'=>'Details for ' . $person['email']); } +////////// +function tab_tags() { return array ('label'=>'Tag Types', 'url'=>l_tags(), + 'bubble' => 'Display and create tag types'); } +function tab_nodegroups() { return array ('label'=>'Nodegroups', 'url'=>l_nodegroups(), + 'bubble' => 'Display and create nodegroups'); } + +// only partial tab +function tablook_event() { return array('image'=>'/planetlab/icons/event.png','height'=>18);} +function tablook_comon() { return array('image'=>'/planetlab/icons/comon.png','height'=>18);} + +//////////////////// //////////////////////////////////////////////////////////// validation functions function topdomain ($hostname) { @@ -225,7 +267,6 @@ function plc_role_global_hash ($api) { } return $hash; } - //////////////////////////////////////////////////////////// nodegroups // hash by 'tagname=value' @@ -246,11 +287,7 @@ function plc_nodegroup_global_hash ($api,$tagnames=NULL) { //////////////////////////////////////////////////////////// titles function t_site($site) { return " on site " . $site['name'] . " (" . $site['login_base'] .")"; } function t_slice ($slice) { return " running slice " . $slice['name'] . " (" . $slice['slice_id'] . ")"; } - -//////////////////////////////////////////////////////////// nav tabs -function tabs_node($node) { return array('Node ' . $node['hostname']=>l_node($node_id)); } -function tabs_site($site) { return array('Site ' . $site['name']=>l_site($site_id)); } -function tabs_slice($slice) { return array('Slice ' . $slice['name']=>l_slice($slice_id)); } +function t_person ($person) { return " belonging to " . $person['email'] . " (" . $person['person_id'] . ")"; } //////////////////////////////////////////////////////////// html fragments function plc_vertical_table ($messages, $class="") { @@ -267,11 +304,6 @@ function plc_vertical_table ($messages, $class="") { return $formatted; } -function plc_section ($text,$line=true) { - if ($line) { print "
";} - print "

$text

\n"; -} - function plc_error ($text) { // should use the same channel as the php errors.. print "
Error " . $text . "
";