Code cleanup.

[fa-stable.git] / admin / db / maintenance_db.inc

diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index 1a73d00a9bc05c67f47f076413eb0a0e04b91e4d..1d9a027380273950d44cb58f32aa6ba175f6c2fe 100644 (file)
--- a/admin/db/maintenance_db.inc
+++ b/admin/db/maintenance_db.inc
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 function write_config_db($new = false)
 {
        global $path_to_root, $def_coy, $db_connections, $tb_pref_counter;
@@ -116,6 +125,7 @@ function db_import($filename, $connection, $force=true)
                "drop table if exists" => 'drop_queries');
        $ignored_mysql_errors = array( //errors ignored in normal (non forced) mode
                '1022', // duplicate key
+               '1050', // Table %s already exists
                '1060', // duplicate column name
                '1061', // duplicate key name
                '1062', // duplicate key entry
@@ -187,7 +197,7 @@ function db_import($filename, $connection, $force=true)
                        if (!db_query($drop_query[0]))
                        {
                                if (!in_array(db_error_no(), $ignored_mysql_errors))
-                                       $sql_errors[] = array(db_error_no().':'.db_error_msg($db), $drop_query[1]);
+                                       $sql_errors[] = array(db_error_msg($db), $drop_query[1]);
                        }
                }
        }
@@ -198,9 +208,10 @@ function db_import($filename, $connection, $force=true)
                foreach($table_queries as $table_query)
                {
                        if (!db_query($table_query[0]))
-                       {
-                               if (!$force || !in_array(db_error_no(), $ignored_mysql_errors))
+                       {       
+                               if (!$force && !in_array(db_error_no(), $ignored_mysql_errors)) {
                                        $sql_errors[] = array(db_error_msg($db), $table_query[1]);
+                               }
                        }
                }
        }
@@ -212,7 +223,7 @@ function db_import($filename, $connection, $force=true)
                {
                        if (!db_query($data_query[0]))
                        {
-                               if (!$force || !in_array(db_error_no(),$ignored_mysql_errors))
+                               if (!$force && !in_array(db_error_no(),$ignored_mysql_errors))
                                        $sql_errors[] = array(db_error_msg($db), $data_query[1]);
                        }
                }
@@ -631,5 +642,21 @@ function save_to_file($backupfile, $zip, $fileData)
     }
 }
 
-
+function create_comp_dirs($comp_path, $comp_subdirs)
+{
+               $index = "<?php\nheader(\"Location: ../index.php\");\n?>";
+           $cdir = $comp_path;
+           @mkdir($cdir);
+               $f = @fopen("$cdir/index.php", "wb");
+               @fwrite($f, $index);
+               @fclose($f);
+
+           foreach($comp_subdirs as $dir)
+           {
+                       @mkdir($cdir.'/'.$dir);
+                       $f = @fopen("$cdir/$dir/index.php", "wb");
+                       @fwrite($f, $index);
+                       @fclose($f);
+           }
+}
 ?>
\ No newline at end of file