X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fmaintenance_db.inc;h=9fa78b999af3c8c4160d4e929298ac88a24da3e4;hb=5866801d02b8007f74ea5bfd15a8ecac7c1c58c1;hp=6a66ce08046108ce729e6bbea805e1d9bc3d2dae;hpb=5e63c6ace55729bbb5ee3b060035a25a4426eb0a;p=fa-stable.git

diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index 6a66ce08..9fa78b99 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";
 
@@ -105,6 +106,7 @@ function write_config_db($new = false)
 			}
 			// Close file
 			fclose($zp);
+			cache_invalidate($filename);
 		}
 	}
 	else
@@ -164,6 +166,7 @@ function write_extensions($extensions=null, $company = -1)
 		}
 		// Close file
 		fclose($zp);
+		cache_invalidate($filename);
 	}
 	return true;
 }
@@ -180,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;
@@ -207,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";
@@ -243,6 +245,7 @@ function write_lang()
 			}
 			// Close file
 			fclose($zp);
+			cache_invalidate($filename);
 		}
 	}
 	else
@@ -259,9 +262,9 @@ function write_lang()
 		$force - ignore duplicate errors
 		$init - presume $filename is initialization file with '0_' prefix
 		$protect - protect users/roles 
-		$return_errors - return errors instead of display them
+		$system - system upgrade; no constrains on queries, does not rearrange sql queries, returns collected errors
 */
-function db_import($filename, $connection, $force=true, $init=true, $protect=false, $return_errors=false)
+function db_import($filename, $connection, $force=true, $init=true, $protect=false, $system=false)
 {
 	global $db, $SysPrefs;
 
@@ -278,6 +281,8 @@ function db_import($filename, $connection, $force=true, $init=true, $protect=fal
 		"drop table if exists" => 'drop_queries',
 		"drop function if exists" => 'drop_queries',
 		"drop trigger if exists" => 'drop_queries',
+		"select" => 'data_queries', 
+		"delete" => 'data_queries', 
 		);
 
 	$protected = array(
@@ -302,10 +307,16 @@ 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");
+	db_query("SET sql_mode=''");
+
+	if (isset($connection['collation']))
+		db_set_collation($db, $connection['collation']);
+
 	$check_line_len = false;
-	// uncrompress gziped backup files
+
+	// uncompress gziped backup files
 	if (strpos($filename, ".gz") || strpos($filename, ".GZ"))
 	{	$lines = db_ungzip("lines", $filename);
 		$check_line_len = true;
@@ -328,29 +339,34 @@ function db_import($filename, $connection, $force=true, $init=true, $protect=fal
 
 		if ($query_table == '') 
 		{	// check if line begins with one of allowed queries
-		 	foreach($allowed_commands as $cmd => $table) 
-			{
-				if (strtolower(substr($line, 0, strlen($cmd))) == $cmd) 
+			if ($system) {
+				$query_table = 'data_queries';	// dont reorder queries, only standard delimiter allowed
+				${$query_table}[] = array('', $line_no+1);
+				$skip = false;
+			} else
+				foreach($allowed_commands as $cmd => $table) 
 				{
-					if ($cmd == 'delimiter') {
-						$delimiter = trim(substr($line, 10));
-						continue 2;
-					}
-					$query_table = $table;
-					$skip = false;
-					if ($protect)
+					if (strtolower(substr($line, 0, strlen($cmd))) == $cmd) 
 					{
-						foreach($protected as $protbl)
-							if (strpos($line, $connection["tbpref"].$protbl) !== false)
-							{
-								$skip = true; break;
-							}
+						if ($cmd == 'delimiter') {
+							$delimiter = trim(substr($line, 10));
+							continue 2;
+						}
+						$query_table = $table;
+						$skip = false;
+						if ($protect)
+						{
+							foreach($protected as $protbl)
+								if (strpos($line, $connection["tbpref"].$protbl) !== false)
+								{
+									$skip = true; break;
+								}
+						}
+						if (!$skip)
+							${$query_table}[] = array('', $line_no+1);
+						break;
 					}
-					if (!$skip)
-						${$query_table}[] = array('', $line_no+1);
-					break;
 				}
-		 	}
 		 }
 		 if($query_table != '')  // inside allowed query
 		 {
@@ -390,7 +406,7 @@ function db_import($filename, $connection, $force=true, $init=true, $protect=fal
 		if ($new_file) // import on old db is forbidden: this would destroy db content unless latin1 was used before in UI
 		{
 			$msg = _("This is new format backup file which cannot be restored on database not migrated to utf8.");
-			if ($return_errors)
+			if ($system)
 				return $msg;
 			else
 				display_error($msg);
@@ -412,7 +428,7 @@ function db_import($filename, $connection, $force=true, $init=true, $protect=fal
 	fclose($f);
 	}
 /*/
-	if ($return_errors)
+	if ($system)
 	{	// prevent errors display
 		$save_debug = $SysPrefs->go_debug;
 		$SysPrefs->go_debug = 0;
@@ -457,7 +473,7 @@ function db_import($filename, $connection, $force=true, $init=true, $protect=fal
 		}
 	}
 
-	if ($return_errors)
+	if ($system)
 		$SysPrefs->go_debug = $save_debug;
 
 	$SysPrefs->sql_trail = $trail;
@@ -468,7 +484,7 @@ function db_import($filename, $connection, $force=true, $init=true, $protect=fal
 	db_set_charset($db, $old_encoding); // restore connection encoding
 
 	if (count($sql_errors)) {
-		if ($return_errors)
+		if ($system)
 			return $sql_errors;
 
 		// display first failure message; the rest are probably derivative 
@@ -542,7 +558,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='')
@@ -555,8 +570,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";
@@ -589,8 +603,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();
@@ -648,9 +660,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";
 
@@ -742,8 +751,6 @@ function db_export($conn, $filename, $zip='no', $comment='')
 		return false;
 	}
 
-	//if ($zip == "zip")
-	//	$zip = $time;
 	if (save_to_file($backupfile, $zip, $out))
 	{
 		$out = "";