Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 4569cae57f127afd093794310ccd290d2d9fdf36

 interface/web/sites/database_user_edit.php

@@ -50,6 +50,22 @@

class page_action extends tform_actions {

   function onShowNew() {
      global $app;

      // we will check only users, not admins
      if($_SESSION['s']['user']['typ'] == 'user') {
         if(!$app->tform->checkClientLimit('limit_database_user')) {
            $app->error($app->tform->wordbook["limit_database_user_txt"]);
         }
         if(!$app->tform->checkResellerLimit('limit_database_user')) {
            $app->error('Reseller: '.$app->tform->wordbook["limit_database_user_txt"]);
         }
      }

      parent::onShowNew();
   }

   function onShowEnd() {
      global $app, $conf, $interfaceConf;