Changeset 3395:445e9ff79a1f

Timestamp:

11/08/16 11:56:54 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Capture output buffer during module’s file loading, addresses #2214

File:

• inc/core/class.dc.modules.php (modified) (5 diffs)

inc/core/class.dc.modules.php

@@ -193 +193 @@
                               $this->id = $entry;
                               $this->mroot = $full_entry;
+                              ob_start();
                               require $full_entry.'/_define.php';
+                              ob_end_clean();
                               $this->all_modules[$entry] =& $this->modules[$entry];
                               $this->id = null;
@@ -203 +205 @@
                                    $this->id = $entry;
                                    $this->mroot = $full_entry;
-                                   $this->disabled_mode=true;
+                                   $this->disabled_mode = true;
+                                   ob_start();
                                    require $full_entry.'/_define.php';
-                                   $this->disabled_mode=false;
+                                   ob_end_clean();
+                                   $this->disabled_mode = false;
                                    $this->disabled[$entry] =  $this->disabled_meta;
                                    $this->all_modules[$entry] =& $this->disabled[$entry];
@@ -260 +264 @@
           if (file_exists($dir.'/_define.php')) {
                $this->id = $id;
+               ob_start();
                require $dir.'/_define.php';
+               ob_end_clean();
                $this->id = null;
           }
@@ -722 +728 @@
      }
 
-     protected function loadModuleFile($________)
+     protected function loadModuleFile($________,$catch = true)
      {
           if (!file_exists($________)) {
@@ -736 +742 @@
           }
 
+          if ($catch) {
+               // Catch ouput to prevents hacked or corrupted modules
+               ob_start();
+               $ret = require $________;
+               ob_end_clean();
+               return $ret;
+          }
+
           return require $________;
      }