Access control system description.

[fa-stable.git] / sql / alter2.2.php

diff --git a/sql/alter2.2.php b/sql/alter2.2.php
index 8d9e1449790e21fa05c86978edb32354aef9796f..d6827b8e977f0d3b4e51c365c07a7b42955d7267 100644 (file)
--- a/sql/alter2.2.php
+++ b/sql/alter2.2.php
@@ -28,7 +28,7 @@ class fa2_2 {
        {
                global $db, $systypes_array;
                
-               if (!$preconf)
+               if (!$this->preconf)
                        return false;
                
                // set item category dflt accounts to values from company GL setup
@@ -56,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));
@@ -167,7 +167,7 @@ function convert_roles($pref)
                        'SA_SALESBULKREP', 'SA_CUSTSTATREP', 'SA_SUPPLIERANALYTIC',
                        'SA_SUPPPAYMREP', 'SA_SUPPBULKREP', 'SA_ITEMSVALREP', 'SA_ITEMSANALYTIC',
                        'SA_BOMREP', 'SA_MANUFBULKREP', 'SA_DIMENSIONREP', 'SA_BANKREP', 'SA_GLREP',
-                       'SA_GLANALYTIC', 'SA_TAXREP', 'SA_SALESANALYTIC'),
+                       'SA_GLANALYTIC', 'SA_TAXREP', 'SA_SALESANALYTIC', 'SA_SALESQUOTE'),
                3 => array('SA_GLACCOUNTGROUP', 'SA_GLACCOUNTCLASS','SA_PAYMENT', 
                        'SA_DEPOSIT', 'SA_JOURNALENTRY', 'SA_INVENTORYMOVETYPE',
                        'SA_LOCATIONTRANSFER', 'SA_INVENTORYADJUSTMENT', 'SA_WORKCENTRES',
@@ -193,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) {
@@ -248,7 +248,7 @@ function fix_extensions() {
                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 no writeable'));
+               display_error(_('Cannot upgrade extensions system: file /modules/installed_modules.php is not writeable'));
                return false;
        }