Fix custom database names

diff --git a/db_structure.xml b/db_structure.xml
index f5d0f24505e500c52f1cff8a0438a9b0c2333491..7efb722bd721a0f6ee563301039ab7e25a35cad8 100755 (executable)
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <database>
 
- <name>owncloud</name>
+ <name>*dbname*</name>
  <create>true</create>
  <overwrite>false</overwrite>
 
@@ -9,7 +9,7 @@
 
  <table>
 
-  <name>groups</name>
+  <name>*dbprefix*groups</name>
 
   <declaration>
 
@@ -45,7 +45,7 @@
 
  <table>
 
-  <name>locks</name>
+  <name>*dbprefix*locks</name>
 
   <declaration>
 
@@ -173,7 +173,7 @@
 
  <table>
 
-  <name>log</name>
+  <name>*dbprefix*log</name>
 
   <declaration>
 
@@ -224,7 +224,7 @@
 
  <table>
 
-  <name>properties</name>
+  <name>*dbprefix*properties</name>
 
   <declaration>
 
@@ -289,7 +289,7 @@
 
  <table>
 
-  <name>user_group</name>
+  <name>*dbprefix*user_group</name>
 
   <declaration>
 
@@ -324,7 +324,7 @@
 
  <table>
 
-  <name>users</name>
+  <name>*dbprefix*users</name>
 
   <declaration>
 

diff --git a/inc/lib_base.php b/inc/lib_base.php
index 67dbcb2eac93ac66fe0f1d83f7daba9b1668ff31..5c9906d361d8fb7962271123f6b55414d54eea5f 100755 (executable)
--- a/inc/lib_base.php
+++ b/inc/lib_base.php
@@ -530,7 +530,17 @@ class OC_DB {
        
        static function createDBFromStructure($file){
                OC_DB::connect();
-               $definition=@self::$schema->parseDatabaseDefinitionFile($file);
+               global $CONFIG_DBNAME;
+               global $CONFIG_DBTABLEPREFIX;
+               $content=file_get_contents($file);
+               $file2=tempnam(sys_get_temp_dir(),'oc_db_scheme_');
+               echo $content;
+               $content=str_replace('*dbname*',$CONFIG_DBNAME,$content);
+               $content=str_replace('*dbprefix*',$CONFIG_DBTABLEPREFIX,$content);
+               echo $content;
+               file_put_contents($file2,$content);
+               $definition=@self::$schema->parseDatabaseDefinitionFile($file2);
+               unlink($file2);
                if($definition instanceof MDB2_Schema_Error){
                        die($definition->getMessage() . ': ' . $definition->getUserInfo());
                }