Store the state of reply and forward settings being enabled

admin/freeposte/admin/forms.py

@@ -42,15 +42,15 @@ class UserPasswordForm(Form):
 
 
 class UserForwardForm(Form):
-    forward_enabled = fields.BooleanField('Enable forwarding', default=False)
+    forward_enabled = fields.BooleanField('Enable forwarding')
-    forward = fields.StringField(
+    forward_destination = fields.StringField(
         'Destination', [validators.Optional(), validators.Email()]
     )
     submit = fields.SubmitField('Update')
 
 
 class UserReplyForm(Form):
-    reply_enabled = fields.BooleanField('Enable reply', default=False)
+    reply_enabled = fields.BooleanField('Enable automatic reply')
     reply_subject = fields.StringField('Reply subject')
     reply_body = fields.StringField('Reply body', widget=widgets.TextArea())
     submit = fields.SubmitField('Update')

admin/freeposte/admin/models.py

@@ -87,7 +87,9 @@ class User(Email):
     enable_pop = db.Column(db.Boolean(), nullable=False, default=True)
 
     # Filters
-    forward = db.Column(db.String(160), nullable=True, default=None)
+    forward_enabled = db.Column(db.Boolean(), nullable=False, default=False)
+    forward_destination = db.Column(db.String(255), nullable=True, default=None)
+    reply_enabled = db.Column(db.Boolean(), nullable=False, default=False)
     reply_subject = db.Column(db.String(255), nullable=True, default=None)
     reply_body = db.Column(db.Text(), nullable=True, default=None)
 

admin/freeposte/admin/templates/admin/list.html

@@ -14,8 +14,6 @@ Global administrators
     <tr>
       <th>Actions</th>
       <th>Email</th>
-      <th>Created</th>
-      <th>Last edit</th>
     </tr>
     {% for admin in admins %}
     <tr>
@@ -23,8 +21,6 @@ Global administrators
         <a href="{{ url_for('.admin_delete', admin=admin.email) }}" onclick="return confirm('Are you sure?')" title="Delete"><i class="fa fa-trash"></i></a>
       </td>
       <td>{{ admin }}</td>
-      <td>{{ admin.created_at }}</td>
-      <td>{{ admin.updated_at or '' }}</td>
     </tr>
     {% endfor %}
   </tbody>

admin/freeposte/admin/templates/manager/list.html

@@ -18,8 +18,6 @@ Manager list
     <tr>
       <th>Actions</th>
       <th>Email</th>
-      <th>Created</th>
-      <th>Last edit</th>
     </tr>
     {% for manager in domain.managers %}
     <tr>
@@ -27,8 +25,6 @@ Manager list
         <a href="{{ url_for('.manager_delete', manager=manager.email) }}" onclick="return confirm('Are you sure?')" title="Delete"><i class="fa fa-trash"></i></a>
       </td>
       <td>{{ manager }}</td>
-      <td>{{ manager.created_at }}</td>
-      <td>{{ manager.updated_at or '' }}</td>
     </tr>
     {% endfor %}
   </tbody>

admin/freeposte/admin/templates/user/forward.html

@@ -12,11 +12,10 @@ Forward emails
 <form class="form" method="post" role="form">
   {{ form.hidden_tag() }}
   {{ macros.form_field(form.forward_enabled,
-      onchange="if(this.checked){$('#forward').removeAttr('disabled')}
+      onchange="if(this.checked){$('#forward_destination').removeAttr('disabled')}
-                else{$('#forward').attr('disabled', '').val('')}",
+                else{$('#forward_destination').attr('disabled', '')}") }}
-      **{("checked" if user.forward else "unchecked"): ""}) }}
+  {{ macros.form_field(form.forward_destination,
-  {{ macros.form_field(form.forward,
+      **{("enabled" if user.forward_enabled else "disabled"): ""}) }}
-      **{("enabled" if user.forward else "disabled"): ""}) }}
   {{ macros.form_field(form.submit) }}
 </form>
 {% endblock %}

admin/freeposte/admin/templates/user/reply.html

@@ -13,8 +13,7 @@ Automatic reply
   {{ form.hidden_tag() }}
   {{ macros.form_field(form.reply_enabled,
       onchange="if(this.checked){$('#reply_subject,#reply_body').removeAttr('disabled')}
-                else{$('#reply_subject,#reply_body').attr('disabled', '').val('')}",
+                else{$('#reply_subject,#reply_body').attr('disabled', '')}") }}
-      **{("checked" if user.reply_subject else "unchecked"): ""}) }}
   {{ macros.form_field(form.reply_subject,
       **{("enabled" if user.reply_subject else "disabled"): ""}) }}
     {{ macros.form_field(form.reply_body, rows=10,

admin/freeposte/admin/views/fetches.py

@@ -10,11 +10,11 @@ import wtforms_components
 @app.route('/fetch/list/<user_email>', methods=['GET'])
 @flask_login.login_required
 def fetch_list(user_email):
-    user = utils.get_user(user_email, True)
+    user = utils.get_user(user_email)
     return flask.render_template('fetch/list.html', user=user)
 
 
-@app.route('/fetch/list', methods=['GET', 'POST'], defaults={'user_email': None})
+@app.route('/fetch/create', methods=['GET', 'POST'], defaults={'user_email': None})
 @app.route('/fetch/create/<user_email>', methods=['GET', 'POST'])
 @flask_login.login_required
 def fetch_create(user_email):

dovecot/sieve/before.sieve

@@ -1,14 +1,10 @@
 require ["variables", "vacation", "vnd.dovecot.extdata"];
 
-if string :is "${extdata.reply_subject}" "" {
+if ${extdata.reply_enabled} {
-
-} else {
   vacation :days 1 :subject "${extdata.reply_subject}" "${extdata.reply_body}";
 }
 
-if string :is "${extdata.forward}" "" {
+if ${extdata.forward_enabled} {
-
+  redirect "${extdata.forward_destination}";
-} else {
-  redirect "${extdata.forward}";
   keep;
 }