- added incremental sql from merge request #73

Marius Cramer

2014-07-08 6e1bd90b34d295a4f12b8a0ec95a530d58e11f5c

 interface/web/sites/database_edit.php

@@ -73,22 +73,46 @@

         // Get the limits of the client
         $client_group_id = $_SESSION["s"]["user"]["default_group"];
         $client = $app->db->queryOneRecord("SELECT default_dbserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
         $client = $app->db->queryOneRecord("SELECT db_servers FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);

         // Set the webserver to the default server of the client
         $tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_dbserver]");
         $app->tpl->setVar("server_id", "<option value='$client[default_dbserver]'>$tmp[server_name]</option>");
         $tmp = $app->db->queryAllRecords("SELECT server_id, server_name FROM server WHERE server_id IN ($client[db_servers])");

         $only_one_server = count($tmp) === 1;
         $app->tpl->setVar('only_one_server', $only_one_server);

         if ($only_one_server) {
            $app->tpl->setVar('server_id_value', $tmp[0]['server_id']);
         }

         foreach ($tmp as $db_server) {
            $options_db_servers .= "<option value='$db_server[server_id]'>$db_server[server_name]</option>";
         }

         $app->tpl->setVar("server_id", $options_db_servers);
         unset($tmp);

      } elseif ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) {

         // Get the limits of the client
         $client_group_id = $_SESSION["s"]["user"]["default_group"];
         $client = $app->db->queryOneRecord("SELECT client.client_id, limit_web_domain, default_webserver, contact_name FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
         $client = $app->db->queryOneRecord("SELECT client.client_id, limit_web_domain, db_servers, contact_name FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);

         // Set the webserver to the default server of the client
         $tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_webserver]");
         $app->tpl->setVar("server_id", "<option value='$client[default_webserver]'>$tmp[server_name]</option>");
         $tmp = $app->db->queryAllRecords("SELECT server_id, server_name FROM server WHERE server_id IN ($client[db_servers])");

         $only_one_server = count($tmp) === 1;
         $app->tpl->setVar('only_one_server', $only_one_server);

         if ($only_one_server) {
            $app->tpl->setVar('server_id_value', $tmp[0]['server_id']);
         }

         foreach ($tmp as $db_server) {
            $options_db_servers .= "<option value='$db_server[server_id]'>$db_server[server_name]</option>";
         }

         $app->tpl->setVar("server_id", $options_db_servers);
         unset($tmp);

      } else {
@@ -126,6 +150,7 @@
         $app->tpl->setVar("edit_disabled", 1);
         $app->tpl->setVar("server_id_value", $this->dataRecord["server_id"]);
         $app->tpl->setVar("database_charset_value", $this->dataRecord["database_charset"]);
         $app->tpl->setVar("limit_database_quota", $this->dataRecord["database_quota"]);
      } else {
         $app->tpl->setVar("edit_disabled", 0);
      }
@@ -142,26 +167,65 @@
      if($_SESSION["s"]["user"]["typ"] != 'admin') {
         // Get the limits of the client
         $client_group_id = $_SESSION["s"]["user"]["default_group"];
         $client = $app->db->queryOneRecord("SELECT default_dbserver, limit_database FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
         $client = $app->db->queryOneRecord("SELECT db_servers, limit_database, limit_database_quota FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.groupid = $client_group_id");

         // When the record is updated
         if($this->id > 0) {
            // restore the server ID if the user is not admin and record is edited
            $tmp = $app->db->queryOneRecord("SELECT server_id FROM web_database WHERE database_id = ".$app->functions->intval($this->id));
            $tmp = $app->db->queryOneRecord("SELECT server_id FROM web_database WHERE database_id = ?", $app->functions->intval($this->id));
            $this->dataRecord["server_id"] = $tmp["server_id"];
            unset($tmp);
            //* Check client quota
            if ($client['limit_database_quota'] >= 0) {
               //* get the database prefix
               $app->uses('getconf,tools_sites');
               $global_config = $app->getconf->get_global_config('sites');
               $dbname_prefix = $app->tools_sites->replacePrefix($global_config['dbname_prefix'], $this->dataRecord);
               //* get quota from other databases
               $tmp = $app->db->queryOneRecord("SELECT sum(database_quota) as db_quota FROM web_database WHERE sys_groupid = ? AND database_name <> ?", $client_group_id, $dbname_prefix.$this->dataRecord['database_name']);
               $used_quota = $app->functions->intval($tmp['db_quota']);
               $new_db_quota = $app->functions->intval($this->dataRecord["database_quota"]);
               if(($used_quota + $new_db_quota > $client['limit_database_quota']) || ($new_db_quota < 0 && $client['limit_database_quota'] >= 0)) {
                  $max_free_quota = floor($client['limit_database_quota'] - $used_quota);
                  if($max_free_quota < 0) {
                     $max_free_quota = 0;
                  }
                  $app->tform->errorMessage .= $app->tform->lng("limit_database_quota_free_txt").": ".$max_free_quota." MB<br>";
                  $this->dataRecord['database_quota'] = $max_free_quota;
               }
               unset($tmp);
               unset($global_config);
               unset($dbname_prefix);
            }
            // When the record is inserted
         } else {
            // set the server ID to the default dbserver of the client
            $this->dataRecord["server_id"] = $client["default_dbserver"];
            $client['db_servers_ids'] = explode(',', $client['db_servers']);

            // Check if chosen server is in authorized servers for this client
            if (!(is_array($client['db_servers_ids']) && in_array($this->dataRecord["server_id"], $client['db_servers_ids'])) && $_SESSION["s"]["user"]["typ"] != 'admin') {
               $app->error($app->tform->wordbook['error_not_allowed_server_id']);
            }

            // Check if the user may add another database
            if($client["limit_database"] >= 0) {
               $tmp = $app->db->queryOneRecord("SELECT count(database_id) as number FROM web_database WHERE sys_groupid = $client_group_id");
               $tmp = $app->db->queryOneRecord("SELECT count(database_id) as number FROM web_database WHERE sys_groupid = ?", $client_group_id);
               if($tmp["number"] >= $client["limit_database"]) {
                  $app->error($app->tform->wordbook["limit_database_txt"]);
               }
            }

            //* Check client quota
            if ($client['limit_database_quota'] >= 0) {
               $tmp = $app->db->queryOneRecord("SELECT sum(database_quota) as db_quota FROM web_database WHERE sys_groupid = ?", $client_group_id);
               $db_quota = $tmp['db_quota'];
               $new_db_quota = $app->functions->intval($this->dataRecord["database_quota"]);
               if(($db_quota + $new_db_quota > $client['limit_database_quota']) || ($new_db_quota < 0 && $client['limit_database_quota'] >= 0)) {
                  $max_free_quota = floor($client['limit_database_quota'] - $db_quota);
                  if($max_free_quota < 0) $max_free_quota = 0;
                  $app->tform->errorMessage .= $app->tform->lng("limit_database_quota_free_txt").": ".$max_free_quota." MB<br>";
                  $this->dataRecord['database_quota'] = $max_free_quota;
               }
               unset($tmp);
            }

         }
@@ -242,11 +306,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');
@@ -259,7 +323,7 @@
                }
            */

            if($this->dataRecord['remote_access'] != 'y'){
            if(isset($this->dataRecord['remote_access']) && $this->dataRecord['remote_access'] != 'y'){
               $this->dataRecord['remote_ips'] = $server_config['ip_address'];
               $this->dataRecord['remote_access'] = 'y';
            } else {
@@ -275,7 +339,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();
   }
@@ -310,11 +393,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');
@@ -327,7 +410,7 @@
                }
            */

            if($this->dataRecord['remote_access'] != 'y'){
            if(isset($this->dataRecord['remote_access']) && $this->dataRecord['remote_access'] != 'y'){
               $this->dataRecord['remote_ips'] = $server_config['ip_address'];
               $this->dataRecord['remote_access'] = 'y';
            } else {
@@ -343,6 +426,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();
   }
@@ -380,9 +484,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->db->quote($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);
@@ -396,9 +500,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->db->quote($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);