- Fixes: FS#3693 - sites_database_add doesn't set the sys_groupid parameter

Marius Cramer

2014-10-10 2f7e607a9d5331c5d5f56dec8bc167907a08ddad

 interface/web/sites/database_edit.php

@@ -275,7 +275,26 @@
            }
         }
      }

		
      if ($app->tform->errorMessage == '') {
         // force update of the used database user
         if($this->dataRecord['database_user_id']) {
            $user_old_rec = $app->db->queryOneRecord('SELECT * FROM `web_database_user` WHERE `database_user_id` = ' . $app->functions->intval($this->dataRecord['database_user_id']));
            if($user_old_rec) {
               $user_new_rec = $user_old_rec;
               $user_new_rec['server_id'] = $this->dataRecord['server_id'];
               $app->db->datalogSave('web_database_user', 'UPDATE', 'database_user_id', $this->dataRecord['database_user_id'], $user_old_rec, $user_new_rec);
            }
         }
         if($this->dataRecord['database_ro_user_id']) {
            $user_old_rec = $app->db->queryOneRecord('SELECT * FROM `web_database_user` WHERE `database_user_id` = ' . $app->functions->intval($this->dataRecord['database_ro_user_id']));
            if($user_old_rec) {
               $user_new_rec = $user_old_rec;
               $user_new_rec['server_id'] = $this->dataRecord['server_id'];
               $app->db->datalogSave('web_database_user', 'UPDATE', 'database_user_id', $this->dataRecord['database_ro_user_id'], $user_old_rec, $user_new_rec);
            }
         }
      }

      parent::onBeforeUpdate();
   }
@@ -344,6 +363,27 @@
         }
      }

      if ($app->tform->errorMessage == '') {
         // force update of the used database user
         if($this->dataRecord['database_user_id']) {
            $user_old_rec = $app->db->queryOneRecord('SELECT * FROM `web_database_user` WHERE `database_user_id` = ' . $app->functions->intval($this->dataRecord['database_user_id']));
            if($user_old_rec) {
               $user_new_rec = $user_old_rec;
               $user_new_rec['server_id'] = $this->dataRecord['server_id'];
               $app->db->datalogSave('web_database_user', 'UPDATE', 'database_user_id', $this->dataRecord['database_user_id'], $user_old_rec, $user_new_rec);
            }
         }
         if($this->dataRecord['database_ro_user_id']) {
            $user_old_rec = $app->db->queryOneRecord('SELECT * FROM `web_database_user` WHERE `database_user_id` = ' . $app->functions->intval($this->dataRecord['database_ro_user_id']));
            if($user_old_rec) {
               $user_new_rec = $user_old_rec;
               $user_new_rec['server_id'] = $this->dataRecord['server_id'];
               $app->db->datalogSave('web_database_user', 'UPDATE', 'database_user_id', $this->dataRecord['database_ro_user_id'], $user_old_rec, $user_new_rec);
            }
         }
      }


      parent::onBeforeInsert();
   }

@@ -365,9 +405,6 @@
      global $app;
      if(!empty($sql) && !$app->tform->isReadonlyTab($app->tform->getCurrentTab(), $this->id)) {

         $app->uses('sites_database_plugin');
         //$app->sites_database_plugin->processDatabaseUpdate($this);

         $app->db->query($sql);
         if($app->db->errorMessage != '') die($app->db->errorMessage);
      }
@@ -376,34 +413,15 @@
   function onAfterInsert() {
      global $app, $conf;

      if($this->dataRecord["parent_domain_id"] > 0) {
         $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval($this->dataRecord["parent_domain_id"]));

         //* The Database user shall be owned by the same group then the website
         $sys_groupid = $app->functions->intval($web['sys_groupid']);
         $backup_interval = $app->functions->intval($web['backup_interval']);
         $backup_copies = $app->functions->intval($web['backup_copies']);

         $sql = "UPDATE web_database SET sys_groupid = '$sys_groupid', backup_interval = '$backup_interval', backup_copies = '$backup_copies' WHERE database_id = ".$this->id;
         $app->db->query($sql);
      }
      $app->uses('sites_database_plugin');
      $app->sites_database_plugin->processDatabaseInsert($this);
   }

   function onAfterUpdate() {
      global $app, $conf;

      if($this->dataRecord["parent_domain_id"] > 0) {
         $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval($this->dataRecord["parent_domain_id"]));

         //* The Database user shall be owned by the same group then the website
         $sys_groupid = $app->functions->intval($web['sys_groupid']);
         $backup_interval = $app->functions->intval($web['backup_interval']);
         $backup_copies = $app->functions->intval($web['backup_copies']);

         $sql = "UPDATE web_database SET sys_groupid = '$sys_groupid', backup_interval = '$backup_interval', backup_copies = '$backup_copies' WHERE database_id = ".$this->id;
         $app->db->query($sql);
      }

      $app->uses('sites_database_plugin');
      $app->sites_database_plugin->processDatabaseUpdate($this);
   }

}