Merge branch 'hotfixes'

classes/BasicSpecialFunction.php

@@ -40,7 +40,7 @@ class SpecialFunction extends AbstractSpecialFunction{
   	try{
   	  $viewFile = $conf['special']['uri'].".".$f.$conf['view']['extension'].".".$extension;
   	  $modelFile = $conf['special']['uri'].".".$f.$conf['model']['extension'].".".$extension;
-  	  if(!is_file($conf['model']['directory'].$modelFile) || !is_file($conf['view']['directory'].$viewFile)){
+  	  if(!(is_dir($conf['model']['directory'].$modelFile) || is_file($conf['model']['directory'].$modelFile)) || !is_file($conf['view']['directory'].$viewFile)){
   	  	throw new Exception('Method does not exist!');
   	  	Utils::send404($uri);
   	  }
@@ -71,14 +71,14 @@ class SpecialFunction extends AbstractSpecialFunction{
   	  	$args["arg".$i]=$params[$i];
   	  }
  	  $data['params'] = $params;
-$base = $conf['view']['standard'];
-$base['type'] = $modelFile;
-$base['this']['value'] = $uri;
-$base['this']['curie'] = Utils::uri2curie($uri);
-$base['this']['contentType'] = $acceptContentType;
-$base['model']['directory'] = $conf['model']['directory'];
-$base['view']['directory'] = $conf['view']['directory'];
-$base['ns'] = $conf['ns'];  	  $base['ns'] = $conf['ns'];
+ 	  $base = $conf['view']['standard'];
+ 	  $base['type'] = $modelFile;
+ 	  $base['this']['value'] = $uri;
+ 	  $base['this']['curie'] = Utils::uri2curie($uri);
+ 	  $base['this']['contentType'] = $acceptContentType;
+ 	  $base['model']['directory'] = $conf['model']['directory'];
+ 	  $base['view']['directory'] = $conf['view']['directory'];
+ 	  $base['ns'] = $conf['ns'];  	  $base['ns'] = $conf['ns'];
   	  $base['type'] = $modelFile;
   	  $base['header'] = $prefixHeader;
   	  $base['args'] = $args;
@@ -98,6 +98,7 @@ $base['ns'] = $conf['ns'];  	  $base['ns'] = $conf['ns'];
   	  $rRoot = &$resulst;
   	  Utils::processDocument($viewFile, $base, $results);  	
   	}catch (Exception $ex){
+  	  echo $ex0>getMessage();
   	  trigger_error($ex->getMessage(), E_ERROR);
   	  Utils::send500($uri);
   	}