Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-01-23 cf646e99be232c783dcbae86e329470674772749

 interface/web/sites/database_edit.php

@@ -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();
   }
@@ -371,6 +390,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();
   }