From fb5edb6eedaae44485e16ce72d9b40d2748c8a06 Mon Sep 17 00:00:00 2001
From: dan <dan@techsaviours.org>
Date: Fri, 10 Feb 2023 23:03:28 +0100
Subject: [PATCH] (Grav GitSync) Automatic Commit from dan

---
 .../postgresql-major-update-v-15/item.en.md   | 23 +++++++++++++++++++
 plugins/form/CHANGELOG.md                     |  6 +++++
 plugins/form/blueprints.yaml                  |  2 +-
 plugins/form/classes/BasicCaptcha.php         | 12 +++++-----
 4 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 pages/01.blog/postgresql-major-update-v-15/item.en.md

diff --git a/pages/01.blog/postgresql-major-update-v-15/item.en.md b/pages/01.blog/postgresql-major-update-v-15/item.en.md
new file mode 100644
index 0000000..5353d29
--- /dev/null
+++ b/pages/01.blog/postgresql-major-update-v-15/item.en.md
@@ -0,0 +1,23 @@
+---
+title: 'PostgreSQL Major Update v.15'
+author: Dan
+published: true
+date: '10-02-2023 21:59'
+taxonomy:
+    category:
+        - news
+    tag:
+        - postgresql
+        - 'TECH SAVIOURS'
+        - matrix
+        - git
+        - gitea
+        - instance
+aura:
+    author: dan
+---
+
+The next server update ("Wednesday around 5pm NZ time (8am UTC)") includes a few hours of downtime.
+The reason is not really the major update of PostgreSQL. But we take the opportunity to clean up the database at the same time (especially for Matrix).
+
+This means that Matrix and our Git instance will be unavailable during this process.
\ No newline at end of file
diff --git a/plugins/form/CHANGELOG.md b/plugins/form/CHANGELOG.md
index 2d9c678..0156059 100644
--- a/plugins/form/CHANGELOG.md
+++ b/plugins/form/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v7.1.2
+## 01/08/2023
+
+1. [](#bugfix)
+   * Fixes issue with multiplication type BasicCaptcha Math Captcha [#587](https://github.com/getgrav/grav-plugin-form/issues/587)
+
 # v7.1.1
 ## 11/29/2022
 
diff --git a/plugins/form/blueprints.yaml b/plugins/form/blueprints.yaml
index 721487a..84f95c2 100644
--- a/plugins/form/blueprints.yaml
+++ b/plugins/form/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Form
 slug: form
 type: plugin
-version: 7.1.1
+version: 7.1.2
 description: Enables forms handling and processing
 icon: check-square
 author:
diff --git a/plugins/form/classes/BasicCaptcha.php b/plugins/form/classes/BasicCaptcha.php
index 4f5a169..61bc10b 100644
--- a/plugins/form/classes/BasicCaptcha.php
+++ b/plugins/form/classes/BasicCaptcha.php
@@ -32,20 +32,20 @@ class BasicCaptcha
             // calculator
             if ($operator === '-') {
                 if ($first_num < $second_num) {
-                    $result = "$second_num-$first_num";
-                    $captcha_code = $second_num-$first_num;
+                    $result = "$second_num - $first_num";
+                    $captcha_code = $second_num - $first_num;
                 } else {
                     $result = "$first_num-$second_num";
                     $captcha_code = $first_num - $second_num;
                 }
             } elseif ($operator === '*') {
-                $result = "{$first_num}x{$second_num}";
-                $captcha_code = $first_num - $second_num;
+                $result = "{$first_num} x {$second_num}";
+                $captcha_code = $first_num * $second_num;
             } elseif ($operator === '/') {
-                $result = "$first_num/ second_num";
+                $result = "$first_num / second_num";
                 $captcha_code = $first_num / $second_num;
             } elseif ($operator === '+') {
-                $result = "$first_num+$second_num";
+                $result = "$first_num + $second_num";
                 $captcha_code = $first_num + $second_num;
             }
         } else {