Merge branch 'development'

classes/Exporter.php

@@ -31,7 +31,11 @@ class Exporter{
   	array_push($triples, $t);
   	$t['o']      = LS.'Application';	
   	array_push($triples, $t);
-  	
+  	if($conf['parentApp'] != NULL){
+  	 	$t['p'] = OPMV.'wasDerivedFrom';
+  	 	$t['o'] = $conf['parentApp'];
+  	 	array_push($triples, $t);
+  	}
   	
   	$t['p']      = LS.'usedParameter';
   	$t['o']      = uniqid("_:b");

classes/Importer.php

@@ -58,7 +58,7 @@ class Importer{
 	//$arr = explode("lodspeakr/benegesserit", $this->basedir);
 	//$this->basedir = $arr[0];
 	$content .= "\$conf['basedir'] = \"$this->basedir\";\n";
-	
+	$content .= "\$conf['parentApp'] = \"$app\";\n";
 	$pwd = getcwd();
 	$content .= "\$conf['home'] = \"$pwd/\";\n";
 	
@@ -78,7 +78,12 @@ class Importer{
 	foreach($appParams  as $k => $v){
 	  $content .= "\$conf['$k'] = \"$v\";\n";
 	}
-	
+	$content .= "/*ATTENTION: By default this application is available to
+ * be exported and copied (its configuration)
+ * by others. If you do not want that, 
+ * turn the next option as false
+ */ 
+\$conf['export'] = true;\n\n";
 	//Components
   	foreach($compArr as $v){
   	  $component = $v['s'];

index.php

@@ -41,7 +41,7 @@ $extension = Utils::getExtension($acceptContentType);
 if($acceptContentType == NULL){
   Utils::send406($uri);
 }
-if(file_exists($conf['static']['directory'].$_GET['q']) && sizeof($_GET['q'])>0){
+if(sizeof($_GET['q'])>0 && file_exists($conf['static']['directory'].$_GET['q'])){
   echo file_get_contents($conf['static']['directory'].$_GET['q']);
   exit(0);
 }