Merge branch 'stable-3.1'

Marius Burkard

2016-05-04 c3189ce6c7301c3ec17878fd3918f31d0d3cb18a

 interface/web/sites/database_user_edit.php

@@ -55,10 +55,10 @@

      // we will check only users, not admins
      if($_SESSION['s']['user']['typ'] == 'user') {
         if(!$app->tform->checkClientLimit('limit_database_users')) {
         if(!$app->tform->checkClientLimit('limit_database_user')) {
            $app->error($app->tform->wordbook["limit_database_user_txt"]);
         }
         if(!$app->tform->checkResellerLimit('limit_database_users')) {
         if(!$app->tform->checkResellerLimit('limit_database_user')) {
            $app->error('Reseller: '.$app->tform->wordbook["limit_database_user_txt"]);
         }
      }
@@ -169,10 +169,11 @@
      /* prepare password for MongoDB */
      // TODO: this still doens't work as when only the username changes we have no database_password.
      // taking the one from oldData doesn't work as it's encrypted...shit!
/*
      $this->dataRecord['database_password_mongo'] = $this->dataRecord['database_user'].":mongo:".$this->dataRecord['database_password'];

      $this->dataRecord['server_id'] = 0; // we need this on all servers

*/
      parent::onBeforeUpdate();
   }

@@ -206,7 +207,7 @@
      $this->dataRecord['server_id'] = 0; // we need this on all servers

      /* prepare password for MongoDB */
      $this->dataRecord['database_password_mongo'] = $this->dataRecord['database_user'].":mongo:".$this->dataRecord['database_password'];
//      $this->dataRecord['database_password_mongo'] = $this->dataRecord['database_user'].":mongo:".$this->dataRecord['database_password'];

      parent::onBeforeInsert();
   }