Skip to content

Commit f8f229c

Browse files
committed
Releasing 0.9.1
2 parents 43ba31f + 2bebba9 commit f8f229c

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
FROM eu.gcr.io/long-grin-186810/rs-php:7.4.4-apache-2.4.38.0
22
LABEL maintainer="Ralph Schuster <github@ralph-schuster.eu>"
33

4-
#RUN apt-get update && apt-get update && apt-get install -y --no-install-recommends \
5-
# patch \
6-
# && rm -rf /var/lib/apt/lists/*
4+
RUN apt-get update && apt-get update && apt-get install -y --no-install-recommends \
5+
patch \
6+
&& rm -rf /var/lib/apt/lists/*
77

88
#ADD etc/php/ /usr/local/etc/php/conf.d/
99
#ADD etc/conf/ /etc/apache2/conf-enabled/
@@ -18,8 +18,9 @@ RUN set -xe \
1818
&& curl -o postfixadmin.tar.gz -L "$PFA_URL" \
1919
&& tar --strip-components=1 -xvf postfixadmin.tar.gz \
2020
&& rm postfixadmin.tar.gz \
21-
&& mkdir templates_c \
22-
&& chown -R www-data:www-data .
21+
&& mkdir templates_c
2322

2423
ADD src/ /var/www/html/
24+
RUN patch model/MailboxHandler.php < MailboxHandler.php.patch
2525

26+
RUN chown -R www-data:www-data .

src/MailboxHandler.php.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
--- MailboxHandler.php.orig 2020-04-18 17:09:37.402734541 +0200
2+
+++ MailboxHandler.php 2020-04-18 17:10:37.162880214 +0200
3+
@@ -216,7 +216,7 @@
4+
5+
6+
protected function beforestore() {
7+
-
8+
+ if (!is_numeric($this->values['quota'])) $this->values['quota'] = 0;
9+
if (isset($this->values['quota']) && $this->values['quota'] != -1) {
10+
$multiplier = Config::read('quota_multiplier');
11+
if ($multiplier == 0 || !is_numeric($multiplier)) { // or empty string, or null, or false...
12+

0 commit comments

Comments
 (0)