Minor change in class.graphic.inc

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

diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index f1acc83aea6ec1477ce1bbfb4cab64ce6ed71040..9e0793f17c014173ac08dccb9fda2064329475c1 100644 (file)
--- a/admin/db/maintenance_db.inc
+++ b/admin/db/maintenance_db.inc
@@ -251,45 +251,6 @@ function write_lang()
        return true;
 }
 
-function db_create_db($connection)
-{
-       $db = mysql_connect($connection["host"] ,
-               $connection["dbuser"], $connection["dbpassword"]);
-       if (!mysql_select_db($connection["dbname"], $db))
-       {
-               $sql = "CREATE DATABASE " . $connection["dbname"] . "";
-               if (!mysql_query($sql))
-                       return 0;
-               mysql_select_db($connection["dbname"], $db);
-       }
-       return $db;
-}
-
-function db_drop_db($connection)
-{
-
-       if ($connection["tbpref"] == "")
-       {
-               $sql = "DROP DATABASE " . $connection["dbname"] . "";
-               return mysql_query($sql);
-       }
-       else
-       {
-       $res = db_query("show table status");
-       $all_tables = array();
-       while($row = db_fetch($res))
-               $all_tables[] = $row;
-        // get table structures
-               foreach ($all_tables as $table)
-               {
-                       if (strpos($table['Name'], $connection["tbpref"]) === 0)
-                               db_query("DROP TABLE `".$table['Name'] . "`");
-               }
-               //deleting the tables, how??
-               return true;
-       }
-}
-
 function db_import($filename, $connection, $force=true)
 {
        global $db, $go_debug;
@@ -482,7 +443,7 @@ function db_backup($conn, $ext='no', $comm='', $tbpref = TB_PREF)
 
 // generates a dump of $db database
 // $drop and $zip tell if to include the drop table statement or dry to pack
-function db_export($conn, $filename, $zip='no', $comment='', $tbpref = TB_PREF)
+function db_export($conn, $filename, $zip='no', $comment='', $tbpref = TB_PREF, $no_default=false)
 {
 
        global $app_title, $version, $power_url, $path_to_root;
@@ -573,6 +534,8 @@ function db_export($conn, $filename, $zip='no', $comment='', $tbpref = TB_PREF)
                        $out.="### Structure of table `".$tablename."` ###\n\n";
 
                        $out.="DROP TABLE IF EXISTS `".$tablename."`;\n\n";
+                       if ($no_default && ($def_pos = strpos($table_sql[$tablename], "DEFAULT CHARSET")) > 0)
+                               $table_sql[$tablename] = substr($table_sql[$tablename], 0, $def_pos);
                        $out.=$table_sql[$tablename];
 
                        // add auto_increment value
@@ -646,9 +609,6 @@ function db_export($conn, $filename, $zip='no', $comment='', $tbpref = TB_PREF)
                return false;
        }
 
-       // if (mysql_error()) return "DB_ERROR";
-       //@mysql_close($con);
-
        //if ($zip == "zip")
        //      $zip = $time;
        if (save_to_file($backupfile, $zip, $out))