Merge branch 'master' into deuxfleurs

2 files changed, 13 insertions, 2 deletions

diff --git a/plugins/base/routes.go b/plugins/base/routes.go
index f426c96..52d1681 100644
--- a/plugins/base/routes.go
+++ b/plugins/base/routes.go
@@ -366,7 +366,8 @@ func handleLogin(ctx *alps.Context) error {
 		s, err := ctx.Server.Sessions.Put(username, password)
 		if err != nil {
 			if _, ok := err.(alps.AuthError); ok {
-				return ctx.Render(http.StatusOK, "login.html", &renderData)
+				renderData.BaseRenderData.GlobalData.Notice = "Failed to login!"
+				return ctx.Render(http.StatusUnauthorized, "login.html", &renderData)
 			}
 			return fmt.Errorf("failed to put connection in pool: %v", err)
 		}
@@ -1023,6 +1024,11 @@ func handleMove(ctx *alps.Context) error {
 		return echo.NewHTTPError(http.StatusBadRequest, err)
 	}
 
+	if len(uids) == 0 {
+		ctx.Session.PutNotice("No messages selected.")
+		return ctx.Redirect(http.StatusFound, fmt.Sprintf("/mailbox/%v", url.PathEscape(mboxName)))
+	}
+
 	to := formOrQueryParam(ctx, "to")
 	if to == "" {
 		return echo.NewHTTPError(http.StatusBadRequest, "missing 'to' form parameter")
@@ -1070,6 +1076,11 @@ func handleDelete(ctx *alps.Context) error {
 		return echo.NewHTTPError(http.StatusBadRequest, err)
 	}
 
+	if len(uids) == 0 {
+		ctx.Session.PutNotice("No messages selected.")
+		return ctx.Redirect(http.StatusFound, fmt.Sprintf("/mailbox/%v", url.PathEscape(mboxName)))
+	}
+
 	err = ctx.Session.DoIMAP(func(c *imapclient.Client) error {
 		if err := ensureMailboxSelected(c, mboxName); err != nil {
 			return err
diff --git a/plugins/carddav/routes.go b/plugins/carddav/routes.go
index fe7c37d..6c8a85f 100644
--- a/plugins/carddav/routes.go
+++ b/plugins/carddav/routes.go
@@ -141,7 +141,7 @@ func registerRoutes(p *plugin) {
 		var ao *carddav.AddressObject
 		var card vcard.Card
 		if addressObjectPath != "" {
-			ao, err := c.GetAddressObject(addressObjectPath)
+			ao, err = c.GetAddressObject(addressObjectPath)
 			if err != nil {
 				return fmt.Errorf("failed to query CardDAV address: %v", err)
 			}