Skip to content
Snippets Groups Projects
Commit 40cc5800 authored by alangrafu's avatar alangrafu
Browse files

Fixed bug in classModule

parent 8d1eeeeb
No related branches found
No related tags found
No related merge requests found
...@@ -35,6 +35,8 @@ $conf['http_accept']['nt'] = array('text/plain'); ...@@ -35,6 +35,8 @@ $conf['http_accept']['nt'] = array('text/plain');
$conf['service']['prefix'] = 'service.'; $conf['service']['prefix'] = 'service.';
$conf['service']['class'] = 'classes/BasicSpecialFunction.php'; $conf['service']['class'] = 'classes/BasicSpecialFunction.php';
$conf['class']['prefix'] = 'class.';
//Frontpage when user goes to http://example.org/ //Frontpage when user goes to http://example.org/
$conf['root'] = 'index.html'; $conf['root'] = 'index.html';
$conf['extension_connector'] = '.'; $conf['extension_connector'] = '.';
......
...@@ -62,7 +62,6 @@ class ClassModule extends abstractModule{ ...@@ -62,7 +62,6 @@ class ClassModule extends abstractModule{
$t=Queries::getClass($uri, $endpoints['local']); $t=Queries::getClass($uri, $endpoints['local']);
list($modelFile, $viewFile) = $this::getModelandView($t, $extension); list($modelFile, $viewFile) = $this::getModelandView($t, $extension);
$base = $conf['view']['standard']; $base = $conf['view']['standard'];
$base['type'] = $modelFile; $base['type'] = $modelFile;
$base['this']['value'] = $uri; $base['this']['value'] = $uri;
...@@ -112,11 +111,11 @@ class ClassModule extends abstractModule{ ...@@ -112,11 +111,11 @@ class ClassModule extends abstractModule{
} }
arsort($typesAndValues); arsort($typesAndValues);
foreach($typesAndValues as $v => $w){ foreach($typesAndValues as $v => $w){
$auxViewFile = $conf['view']['directory'].$v.$conf['view']['extension'].".".$extension; $auxViewFile = $conf['view']['directory'].$conf['class']['prefix'].$v.'/'.$extension.'.template';
$auxModelFile = $conf['model']['directory'].$v.$conf['model']['extension'].".".$extension; $auxModelFile = $conf['model']['directory'].$conf['class']['prefix'].$v.'/'.$extension.'.queries';
if(file_exists($auxModelFile) && file_exists($auxViewFile) && $v != null){ if(file_exists($auxModelFile) && file_exists($auxViewFile) && $v != null){
$viewFile = $v.$conf['view']['extension'].".".$extension; $viewFile = $conf['class']['prefix'].$v.'/'.$extension.'.template';
$modelFile = $v.$conf['model']['extension'].".".$extension; $modelFile = $conf['class']['prefix'].$v.'/'.$extension.'.queries';
break; break;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment