X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fmaintenance_db.inc;h=e574fc98a012555ab2d373724ee96b2b3cc7605c;hb=f727374771773225a431a213de98aca84684f558;hp=5c81bcc694e9af867a125ee33b20eb5f4d07e506;hpb=9145a040396e901eda3fa154dcfaaa66004e568c;p=fa-stable.git

diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index 5c81bcc6..e574fc98 100644
--- a/admin/db/maintenance_db.inc
+++ b/admin/db/maintenance_db.inc
@@ -71,15 +71,16 @@ 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";
 	$msg .= "'host' - the computer ip address or name where the database is. The default is 'localhost' assuming that the web server is also the sql server.\n\n";
+	$msg .= "'port' - the computer port where the database is. The default is '3306'. Set empty for default.\n\n";
 	$msg .= "'dbuser' - the user name under which the company database should be accessed.\n";
 	$msg .= "  NB it is not secure to use root as the dbuser with no password - a user with appropriate privileges must be set up.\n\n";
 	$msg .= "'dbpassword' - the password required for the dbuser to authorise the above database user.\n\n";
 	$msg .= "'dbname' - the name of the database as defined in the RDMS being used. Typically RDMS allow many databases to be maintained under the same server.\n";
+	$msg .= "'collation' - the character set used for the database.\n";
 	$msg .= "'tbpref' - prefix on table names, or '' if not used. Always use non-empty prefixes if multiply company use the same database.\n";
 	$msg .= "*/\n\n\n";
 
@@ -182,7 +183,7 @@ function update_extensions($extensions) {
 	}
 
 	// update per company files
- 	$cnt = max(1, count($db_connections));
+ 	$cnt = max(1, count_array($db_connections));
 	for($i = 0; $i < $cnt; $i++) 
 	{
 		$newexts = $extensions;
@@ -209,7 +210,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";
@@ -309,6 +309,7 @@ function db_import($filename, $connection, $force=true, $init=true, $protect=fal
 
 	ini_set("max_execution_time", max("180", ini_get("max_execution_time")));
 	db_query("SET foreign_key_checks=0");
+	db_query("SET sql_mode=''");
 
 	if (isset($connection['collation']))
 		db_set_collation($db, $connection['collation']);
@@ -552,7 +553,6 @@ function db_backup($conn, $ext='no', $comm='', $path='')
 
 	return db_export($conn, $path . clean_file_name($filename), $ext, $comm);
 }
-//
 // Generates a dump of $db database
 //
 function db_export($conn, $filename, $zip='no', $comment='')
@@ -565,8 +565,7 @@ function db_export($conn, $filename, $zip='no', $comment='')
     $max_size = 1048576 * 2; // 2 MB
     // changes max size if value can be retrieved
     if (ini_get("memory_limit"))
-    	$max_size = 900000 * ini_get("memory_limit");
-
+    	$max_size = 1048576 * (int)ini_get("memory_limit");
     // set backupfile name
     if ($zip == "gzip")
     	$backupfile = $filename . ".gz";
@@ -599,8 +598,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();
@@ -658,9 +655,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";
 
@@ -752,8 +746,6 @@ function db_export($conn, $filename, $zip='no', $comment='')
 		return false;
 	}
 
-	//if ($zip == "zip")
-	//	$zip = $time;
 	if (save_to_file($backupfile, $zip, $out))
 	{
 		$out = "";