X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=modules%2Fplanetlab.module;h=2845f7504133307898dbb99ba94a285f806903e3;hb=d36b85111cd90e06963b8136a584254e2f09410e;hp=73cd389267f5474f19c7c7e381b2073d21704b33;hpb=13f1390a55a79b7e3ef6d0558ea070c88bd06cb4;p=plewww.git diff --git a/modules/planetlab.module b/modules/planetlab.module index 73cd389..2845f75 100644 --- a/modules/planetlab.module +++ b/modules/planetlab.module @@ -5,40 +5,40 @@ // Mark Huang // Copyright (C) 2006 The Trustees of Princeton University // - // $Id: planetlab.module 809 2007-09-03 09:47:40Z thierry $ + // $Id$ // +error_reporting(0); require_once 'plc_config.php'; require_once 'plc_session.php'; +require_once 'plc_functions.php'; -function planetlab_help($section) -{ +drupal_set_html_head(''); + +function planetlab_help($section) { switch ($section) { case 'admin/modules#description': return t('Enables authenticated login via a PlanetLab API server.'); } } -function planetlab_info($field = 0) -{ +function planetlab_info($field = 0) { $info['name'] = 'PlanetLab'; if ($field) { return $info[$field]; - } - else { + } else { return $info; } } -function planetlab_menu($may_cache) -{ +function planetlab_menu($may_cache) { $items = array(); if ($may_cache) { $items[] = array( - 'path' => 'planetlab/logout', - 'title' => t('Log out of %s', array('%s' => variable_get('site_name', 'local'))), + 'path' => 'planetlab/common/logout', + 'title' => t('Logout of %s', array('%s' => variable_get('site_name', 'local'))), 'callback' => 'planetlab_logout', 'access' => TRUE, 'type' => MENU_CALLBACK @@ -55,19 +55,60 @@ function planetlab_menu($may_cache) return $items; } -function planetlab_block($op = 'list', $delta = 0, $edit = array()) -{ +//////////////////// formatting helpers - specific to module presentation +function ul_start () { return ''; } +function leaf($text) { return '
  • ' . $text . '
    • '; } +function expanded($text) { return '
  • ' . $text . '
    • '; } +function p($text) { return '

    ' . $text . '

    '; } + +# this should get embedded into a ul_start()/ul_end() pair +function plc_my_site_links() { + $html = ''; + $sites = plc_my_sites(); + if (count($sites)>1) foreach ($sites as $site) { + $html .= leaf( href(l_site($site['site_id']),$site['abbreviated_name'])); + } else { + $html .= leaf( href(l_site(plc_my_site_id()),"My Site")); + } + return $html; +} + +// ditto +function plc_my_node_links () { + $html = ''; + if (count (plc_my_site_ids()) == 1) { + $html .= leaf( href (l_nodes_my_site() ,"My Site Nodes")); + } else { + $html .= leaf( href (l_nodes_all_my_site(),"All My Sites Nodes")); + } + return $html; +} + +// fake theme to look like menu +function menu_theme ($menu) { + $result = ''; + $result .= ul_start(); + foreach ($menu as $item) $result .= $item; + $result .= ul_end(); + return $result; +} + +function planetlab_block($op = 'list', $delta = 0, $edit = array()) { global $user, $plc; if ($op == 'list') { $blocks[0]['info'] = t('PlanetLab login'); return $blocks; - } - else if ($op == 'view') { + + } else if ($op == 'view') { $block = array(); - if (!$plc->person) { + if ($plc->hide_planetlab_block) { + // do nothing + // this is a private hook from the Vicci module to hide the planetlab module + } else if (!$plc->person) { // Force login via HTTPS unset($_GET['time']); $form['#action'] = "https://" . $_SERVER['HTTP_HOST'] . url($_GET['q'], drupal_get_destination()); @@ -89,93 +130,112 @@ function planetlab_block($op = 'list', $delta = 0, $edit = array()) $block['subject'] = t('%s login', array('%s' => variable_get('site_name', 'local'))); $block['content'] = drupal_get_form('planetlab_login_block', $form, 'planetlab_login'); - $block['content'] .= '

    Forgot your password?

    '; - $block['content'] .= '

    Create an account

    '; - $block['content'] .= '

    File a site registration

    '; + $block['content'] .= p(''); + $block['content'] .= p( href (l_reset_password(),"Forgot your password?") ); + $block['content'] .= p( href(l_person_register(),"Create an account") ); + $block['content'] .= p( href(l_site_register(),"File a site registration") ); } else { - $block['subject'] = $plc->person['email']; - $is_admin = in_array(10,$plc->person['role_ids']); - $is_pi = in_array(20,$plc->person['role_ids']); - $is_user = in_array(30,$plc->person['role_ids']); - $is_tech = in_array(40,$plc->person['role_ids']); - - $site_item = ''; - $site_item .= 'Sites'; - $site_item .= '"; - $items[] = $site_item; - - $user_item = ''; - $user_item .= 'Users'; - $user_item .= ''; - $items [] = $user_item; - - $node_item = ''; - $node_item .= 'Nodes'; - $node_item .= ''; - $items [] = $node_item; - - $slice_item = ''; - //if( !( $is_tech && ! $is_user && ! $is_pi && ! $is_admin ) ) - $slice_item .= 'Slices'; - $slice_item .= ''; - $items [] = $slice_item; - - if( $is_admin || $is_pi ) { - $tag_item = ''; - $tag_item .= 'Tags'; - $tag_item .= ''; - $items [] = $tag_item; - } - - - if ( $is_admin ) - $items[] = l(t('Peers'),'db/peers/'); - - if ( $is_admin ) - $items[] = l(t('Events'),'db/events/'); - - $items[] = l(t('About'),'db/about.php'); + $block['subject'] = truncate($plc->person['email'],30); + //////////////////// Logout + $bullet_item = ''; if ($user->uid) { // Drupal logout (destroys the session and cleans up $user) - $items[] = l(t('Log out of %s', array('%s' => variable_get('site_name', 'local'))), 'logout'); + // Thierry unclear when this triggers, I suspect this is obsolete + $bullet_item .= l(t('Logout of %s', + array('%s' => variable_get('site_name', 'local'))), 'logout'); } else { // PlanetLab logout (just destroy the session) - $items[] = l(t('Log out'), 'planetlab/logout'); + $bullet_item .= href (l_logout(),'Logout'); + } + $bullet_item .= ul_start(); + // logout + if ( $plc->alt_person && $plc->alt_auth) { + $email = truncate($plc->person['email'],20); + $bullet_item .= leaf( href( l_sulogout(),"Un-become $email")); + } + $bullet_item .= ul_end(); + $items []= expanded ($bullet_item); + + //////////////////// accounts + $bullet_item = ''; + $bullet_item .= l_person_t(plc_my_person_id(),"My Account"); + $bullet_item .= ul_start(); + if (plc_is_admin() || plc_is_pi()) + $bullet_item .= leaf( href( l_persons_site(plc_my_site_id()), "My Site Accounts")); + if (plc_is_admin()) { + $bullet_item .= leaf(href(l_persons_peer('local'),'Local Accounts (slow)')); + $bullet_item .= leaf(href(l_persons(),'All Accounts (slow)')); + } + + $bullet_item .= ul_end(); + $items [] = expanded($bullet_item); + + //////////////////// Sites + $bullet_item = ''; + $bullet_item .= href(l_sites(),"Sites"); + $bullet_item .= ul_start(); + $bullet_item .= plc_my_site_links(); + if ( plc_is_admin() ) + $bullet_item .= leaf( href(l_sites_pending(),"Pending Requests")); + $bullet_item .= ul_end(); + $items[] = expanded($bullet_item); + + //////////////////// Nodes + $bullet_item = ''; + $bullet_item .= href(l_nodes(),"Nodes"); + $bullet_item .= ul_start(); + $bullet_item .= plc_my_node_links(); + if (plc_is_admin() || plc_is_pi() || plc_is_tech()) + $bullet_item .= leaf( href (l_register_node(),"Register Node")); + $bullet_item .= ul_end(); + $items [] = expanded($bullet_item); + + //////////////////// Slices + $bullet_item = ''; + //if( !( plc_is_tech() && ! plc_is_user() && ! plc_is_pi() && ! plc_is_admin() ) ) + if (plc_is_admin()) { + $bullet_item .= href(l_slices(),"Slices"); + } else { + $bullet_item .= href(l_slices(),"My Slices"); + } + $bullet_item .= ul_start(); + if (plc_is_admin()) + $bullet_item .= leaf ( href(l_slices_my_site(), 'My Site Slices')); + if( plc_is_admin() || plc_is_pi() ) { + $bullet_item .= leaf(href(l_slice_add(),"Create Slice")); + } + if( !( plc_is_tech() && ! plc_is_user() && ! plc_is_pi() && ! plc_is_admin() ) ) + $bullet_item .= leaf(href(l_sirius(),"Sirius")); + $bullet_item .= ul_end(); + $items [] = expanded($bullet_item); + + //////////////////// Admin + if( plc_is_admin() || plc_is_pi() ) { + $bullet_item = ''; + $bullet_item .= href(l_admin(),"Admin search"); + $bullet_item .= ul_start(); + if ( plc_is_admin() ) + $bullet_item .= leaf( href (l_node_add(),"Add Node")); + $bullet_item .= leaf( href( l_tags(),"Tags")); + $bullet_item .= leaf( href( l_nodegroups(),"Node groups")); + $bullet_item .= leaf (href(l_peers(),'Peers')); + if ( plc_is_admin() ) + $bullet_item .= leaf (href(l_events(),'Events')); + $bullet_item .= ul_end(); + $items [] = expanded($bullet_item); } - $block['content'] = theme('item_list', $items); + $bullet_item = ''; + $bullet_item .= href(l_about(),'About MyPLC'); + $bullet_item .= ul_start(); + $bullet_item .= leaf ( href (l_doc_plcapi(),"PLCAPI doc")); + $bullet_item .= leaf ( href (l_doc_nmapi(),"NMAPI doc")); + $bullet_item .= ul_end(); + $items[] = expanded($bullet_item); + + //$block['content'] = theme('list_item', $items); + $block['content'] = menu_theme($items); } /* @@ -191,8 +251,7 @@ function planetlab_block($op = 'list', $delta = 0, $edit = array()) } } -function planetlab_login_validate($form_id, $form_values) -{ +function planetlab_login_validate($form_id, $form_values) { global $user, $plc; if ($form_values['name'] && $form_values['pass']) { @@ -220,8 +279,7 @@ function planetlab_login_validate($form_id, $form_values) } } -function planetlab_login_submit($form_id, $form_values) -{ +function planetlab_login_submit($form_id, $form_values) { global $plc; // Our referring page is encased in a query string of the form @@ -256,14 +314,13 @@ function planetlab_login_submit($form_id, $form_values) if ($url[0] != "/") { $url = "/$url"; } - Header("Location: $url"); + header("Location: $url"); exit(); } } } -function planetlab_logout() -{ +function planetlab_logout() { global $plc; if ($plc->person) { @@ -279,8 +336,7 @@ function planetlab_logout() drupal_goto(NULL, 'time='. time()); } -function planetlab_user($type, &$edit, &$user, $category = NULL) -{ +function planetlab_user($type, &$edit, &$user, $category = NULL) { switch ($type) { case 'logout': if ($plc->person) { @@ -291,8 +347,15 @@ function planetlab_user($type, &$edit, &$user, $category = NULL) } } -function planetlab_page() -{ +function isValidFileName($file) { + + /* don't allow .. and allow any "word" character \ / */ + + return preg_match('/^(((?:\.)(?!\.))|\w)+$/', $file); + +} + +function planetlab_page() { $path = $_SERVER['DOCUMENT_ROOT'] . preg_replace('/^db\//', '/planetlab/', $_GET['q']); // error_log("Requested " . $_GET['q'] . " -> $path"); @@ -313,7 +376,12 @@ function planetlab_page() $output = ob_get_contents(); ob_end_clean(); } else { - $output = file_get_contents($path); + if (isValidFileName($path)) { + $output = file_get_contents($path); + } + else { + $output = ""; + } } return $output; } @@ -321,8 +389,7 @@ function planetlab_page() drupal_not_found(); } -function theme_planetlab($content) -{ +function theme_planetlab($content) { return $content; }