and again

Dominik

2014-01-27 c930a0f799b9016a2938679ff0795e85ca18a88c

 interface/web/sites/database_edit.php

@@ -269,11 +269,11 @@
      }

      //* Check for duplicates
      $tmp = $app->db->queryOneRecord("SELECT count(database_id) as dbnum FROM web_database WHERE database_name = '".$this->dataRecord['database_name']."' AND server_id = '".$this->dataRecord["server_id"]."' AND database_id != '".$this->id."'");
      $tmp = $app->db->queryOneRecord("SELECT count(database_id) as dbnum FROM web_database WHERE database_name = '".$app->db->quote($this->dataRecord['database_name'])."' AND server_id = '".$app->functions->intval($this->dataRecord["server_id"])."' AND database_id != '".$this->id."'");
      if($tmp['dbnum'] > 0) $app->tform->errorMessage .= $app->lng('database_name_error_unique').'<br />';

      // get the web server ip (parent domain)
      $tmp = $app->db->queryOneRecord("SELECT server_id FROM web_domain WHERE domain_id = '".$this->dataRecord['parent_domain_id']."'");
      $tmp = $app->db->queryOneRecord("SELECT server_id FROM web_domain WHERE domain_id = '".$app->functions->intval($this->dataRecord['parent_domain_id'])."'");
      if($tmp['server_id'] && $tmp['server_id'] != $this->dataRecord['server_id']) {
         // we need remote access rights for this server, so get it's ip address
         $server_config = $app->getconf->get_server_config($tmp['server_id'], 'server');
@@ -302,7 +302,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();
   }
@@ -337,11 +356,11 @@
      }

      //* Check for duplicates
      $tmp = $app->db->queryOneRecord("SELECT count(database_id) as dbnum FROM web_database WHERE database_name = '".$this->dataRecord['database_name']."' AND server_id = '".$this->dataRecord["server_id"]."'");
      $tmp = $app->db->queryOneRecord("SELECT count(database_id) as dbnum FROM web_database WHERE database_name = '".$app->db->quote($this->dataRecord['database_name'])."' AND server_id = '".$app->functions->intval($this->dataRecord["server_id"])."'");
      if($tmp['dbnum'] > 0) $app->tform->errorMessage .= $app->tform->lng('database_name_error_unique').'<br />';

      // get the web server ip (parent domain)
      $tmp = $app->db->queryOneRecord("SELECT server_id FROM web_domain WHERE domain_id = '".$this->dataRecord['parent_domain_id']."'");
      $tmp = $app->db->queryOneRecord("SELECT server_id FROM web_domain WHERE domain_id = '".$app->functions->intval($this->dataRecord['parent_domain_id'])."'");
      if($tmp['server_id'] && $tmp['server_id'] != $this->dataRecord['server_id']) {
         // we need remote access rights for this server, so get it's ip address
         $server_config = $app->getconf->get_server_config($tmp['server_id'], 'server');
@@ -370,6 +389,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();
   }
@@ -407,9 +447,9 @@
         $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 = $web['sys_groupid'];
         $backup_interval = $web['backup_interval'];
         $backup_copies = $web['backup_copies'];
         $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);
@@ -423,9 +463,9 @@
         $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 = $web['sys_groupid'];
         $backup_interval = $web['backup_interval'];
         $backup_copies = $web['backup_copies'];
         $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);