Testing new version of uri renaming

classes/Utils.php

@@ -468,10 +468,26 @@ class Utils{
   	  	}*/
   	  }else{
   	  	if(isset($value['uri']) && $value['uri'] == 1){
-  	  	  if($conf['mirror_external_uris']){
+  	  	  if($conf['mirror_external_uris'] != false){
   	  	  	$value['mirroredUri'] = $value['value'];
   	  	  }
-  	  	  $value['value'] = preg_replace("|^".$conf['ns']['local']."|", $conf['basedir'], $value['value']);
+  	  	  if(is_boolean($conf['mirror_external_uris'])){
+  	  	  	$value['value'] = preg_replace("|^".$conf['ns']['local']."|", $conf['basedir'], $value['value']);
+  	  	  }elseif(is_string($conf['mirror_external_uris'])){
+  	  	  	$value['value'] = preg_replace("|^".$conf['mirror_external_uris']."|", $conf['basedir'], $value['value']);
+  	  	  }elseif(is_array($conf['mirror_external_uris'])){
+  	  	  	foreach($conf['mirror_external_uris'] as $v){
+  	  	  	  $aux = preg_replace("|^".$conf['mirror_external_uris']."|", $conf['basedir'], $value['value']);
+  	  	  	  if($aux != $value['value']]){
+  	  	  	  	$value['value'] = $aux;
+  	  	  	  	break;
+  	  	  	  }
+  	  	  	}	  	  	
+  	  	  }else{
+  	  	  	Utils::send500("Error in mirroring configuration");
+  	  	  	exit(1);
+  	  	  }
+  	  	  
   	  	  $value['curie'] = Utils::uri2curie($value['value']);
   	  	  $array[$key] = $value;
   	  	}  	  	  	  	

classes/modules/serviceModule.php

@@ -64,7 +64,7 @@ class ServiceModule extends abstractModule{
   	  $prefixHeader = array();
   	  
   	  for($i=0;$i<sizeof($params);$i++){
-  	  	if($conf['mirror_external_uris']){
+  	  	if($conf['mirror_external_uris'] != false){
   	  	  $altUri = Utils::curie2uri($params[$i]);
   	  	  $altUri = preg_replace("|^".$conf['basedir']."|", $conf['ns']['local'], $altUri);
   	  	  $params[$i] = Utils::uri2curie($altUri);

classes/modules/typeModule.php

@@ -47,7 +47,7 @@ class TypeModule extends abstractModule{
   	}
   	
   	$uri = $res;
-  	if($conf['mirror_external_uris']){
+  	if($conf['mirror_external_uris'] != false){
   	  $localUri = preg_replace("|^".$conf['ns']['local']."|", $conf['basedir'], $res);
   	}
   	

classes/modules/uriModule.php

@@ -67,7 +67,7 @@ class UriModule extends abstractModule{
   	}
   	
   	$uri = $res;
-  	if($conf['mirror_external_uris']){
+  	if($conf['mirror_external_uris'] != false){
   	  $localUri = preg_replace("|^".$conf['ns']['local']."|", $conf['basedir'], $res);
   	}
   	

index.php

@@ -59,9 +59,20 @@ if($uri == $conf['basedir']){
 }
 
 //Configure external URIs if necessary
-if($conf['mirror_external_uris']){
-  $uri = $conf['ns']['local'].$_GET['q'];
+if($conf['mirror_external_uris'] != false){
   $localUri = $conf['basedir'].$_GET['q'];
+  
+  if(is_boolean($conf['mirror_external_uris'])){
+  	$uri = $conf['ns']['local'].$_GET['q'];
+  }elseif(is_string($conf['mirror_external_uris'])){
+  	$uri = $conf['mirror_external_uris'].$_GET['q'];
+  }elseif(is_array($conf['mirror_external_uris'])){
+  	$uri = $conf['ns']['local'].$_GET['q'];  	  	
+  }else{
+  	Utils::send500("Error in mirroring configuration");
+  	exit(1);
+  }
+  
 }
 
 

install.sh

@@ -53,7 +53,7 @@ while [ "$everything_ok" != "y" ]; do
   if [[ "$basedir" =~ ^"$ns" ]]; then
     external="false"
   else
-    external="true"
+    external=$ns
     extra="\$conf['ns']['base']   = '$basedir';"
   fi