X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fmaintenance_db.inc;h=ba4d089225e79ccdd2ae1ad6204c5f8ff89eed0d;hb=c34e563fae8003a637a485b4eaf634678b90c60f;hp=ad3a32782a2d0fe5ea6232698abe4cbc00dcfc04;hpb=f564511bdad01d163c41aa4ec7cc80cc136fa262;p=fa-stable.git

diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index ad3a3278..ba4d0892 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
@@ -279,7 +282,9 @@ function db_import($filename, $connection, $force=true, $init=true, $protect=fal
 		"drop function if exists" => 'drop_queries',
 		"drop trigger if exists" => 'drop_queries',
 		"select" => 'data_queries', 
-		"delete" => 'data_queries', 
+		"delete" => 'data_queries',
+		"drop view if exists" => 'drop_queries',
+		"create view as" => 'data_queries'		//we should be able to create views after all tables have been created 
 		);
 
 	$protected = array(
@@ -306,6 +311,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']);
@@ -549,7 +555,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='')
@@ -562,8 +567,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";
@@ -596,8 +600,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();
@@ -645,99 +647,119 @@ function db_export($conn, $filename, $zip='no', $comment='')
 	{
 		foreach ($all_tables as $row)
 		{
-			$tablename = $row['Name'];
-			$auto_incr[$tablename] = $row['Auto_increment'];
-
-			$out.="\n\n";
-			// export tables
-			$out.="### Structure of table `".$tablename."` ###\n\n";
-
-			$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";
-
-			// export data
-			if (!$error)
-			{
-				$out.="### Data of table `".$tablename."` ###\n";
-
-				// check if field types are NULL or NOT NULL
-				$res3 = db_query("SHOW COLUMNS FROM `" . $tablename . "`");
-
-				$field_null = array();
-				for ($j = 0; $j < db_num_rows($res3); $j++)
-				{
-					$row3 = db_fetch($res3);
-					$field_null[] = $row3[2]=='YES' && $row3[4]===null;
-				}
-
-				$res2 = db_query("SELECT * FROM `" . $tablename . "`");
-				$maxinsert = 0;
-				$insert = '';
-				for ($j = 0; $j < db_num_rows($res2); $j++)
+			if (!empty($row['Engine'])) {	//don't export views like tables
+				$tablename = $row['Name'];
+				$auto_incr[$tablename] = $row['Auto_increment'];
+	
+				$out.="\n\n";
+				// export tables
+				$out.="### Structure of table `".$tablename."` ###\n\n";
+	
+				$out.="DROP TABLE IF EXISTS `".$tablename."`;\n\n";
+				$out.=$table_sql[$tablename];
+	
+				$out.=" ;";
+				$out.="\n\n";
+	
+				// export data
+				if (!$error)
 				{
-					$row2 = db_fetch_row($res2);
-					$values = '(';
-					for ($k = 0; $k < $nf = db_num_fields($res2); $k++)
+					$out.="### Data of table `".$tablename."` ###\n";
+	
+					// check if field types are NULL or NOT NULL
+					$res3 = db_query("SHOW COLUMNS FROM `" . $tablename . "`");
+	
+					$field_null = array();
+					for ($j = 0; $j < db_num_rows($res3); $j++)
 					{
-						$values .= db_escape($row2[$k], $field_null[$k]);
-						if ($k < ($nf - 1))
-							$values .= ', ';
+						$row3 = db_fetch($res3);
+						$field_null[] = $row3[2]=='YES' && $row3[4]===null;
 					}
-					$values .= ')';
-					$len = strlen($values);
-					if ($maxinsert < $len+1)
+	
+					$res2 = db_query("SELECT * FROM `" . $tablename . "`");
+					$maxinsert = 0;
+					$insert = '';
+					for ($j = 0; $j < db_num_rows($res2); $j++)
 					{
-						$maxinsert = EXPORT_MAX_INSERT;
-						if ($insert)
+						$row2 = db_fetch_row($res2);
+						$values = '(';
+						for ($k = 0; $k < $nf = db_num_fields($res2); $k++)
 						{
-							$out .= $insert .';'; // flush insert query
-							$insert = '';
+							$values .= db_escape($row2[$k], $field_null[$k]);
+							if ($k < ($nf - 1))
+								$values .= ', ';
+						}
+						$values .= ')';
+						$len = strlen($values);
+						if ($maxinsert < $len+1)
+						{
+							$maxinsert = EXPORT_MAX_INSERT;
+							if ($insert)
+							{
+								$out .= $insert .';'; // flush insert query
+								$insert = '';
+							}
+						}
+	
+						if ($insert == '')
+						{
+							$insert = "\nINSERT INTO `" . $tablename . "` VALUES\n";
+							$maxinsert -= strlen($insert);
+						} else {
+							$insert .= ",\n";
+						}
+	
+						$maxinsert -= $len;
+						$insert .= $values;
+	
+						// if saving is successful, then empty $out, else set error flag
+						if (strlen($out) > $max_size && $zip != "zip")
+						{
+							if (save_to_file($backupfile, $zip, $out))
+								$out = "";
+							else
+								$error = true;
 						}
 					}
-
-					if ($insert == '')
-					{
-						$insert = "\nINSERT INTO `" . $tablename . "` VALUES\n";
-						$maxinsert -= strlen($insert);
-					} else {
-						$insert .= ",\n";
-					}
-
-					$maxinsert -= $len;
-					$insert .= $values;
-
-					// if saving is successful, then empty $out, else set error flag
-					if (strlen($out) > $max_size && $zip != "zip")
-					{
-						if (save_to_file($backupfile, $zip, $out))
-							$out = "";
-						else
-							$error = true;
-					}
+					if ($insert)
+						$out .= $insert. ';';
+				// an error occurred! Try to delete file and return error status
+				}
+				elseif ($error)
+				{
+					@unlink($backupfile);
+					return false;
+				}
+	
+				// if saving is successful, then empty $out, else set error flag
+				if (strlen($out) > $max_size && $zip != "zip")
+				{
+					if (save_to_file($backupfile, $zip, $out))
+						$out= "";
+					else
+						$error = true;
+				}
+			}	//end if Engine set (not a view)
+		}
+		//process views last so all tables have been created before views are created
+		foreach ($all_tables as $row)
+		{
+			if (empty($row['Engine'])) {
+				$viewname = $row['Name'];
+				$out .= "\n\nDROP VIEW IF EXISTS `".$viewname."`;\n";
+				//db_get_view_schema() is in /includes/db/connect_db_mysqli.inc because it is mysql specific
+				if (NULL !== ($schema = db_get_view_schema($viewname)))
+				{
+					$out .= "CREATE VIEW `".$viewname."` AS ".$schema.";\n\n";
+					if (!save_to_file($backupfile, $zip, $out)) $error = true;
+					else $out = "";
+				}
+				else $error = true;
+				
+				if ($error) {
+					@unlink($backupfile);
+					return false;
 				}
-				if ($insert)
-					$out .= $insert. ';';
-			// an error occurred! Try to delete file and return error status
-			}
-			elseif ($error)
-			{
-				@unlink($backupfile);
-				return false;
-			}
-
-			// if saving is successful, then empty $out, else set error flag
-			if (strlen($out) > $max_size && $zip != "zip")
-			{
-				if (save_to_file($backupfile, $zip, $out))
-					$out= "";
-				else
-					$error = true;
 			}
 		}
 
@@ -749,8 +771,6 @@ function db_export($conn, $filename, $zip='no', $comment='')
 		return false;
 	}
 
-	//if ($zip == "zip")
-	//	$zip = $time;
 	if (save_to_file($backupfile, $zip, $out))
 	{
 		$out = "";