alecpl
2010-04-29 3978d28ecd6c615635937419b6749dfac75bf768
- Fix quota_zero_as_unlimited (#1486662)


2 files modified
17 ■■■■ changed files
CHANGELOG 1 ●●●● patch | view | raw | blame | history
program/steps/mail/func.inc 16 ●●●● patch | view | raw | blame | history
CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
- Fix quota_zero_as_unlimited (#1486662)
- Fix folder subscription checking (#1486684)
- Fix INBOX appears (sometimes) twice in mailbox list (#1486672)
- Fix listing of attachments of some types e.g. "x-epoc/x-sisx-app" (#1486653)
program/steps/mail/func.inc
@@ -447,10 +447,10 @@
  $quota = $RCMAIL->imap->get_quota();
  $quota = $RCMAIL->plugins->exec_hook('quota', $quota);
  if (!isset($quota['used']) || !isset($quota['total']))
    return rcube_label('unknown');
  if (!$quota['total'] && $RCMAIL->config->get('quota_zero_as_unlimited'))
    return rcube_label('unlimited');
  if (!($quota['total']==0 && $RCMAIL->config->get('quota_zero_as_unlimited')))
  if ($quota['total'])
    {
    if (!isset($quota['percent']))
      $quota['percent'] = min(100, round(($quota['used']/max(1,$quota['total']))*100));
@@ -463,18 +463,18 @@
      $quota_result = array(
        'percent'     => $quota['percent'],
        'title'        => $quota_result,
    );
      );
      if ($attrib['width'])
        $quota_result['width'] = $attrib['width'];
      if ($attrib['height'])
        $quota_result['height']    = $attrib['height'];
      }
    }
  else
    return rcube_label('unlimited');
  return $quota_result;
      return $quota_result;
    }
  return rcube_label('unknown');
  }