Switch to new access levels system

[fa-stable.git] / admin / inst_upgrade.php

diff --git a/admin/inst_upgrade.php b/admin/inst_upgrade.php
index 9141808debec6d073754a488a8164527e1f844ef..d0cb4b1a35fd81a4ef362a2a556a26d865d5786b 100644 (file)
--- a/admin/inst_upgrade.php
+++ b/admin/inst_upgrade.php
@@ -1,15 +1,15 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-       Released under the terms of the GNU Affero General Public License,
-       AGPL, as published by the Free Software Foundation, either version 
-       3 of the License, or (at your option) any later version.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 20;
+$page_security = 'SA_SOFTWAREUPGRADE';
 $path_to_root="..";
 include_once($path_to_root . "/includes/session.inc");
 
@@ -29,7 +29,7 @@ include_once($path_to_root . "/includes/ui.inc");
 //
 function check_table($pref, $table, $field=null, $properties=null)
 {
-       $fields = db_query("SHOW COLUMNS FROM ".$pref.$table);
+       $fields = @db_query("SHOW COLUMNS FROM ".$pref.$table);
        if (!$fields)
                return 1;               // no such table or error
 
@@ -98,7 +98,7 @@ function upgrade_step($index, $conn)
        {
                if (!$inst->installed($pref) || $force) 
                {
-       //              if(!$inst->pre_check($pref)) return false;
+                       if (!$inst->pre_check($pref)) return false;
 
                        if ($sql != '')
                                $ret &= db_import($path_to_root.'/sql/'.$sql, $conn, $force);
@@ -134,13 +134,8 @@ if (get_post('Upgrade'))
                                ." '".$conn['name']."'");
                        continue;
                }
-       // create security backup               
-               if ($conn['tbpref'] != "")
-                       $filename = $conn['dbname'] . "_" . $conn['tbpref'] . date("Ymd_Hi") . ".sql";
-               else
-                       $filename = $conn['dbname'] . "_" . date("Ymd_Hi") . ".sql";
-
-               db_export($conn, $filename, 'no', 'Security backup before upgrade', $conn['tbpref']);
+       // create security backup       
+               db_backup($conn, 'no', 'Security backup before upgrade', $conn['tbpref']);
        // apply all upgrade data
                foreach ($installers as $i => $inst) 
                {
@@ -156,7 +151,13 @@ if (get_post('Upgrade'))
                if (!$ret) break;
        }
        if($ret)
+       {       // re-read the prefs
+               global $path_to_root;
+               include_once($path_to_root . "/admin/db/users_db.inc");
+               $user = get_user_by_login($_SESSION["wa_current_user"]->username);
+               $_SESSION["wa_current_user"]->prefs = new user_prefs($user);
                display_notification(_('All companies data has been successfully updated'));
+       }       
        $Ajax->activate('_page_body');
 }