remove error_reporting(0) that has been causing all the pain with logs

[plewww.git] / modules / planetlab.module

diff --git a/modules/planetlab.module b/modules/planetlab.module
index 478c5c0..7e577c5 100644 (file)
--- a/modules/planetlab.module
+++ b/modules/planetlab.module
@@ -8,6 +8,8 @@
   // $Id$
   //
 
+//error_reporting(0);
+
 require_once 'plc_config.php';
 require_once 'plc_session.php';
 require_once 'plc_functions.php';
@@ -104,7 +106,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,9 +135,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_SHORTNAME!="VICCI") || (plc_advanced())) {
-      // for now, only pay attention to plc_advanced() on vicci
-
+    } else {
       $block['subject'] = truncate($plc->person['email'],30);
 
       //////////////////// Logout 
@@ -184,8 +187,9 @@ function planetlab_block($op = 'list', $delta = 0, $edit = array()) {
       $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"));
+      if (plc_is_admin() || plc_is_pi() || plc_is_tech()) {
+             $bullet_item .= leaf( href (l_register_node(), "Register Node (ko)"));
+      }
       $bullet_item .= ul_end();
       $items [] = expanded($bullet_item);
 
@@ -345,6 +349,14 @@ function planetlab_user($type, &$edit, &$user, $category = NULL) {
   }
 }
 
+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']);
 
@@ -366,7 +378,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;
   }