Synchronize meta-variable expansion rules in frontend with backend

Port the expandvars method from Savane::Feature to PHP, so that
the meta-variables such as PROJECT and REPO are handled similarly
by both backend and frontend.

* frontend/php/include/Group.class (_expandvars)
(_expandfield): New private functions.
(getTypeUrl,getTypeDir)
(getSubRepoUrl,getSubRepoDir): Rewrite using _expandfield.

1 files changed, 46 insertions, 8 deletions

diff --git a/frontend/php/include/Group.class b/frontend/php/include/Group.class
index e5b1a71..2880f6e 100644
--- a/frontend/php/include/Group.class
+++ b/frontend/php/include/Group.class
@@ -132,25 +132,63 @@ class Group extends Error
   # Url, Dir, CanUse, Permission
   # (all takes an argument)
 
+  private function _expandvars($subject, $repl)
+  {
+    $res = '';
+    while (preg_match('/(?<pref>[^{%]*)%(?:\{(?<x>[A-Z]+)\}|(?<y>[A-Z]+))(?<tail>.*)/', $subject, $matches))
+      {
+	$var = $matches['x'] ? $matches['x'] : $matches['y'];
+	
+	if (isset($repl[$var]) && $repl[$var] != '')
+	  {
+	    $res .= $matches['pref'] . $repl[$var];
+	    $subject = $matches['tail'];
+	  }
+	else if (preg_match('/(.*)\/$/', $matches['pref'], $m0)
+		 && preg_match('/^(?:([\/.].*))?$/',
+			       $matches['tail'],
+			       $m1))
+	  {
+	    $res .= $m0[1];
+	    $subject = $m1[1];
+	  }
+	else
+	  {
+	    $res .= $matches['pref'];
+	    $subject = $matches['tail'];
+	  }
+      }
+    return $res.$subject;
+  }
+  
+  private function _expandfield($field, $repl)
+  {
+    return $this->_expandvars($this->type_data_array[$field], $repl);
+  }
+  
   function getTypeUrl($artifact) 
-    { return ereg_replace("%PROJECT", $this->getUnixName(),
-			  $this->type_data_array['url_'.$artifact]);
+    {
+      return $this->_expandvars('url_'.$artifact,
+				array('PROJECT' => $this->getUnixName()));
     }
 
   function getTypeDir($artifact) 
-    { return ereg_replace("%PROJECT", $this->getUnixName(),
-			  $this->type_data_array['dir_'.$artifact]);
+    {
+      return $this->_expandvars('dir_'.$artifact,
+				array('PROJECT' => $this->getUnixName()));
     }
 
   function getSubRepoUrl($name,$artifact)
     {
-      return ereg_replace("%PROJECT", $this->getUnixName() . "/" . $name,
-	                  $this->type_data_array['url_'.$artifact]);
+      return $this->_expandvars('url_'.$artifact,
+				array('PROJECT' => $this->getUnixName(),
+				      'REPO' => $name));
     }
   function getSubRepoDir($name,$artifact)
     {
-      return ereg_replace("%PROJECT", $this->getUnixName() . "/" . $name,
-	                  $this->type_data_array['dir_'.$artifact]);
+      return $this->_expandvars('dir_'.$artifact,
+				array('PROJECT' => $this->getUnixName(),
+				      'REPO' => $name));
     }
   
   function CanUse($artifact)