X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=admin%2Fdb%2Fmaintenance_db.inc;h=f621c2c2e6c5aee8df2a5a0c04e61406ed498cdd;hb=f3a66a48d134ae48f3107513b3acfae9cbc9cca9;hp=6ab542d0397a3f656d033d921fdb512d3a4d7309;hpb=73aeb6b0d87897b7773503bbf3781d64937b525f;p=fa-stable.git

diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index 6ab542d0..f621c2c2 100644
--- a/admin/db/maintenance_db.inc
+++ b/admin/db/maintenance_db.inc
@@ -71,7 +71,6 @@ function write_config_db($new = false)
 
 	if ($new)
 		$tb_pref_counter++;
-	$n = count($db_connections);
 	$msg = "<?php\n\n";
 	$msg .= "/*Connection Information for the database\n";
 	$msg .= "\$def_coy - the default company that is pre-selected on login\n\n";
@@ -105,6 +104,7 @@ function write_config_db($new = false)
 			}
 			// Close file
 			fclose($zp);
+			cache_invalidate($filename);
 		}
 	}
 	else
@@ -164,6 +164,7 @@ function write_extensions($extensions=null, $company = -1)
 		}
 		// Close file
 		fclose($zp);
+		cache_invalidate($filename);
 	}
 	return true;
 }
@@ -207,7 +208,6 @@ function write_lang()
 	global $path_to_root, $installed_languages, $dflt_lang;
 
 	$installed_languages = array_natsort($installed_languages, 'code', 'code');
-	$n = count($installed_languages);
 	$msg = "<?php\n\n";
 
 	$msg .= "/* How to make new entries here for non-packaged languages:\n\n";
@@ -243,6 +243,7 @@ function write_lang()
 			}
 			// Close file
 			fclose($zp);
+			cache_invalidate($filename);
 		}
 	}
 	else
@@ -304,8 +305,12 @@ function db_import($filename, $connection, $force=true, $init=true, $protect=fal
 
 	$old_encoding = db_get_charset($db);
 
-	ini_set("max_execution_time", "180");
+	ini_set("max_execution_time", max("180", ini_get("max_execution_time")));
 	db_query("SET foreign_key_checks=0");
+
+	if (isset($connection['collation']))
+		db_set_collation($db, $connection['collation']);
+
 	$check_line_len = false;
 
 	// uncompress gziped backup files
@@ -592,8 +597,6 @@ function db_export($conn, $filename, $zip='no', $comment='')
 		$out.="\n";
 	}
 
-    //$out.="use ".$db.";\n"; we don't use this option.
-
 	if (db_fixed())
 	{
 		db_set_encoding();
@@ -651,9 +654,6 @@ function db_export($conn, $filename, $zip='no', $comment='')
 			$out.="DROP TABLE IF EXISTS `".$tablename."`;\n\n";
 			$out.=$table_sql[$tablename];
 
-			// add auto_increment value
-//			if ($auto_incr[$tablename])
-//				$out.=" AUTO_INCREMENT=".$auto_incr[$tablename];
 			$out.=" ;";
 			$out.="\n\n";
 
@@ -745,8 +745,6 @@ function db_export($conn, $filename, $zip='no', $comment='')
 		return false;
 	}
 
-	//if ($zip == "zip")
-	//	$zip = $time;
 	if (save_to_file($backupfile, $zip, $out))
 	{
 		$out = "";