Merge branch 'master' into 'master'

Marius Cramer

2015-06-07 fc0edb2f00bcdc6baaaa29f9041e82f3003b9b44

 interface/web/dashboard/dashlets/mailquota.php

@@ -3,10 +3,10 @@
class dashlet_mailquota {

   function show() {
      global $app, $conf;
      global $app;

      //* Loading Template
      $app->uses('tpl');
      $app->uses('tpl,quota_lib');

      $tpl = new tpl;
      $tpl->newTemplate("dashlets/templates/mailquota.htm");
@@ -16,7 +16,7 @@
      if(is_file($lng_file)) include $lng_file;
      $tpl->setVar($wb);

      $emails = $app->quota_lib->get_mailquota_data( ($_SESSION["s"]["user"]["typ"] != 'admin') ? $_SESSION['s']['user']['default_group'] : null);
      $emails = $app->quota_lib->get_mailquota_data( ($_SESSION["s"]["user"]["typ"] != 'admin') ? $_SESSION['s']['user']['client_id'] : null);
      //print_r($emails);

      $has_mailquota = false;