Merge remote-tracking branch 'origin/main'

README.md

@@ -12,7 +12,9 @@ developers and businesses looking for a reliable and GDPR-compliant form managem
 - **Robust Admin Panel**: Manage your forms with ease using our user-friendly admin panel, designed for efficient and intuitive form management.
 - **Cost-Effective**: Designed to run smoothly on inexpensive hosting or free cloud services, reducing your operational costs.
 - **GDPR Compliant**: We prioritize your data privacy. PHPForm ensures that all your data remains yours, complying fully with GDPR regulations.
-- **Open Source**: Dive into the code, customize, and contribute! Our community-driven approach means PHPForm is continually evolving.
+- **Browser Push and Email notifications**: Get notified when a new form submission is received.
+- **reCaptcha Protection**: Protect your forms from spam and abuse with Google reCaptcha.
+- **Token-based Protection**: Ideal protection for mobile and desktop apps.
 
 # Requirements
 ### PHP Version
@@ -108,6 +110,20 @@ php bin/console doctrine:migrations:diff
 php bin/console doctrine:migrations:migrate
 ```
 
+## Troubleshooting
+#### Vendor folder is missing
+If you see an error that the vendor folder is missing, you need to install the dependencies.
+```
+Warning: require_once(/app/vendor/autoload_runtime.php): Failed to open stream: No such file or directory in /app/public/index.php on line 5
+```
+The main problem usually when you run composer install from the root user.
+If you still want to run composer install from the root user, you can use the following command:
+```bash
+COMPOSER_ALLOW_SUPERUSER=1 composer install
+```
+
+
+
 ## Deploy instructions
  - [Installing PHPForm on DigitalOcean Apps](https://medium.com/@ashelestov/installing-flexform-on-digitalocean-apps-b3e5b1ba868a)
 

src/Admin/Resources/templates/forms/index.html.twig

@@ -67,8 +67,8 @@
                             </a>
                         {% endif %}
                         {% if app.user.isSuperUser %}
-                            {% if (form.recaptchaToken|length == 0) %}
-                                <a class="tag is-danger is-light ml-1" title="Not protected!" href="{{ path('admin_forms_edit', { id: form.id }) }}">
+                            {% if (form.recaptchaToken|length == 0 and form.secret|length == 0) %}
+                                <a class="tag is-danger is-light ml-1" title="Please use token or reCaptcha protection" href="{{ path('admin_forms_token', { id: form.id }) }}">
                                     <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" style="width: 16px; height: 16px; fill: hsl(348, 100%, 61%);">
                                         <path d="M21.171,15.398l-5.912-9.854C14.483,4.251,13.296,3.511,12,3.511s-2.483,0.74-3.259,2.031l-5.912,9.856  c-0.786,1.309-0.872,2.705-0.235,3.83C3.23,20.354,4.472,21,6,21h12c1.528,0,2.77-0.646,3.406-1.771  C22.043,18.104,21.957,16.708,21.171,15.398z M12,17.549c-0.854,0-1.55-0.695-1.55-1.549c0-0.855,0.695-1.551,1.55-1.551  s1.55,0.696,1.55,1.551C13.55,16.854,12.854,17.549,12,17.549z M13.633,10.125c-0.011,0.031-1.401,3.468-1.401,3.468  c-0.038,0.094-0.13,0.156-0.231,0.156s-0.193-0.062-0.231-0.156l-1.391-3.438C10.289,9.922,10.25,9.712,10.25,9.5  c0-0.965,0.785-1.75,1.75-1.75s1.75,0.785,1.75,1.75C13.75,9.712,13.711,9.922,13.633,10.125z"/>
                                     </svg>