Fixed class constructor names.

[fa-stable.git] / admin / includes / fa_patch.class.inc

diff --git a/admin/includes/fa_patch.class.inc b/admin/includes/fa_patch.class.inc
index 880e24b9ff87afc7a75f1f71c42bafcec2f87e56..d16664053fcd835987e4363e9f8b5b519b97906f 100644 (file)
--- a/admin/includes/fa_patch.class.inc
+++ b/admin/includes/fa_patch.class.inc
@@ -9,7 +9,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-
+include_once($path_to_root."/includes/packages.inc");
 //
 //     Utility class contains basic database upgrade routines.
 //
@@ -24,9 +24,9 @@ class fa_patch {
        var $backup;                            // pre-upgrade backup filename
 
        var $errors = array();
-       var     $ma_upgrade_time = 300;
+       var     $max_upgrade_time = 300;
 
-       function fa_patch()
+       function __construct()
        {
                global $path_to_root;
 
@@ -48,6 +48,62 @@ class fa_patch {
                return false;
        }
 
+       /*
+               Selectively extends access to selected security areas/sections.
+       */
+       function update_security_roles($sec_updates)
+       {
+               global $security_areas, $security_sections;
+
+               $roles = db_query("SELECT * FROM ".TB_PREF."security_roles");
+
+               while($role = db_fetch($roles))
+               {
+                       $role['areas'] = explode(';', $role['areas']);
+                       $role['sections'] = explode(';', $role['sections']);
+                       foreach($sec_updates as $has => $add)
+                       {
+                               if (in_array($security_areas[$has][0], $role['areas']))
+                               {
+                                       $sections = array();
+                                       foreach($add as $area)
+                                       {
+                                               $role['areas'][] = $security_areas[$area][0];
+                                               $role['sections'][] = $security_areas[$area][0]&~0xff;
+                                       }
+                                       sort($role['areas']);
+                                       update_security_role($role['id'], $role['role'], $role['description'], 
+                                               array_values($role['sections']), array_values($role['areas']));
+                               }
+                       }
+               }
+               return true;
+       }
+
+       /*
+               Check and disable incompatible extensions.
+       */
+       function update_extensions()
+       {
+               global $version;
+
+               $mods = get_company_extensions();
+               $exts = get_company_extensions($this->cur_company);
+
+               $fixed = false;
+               foreach($mods as $key => $ins) {
+                       foreach($exts as $ext)
+                               if ($ext['name'] == $ins['name'] && (!check_src_ext_version($ins['version']))) {
+                                       $mods[$key]['active'] = false;
+                                       $this->log_error(sprintf(_("Uncompatible extension '%s' disabled for company %d."), $ins['name'], $this->cur_company), 'Notice');
+                                       $fixed = true;
+                                       continue 2;
+                               }
+               }
+               if ($fixed)
+                       write_extensions($mods, $this->cur_company);
+       }
+
        /*
                Pre-install maintenance: login to company, open upgrade log, make a backup
        */
@@ -70,6 +126,8 @@ class fa_patch {
                        return $this->log_error(sprintf(_("Cannot upgrade company %s: database version is incompatible ('%s' instead of '%s')."),
                                $this->cur_company, $cur_ver, $this->previous));
 
+               $this->update_extensions();     // disable uncompatible extensions
+
                if (!$this->prepare())  // fetch params, perform additional checks (if any)
                  return false;
 
@@ -137,7 +195,7 @@ class fa_patch {
                                if ($result)
                                        $this->log_error(_("Upgrade failed. Original database content restored successfully."), 'Info');
                                else
-                                       $thi->log_error(sprintf(_("Database restore operation failed. Original database content is in %s file."), $this->backup));
+                                       $this->log_error(sprintf(_("Database restore operation failed. Original database content is in %s file."), $this->backup));
                                $this->post_fail($this->cur_company);
                        }
                } else {