Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/sites/database_edit.php

@@ -89,7 +89,7 @@
         }

         foreach ($tmp as $db_server) {
            $options_db_servers .= "<option value='$db_server[server_id]'>$db_server[server_name]</option>";
            $options_db_servers .= '<option value="'.$db_server['server_id'].'"'.($this->id > 0 && $this->dataRecord["server_id"] == $db_server['server_id'] ? ' selected="selected"' : '').'>'.$db_server['server_name'].'</option>';
         }

         $app->tpl->setVar("server_id", $options_db_servers);
@@ -112,7 +112,7 @@
         }

         foreach ($tmp as $db_server) {
            $options_db_servers .= "<option value='$db_server[server_id]'>$db_server[server_name]</option>";
            $options_db_servers .= '<option value="'.$db_server['server_id'].'"'.($this->id > 0 && $this->dataRecord["server_id"] == $db_server['server_id'] ? ' selected="selected"' : '').'>'.$db_server['server_name'].'</option>';
         }

         $app->tpl->setVar("server_id", $options_db_servers);
@@ -154,7 +154,8 @@

      if($this->id > 0) {
         //* we are editing a existing record
         $app->tpl->setVar("edit_disabled", 1);
         $edit_disabled = @($_SESSION["s"]["user"]["typ"] == 'admin')? 0 : 1; //* admin can change the database-name
         $app->tpl->setVar("edit_disabled", $edit_disabled);
         $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"]);
@@ -174,7 +175,7 @@
      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 db_servers, limit_database, limit_database_quota, parent_client_id 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, parent_client_id 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) {
@@ -261,7 +262,6 @@
               }
               unset($tmp);
            }

         }
      } else {
         // check if client of database parent domain is client of db user!
@@ -300,8 +300,11 @@
      $dbname_prefix = $app->tools_sites->getPrefix($old_record['database_name_prefix'], $dbname_prefix);
      $this->dataRecord['database_name_prefix'] = $dbname_prefix;

      if($old_record["database_name"] != $dbname_prefix . $this->dataRecord["database_name"]) {
         $app->tform->errorMessage .= $app->tform->wordbook["database_name_change_txt"].'<br />';
      //* Only admin can change the database name
      if ($_SESSION["s"]["user"]["typ"] != 'admin') {
         if($old_record["database_name"] != $dbname_prefix . $this->dataRecord["database_name"]) {
            $app->tform->errorMessage .= $app->tform->wordbook["database_name_change_txt"].'<br />';
         }
      }
      if($old_record["database_charset"] != $this->dataRecord["database_charset"]) {
         $app->tform->errorMessage .= $app->tform->wordbook["database_charset_change_txt"].'<br />';