X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=modules%2Fplanetlab.module;h=06aa2592a3980532eed75d05545b6dd50058b9be;hb=31f2c290aac50eac519f4d2c428b6f76c5cb67c9;hp=3fd2c5b888f0aa38aa42e1f5e4ebbee36345a14b;hpb=b01e287f4073b2f1edc8857abed2a961cbb25098;p=plewww.git diff --git a/modules/planetlab.module b/modules/planetlab.module index 3fd2c5b..06aa259 100644 --- a/modules/planetlab.module +++ b/modules/planetlab.module @@ -104,7 +104,10 @@ function planetlab_block($op = 'list', $delta = 0, $edit = array()) { } 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()); @@ -130,7 +133,7 @@ function planetlab_block($op = 'list', $delta = 0, $edit = array()) { $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 if (plc_advanced()) { + } else { $block['subject'] = truncate($plc->person['email'],30); //////////////////// Logout