X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sql%2Falter2.2.php;h=89d9f1ffd86e398ce845ad1def019f70d644e326;hb=cc36638b65572da4867b7622723d6ed0135525b8;hp=21fa6822c7f5492f927e7a05739811b0e65c9c9d;hpb=22a3c4f6476f3925627d1a4c96d6ac3e515381f6;p=fa-stable.git

diff --git a/sql/alter2.2.php b/sql/alter2.2.php
index 21fa6822..89d9f1ff 100644
--- a/sql/alter2.2.php
+++ b/sql/alter2.2.php
@@ -14,6 +14,12 @@ class fa2_2 {
 	var $version = '2.2';	// version installed
 	var $description = 'Version 2.2';
 	var $sql = 'alter2.2.sql';
+	var $preconf = true;
+	
+	function fa2_2() {
+		$this->preconf = fix_extensions();
+	}
+	
 	//
 	//	Install procedure. All additional changes 
 	//	not included in sql file should go here.
@@ -21,6 +27,10 @@ class fa2_2 {
 	function install($pref, $force) 
 	{
 		global $db, $systypes_array;
+		
+		if (!$this->preconf)
+			return false;
+		
 		// set item category dflt accounts to values from company GL setup
 		$prefs = get_company_prefs();
 		$sql = "UPDATE {$pref}stock_category SET "
@@ -46,7 +56,7 @@ class fa2_2 {
 			if (db_num_rows($result)) {
 				while ($row = db_fetch($result)) {
 					$res2 = db_query("INSERT INTO {$pref}refs VALUES("
-						. $row['id'].",".$typeno.",'".$row['ref']."')");
+						. $row['id'].",".$typeno.",'".addslashes($row['ref'])."')");
 					if (!$res2) {
 						display_error(_("Cannot copy references from $tbl")
 							.':<br>'. db_error_msg($db));
@@ -116,7 +126,7 @@ class fa2_2 {
 	//	Test if patch was applied before.
 	//
 	function installed($pref) {
-		$n = 14; // number of features to be installed
+		$n = 15; // number of features to be installed
 		if (check_table($pref, 'company', 'custom1_name')) $n--;
 		if (!check_table($pref, 'company', 'profit_loss_year_act')) $n--;
 		if (!check_table($pref, 'company', 'login_tout')) $n--;
@@ -131,7 +141,8 @@ class fa2_2 {
 		if (!check_table($pref, 'suppliers', 'supp_ref')) $n--;
 		if (!check_table($pref, 'users', 'role_id')) $n--;
 		if (!check_table($pref, 'sales_orders', 'reference')) $n--;
-		return $n == 0 ? true : 14 - $n;
+		if (!check_table($pref, 'tags')) $n--;
+		return $n == 0 ? true : 15 - $n;
 	}
 };
 
@@ -182,7 +193,7 @@ function convert_roles($pref)
 		15 => array('SA_PRINTERS', 'SA_PRINTPROFILE', 'SA_BACKUP', 'SA_USERS',
 			'SA_POSSETUP'),
 		20 => array('SA_CREATECOMPANY', 'SA_CREATELANGUAGE', 'SA_CREATEMODULES',
-			'SA_SOFTWAREUPGRADE', 'SA_SECROLES')
+			'SA_SOFTWAREUPGRADE', 'SA_SECROLES', 'SA_DIMTAGS', 'SA_GLACCOUNTTAGS')
 		);
 		$new_ids = array();
 		foreach ($security_groups as $role_id => $areas) {
@@ -226,6 +237,52 @@ function import_security_role($pref, $name, $sections, $areas)
 	db_query($sql, "could not add new security role");
 }
 
+/*
+	Changes in extensions system.
+	This function is executed once on first Upgrade System display.
+*/
+function fix_extensions() {
+	global $path_to_root, $db_connections;
+
+	if (!file_exists($path_to_root.'/modules/installed_modules.php'))
+		return true; // already converted
+	
+	if (!is_writable($path_to_root.'/modules/installed_modules.php')) {
+		display_error(_('Cannot upgrade extensions system: file /modules/installed_modules.php is not writeable'));
+		return false;
+	}
+	
+	$exts = array();
+	include($path_to_root.'/installed_extensions.php');
+	foreach($installed_extensions as $ext) {
+		$ext['filename'] = $ext['app_file']; unset($ext['app_file']);
+		$ext['tab'] = $ext['name'];
+		$ext['name'] = access_string($ext['title'], true); 
+		$ext['path'] = $ext['folder']; unset($ext['folder']);
+		$ext['type'] = 'module';
+		$ext['active'] = '1';
+		$exts[] = $ext;
+	}
+
+	include($path_to_root.'/modules/installed_modules.php');
+	foreach($installed_modules as $mod) {
+		$mod['title'] = $mod['name'];
+		$mod['name'] = access_string($mod['name'], true);
+		$mod['type'] = 'plugin';
+		$ext['active'] = '1';
+		$exts[] = $mod;
+	}
+	if (!write_extensions($exts))
+		return false;
+	
+	$cnt = count($db_connections);
+	for ($i = 0; $i < $cnt; $i++)
+		write_extensions($exts, $i);
+
+	unlink($path_to_root.'/modules/installed_modules.php');
+	return true;
+}
+
 $install = new fa2_2;
 
 ?>
\ No newline at end of file