minor plugin fixes to protect against invalid/malformed plugins

darcs-hash:20050804235036-50fdc-1881a40da689bc5abbe608a2ce96a1ed192a43a4.gz

2 files changed, 5 insertions, 9 deletions

diff --git a/inc/parserutils.php b/inc/parserutils.php
index e3bd04524..5b0e802bc 100644
--- a/inc/parserutils.php
+++ b/inc/parserutils.php
@@ -199,7 +199,7 @@ function p_get_parsermodes(){
     global $PARSER_MODES;
     $obj = null; 
     foreach($pluginlist as $p){
-      $obj =& plugin_load('syntax',$p);               //load plugin into $obj
+      if(!$obj =& plugin_load('syntax',$p)) continue; //attempt to load plugin into $obj
       $PARSER_MODES[$obj->getType()][] = "plugin_$p"; //register mode type
       //add to modes
       $modes[] = array(
diff --git a/inc/pluginutils.php b/inc/pluginutils.php
index 89d0c9f44..964635b2c 100644
--- a/inc/pluginutils.php
+++ b/inc/pluginutils.php
@@ -81,21 +81,17 @@ function &plugin_load($type,$name){
   }
 
   //try to load the wanted plugin file
-  if(!include_once(DOKU_PLUGIN."$name/$type.php")){
+  if(!@include_once(DOKU_PLUGIN."$name/$type.php")){
     list($plugin, $component) = preg_split("/_/",$name, 2);
-    if (!$component || !include_once(DOKU_PLUGIN."$plugin/$type/$component.php")) {
+    if (!$component || !@include_once(DOKU_PLUGIN."$plugin/$type/$component.php")) {
         return null;
     }
   }
 
-/* FIXME: chris: what's this for?
-  global $plugin_investigate_pluginorder;
-  if (!isset($plugin_investigate_pluginorder)) $plugin_investigate_pluginorder = array();
-  $plugin_investigate_pluginorder[] = $name;
-*/
-
   //construct class and instanciate
   $class = $type.'_plugin_'.$name;
+  if (!class_exists($class)) return null;
+  
   $DOKU_PLUGINS[$type][$name] = new $class;
   return $DOKU_PLUGINS[$type][$name];
 }