+
+## Introduction
+
+Best practices are a set of guidelines that help you write code that is easy to read, understand, and maintain. They are a set of rules that you should follow when writing code. They are not rules that you must follow, but they are recommended.
+
+We follow the [WordPress Coding Standards](https://make.wordpress.org/core/handbook/best-practices/coding-standards/). For PHP, you can inspire from https://github.com/piotrplenik/clean-code-php
+
+But this is not enough...
+
+## Code for the Team
+
+> When you write code, you are not writing it for yourself. You are writing it for the team. You are writing it for the future you. You are writing it for the future team members. You are writing it for the future clients. -- Copilot, April 2023
+
+The sign of code quality are:
+- Easy to read and understand.
+- Easy to maintain.
+- Easy to extend.
+- Easy to debug.
+
+To general, let's make an example for it:
+
+Suppose you have this task: `Given a list of numbers, sum only the even numbers.`
+
+A simple book-like solution would be:
+
+```javascript
+const numbers = [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ];
+
+let sum = 0;
+
+for ( let i = 0; i < numbers.length; i++ ) {
+ if ( numbers[ i ] % 2 === 0 ) {
+ sum += numbers[ i ];
+ }
+}
+
+console.log( sum );
+```
+
+This is a simple solution. But it can be better. Let's refactor it:
+
+```javascript
+const numbers = [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ];
+
+const sum = numbers
+ .filter( ( number ) => number % 2 === 0 )
+ .reduce( ( sum, number ) => sum + number, 0 );
+
+console.log( sum );
+```
+
+Why is this better?
+
+- It is easier to read and understand. When you have a classic `for` loop, you need to read the whole loop to understand what it does. With the `filter` and `reduce` functions, you can understand what it does by reading only the first line. `filter` and `reduce` are specialized loops, they have a specific purpose.
+- Easy to maintain. It it easier to spot where to make a change.
+- Easy to extend. If the numbers are send as `string` instead of `number`, you can easily change the code to convert them to `number` before filtering and reducing. Example: Add `.map( ( number ) => parseInt( number, 10 ) )` before filter.
+- Easy to debug. The functionality is modular, so you can remove things one at the time and check them. One neat trick you can do is to create an inspection function like this:
+
+```javascript
+const inspect = ( value ) => {
+ console.log( value );
+ return value;
+};
+```
+
+Then, you can add it in the chain like this:
+
+```javascript
+const sum = numbers
+ .filter( ( number ) => number % 2 === 0 )
+ .map( inspect )
+ .reduce( ( sum, number ) => sum + number, 0 );
+```
+
+This will out the result at each step of the chain. This is very useful when you need to debug a chain of functions.
+
+The first version might me more faster, but if the code is running only at a press of a button or an event, it is not a big deal.
+
+## Elegant Code
+
+In era of generated code, we still need to have elegant code. At the end of the day, we are still writing code for humans (this might be obsolete in feature). We need to write code that is easy to read and understand.
+
+Since the beginning of coding, people made a lot of articles and principles about how to write elegant code. Here are some of them:
+
+- DRY (Don't Repeat Yourself) - [Wikipedia](https://en.wikipedia.org/wiki/Don%27t_repeat_yourself)
+- KISS (Keep It Simple, Stupid) - [Wikipedia](https://en.wikipedia.org/wiki/KISS_principle)
+- YAGNI (You Ain't Gonna Need It) - [Wikipedia](https://en.wikipedia.org/wiki/You_aren%27t_gonna_need_it)
+- SOLID - [Wikipedia](https://en.wikipedia.org/wiki/SOLID)
+- Design Patterns - [Wikipedia](https://en.wikipedia.org/wiki/Software_design_pattern)
+
+## Performance
+
+If you come from a background where performance is a big deal, you might be tempted to write code that is optimized for performance. Example: game development, HPC, etc.
+
+In this project, we do not have cases when the code must do a lot of things at a high rate (like rendering a scene in a game). So, we can write code that is easy to read and understand, and we can optimize it later if needed.
+
+> Early optimization is the root of all evil. -- Donald Knuth
+
+The challenge in this project is to extend the code to support more features. The more we have, the harder it will be to maintain the code. Fancy tricks without a good reason are not good.
+
+A piece code that is performant, easy to read and understand, and easy to maintain is the best. [But sometime you can not have it all](https://www.youtube.com/watch?v=hFDcoX7s6rE). So, you need to choose what is more important for your case.
\ No newline at end of file
diff --git a/docs/creating-blocks.md b/docs/creating-blocks.md
new file mode 100644
index 000000000..a87a25a7b
--- /dev/null
+++ b/docs/creating-blocks.md
@@ -0,0 +1,77 @@
+# Creating a new block for Otter
+
+A list of steps to follow so that your block is added correctly. This offer a general guideline on what to do and check when creating a new block. Usually you will copy the settings from an existing block and change the values.
+
+## Registration
+
+Suppose you want to create a new block called `my-card`.
+
+So, you make a new folder in `./src/blocks/blocks/` called `my-card`.
+
+Every block needs a `block.json`. This file contains the block's metadata, such as its name, description, category, icon, and other attributes definition.
+Then you create `index.js` and where you call the registration function `registerBlockType`.
+
+You need to import the `index.js` in the `./src/blocks/blocks/index.js` file (this file is one that make the initiation, you can check this on the `webpack.config.js` entry)(The block will not be registered if you don't do this.)
+
+In the root folder, at `./blocks.json`, add another entry with the name of your block and the location of the `block.json` file. (You can also have the option for pro block and their assets, add them based on your needs).
+
+Back to the `./src/blocks/blocks/my-card`. You can create the other files like: `edit.js`, `save.js`, `inspector.js`, `style.scss`, `editor.scss`.
+
+If your block has functionality for end user (aka frontend), you need to add the script in new folder at `./src/blocks/frontend/`. Then you need to add as an entry point in `./webpack.config.json` file. Then building the project, you will that the script is added independently in `./build/blocks/` (you need to run `npm run build` or `npm run start` if you do not see the folder `./build`). Then register that independent script in `./inc/class-registration.php` on `enqueue_dependencies` function (this function load the script for the end user if the block is present in page). (Tip: Add a `console.log('Loaded')` at the beginning of your script to check if it is loaded).
+
+## Adding content
+
+To add content you will usually have those files:
+- `edit.js` - This file contains the code for the Editor. What user see in the editor.
+- `save.js` - This file contains the code for the Frontend. What the end user see in the final page.
+- `inspector.js` - This file contains the code for the Inspector. What user see in the right sidebar. This is imported in `edit.js` file. Make sure to consult [Gutenberg Component Story Book](https://wordpress.github.io/gutenberg/?path=%2Fstory%2Fdocs-introduction--page) to see what components are available.
+- `style.scss` - The styling on what the end user see in the final page.
+- `editor.scss` - The styling on see in the editor. You can inherit the content from `style.scss` file. Thus this file will contains only changes for the Editor quirks (extra padding on some elements, different nesting on core components, etc.).
+- `controls.js` - This file will contains the controls component for the block (The bar that appears in the writing area when you select a block). This is imported in `edit.js` file.
+
+`save.js` can be omitted if the block is rendered dynamically on the frontend. This is usually when the block is very complex or its specification are not standard it will require changes in the future. You need to a create a PHP rendering class in `./inc/render/`, then register the class in `./inc/class-registration.php` on `register_blocks` function in `$dynamic_blocks` array.
+
+> Do not forget to run `composer dumpautoload -o` after you create a new PHP class.
+
+## Pro
+
+Pro feature need to be separated from the free version if it is possible. This is to make sure that the free version is not bloated with unnecessary code. The pro version will be loaded only if the user has the pro version of the plugin.
+
+Pro block are added in `./src/blocks/pro/`. The folder structure is the same as the free version.
+
+Some blocks are hybrid, free to use but with limited functionality (e.g.: Sticky, Popup). The pro features are added via JS WP hooks (in a style similar to the one from PHP). Learn more about them [here](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-hooks/).
+
+You need to be careful with using `useSelect` or `useDispatch` hooks inside a function that is a part of the filter. As mentioned in [Handbook](./handbook.md), use `console.count` to check how many times the function is called. Sometime we had unpleasant surprise when we found out that the function is called multiple times: [#799](https://github.com/Codeinwp/otter-blocks/issues/799).
+
+## Testing/Quality
+
+A good block has the following qualities:
+- It works as expected.
+- It does not break the editor.
+- It does not create performance issues.
+- Works well with other blocks if it is the case.
+
+To assert the quality of the block, have in sight those things:
+- It works with the minimum supported version of WordPress. (Sometimes, the supported version will be raised just to enable some new approach for an easy implementation of a feature, make sure to talk with the manager about this to be sure, otherwise you will probably re-implement the block if you find it to late).
+- It looks OK with other themes. We target Neve and WP default theme, but you should check with other popular themes since they may add some extra CSS property that might break the layout.
+- It works on environments that it is supposed to work: Full Side Editing Editor, Site Editor, Widgets Editor, Custom Neve Layouts, etc.
+
+Users want simple things from the block:
+- It should be easy to use.
+- It should be easy to understand.
+- It should to the job that is supposed to do (this will be very subjective if the indent of the block is not crystal clear).
+- It should not break their work. (Suppose you are a writer, you work 3 hours on a post and you add a block that breaks the layout the content is not saved, you will be very angry -- your are suppose to ease/add value to their work.).
+
+## Future Proof Block
+
+A future proof block is a block that will not break if the user updates the plugin. This is important because we want to make sure that the user will not lose the content if he updates the plugin. The same goes in reverse, if the user rolls back to an older version of the plugin, the block should not break.
+
+The pain point of this is the definition of the attributes, if you have an attributes that is initially a string and later you need an array, you will need to migrate the data. But it will create a problem if the user rolls back to an older version of the plugin since the old version might delete the new format of the data.
+
+For this to happen, you need to discuss with the manager about the attributes and how they will be used. If you are not sure, you can always ask for help. Sometime not even the team or manager can not be sure about it.
+
+The following question can help you to decide if the block is future proof: If tomorrow I will add more on this attribute, that will be the least painful data structure to work with it?
+
+Example: Suppose you have a simple boolean attribute called `save`. If true, the data will be saved on the database. But you think that data can be saved on multiple location: on disk, on cloud, etc. So instead of boolean, you can make it to a string that can have the following values: `database`, `disk`, `cloud`. You can also think that the data can be saved on multiple location at the same time. So you can make it to an array of strings. But this all can be done with a special string like `database,disk,cloud` or `database-disk-cloud`. You can propose those to the manager and team to decide which one is the best. But make sure that the decision is also best for you since you will be the one that will implement it and fix it if something goes wrong (some folks call this _ownership_).
+
+In a nutshell, the block is nice to be (backward compatible)[https://en.wikipedia.org/wiki/Backward_compatibility] with as many version possible since its creation.
\ No newline at end of file
diff --git a/docs/dynamic-conditions-and-content.md b/docs/dynamic-conditions-and-content.md
new file mode 100644
index 000000000..36f35a204
--- /dev/null
+++ b/docs/dynamic-conditions-and-content.md
@@ -0,0 +1,58 @@
+# Dynamic Block Conditions and Content
+
+One of the most powerful feature of Otter is the ability to dynamically change the content of page with blocks using conditions. This is a very powerful feature that allows you to create a single page that can be used for multiple purposes.
+
+E.g.: Showing a different content for logged in users and for guests.
+
+Dynamic content allow the user to easy change the content of the page without the need to update page for each case.
+
+E.g.: Switching images, switching links (imagine manually updating affiliate links for 100 posts).
+
+## Structure
+
+They are split into two parts: Free and Pro.
+
+The Pro part acts like an extension to the Free part.
+
+| Feature | Editor | Backend |
+| :-- | :-- | :-- |
+| Dynamic Block Conditions | `./src/blocks/plugins/conditions` | `./inc/plugins/class-block-conditions.php` |
+| Dynamic Content | `./src/blocks/plugins/dynamic-content` | `./inc/plugins/class-dynamic-content.php` |
+
+Extensions (Pro)
+
+| Feature | Editor | Backend |
+| :-- | :-- | :-- |
+| Dynamic Block Conditions | `./src/blocks/plugins/conditions` | `./plugins/otter-pro/class-block-conditions.php` |
+| Dynamic Content | `./src/blocks/pro/plugins/conditions` | `./plugins/otter-pro/class-dynamic-content.php` |
+
+
+## How it works
+
+### Dynamic Block Conditions
+
+Block Condition can be added via `Block Tools` in Inspector. It allows you to add conditions for the block to be displayed. There many options available, like: author, post type, logged in status, user role, etc. And even fancy integration with Stripe and WooCommerce.
+
+Once you set a condition, they are saved in the block attributes and are used to check if the block should be displayed or not using PHP.
+
+When the blocks are rendered, we parse the condition from the attribute `'otterConditions'`, then we check if their rule is true. You can check `render_blocks` function in `./inc/plugins/class-block-conditions.php` to see the workflow.
+
+The concept and workflow is simplistic. The hard part of this is making the evaluation function for each condition. When making a condition you need to have in sight:
+- performance. This function is called for each block on the page with the given condition, so it needs to be as fast as possible.
+- stability. You need to handle the errors and do not let the page crash.
+
+To add a new condition outside Otter context (e.g.: making a custom plugin for extending functionality), you need to add a new function to filter `otter_blocks_evaluate_condition`. You can see an example in `./plugins/otter-pro/class-block-conditions.php`.
+
+### Dynamic Content
+
+Dynamic Content is a feature that allows you to change the content of the block using conditions. It works similar to Dynamic Block Conditions, but instead of hiding the block, it changes the content of the block.
+
+In a page, you can active this by inserting the trigger `%` and then select what content you want to add.
+
+The workflow is similar with Block Conditions, but instead of checking if the block has an established attribute, we look for a _magic tag_ like `
About the Author
John Peterson
Tousled letterpre tote bag bicycle rights cliche twee hashtag pokpo demos tanero lamina sime voti. Quinoa ramps hashtag yuccie, selfies af wolf. Thundercats brunch gastropub whatever poutine tattooed godard bespoke blog seitan flannel jianbing bitters cloud.. Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
About the Author
John Peterson
Tousled letterpre tote bag bicycle rights cliche twee hashtag pokpo demos tanero lamina sime voti. Quinoa ramps hashtag yuccie, selfies af wolf. Thundercats brunch gastropub whatever poutine tattooed godard bespoke blog seitan flannel jianbing bitters cloud.. Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
A call to action section
A Call to action section
A call to action section
A Call to action section
"...Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque..."
Jason Doe
"...Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque..."
Jason Doe
A section with Flipboxes
This is a section description
Artworks
Finely crafted artworks
It\'s Party time!
This is the content of the back side. Customise it to match your needs.
Posters
Finely crafted artworks
It\'s Party time!
This is the content of the back side. Customise it to match your needs.
Museums
Finely crafted artworks
It\'s Party time!
This is the content of the back side. Customise it to match your needs.
A section with Flipboxes
This is a section description
Artworks
Finely crafted artworks
It\'s Party time!
This is the content of the back side. Customise it to match your needs.
Posters
Finely crafted artworks
It\'s Party time!
This is the content of the back side. Customise it to match your needs.
Museums
Finely crafted artworks
It\'s Party time!
This is the content of the back side. Customise it to match your needs.
Feature one
Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
Feature two
Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
Feature three
Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
Feature one
Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
Feature two
Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
Feature three
Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
This is an overline
This is Heading two
Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.
Service title
Synergestic actionables. Organic growth deep dive but circle back or but what\'s the real problem we\'re trying to solve here?
Service title
Synergestic actionables. Organic growth deep dive but circle back or but what\'s the real problem we\'re trying to solve here?
Service title
Synergestic actionables. Organic growth deep dive but circle back or but what\'s the real problem we\'re trying to solve here?
This is an overline
This is Heading two
Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.
Service title
Synergestic actionables. Organic growth deep dive but circle back or but what\'s the real problem we\'re trying to solve here?
Service title
Synergestic actionables. Organic growth deep dive but circle back or but what\'s the real problem we\'re trying to solve here?
Service title
Synergestic actionables. Organic growth deep dive but circle back or but what\'s the real problem we\'re trying to solve here?
Skills
Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta.
Skills
Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta.
People
Buildings
Nature
People
Buildings
Nature
Gallery section
A gallery with a text column and some text
Gallery section
A gallery with a text column and some text
Pumpkins & Penguins
Sed ut perspiciatis unde omnis iste natus
Pumpkins & Penguins
Sed ut perspiciatis unde omnis iste natus
Just another Section with a title on the side
Customisable
Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
Online
Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
Secure
Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
Strategic
Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
Just another Section with a title on the side
Customisable
Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
Online
Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
Secure
Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
Strategic
Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
Overline
Section with image
Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta.
Overline
Section with image
Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta.
Subheader
Services Content
Tousled letterpre tote bag bicycle rights cliche twee hashtag pokpo demos tanero lamina sime voti. Quinoa ramps hashtag yuccie, selfies af wolf. Thundercats brunch gastropub whatever poutine tattooed godard bespoke blog seitan flannel jianbing bitters cloud.
Service 1
Tousled letterpre tote bag bicycle rights cliche twee hashtag pokpo demos tanero lamina sime voti. Wolf moon shoreditch biodiesel hoodie kale chips bitter.
Service 3
Tousled letterpre tote bag bicycle rights cliche twee hashtag pokpo demos tanero lamina sime voti. Wolf moon shoreditch biodiesel hoodie kale chips bitter.
Service 2
Tousled letterpre tote bag bicycle rights cliche twee hashtag pokpo demos tanero lamina sime voti. Wolf moon shoreditch biodiesel hoodie kale chips bitter.
Subheader
Services Content
Tousled letterpre tote bag bicycle rights cliche twee hashtag pokpo demos tanero lamina sime voti. Quinoa ramps hashtag yuccie, selfies af wolf. Thundercats brunch gastropub whatever poutine tattooed godard bespoke blog seitan flannel jianbing bitters cloud.
Service 1
Tousled letterpre tote bag bicycle rights cliche twee hashtag pokpo demos tanero lamina sime voti. Wolf moon shoreditch biodiesel hoodie kale chips bitter.
Service 3
Tousled letterpre tote bag bicycle rights cliche twee hashtag pokpo demos tanero lamina sime voti. Wolf moon shoreditch biodiesel hoodie kale chips bitter.
Service 2
Tousled letterpre tote bag bicycle rights cliche twee hashtag pokpo demos tanero lamina sime voti. Wolf moon shoreditch biodiesel hoodie kale chips bitter.
Our Team
The whole is much more than the sum of it\'s part. Meet our team!
Jake Austin
Founder
Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
John Peterson
Technical Lead
Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
Mary Andrews
Marketing
Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
Josh Bourne
Support
Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
Our Team
The whole is much more than the sum of it\'s part. Meet our team!
Jake Austin
Founder
Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
John Peterson
Technical Lead
Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
Mary Andrews
Marketing
Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
Josh Bourne
Support
Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque.
"...Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque..."
Jason Doe
"...Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque..."
Jason Doe
"...Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque..."
Jason Doe
"...Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque..."
Jason Doe
"...Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque..."
Jason Doe
"...Sed ut perspiciatis unde omnis natus error sit voluptatem accusantium doloremque..."
Jason Doe
Overline
Section with image
Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque.
Overline
Section with image
Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque.
; ?>)
+
+
+
+
+ [^"\'<>]+)["\']|data-id=["\'](?P
+ ; ?>)
+
+
+
+ ';
+
+ foreach ( $options_array as $field_label ) {
+ if ( empty( $field_label ) ) {
+ continue;
+ }
+
+ $field_value = implode( '_', explode( ' ', sanitize_title( $field_label ) ) );
+ $field_id = 'field-' . $field_value;
+
+ $output .= $this->render_field( $field_type, $field_label, $field_value, $id, $field_id, $is_required );
+ }
+
+ $output .= '
';
+ }
+
+ $output .= '' . $help_text . '';
+
+ $output .= '';
+ return $output;
+ }
+
+ /**
+ * Render an input field.
+ *
+ * @param string $type The type of the field (checkbox, radio).
+ * @param string $label The label of the field.
+ * @param string $value The value of the field.
+ * @param string $name The name of the field.
+ * @param string $id The id of the field.
+ * @param bool $is_required The required status of the field.
+ * @return string
+ */
+ public function render_field( $type, $label, $value, $name, $id, $is_required = false ) {
+ $output = '';
+
+ $output .= '';
+ $output .= '';
+
+ $output .= '
';
+
+ return $output;
+ }
+
+ /**
+ * Render a select field.
+ *
+ * @param string $label The label of the field.
+ * @param array $options_array The options of the field.
+ * @param string $id The id of the field.
+ * @param bool $is_multiple The multiple status of the field.
+ * @param bool $is_required The required status of the field.
+ * @return string
+ */
+ public function render_select_field( $label, $options_array, $id, $is_multiple, $is_required ) {
+ $output = '';
+ $output .= '';
+ return $output;
+ }
+
+ /**
+ * Render the required sign.
+ *
+ * @param bool $is_required The required status of the field.
+ * @return string
+ */
+ public function render_required_sign( $is_required ) {
+ return $is_required ? '*' : '';
+ }
+}
diff --git a/inc/render/class-stripe-checkout-block.php b/inc/render/class-stripe-checkout-block.php
index 21d17fc9c..4bc65eed2 100644
--- a/inc/render/class-stripe-checkout-block.php
+++ b/inc/render/class-stripe-checkout-block.php
@@ -38,9 +38,9 @@ public function render( $attributes ) {
if ( false !== $status ) {
if ( 'success' === $status ) {
- $message = isset( $attributes['successMessage'] ) ? $attributes['successMessage'] : __( 'Your payment was successful. If you have any questions, please email orders@example.com.', 'otter-blocks' );
+ $message = isset( $attributes['successMessage'] ) ? wp_kses_post( $attributes['successMessage'] ) : __( 'Your payment was successful. If you have any questions, please email orders@example.com.', 'otter-blocks' );
} else {
- $message = isset( $attributes['cancelMessage'] ) ? $attributes['cancelMessage'] : __( 'Your payment was unsuccessful. If you have any questions, please email orders@example.com.', 'otter-blocks' );
+ $message = isset( $attributes['cancelMessage'] ) ? wp_kses_post( $attributes['cancelMessage'] ) : __( 'Your payment was unsuccessful. If you have any questions, please email orders@example.com.', 'otter-blocks' );
}
return sprintf( '', $message, $status );
diff --git a/inc/server/class-form-server.php b/inc/server/class-form-server.php
index 8f9bc5006..63d3ccf8f 100644
--- a/inc/server/class-form-server.php
+++ b/inc/server/class-form-server.php
@@ -11,10 +11,13 @@
use ThemeIsle\GutenbergBlocks\Integration\Form_Data_Request;
use ThemeIsle\GutenbergBlocks\Integration\Form_Data_Response;
use ThemeIsle\GutenbergBlocks\Integration\Form_Email;
+use ThemeIsle\GutenbergBlocks\Integration\Form_Field_Option_Data;
use ThemeIsle\GutenbergBlocks\Integration\Form_Providers;
use ThemeIsle\GutenbergBlocks\Integration\Form_Settings_Data;
+use ThemeIsle\GutenbergBlocks\Integration\Form_Utils;
use ThemeIsle\GutenbergBlocks\Integration\Mailchimp_Integration;
use ThemeIsle\GutenbergBlocks\Integration\Sendinblue_Integration;
+use ThemeIsle\GutenbergBlocks\Pro;
use WP_Error;
use WP_HTTP_Response;
use WP_REST_Request;
@@ -57,6 +60,10 @@ class Form_Server {
*/
const ANTI_SPAM_TIMEOUT = 5000; // 5 seconds
+ /**
+ * Autoresponder Email Error Expiration Time
+ */
+ const AUTO_RESPONDER_ERROR_EXPIRATION_TIME = 7 * 24 * 60; // 1 week
/**
* Initialize the class
@@ -111,11 +118,34 @@ public function init() {
)
);
- add_action( 'otter_form_before_submit', array( $this, 'before_submit' ) );
- add_action( 'otter_form_after_submit', array( $this, 'after_submit' ) );
- add_filter( 'otter_form_email_build_body', array( $this, 'build_email_content' ) );
- add_filter( 'otter_form_email_build_body_error', array( $this, 'build_email_error_content' ), 1, 2 );
+ /**
+ * Register utility filters for form data validation.
+ */
+ add_filter( 'otter_form_validate_form', array( $this, 'check_form_conditions' ) );
+ add_filter( 'otter_form_validate_form', array( $this, 'check_form_files' ) );
+
+ /**
+ * Register utility filters for bot detection (e.g.: captcha, honeypot methods).
+ */
add_filter( 'otter_form_anti_spam_validation', array( $this, 'anti_spam_validation' ) );
+ add_filter( 'otter_form_anti_spam_validation', array( $this, 'check_form_captcha' ) );
+
+ /**
+ * Register utility filters for form data preparation (e.g.: uploading files, database queries).
+ */
+ add_filter( 'otter_form_data_preparation', array( $this, 'change_provider_based_on_consent' ) );
+
+ /**
+ * Register utility filters for email content building.
+ */
+ add_filter( 'otter_form_email_build_body', array( $this, 'build_email_content' ) );
+ add_filter( 'otter_form_email_build_body_error', array( $this, 'build_email_error_content' ), 1 );
+
+ /**
+ * Register utility actions that triggers after the main submit action. Actions that clean the data, generated files or auxiliary actions.
+ */
+ add_action( 'otter_form_after_submit', array( $this, 'after_submit' ) );
+ add_action( 'otter_form_after_submit', array( $this, 'send_error_email_to_admin' ), 999 );
}
/**
@@ -198,79 +228,90 @@ public function editor( $request ) {
*
* @param WP_REST_Request $request Form request.
* @return WP_Error|WP_HTTP_Response|WP_REST_Response
+ * @throws \Exception Error.
* @since 2.0.3
*/
public function frontend( $request ) {
$res = new Form_Data_Response();
- $form_data = new Form_Data_Request( json_decode( $request->get_body(), true ) );
+ $form_data = new Form_Data_Request( $request );
try {
- // Check is the request is OK.
- $error_code = $this->check_form_conditions( $form_data );
-
- if ( $error_code ) {
- $res->set_code( $error_code );
- return $res->build_response();
- }
-
- // Verify the reCaptcha token.
- if ( $form_data->payload_has_field( 'token' ) ) {
- $result = $this->check_form_captcha( $form_data );
- if ( ! $result['success'] ) {
- $res->set_code( Form_Data_Response::ERROR_INVALID_CAPTCHA_TOKEN );
- return $res->build_response();
- }
- }
+ // Validate the form data.
+ $form_data = apply_filters( 'otter_form_data_validation', $form_data );
$form_options = Form_Settings_Data::get_form_setting_from_wordpress_options( $form_data->get_payload_field( 'formOption' ) );
$form_data->set_form_options( $form_options );
+ $form_data = $this->pull_fields_options_for_form( $form_data );
- $anti_bot_check = apply_filters( 'otter_form_anti_spam_validation', $form_data );
+ // Check bot validation.
+ $form_data = apply_filters( 'otter_form_anti_spam_validation', $form_data );
- if ( $anti_bot_check ) {
- do_action( 'otter_form_before_submit', $form_data );
+ // Prepare the form data.
+ $form_data = apply_filters( 'otter_form_data_preparation', $form_data );
+
+ // Check if $form_data has function get_error_code. Otherwise, it will throw an error.
+ if ( ! ( $form_data instanceof Form_Data_Request ) ) {
+ throw new \Exception( __( 'The form data class is not valid! Some hook is corrupting the data.', 'otter-blocks' ) );
+ }
+
+ if ( ! isset( $form_data ) || $form_data->has_error() ) {
+ $res->set_code( $form_data->get_error_code() );
+ } else {
// Select the submit function based on the provider.
$provider_handlers = apply_filters( 'otter_select_form_provider', $form_data );
if ( $provider_handlers && Form_Providers::provider_has_handler( $provider_handlers, $form_data->get( 'handler' ) ) ) {
// Send the data to the provider handler.
- $provider_response = $provider_handlers[ $form_data->get( 'handler' ) ]( $form_data );
-
- do_action( 'otter_form_after_submit', $form_data );
-
- return $provider_response;
+ $form_data = $provider_handlers[ $form_data->get( 'handler' ) ]( $form_data );
} else {
$res->set_code( Form_Data_Response::ERROR_PROVIDER_NOT_REGISTERED );
}
do_action( 'otter_form_after_submit', $form_data );
- } else {
- $res->set_code( Form_Data_Response::ERROR_BOT_DETECTED );
+
+ if ( ! ( $form_data instanceof Form_Data_Request ) ) {
+ throw new \Exception( __( 'The form data class is not valid after performing provider actions! Some hook is corrupting the data.', 'otter-blocks' ) );
+ }
+
+ if ( ! isset( $form_data ) || $form_data->has_error() ) {
+ $res->set_code( $form_data->get_error_code() );
+ } else {
+ $res->set_code( Form_Data_Response::SUCCESS_EMAIL_SEND );
+ $res->mark_as_success();
+ }
}
} catch ( Exception $e ) {
$res->set_code( Form_Data_Response::ERROR_RUNTIME_ERROR );
$res->add_reason( $e->getMessage() );
- $this->send_error_email( $e->getMessage(), $form_data );
+ $form_data->set_error( Form_Data_Response::ERROR_RUNTIME_ERROR, $e->getMessage() );
+ $this->send_error_email( $form_data );
+ } finally {
+ return $res->build_response();
}
-
- return $res->build_response();
}
-
/**
* Send Email using SMTP.
*
* @param Form_Data_Request $form_data Data from request body.
- * @return WP_Error|WP_HTTP_Response|WP_REST_Response
+ * @return Form_Data_Request
* @since 2.0.3
*/
public function send_default_email( $form_data ) {
- $res = new Form_Data_Response();
+
+ if ( ! isset( $form_data ) || $form_data->has_error() ) {
+ return $form_data;
+ }
try {
- $form_options = $form_data->get_form_options();
+ $form_options = $form_data->get_form_options();
+
+ if ( Pro::is_pro_active() && ! str_ends_with( $form_options->get_submissions_save_location(), 'email' ) ) {
+ return $form_data;
+ }
+
$email_subject = isset( $form_options ) && $form_options->has_email_subject() ? $form_options->get_email_subject() : ( __( 'A new form submission on ', 'otter-blocks' ) . get_bloginfo( 'name' ) );
$email_message = Form_Email::instance()->build_email( $form_data );
@@ -313,21 +354,73 @@ public function send_default_email( $form_data ) {
}
}
+ $attachments = array();
+ if ( $form_data->has_uploaded_files() && ! $form_data->can_keep_uploaded_files() ) {
+ foreach ( $form_data->get_uploaded_files_path() as $file ) {
+ if ( empty( $file['file_location_slug'] ) ) {
+ $attachments[] = $file['file_path'];
+ }
+ }
+ }
+
// phpcs:ignore
- $res->set_success( wp_mail( $to, $email_subject, $email_body, $headers ) );
- if ( $res->is_success() ) {
- $res->set_code( Form_Data_Response::SUCCESS_EMAIL_SEND );
- } else {
- $res->set_code( Form_Data_Response::ERROR_EMAIL_NOT_SEND );
+ $email_was_send = wp_mail( $to, $email_subject, $email_body, $headers, $attachments );
+ if ( ! $email_was_send ) {
+ $form_data->set_error( Form_Data_Response::ERROR_EMAIL_NOT_SEND );
}
} catch ( Exception $e ) {
- $res->set_code( Form_Data_Response::ERROR_RUNTIME_ERROR );
- $res->add_reason( $e->getMessage() );
- $this->send_error_email( $e->getMessage(), $form_data );
+ $form_data->set_error( Form_Data_Response::ERROR_RUNTIME_ERROR, array( $e->getMessage() ) );
+ $this->send_error_email( $form_data );
} finally {
- $form_options = $form_data->get_form_options();
- $res->add_values( $form_options->get_submit_data() );
- return $res->build_response();
+ return $form_data;
+ }
+ }
+
+ /**
+ * Email the admin when an important error occurs.
+ *
+ * @param Form_Data_Request $form_data The form request data.
+ * @since 2.2.3
+ */
+ public function send_error_email_to_admin( $form_data ) {
+ if ( ! isset( $form_data ) || ( ! $form_data instanceof Form_Data_Request ) || $form_data->has_error() || $form_data->has_warning() ) {
+
+ if ( ! isset( $form_data ) || ( ! $form_data instanceof Form_Data_Request ) ) {
+ $form_data = new Form_Data_Request( array() );
+ $form_data->set_error( Form_Data_Response::ERROR_RUNTIME_ERROR, array( __( 'Some hook is corrupting the Form processing pipeline.', 'otter-blocks' ) ) );
+ }
+
+ $send_email = false;
+
+ switch ( $form_data->get_error_code() ) {
+ case Form_Data_Response::ERROR_PROVIDER_CREDENTIAL_ERROR:
+ case Form_Data_Response::ERROR_MISSING_EMAIL:
+ case Form_Data_Response::ERROR_RUNTIME_ERROR:
+ $send_email = true;
+ break;
+ }
+
+ if (
+ ! $send_email &&
+ $form_data->has_warning() &&
+ $form_data->has_warning_codes(
+ array(
+ Form_Data_Response::ERROR_AUTORESPONDER_COULD_NOT_SEND,
+ Form_Data_Response::ERROR_AUTORESPONDER_MISSING_EMAIL_FIELD,
+ )
+ )
+ ) {
+ $key = $form_data->get_form_option_id() . '_autoresponder_error';
+
+ if ( ! get_transient( $key ) ) {
+ $send_email = true;
+ set_transient( $key, true, self::AUTO_RESPONDER_ERROR_EXPIRATION_TIME );
+ }
+ }
+
+ if ( $send_email ) {
+ $this->send_error_email( $form_data );
+ }
}
}
@@ -335,9 +428,13 @@ public function send_default_email( $form_data ) {
* Make additional changes before using the main handler function for submitting.
*
* @param Form_Data_Request $form_data The form request data.
+ * @return Form_Data_Request
* @since 2.0.3
*/
- public function before_submit( $form_data ) {
+ public function change_provider_based_on_consent( $form_data ) {
+ if ( ! isset( $form_data ) || $form_data->has_error() ) {
+ return $form_data;
+ }
// If there is no consent, change the service to send only an email.
if (
@@ -349,6 +446,8 @@ public function before_submit( $form_data ) {
) {
$form_data->change_provider( 'default' );
}
+
+ return $form_data;
}
/**
@@ -360,6 +459,10 @@ public function before_submit( $form_data ) {
*/
public function after_submit( $form_data ) {
+ if ( ! isset( $form_data ) || $form_data->has_error() ) {
+ return;
+ }
+
// Send also an email to the form editor/owner with the data alongside the subscription.
if (
'submit-subscribe' === $form_data->get_form_options()->get_action() &&
@@ -374,10 +477,13 @@ public function after_submit( $form_data ) {
* Check if the form was not completed by a bot.
*
* @param Form_Data_Request $form_data The form request data.
- * @return boolean
+ * @return Form_Data_Request
* @since 2.2.3
*/
public function anti_spam_validation( $form_data ) {
+ if ( ! isset( $form_data ) || $form_data->has_error() ) {
+ return $form_data;
+ }
if (
$form_data->payload_has_field( 'antiSpamTime' ) &&
@@ -388,25 +494,30 @@ public function anti_spam_validation( $form_data ) {
$form_data->get_payload_field( 'antiSpamTime' ) >= self::ANTI_SPAM_TIMEOUT &&
'' === $form_data->get_payload_field( 'antiSpamHoneyPot' )
) {
- return true;
+ return $form_data;
}
}
- return false;
+ $form_data->set_error( Form_Data_Response::ERROR_BOT_DETECTED );
+ return $form_data;
}
/**
* Send an email about error, like: the integration api key is no longer valid.
*
- * @param string $error The error message.
* @param Form_Data_Request $form_data The form request data.
* @return void
* @since 2.0.3
*/
- public static function send_error_email( $error, $form_data ) {
+ public static function send_error_email( $form_data ) {
+
+ if ( ! isset( $form_data ) ) {
+ $form_data = new Form_Data_Request( array() );
+ }
+
$email_subject = ( __( 'An error with the Form blocks has occurred on ', 'otter-blocks' ) . get_bloginfo( 'name' ) );
- $email_message = Form_Email::instance()->build_error_email( $error, $form_data );
- $email_body = apply_filters( 'otter_form_email_build_body_error', $error, $email_message );
+ $email_message = Form_Email::instance()->build_error_email( $form_data );
+ $email_body = apply_filters( 'otter_form_email_build_body_error', $email_message );
// Sent the form date to the admin site as a default behaviour.
$to = sanitize_email( get_site_option( 'admin_email' ) );
$headers = array( 'Content-Type: text/html; charset=UTF-8', 'From: ' . esc_url( get_site_url() ) );
@@ -533,21 +644,22 @@ public function test_subscription_service( $form_data ) {
* Subscribe the user to a service.
*
* @param Form_Data_Request $form_data The form data.
- * @return WP_Error|WP_HTTP_Response|WP_REST_Response
+ * @return Form_Data_Request
* @since 2.0.3
*/
public function subscribe_to_service( $form_data ) {
- $res = new Form_Data_Response();
+ if ( ! isset( $form_data ) || $form_data->has_error() ) {
+ return $form_data;
+ }
try {
// Get the first email from form.
- $email = $this->get_email_from_form_input( $form_data );
+ $email = $form_data->get_email_from_form_input();
if ( '' === $email ) {
- self::send_error_email( __( 'Marketing Integration is active, but there is no Email field in the form. Please check your Form block settings in the page.', 'otter-blocks' ), $form_data );
- $res->mark_as_success();
- return $res->build_response();
+ $form_data->set_error( Form_Data_Response::ERROR_MISSING_EMAIL, array( __( 'Marketing Integration is active, but there is no Email field in the form. Please check your Form block settings in the page.', 'otter-blocks' ) ) );
+ return $form_data;
}
if (
@@ -555,8 +667,7 @@ public function subscribe_to_service( $form_data ) {
$form_data->payload_has_field( 'consent' ) &&
! $form_data->get_payload_field( 'consent' )
) {
- $res->mark_as_success();
- return $res->build_response();
+ return $form_data;
}
// Get the api credentials from the Form block.
@@ -580,46 +691,39 @@ public function subscribe_to_service( $form_data ) {
$valid_api_key = $service::validate_api_key( $wp_options_form->get_api_key() );
if ( $valid_api_key['valid'] ) {
- $res->copy( $service->subscribe( $email ) );
+ $form_data = $service->subscribe( $form_data );
} else {
- $res->set_code( $valid_api_key['code'] );
+ $form_data->set_error( $valid_api_key['code'] );
}
} else {
- $res->set_code( $error_code );
+ $form_data->set_error( $error_code );
}
} catch ( Exception $e ) {
- $res->set_code( Form_Data_Response::ERROR_RUNTIME_ERROR );
- $res->add_reason( $e->getMessage() );
- $this->send_error_email( $e->getMessage(), $form_data );
+ $form_data->set_error( Form_Data_Response::ERROR_RUNTIME_ERROR, array( $e->getMessage() ) );
+ $this->send_error_email( $form_data );
} finally {
- // Handle the case when the credential are no longer valid.
- if ( $res->is_credential_error() ) {
- self::send_error_email( 'error', $form_data );
- }
- $form_options = $form_data->get_form_options();
- $res->add_values( $form_options->get_submit_data() );
-
- return $res->build_response();
+ return $form_data;
}
}
/**
* Check for required data.
*
- * @param Form_Data_Request $data Data from the request.
+ * @param Form_Data_Request $form_data Data from the request.
*
* @return boolean
* @since 2.0.0
*/
- public function has_required_data( $data ) {
- $main_fields_set = $data->are_fields_set(
+ public function has_required_data( $form_data ) {
+
+ $main_fields_set = $form_data->are_fields_set(
array(
'handler',
'payload',
)
);
- $required_payload_fields = $data->are_payload_fields_set(
+ $required_payload_fields = $form_data->are_payload_fields_set(
array(
'nonceValue',
'postUrl',
@@ -628,7 +732,7 @@ public function has_required_data( $data ) {
)
);
- $is_nonce_valid = wp_verify_nonce( $data->get_payload_field( 'nonceValue' ), 'form-verification' );
+ $is_nonce_valid = wp_verify_nonce( $form_data->get_payload_field( 'nonceValue' ), 'form-verification' );
return $main_fields_set && $required_payload_fields && $is_nonce_valid;
}
@@ -639,25 +743,20 @@ public function has_required_data( $data ) {
* @access public
* @param Form_Data_Request $form_data Data from the request.
*
- * @return string
+ * @return Form_Data_Request
* @since 2.0.0
*/
public function check_form_conditions( $form_data ) {
- if ( ! $this->has_required_data( $form_data ) ) {
- return Form_Data_Response::ERROR_MISSING_DATA;
+ if ( ! isset( $form_data ) || $form_data->has_error() ) {
+ return $form_data;
}
- $form_options = $form_data->get_form_options();
-
- if (
- $form_options->form_has_captcha() &&
- (
- ! $form_data->payload_has_field( 'token' ) ||
- '' === $form_data->get_payload_field( 'token' )
- )
- ) {
- return Form_Data_Response::ERROR_MISSING_CAPTCHA;
+ if ( ! $this->has_required_data( $form_data ) ) {
+ $form_data->set_error( Form_Data_Response::ERROR_MISSING_DATA );
+ return $form_data;
}
+
+ return $form_data;
}
/**
@@ -666,39 +765,47 @@ public function check_form_conditions( $form_data ) {
* @access public
* @param Form_Data_Request $form_data Data from the request.
*
- * @return array
+ * @return Form_Data_Request
* @since 2.0.0
*/
public function check_form_captcha( $form_data ) {
- $secret = get_option( 'themeisle_google_captcha_api_secret_key' );
- $resp = wp_remote_post(
- apply_filters( 'otter_blocks_recaptcha_verify_url', 'https://www.google.com/recaptcha/api/siteverify' ),
- array(
- 'body' => 'secret=' . $secret . '&response=' . $form_data->get_payload_field( 'token' ),
- 'headers' => [
- 'Content-Type' => 'application/x-www-form-urlencoded',
- ],
+
+ if ( ! isset( $form_data ) || $form_data->has_error() ) {
+ return $form_data;
+ }
+
+ $form_options = $form_data->get_form_options();
+
+ if (
+ $form_options->form_has_captcha() &&
+ (
+ ! $form_data->payload_has_field( 'token' ) ||
+ '' === $form_data->get_payload_field( 'token' )
)
- );
- return json_decode( $resp['body'], true );
- }
+ ) {
+ $form_data->set_error( Form_Data_Response::ERROR_MISSING_CAPTCHA );
+ }
- /**
- * The instance method for the static class.
- * Defines and returns the instance of the static class.
- *
- * @static
- * @since 1.0.0
- * @access public
- * @return Form_Server
- */
- public static function instance() {
- if ( is_null( self::$instance ) ) {
- self::$instance = new self();
- self::$instance->init();
+ if ( $form_data->payload_has_field( 'token' ) ) {
+ $secret = get_option( 'themeisle_google_captcha_api_secret_key' );
+ $resp = wp_remote_post(
+ apply_filters( 'otter_blocks_recaptcha_verify_url', 'https://www.google.com/recaptcha/api/siteverify' ),
+ array(
+ 'body' => 'secret=' . $secret . '&response=' . $form_data->get_payload_field( 'token' ),
+ 'headers' => [
+ 'Content-Type' => 'application/x-www-form-urlencoded',
+ ],
+ )
+ );
+
+ $result = json_decode( $resp['body'], true );
+
+ if ( ! $result['success'] ) {
+ $form_data->set_error( Form_Data_Response::ERROR_INVALID_CAPTCHA_TOKEN );
+ }
}
- return self::$instance;
+ return $form_data;
}
/**
@@ -715,12 +822,11 @@ public function build_email_content( $content ) {
/**
* Filter for the content of the email for errors.
*
- * @param string $error The error message.
* @param string $content The content.
* @return string
* @sincee 2.0.3
*/
- public function build_email_error_content( $error, $content ) {
+ public function build_email_error_content( $content ) {
return $content;
}
@@ -736,7 +842,7 @@ public function get_email_from_form_input( Form_Data_Request $data ) {
$inputs = $data->get_payload_field( 'formInputsData' );
if ( is_array( $inputs ) ) {
foreach ( $data->get_payload_field( 'formInputsData' ) as $input_field ) {
- if ( 'email' == $input_field['type'] ) {
+ if ( isset( $input_field['type'] ) && 'email' == $input_field['type'] ) {
return $input_field['value'];
}
}
@@ -744,6 +850,81 @@ public function get_email_from_form_input( Form_Data_Request $data ) {
return '';
}
+ /**
+ * Validate the input fields with files.
+ *
+ * @param Form_Data_Request $form_data The form data.
+ * @return Form_Data_Request
+ * @since 2.2.3
+ */
+ public function check_form_files( $form_data ) {
+ if ( ! isset( $form_data ) || $form_data->has_error() ) {
+ return $form_data;
+ }
+
+ $inputs = $form_data->get_form_inputs();
+
+ foreach ( $inputs as $input ) {
+ if ( Form_Utils::is_file_field( $input ) && ! Form_Utils::is_file_field_valid( $input ) ) {
+ $form_data->set_error( Form_Data_Response::ERROR_FILES_METADATA_FORMAT );
+ return $form_data;
+ }
+ }
+
+ return $form_data;
+ }
+
+ /**
+ * Get the Field Options for the given Form.
+ *
+ * @param Form_Data_Request $form_data The form data.
+ * @since 2.2.3
+ */
+ public function pull_fields_options_for_form( $form_data ) {
+ if ( ! ( $form_data instanceof Form_Data_Request ) || $form_data->has_error() ) {
+ return $form_data;
+ }
+
+ $global_fields_options = get_option( 'themeisle_blocks_form_fields_option' );
+
+ if ( empty( $global_fields_options ) ) {
+ return $form_data;
+ }
+
+ foreach ( $form_data->get_form_inputs() as $input ) {
+ if ( isset( $input['metadata']['fieldOptionName'] ) ) {
+ $field_name = $input['metadata']['fieldOptionName'];
+ foreach ( $global_fields_options as $field ) {
+ if ( isset( $field['fieldOptionName'] ) && $field['fieldOptionName'] === $field_name ) {
+ $new_field = new Form_Field_Option_Data( $field_name, $field['fieldOptionType'], $field['options'] );
+ $form_data->add_field_option( $new_field );
+ break;
+ }
+ }
+ }
+ }
+
+ return $form_data;
+ }
+
+ /**
+ * The instance method for the static class.
+ * Defines and returns the instance of the static class.
+ *
+ * @static
+ * @since 1.0.0
+ * @access public
+ * @return Form_Server
+ */
+ public static function instance() {
+ if ( is_null( self::$instance ) ) {
+ self::$instance = new self();
+ self::$instance->init();
+ }
+
+ return self::$instance;
+ }
+
/**
* Throw error on object clone
*
diff --git a/inc/server/class-stripe-server.php b/inc/server/class-stripe-server.php
index 6476ba4fc..ddbe53550 100644
--- a/inc/server/class-stripe-server.php
+++ b/inc/server/class-stripe-server.php
@@ -35,18 +35,11 @@ class Stripe_Server {
*/
public $version = 'v1';
- /**
- * Stripe Object.
- *
- * @var Stripe_Server
- */
- public $stripe = '';
-
/**
* Initialize the class
*/
public function init() {
- $this->stripe = new Stripe_API();
+
add_action( 'rest_api_init', array( $this, 'register_routes' ) );
}
@@ -105,7 +98,7 @@ public function register_routes() {
* @access public
*/
public function get_products( \WP_REST_Request $request ) {
- return $this->stripe->create_request(
+ return ( new Stripe_API() )->create_request(
'products',
array(
'active' => true,
@@ -123,7 +116,7 @@ public function get_products( \WP_REST_Request $request ) {
* @access public
*/
public function get_price( \WP_REST_Request $request ) {
- return $this->stripe->create_request(
+ return ( new Stripe_API() )->create_request(
'prices',
array(
'active' => true,
diff --git a/plugins/otter-pro/inc/class-main.php b/plugins/otter-pro/inc/class-main.php
index 3a3b3487c..0f24982d8 100644
--- a/plugins/otter-pro/inc/class-main.php
+++ b/plugins/otter-pro/inc/class-main.php
@@ -58,7 +58,8 @@ public function autoload_classes( $classnames ) {
'\ThemeIsle\OtterPro\Plugins\Block_Conditions',
'\ThemeIsle\OtterPro\Plugins\Dynamic_Content',
'\ThemeIsle\OtterPro\Plugins\Fonts_Module',
- '\ThemeIsle\OtterPro\Plugins\Form_Block',
+ '\ThemeIsle\OtterPro\Plugins\Form_Pro_Features',
+ '\ThemeIsle\OtterPro\Plugins\Form_Emails_Storing',
'\ThemeIsle\OtterPro\Plugins\License',
'\ThemeIsle\OtterPro\Plugins\Live_Search',
'\ThemeIsle\OtterPro\Plugins\Options_Settings',
@@ -102,6 +103,7 @@ public function register_blocks( $blocks ) {
'product-title',
'product-upsells',
'review-comparison',
+ 'form-file',
);
$blocks = array_merge( $blocks, $pro_blocks );
@@ -132,6 +134,7 @@ public function register_dynamic_blocks( $dynamic_blocks ) {
'product-title' => '\ThemeIsle\OtterPro\Render\WooCommerce\Product_Title_Block',
'product-upsells' => '\ThemeIsle\OtterPro\Render\WooCommerce\Product_Upsells_Block',
'review-comparison' => '\ThemeIsle\OtterPro\Render\Review_Comparison_Block',
+ 'form-file' => '\ThemeIsle\OtterPro\Render\Form_File_Block',
);
$dynamic_blocks = array_merge( $dynamic_blocks, $blocks );
@@ -152,6 +155,7 @@ public function register_blocks_css( $blocks ) {
'\ThemeIsle\OtterPro\CSS\Blocks\Business_Hours_CSS',
'\ThemeIsle\OtterPro\CSS\Blocks\Business_Hours_Item_CSS',
'\ThemeIsle\OtterPro\CSS\Blocks\Review_Comparison_CSS',
+ '\ThemeIsle\OtterPro\CSS\Blocks\Form_File_CSS',
);
$blocks = array_merge( $blocks, $pro_blocks );
diff --git a/plugins/otter-pro/inc/css/blocks/class-form-file-css.php b/plugins/otter-pro/inc/css/blocks/class-form-file-css.php
new file mode 100644
index 000000000..a95942511
--- /dev/null
+++ b/plugins/otter-pro/inc/css/blocks/class-form-file-css.php
@@ -0,0 +1,52 @@
+add_item(
+ array(
+ 'properties' => array(
+ array(
+ 'property' => '--label-color',
+ 'value' => 'labelColor',
+ ),
+ ),
+ )
+ );
+
+ $style = $css->generate();
+
+ return $style;
+ }
+
+}
diff --git a/plugins/otter-pro/inc/plugins/class-dynamic-content.php b/plugins/otter-pro/inc/plugins/class-dynamic-content.php
index c2eefdbaf..39b4cd5e1 100644
--- a/plugins/otter-pro/inc/plugins/class-dynamic-content.php
+++ b/plugins/otter-pro/inc/plugins/class-dynamic-content.php
@@ -174,6 +174,11 @@ public function get_terms( $data ) {
if ( isset( $data['termType'] ) && 'tags' === $data['termType'] ) {
$terms = get_the_tag_list( '', $separator, '', $data['context'] );
+ } elseif ( isset( $data['termType'] ) && 'custom' === $data['termType'] && isset( $data['taxonomy'] ) ) {
+ $taxonomy_terms = get_the_term_list( $data['context'], $data['taxonomy'], '', $separator, '' );
+ if ( ! empty( $taxonomy_terms ) && ! is_wp_error( $taxonomy_terms ) ) {
+ $terms = $taxonomy_terms;
+ }
} else {
$terms = get_the_category_list( $separator, '', $data['context'] );
}
diff --git a/plugins/otter-pro/inc/plugins/class-form-block.php b/plugins/otter-pro/inc/plugins/class-form-block.php
deleted file mode 100644
index 6c8f3ca38..000000000
--- a/plugins/otter-pro/inc/plugins/class-form-block.php
+++ /dev/null
@@ -1,133 +0,0 @@
-get_form_options()->has_autoresponder() ) {
- return;
- }
-
- $res = new Form_Data_Response();
-
- $to = Form_Server::instance()->get_email_from_form_input( $form_data );
- if ( empty( $to ) ) {
- $res->set_code( Form_Data_Response::ERROR_EMAIL_NOT_SEND );
- return $res->build_response();
- }
-
- $headers[] = 'Content-Type: text/html';
- $headers[] = 'From: ' . ( $form_data->get_form_options()->has_from_name() ? sanitize_text_field( $form_data->get_form_options()->get_from_name() ) : get_bloginfo( 'name', 'display' ) );
-
- $autoresponder = $form_data->get_form_options()->get_autoresponder();
- $body = $this->replace_magic_tags( $autoresponder['body'], $form_data->get_form_inputs() );
-
- // phpcs:ignore
- $res->set_success( wp_mail( $to, $autoresponder['subject'], $body, $headers ) );
- if ( $res->is_success() ) {
- $res->set_code( Form_Data_Response::SUCCESS_EMAIL_SEND );
- } else {
- $res->set_code( Form_Data_Response::ERROR_EMAIL_NOT_SEND );
- }
-
- $form_options = $form_data->get_form_options();
- $res->add_values( $form_options->get_submit_data() );
- return $res->build_response();
- }
-
- /**
- * Replace magic tags with the values from the form inputs.
- *
- * @param string $content The content to replace the magic tags.
- * @param array $form_inputs The form inputs.
- *
- * @return string
- */
- public function replace_magic_tags( $content, $form_inputs ) {
- foreach ( $form_inputs as $field ) {
- if ( isset( $field['id'] ) ) {
- $content = str_replace( '%' . $field['id'] . '%', $field['value'], $content );
- }
- }
-
- return $content;
- }
-
- /**
- * The instance method for the static class.
- * Defines and returns the instance of the static class.
- *
- * @static
- * @access public
- * @return Form_Block
- */
- public static function instance() {
- if ( is_null( self::$instance ) ) {
- self::$instance = new self();
- self::$instance->init();
- }
-
- return self::$instance;
- }
-
- /**
- * Throw error on object clone
- *
- * The whole idea of the singleton design pattern is that there is a single
- * object therefore, we don't want the object to be cloned.
- *
- * @access public
- * @return void
- */
- public function __clone() {
- // Cloning instances of the class is forbidden.
- _doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin’ huh?', 'otter-blocks' ), '1.0.0' );
- }
-
- /**
- * Disable unserializing of the class
- *
- * @access public
- * @return void
- */
- public function __wakeup() {
- // Unserializing instances of the class is forbidden.
- _doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin’ huh?', 'otter-blocks' ), '1.0.0' );
- }
-}
diff --git a/plugins/otter-pro/inc/plugins/class-form-emails-storing.php b/plugins/otter-pro/inc/plugins/class-form-emails-storing.php
new file mode 100644
index 000000000..b12eace96
--- /dev/null
+++ b/plugins/otter-pro/inc/plugins/class-form-emails-storing.php
@@ -0,0 +1,1124 @@
+ array(
+ 'name' => esc_html_x( 'Form Submissions', '', 'otter-blocks' ),
+ 'singular_name' => esc_html_x( 'Form Submission', '', 'otter-blocks' ),
+ 'search_items' => esc_html__( 'Search Submissions', 'otter-blocks' ),
+ 'all_items' => esc_html__( 'Form Submissions', 'otter-blocks' ),
+ 'view_item' => esc_html__( 'View Submission', 'otter-blocks' ),
+ 'update_item' => esc_html__( 'Update Submission', 'otter-blocks' ),
+ 'not_found' => esc_html__( 'No submissions found', 'otter-blocks' ),
+ 'not_found_in_trash' => esc_html__( 'No submissions found in the Trash', 'otter-blocks' ),
+ ),
+ 'capability_type' => self::FORM_RECORD_TYPE,
+ 'capabilities' => array(
+ 'create_posts' => 'create_otter_form_records',
+ ),
+ 'description' => __( 'Holds the data from the form submissions', 'otter-blocks' ),
+ 'public' => false,
+ 'show_ui' => true,
+ 'show_in_rest' => true,
+ 'supports' => array( 'title' ),
+ )
+ );
+
+ register_post_status(
+ 'read',
+ array(
+ 'label' => _x( 'Read', 'otter-form-record', 'otter-blocks' ),
+ 'public' => true,
+ 'exclude_from_search' => false,
+ 'show_in_admin_all_list' => true,
+ 'show_in_admin_status_list' => true,
+ /* translators: %s the number of posts */
+ 'label_count' => _n_noop(
+ 'Read (%s)',
+ 'Read (%s)',
+ 'otter-blocks'
+ ),
+ )
+ );
+
+ register_post_status(
+ 'unread',
+ array(
+ 'label' => _x( 'Unread', 'otter-form-record', 'otter-blocks' ),
+ 'public' => true,
+ 'exclude_from_search' => false,
+ 'show_in_admin_all_list' => true,
+ 'show_in_admin_status_list' => true,
+ /* translators: %s the number of posts */
+ 'label_count' => _n_noop(
+ 'Unread (%s)',
+ 'Unread (%s)',
+ 'otter-blocks'
+ ),
+ )
+ );
+ }
+
+ /**
+ * Set custom capabilities for otter_form_record.
+ *
+ * @return void
+ */
+ public function set_form_records_cap() {
+ $role = get_role( 'administrator' );
+
+ if ( null === $role ) {
+ return;
+ }
+
+ if ( ! method_exists( $role, 'add_cap' ) ) {
+ return;
+ }
+
+ $role->add_cap( 'edit_' . self::FORM_RECORD_TYPE );
+ $role->add_cap( 'read_' . self::FORM_RECORD_TYPE );
+ $role->add_cap( 'delete_' . self::FORM_RECORD_TYPE );
+ $role->add_cap( 'edit_' . self::FORM_RECORD_TYPE . 's' );
+ $role->add_cap( 'read_' . self::FORM_RECORD_TYPE . 's' );
+ $role->add_cap( 'delete_' . self::FORM_RECORD_TYPE . 's' );
+ $role->remove_cap( 'create_' . self::FORM_RECORD_TYPE );
+ $role->remove_cap( 'create_' . self::FORM_RECORD_TYPE . 's' );
+ }
+
+ /**
+ * Store form record in custom post type.
+ *
+ * @param Form_Data_Request $form_data The form data object.
+ * @return Form_Data_Request
+ */
+ public function store_form_record( $form_data ) {
+ if (
+ ! isset( $form_data ) ||
+ ( ! class_exists( 'ThemeIsle\GutenbergBlocks\Integration\Form_Data_Request' ) ) ||
+ ! ( $form_data instanceof \ThemeIsle\GutenbergBlocks\Integration\Form_Data_Request ) ||
+ $form_data->has_error()
+ ) {
+ return $form_data;
+ }
+
+ $form_options = $form_data->get_form_options();
+
+ if ( ! isset( $form_options ) || ! str_starts_with( $form_options->get_submissions_save_location(), 'database' ) ) {
+ return $form_data;
+ }
+
+ $email = Form_Server::instance()->get_email_from_form_input( $form_data );
+
+ $post_id = wp_insert_post(
+ array(
+ 'post_type' => self::FORM_RECORD_TYPE,
+ 'post_title' => ! empty( $email ) ? $email : __( 'New submission', 'otter-blocks' ),
+ 'post_status' => 'unread',
+ )
+ );
+
+ if ( ! $post_id ) {
+ return $form_data;
+ }
+
+ $meta = array(
+ 'email' => array(
+ 'label' => 'Email',
+ 'value' => $email,
+ ),
+ 'form' => array(
+ 'label' => 'Form',
+ 'value' => $form_data->get_payload_field( 'formId' ),
+ ),
+ 'post_url' => array(
+ 'label' => 'Post URL',
+ 'value' => $form_data->get_payload_field( 'postUrl' ),
+ ),
+ 'post_id' => array(
+ 'label' => 'Post ID',
+ 'value' => $form_data->get_payload_field( 'postId' ),
+ ),
+ );
+
+ $form_inputs = $form_data->get_form_inputs();
+ $uploaded_files = $form_data->get_uploaded_files_path();
+ $media_files = $form_data->get_files_loaded_to_media_library();
+ $files = $form_data->get_request()->get_file_params();
+
+ foreach ( $form_inputs as $input ) {
+ if ( ! isset( $input['id'] ) ) {
+ continue;
+ }
+
+ $id = substr( $input['id'], -8 );
+
+ if ( 'file' === $input['type'] ) {
+
+ $id .= $input['metadata']['name'] . '_' . $input['metadata']['size'];
+
+ $meta['inputs'][ $id ] = array(
+ 'label' => $input['label'],
+ 'value' => $input['value'],
+ 'type' => $input['type'],
+ 'metadata' => $input['metadata'],
+ );
+
+ $file_data_key = $input['metadata']['data'];
+
+ if ( isset( $media_files[ $file_data_key ] ) ) {
+ $meta['inputs'][ $id ] = array_merge(
+ $meta['inputs'][ $id ],
+ array(
+ 'path' => $media_files[ $file_data_key ]['file_path'],
+ 'mime_type' => $media_files[ $file_data_key ]['file_type'],
+ 'attachment_id' => $media_files[ $file_data_key ]['file_id'],
+ 'saved_in_media' => true,
+ )
+ );
+ } elseif ( isset( $uploaded_files[ $file_data_key ] ) ) {
+ $meta['inputs'][ $id ] = array_merge(
+ $meta['inputs'][ $id ],
+ array(
+ 'path' => $uploaded_files[ $file_data_key ]['file_path'],
+ 'mime_type' => $uploaded_files[ $file_data_key ]['file_type'],
+ 'saved_in_media' => false,
+ )
+ );
+ }
+ } else {
+ $meta['inputs'][ $id ] = array(
+ 'label' => $input['label'],
+ 'value' => $input['value'],
+ 'type' => $input['type'],
+ 'metadata' => $input['metadata'],
+ );
+ }
+ }
+
+ add_post_meta( $post_id, self::FORM_RECORD_META_KEY, $meta );
+ }
+
+ /**
+ * Hide the default headline.
+ *
+ * @return void
+ */
+ public function add_style() {
+ $screen = get_current_screen();
+ if ( 'edit-' . self::FORM_RECORD_TYPE === $screen->id ) {
+ ?>
+
+ '',
+ 'email' => __( 'Email', 'otter-blocks' ),
+ 'form' => __( 'Form ID', 'otter-blocks' ),
+ 'post_url' => __( 'Post', 'otter-blocks' ),
+ 'ID' => __( 'ID', 'otter-blocks' ),
+ 'submission_date' => __( 'Submission Date', 'otter-blocks' ),
+ );
+ }
+
+ /**
+ * Set the table sortable columns.
+ *
+ * @return array
+ */
+ public function form_record_sortable_columns() {
+ return array(
+ 'email' => __( 'Email', 'otter-blocks' ),
+ 'ID' => __( 'ID', 'otter-blocks' ),
+ 'submission_date' => __( 'Submission Date', 'otter-blocks' ),
+ );
+ }
+
+ /**
+ * Set form records bulk actions.
+ *
+ * @return array
+ */
+ public function form_record_bulk_actions() {
+ $status = isset( $_GET['post_status'] ) ? sanitize_text_field( wp_unslash( $_GET['post_status'] ) ) : 'all'; // phpcs:ignore WordPress.Security.NonceVerification.NoNonceVerification
+ $bulk_actions = array();
+
+ if ( 'trash' !== $status ) {
+ $bulk_actions['trash'] = __( 'Move to Trash', 'otter-blocks' );
+
+ if ( 'unread' !== $status ) {
+ $bulk_actions['unread'] = __( 'Mark as Unread', 'otter-blocks' );
+ }
+
+ if ( 'read' !== $status ) {
+ $bulk_actions['read'] = __( 'Mark as Read', 'otter-blocks' );
+ }
+ } else {
+ $bulk_actions['untrash'] = __( 'Restore', 'otter-blocks' );
+ $bulk_actions['delete'] = __( 'Delete Permanently', 'otter-blocks' );
+ }
+
+ return $bulk_actions;
+ }
+
+ /**
+ * Manage form records row actions.
+ *
+ * @param array $actions The current row actions.
+ * @param WP_Post $post The current post object.
+ *
+ * @return array
+ */
+ public function form_record_row_actions( $actions, $post ) {
+ if ( 'otter_form_record' !== $post->post_type ) {
+ return $actions;
+ }
+
+ unset( $actions['inline hide-if-no-js'] );
+ unset( $actions['edit'] );
+
+ $status = $post->post_status;
+ if ( 'trash' !== $status ) {
+ $actions['view'] = sprintf(
+ '%s',
+ get_edit_post_link( $post->ID ),
+ __( 'View', 'otter-blocks' )
+ );
+ }
+
+ if ( 'unread' === $status ) {
+ $actions['read'] = sprintf(
+ '%s',
+ 'row-read',
+ $post->ID,
+ wp_create_nonce( 'read-' . self::FORM_RECORD_TYPE . '_' . $post->ID ),
+ __( 'Mark as Read', 'otter-blocks' )
+ );
+ } elseif ( 'trash' !== $status ) {
+ $actions['unread'] = sprintf(
+ '%s',
+ 'row-unread',
+ $post->ID,
+ wp_create_nonce( 'unread-' . self::FORM_RECORD_TYPE . '_' . $post->ID ),
+ __( 'Mark as Unread', 'otter-blocks' )
+ );
+ }
+
+ return $actions;
+ }
+
+ /**
+ * Handle form record bulk actions.
+ *
+ * @param string $redirect The redirect URL.
+ * @param string $doaction The action being taken.
+ * @param array $object_ids The object IDs.
+ *
+ * @return string
+ */
+ public function handle_form_record_bulk_actions( $redirect, $doaction, $object_ids ) {
+ $redirect = remove_query_arg( 'post_status', $redirect );
+
+ switch ( $doaction ) {
+ case 'read':
+ foreach ( $object_ids as $object_id ) {
+ wp_update_post(
+ array(
+ 'ID' => $object_id,
+ 'post_status' => 'read',
+ )
+ );
+ }
+
+ $redirect = add_query_arg( 'post_status', 'read', $redirect );
+ break;
+ case 'unread':
+ foreach ( $object_ids as $object_id ) {
+ wp_update_post(
+ array(
+ 'ID' => $object_id,
+ 'post_status' => 'unread',
+ )
+ );
+ }
+
+ $redirect = add_query_arg( 'post_status', 'unread', $redirect );
+ break;
+ }
+
+ return $redirect;
+ }
+
+ /**
+ * Mark form record as read when they're restored from trash.
+ *
+ * @param string $new_status The new status.
+ * @param string $old_status The old status.
+ * @param WP_Post $post The post object.
+ */
+ public function transition_draft_to_read( $new_status, $old_status, $post ) {
+ if ( self::FORM_RECORD_TYPE !== $post->post_type || 'trash' !== $old_status || 'draft' !== $new_status ) {
+ return;
+ }
+
+ wp_update_post(
+ array(
+ 'ID' => $post->ID,
+ 'post_status' => 'read',
+ )
+ );
+ }
+
+ /**
+ * Add form record filters.
+ *
+ * @return void
+ */
+ public function form_record_add_filters() {
+ if ( ! get_current_screen() || get_current_screen()->id !== 'edit-' . self::FORM_RECORD_TYPE ) {
+ return;
+ }
+
+ $this->form_dropdown();
+ $this->post_dropdown();
+ }
+
+ /**
+ * Parse form record filters.
+ *
+ * @param WP_Query $query Query.
+ *
+ * @return WP_Query
+ */
+ public function form_record_filter_query( $query ) {
+ if ( empty( $_GET['filters_nonce'] ) || ! wp_verify_nonce( sanitize_key( $_GET['filters_nonce'] ), 'filter' ) ) {
+ return $query;
+ }
+
+ if ( ! is_admin() || ! isset( $_GET['post_type'] ) || self::FORM_RECORD_TYPE !== $_GET['post_type'] ) {
+ return $query;
+ }
+
+ if ( ! isset( $query->query['post_type'] ) || self::FORM_RECORD_TYPE !== $query->query['post_type'] ) {
+ return $query;
+ }
+
+ global $pagenow;
+ if ( 'edit.php' !== $pagenow || ! isset( $_GET['filter_action'] ) ) {
+ return $query;
+ }
+
+ $form = ( ! empty( $_REQUEST['form'] ) ) ? sanitize_text_field( wp_unslash( $_REQUEST['form'] ) ) : '';
+ $post = ( ! empty( $_REQUEST['post'] ) ) ? esc_url_raw( wp_unslash( $_REQUEST['post'] ) ) : '';
+
+ if ( ! empty( $form ) ) {
+ $query->query_vars['meta_query'][] = array(
+ 'key' => self::FORM_RECORD_META_KEY,
+ 'value' => $form,
+ 'compare' => 'LIKE',
+ );
+ }
+
+ if ( ! empty( $post ) ) {
+ $query->query_vars['meta_query'][] = array(
+ 'key' => self::FORM_RECORD_META_KEY,
+ 'value' => $post,
+ 'compare' => 'LIKE',
+ );
+ }
+
+ return $query;
+ }
+
+ /**
+ * Manage form record columns.
+ *
+ * @param string $column The column name.
+ * @param int $post_id The post ID.
+ *
+ * @return void
+ */
+ public function form_record_column_values( $column, $post_id ) {
+ $meta = get_post_meta( $post_id, self::FORM_RECORD_META_KEY, true );
+
+ switch ( $column ) {
+ case 'email':
+ if ( get_post_status( $post_id ) !== 'trash' ) {
+ $this->format_based_on_status(
+ sprintf(
+ '%2$s',
+ esc_url( get_edit_post_link( $post_id ) ),
+ esc_html( get_the_title( $post_id ) )
+ ),
+ get_post_status( $post_id )
+ );
+ break;
+ }
+
+ echo esc_html( get_the_title( $post_id ) );
+ break;
+ case 'form':
+ $this->format_based_on_status(
+ sprintf(
+ '%2$s',
+ esc_url( $meta['post_url']['value'] . '#' . $meta['form']['value'] ),
+ esc_html( substr( $meta['form']['value'], -8 ) )
+ ),
+ get_post_status( $post_id )
+ );
+ break;
+ case 'post_url':
+ // If the post ID is set, use that to get the title and URL for better accuracy.
+ if ( ! empty( $meta['post_id'] ) ) {
+ $source_post = '0' !== $meta['post_id']['value'] ? $meta['post_id']['value'] : get_option( 'page_for_posts' );
+ $title = get_the_title( $source_post );
+ $url = get_permalink( $source_post );
+ } else {
+ if ( function_exists( 'wpcom_vip_url_to_postid' ) ) {
+ $source_post = wpcom_vip_url_to_postid( $meta['post_url']['value'] );
+ } else {
+ $source_post = url_to_postid( $meta['post_url']['value'] ); // phpcs:ignore WordPressVIPMinimum.Functions.RestrictedFunctions.url_to_postid_url_to_postid
+ }
+
+ $source_post = 0 !== $source_post ? $source_post : get_option( 'page_for_posts' );
+ $title = $source_post ? get_the_title( $source_post ) : $meta['post_url']['value'];
+ $url = $meta['post_url']['value'];
+ }
+
+ $this->format_based_on_status(
+ sprintf(
+ '%2$s',
+ esc_url( $url ),
+ esc_html( $title )
+ ),
+ get_post_status( $post_id )
+ );
+ break;
+ case 'ID':
+ $this->format_based_on_status( substr( $post_id, -8 ), get_post_status( $post_id ) );
+ break;
+ case 'submission_date':
+ $this->format_based_on_status(
+ esc_html( get_the_date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), $post_id ) ),
+ get_post_status( $post_id )
+ );
+ break;
+ }
+ }
+
+ /**
+ * Remove the 'publish' box from the otter_form_record post type.
+ *
+ * @return void
+ */
+ public function handle_admin_menu() {
+ remove_meta_box( 'submitdiv', self::FORM_RECORD_TYPE, 'side' );
+
+ global $submenu;
+ unset( $submenu[ 'edit.php?post_type=' . self::FORM_RECORD_TYPE ] );
+
+ remove_menu_page( 'edit.php?post_type=' . self::FORM_RECORD_TYPE );
+ remove_submenu_page( 'otter', 'form-submissions-free' );
+
+ add_submenu_page(
+ 'otter',
+ __( 'Form Submissions', 'otter-blocks' ),
+ __( 'Form Submissions', 'otter-blocks' ),
+ 'manage_options',
+ 'edit.php?post_type=' . self::FORM_RECORD_TYPE,
+ '',
+ 10
+ );
+ }
+
+ /**
+ * Add meta box for form record.
+ *
+ * @return void
+ */
+ public function add_form_record_meta_box() {
+ add_meta_box(
+ 'field_values_meta_box',
+ esc_html__( 'Submission Data', 'otter-blocks' ),
+ array( $this, 'fields_meta_box_markup' ),
+ self::FORM_RECORD_TYPE
+ );
+
+ // this will replace the default publish box, that's why it's using its id.
+ add_meta_box(
+ 'submitpost',
+ esc_html__( 'Update', 'otter-blocks' ),
+ array( $this, 'update_meta_box_markup' ),
+ self::FORM_RECORD_TYPE,
+ 'side'
+ );
+ }
+
+ /**
+ * Save data from form record meta box.
+ *
+ * @param int $post_id The post ID.
+ * @param WP_Post $post The post object.
+ *
+ * @return void
+ */
+ public function form_record_save_meta_box( $post_id, $post ) {
+ if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+ return;
+ }
+
+ if ( self::FORM_RECORD_TYPE !== $post->post_type ) {
+ return;
+ }
+
+ if ( empty( $_POST['action'] ) || 'editpost' !== $_POST['action'] ) { // phpcs:ignore WordPress.Security.NonceVerification.NoNonceVerification
+ return;
+ }
+
+ if ( empty( $_POST['_wpnonce'] ) || ! wp_verify_nonce( sanitize_key( wp_unslash( $_POST['_wpnonce'] ) ), 'update-post_' . $post->ID ) ) {
+ wp_die( esc_html__( 'Nonce not verified.', 'otter-blocks' ) );
+ }
+
+ if ( ! current_user_can( 'edit_post', $post_id ) ) {
+ wp_die( esc_html__( 'User cannot edit this post.', 'otter-blocks' ) );
+ }
+
+ $meta = get_post_meta( $post_id, self::FORM_RECORD_META_KEY, true );
+
+ foreach ( $_POST as $key => $value ) {
+ if ( ! str_starts_with( $key, 'otter_meta_' ) ) {
+ continue;
+ }
+
+ $id = substr( $key, -8 );
+
+ if ( isset( $meta['inputs'][ $id ] ) && $meta['inputs'][ $id ]['value'] !== $value ) {
+ $meta['inputs'][ $id ]['value'] = $value;
+ }
+ }
+
+ update_post_meta( $post_id, self::FORM_RECORD_META_KEY, $meta );
+ }
+
+ /**
+ * Render form record meta box.
+ *
+ * @param WP_Post $post The post object.
+ * @return void
+ */
+ public function fields_meta_box_markup( $post ) {
+ $meta = get_post_meta( $post->ID, self::FORM_RECORD_META_KEY, true );
+ $previous_field_option = '';
+
+ if ( empty( $meta ) ) {
+ return;
+ }
+ ?>
+ | + + | +render_field( $field, $id ); ?> | +
|---|
+
+
+
+ $post,
+ 'post_status' => 'read',
+ )
+ );
+ }
+ }
+
+ /**
+ * Check request nonce and post ID.
+ *
+ * @param string $action The action name.
+ *
+ * @return string The post ID.
+ */
+ public function check_posts( $action ) {
+ $id = ! empty( $_REQUEST[ self::FORM_RECORD_TYPE ] ) ? sanitize_text_field( wp_unslash( $_REQUEST[ self::FORM_RECORD_TYPE ] ) ) : 0; // phpcs:ignore WordPress.Security.NonceVerification.NoNonceVerification
+ $post = get_post( $id );
+
+ if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( sanitize_key( wp_unslash( $_REQUEST['_wpnonce'] ) ), $action . '-' . self::FORM_RECORD_TYPE . '_' . $id ) ) {
+ wp_die( esc_html__( 'Security check failed', 'otter-blocks' ) );
+ }
+
+ if ( ! isset( $_REQUEST[ self::FORM_RECORD_TYPE ] ) ) {
+ wp_die( esc_html__( 'Post ID is required', 'otter-blocks' ) );
+ }
+
+ if ( ! $post ) {
+ wp_die( esc_html__( 'Invalid post ID', 'otter-blocks' ) );
+ }
+
+ if ( self::FORM_RECORD_TYPE !== $post->post_type ) {
+ wp_die( esc_html__( 'Invalid post type', 'otter-blocks' ) );
+ }
+
+ return $id;
+ }
+
+ /**
+ * Read form record.
+ *
+ * @return void
+ */
+ public function read_otter_form_record() {
+ $id = $this->check_posts( 'read' );
+ wp_update_post(
+ array(
+ 'ID' => $id,
+ 'post_status' => 'read',
+ )
+ );
+
+ wp_safe_redirect( remove_query_arg( array( 'action', self::FORM_RECORD_TYPE, '_wpnonce' ), admin_url( 'edit.php?post_type=' . self::FORM_RECORD_TYPE ) ) );
+ exit;
+ }
+
+ /**
+ * Unread form record.
+ *
+ * @return void
+ */
+ public function unread_otter_form_record() {
+ $id = $this->check_posts( 'unread' );
+ wp_update_post(
+ array(
+ 'ID' => $id,
+ 'post_status' => 'unread',
+ )
+ );
+
+ wp_safe_redirect( remove_query_arg( array( 'action', self::FORM_RECORD_TYPE, '_wpnonce' ), admin_url( 'edit.php?post_type=' . self::FORM_RECORD_TYPE ) ) );
+ exit;
+ }
+
+ /**
+ * Get filter options.
+ *
+ * @param string $filter Filter.
+ *
+ * @return array
+ */
+ private function get_filter( $filter ) {
+ /**
+ * Get all form records. Here we want to avoid using WP_Query to not
+ * trigger the 'form_record_filter_query'. This is why the $wpdb.
+ */
+ $cache_key = 'otter_form_records';
+ $form_records = wp_cache_get( $cache_key );
+
+ if ( ! $form_records ) {
+ global $wpdb;
+ // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery
+ $form_records = $wpdb->get_results(
+ $wpdb->prepare(
+ "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status IN ('read', 'unread', 'trash', 'publish')",
+ self::FORM_RECORD_TYPE
+ )
+ );
+
+ wp_cache_set( $cache_key, $form_records );
+ }
+
+ $options = array();
+ foreach ( $form_records as $record ) {
+ $meta = get_post_meta( $record->ID, self::FORM_RECORD_META_KEY, true );
+
+ switch ( $filter ) {
+ case 'form':
+ $options[ $meta['form']['value'] ] = substr( $meta['form']['value'], -8 );
+ break;
+ case 'post':
+ if ( function_exists( 'wpcom_vip_url_to_postid' ) ) {
+ $post_id = wpcom_vip_url_to_postid( $meta['post_url']['value'] );
+ } else {
+ $post_id = url_to_postid( $meta['post_url']['value'] ); // phpcs:ignore WordPressVIPMinimum.Functions.RestrictedFunctions.url_to_postid_url_to_postid
+ }
+
+ $options[ $meta['post_url']['value'] ] = $post_id ? get_the_title( $post_id ) : $meta['post_url']['value'];
+ break;
+ }
+ }
+
+ return $options;
+ }
+
+ /**
+ * Get forms dropdown.
+ *
+ * @return void
+ */
+ private function form_dropdown() {
+ $forms = $this->get_filter( 'form' );
+
+ if ( empty( $forms ) ) {
+ return;
+ }
+
+ // phpcs:ignore WordPress.Security.NonceVerification.NoNonceVerification
+ $form = isset( $_GET['form'] ) ? sanitize_text_field( wp_unslash( $_GET['form'] ) ) : '';
+
+ ?>
+
+
+ get_filter( 'post' );
+
+ if ( empty( $posts ) ) {
+ return;
+ }
+
+ // phpcs:ignore WordPress.Security.NonceVerification.NoNonceVerification
+ $post = isset( $_GET['post'] ) ? sanitize_text_field( wp_unslash( $_GET['post'] ) ) : '';
+
+ ?>
+
+
+ ' . wp_kses_post( $content ) . '';
+ return;
+ }
+
+ echo wp_kses_post( $content );
+ }
+
+ /**
+ * The instance method for the static class.
+ * Defines and returns the instance of the static class.
+ *
+ * @static
+ * @access public
+ * @return Form_Emails_Storing
+ */
+ public static function instance() {
+ if ( is_null( self::$instance ) ) {
+ self::$instance = new self();
+ self::$instance->init();
+ }
+
+ return self::$instance;
+ }
+
+ /**
+ * Throw error on object clone
+ *
+ * The whole idea of the singleton design pattern is that there is a single
+ * object therefore, we don't want the object to be cloned.
+ *
+ * @access public
+ * @return void
+ */
+ public function __clone() {
+ // Cloning instances of the class is forbidden.
+ _doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin’ huh?', 'otter-blocks' ), '1.0.0' );
+ }
+
+ /**
+ * Disable unserializing of the class
+ *
+ * @access public
+ * @return void
+ */
+ public function __wakeup() {
+ // Unserializing instances of the class is forbidden.
+ _doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin’ huh?', 'otter-blocks' ), '1.0.0' );
+ }
+}
diff --git a/plugins/otter-pro/inc/plugins/class-form-pro-features.php b/plugins/otter-pro/inc/plugins/class-form-pro-features.php
new file mode 100644
index 000000000..570a08b35
--- /dev/null
+++ b/plugins/otter-pro/inc/plugins/class-form-pro-features.php
@@ -0,0 +1,402 @@
+has_error() ) {
+ return $form_data;
+ }
+
+ $inputs = $form_data->get_form_inputs();
+
+ $saved_files = array();
+ $approved_fields = array();
+
+ try {
+ $counts_files = array();
+ $files = $form_data->get_request()->get_file_params();
+
+ foreach ( $inputs as $input ) {
+ if (
+ \ThemeIsle\GutenbergBlocks\Integration\Form_Utils::is_file_field( $input ) &&
+ isset( $input['metadata']['fieldOptionName'] ) &&
+ $form_data->has_field_option( $input['metadata']['fieldOptionName'] )
+ ) {
+ $name = $input['metadata']['fieldOptionName'];
+ if ( ! isset( $counts_files[ $name ] ) ) {
+ $counts_files[ $name ] = 1;
+ } else {
+ $counts_files[ $name ]++;
+
+ if (
+ $form_data->get_field_option( $name )->has_option( 'maxFilesNumber' ) &&
+ $counts_files[ $name ] > $form_data->get_field_option( $name )->get_option( 'maxFilesNumber' )
+ ) {
+ $form_data->set_error( \ThemeIsle\GutenbergBlocks\Integration\Form_Data_Response::ERROR_FILE_UPLOAD_MAX_FILES_NUMBER );
+ break;
+ }
+
+ if (
+ ! $form_data->get_field_option( $name )->has_option( 'maxFilesSize' ) &&
+ $counts_files[ $name ] > 10
+ ) {
+ $form_data->set_error( \ThemeIsle\GutenbergBlocks\Integration\Form_Data_Response::ERROR_FILE_UPLOAD_MAX_FILES_NUMBER );
+ break;
+ }
+ }
+ }
+ }
+
+ if ( ! $form_data->has_error() ) {
+ foreach ( $inputs as $input ) {
+
+ $field_option_name = null;
+
+ if ( isset( $input['metadata']['fieldOptionName'] ) ) {
+ $field_option_name = $input['metadata']['fieldOptionName'];
+ }
+
+ if (
+ \ThemeIsle\GutenbergBlocks\Integration\Form_Utils::is_file_field( $input ) &&
+ isset( $field_option_name )
+ ) {
+
+ $field_option = $form_data->get_field_option( $field_option_name );
+
+ if ( is_null( $field_option ) ) {
+ $form_data->set_error( \ThemeIsle\GutenbergBlocks\Integration\Form_Data_Response::ERROR_MISSING_FILE_FIELD_OPTION );
+ break;
+ }
+
+ $file_data_key = $input['metadata']['data'];
+
+ if ( ! isset( $file_data_key ) || ! isset( $files[ $file_data_key ] ) ) {
+ $form_data->set_error( \ThemeIsle\GutenbergBlocks\Integration\Form_Data_Response::ERROR_FILE_MISSING_BINARY );
+ break;
+ }
+
+ $file_data = $files[ $file_data_key ];
+
+ // Get the extension from file using WordPress functions.
+ $extension = wp_check_filetype( $file_data['name'] );
+
+ if ( ! $extension['ext'] ) {
+ $form_data->set_error( \ThemeIsle\GutenbergBlocks\Integration\Form_Data_Response::ERROR_FILE_UPLOAD_TYPE_WP );
+ break;
+ }
+
+ $form_files_ext = $field_option->get_option( 'allowedFileTypes' );
+
+ if ( ! empty( $form_files_ext ) ) {
+ $form_files_ext = str_replace( '.', '', $form_files_ext );
+ $form_files_ext = str_replace( '/*', '', $form_files_ext );
+
+ $mime_match = wp_match_mime_types( $form_files_ext, $extension['type'] );
+
+ if ( 0 == count( $mime_match ) ) {
+ $form_data->set_error( \ThemeIsle\GutenbergBlocks\Integration\Form_Data_Response::ERROR_FILE_UPLOAD_TYPE );
+ break;
+ }
+ }
+
+ // Check the file size.
+ if ( $field_option->has_option( 'maxFileSize' ) ) {
+ $max_file_size = $field_option->get_option( 'maxFileSize' );
+ $max_file_size = $max_file_size * 1024 * 1024;
+
+ // Get $file_data file size.
+ $file_size = filesize( $file_data['tmp_name'] );
+ if ( false === $file_size || $max_file_size < strlen( $file_size ) ) {
+ $form_data->set_error( \ThemeIsle\GutenbergBlocks\Integration\Form_Data_Response::ERROR_FILE_UPLOAD_MAX_SIZE );
+ break;
+ }
+ }
+
+ $approved_fields[] = $input;
+ }
+ }
+ }
+
+ if ( ! $form_data->has_error() ) {
+ foreach ( $approved_fields as $field ) {
+ $file = \ThemeIsle\GutenbergBlocks\Integration\Form_Utils::save_file_from_field( $field, $files );
+
+ if ( $file['success'] ) {
+ $field_option = $form_data->get_field_option( $field['metadata']['fieldOptionName'] );
+ $saved_file = $field_option->get_option( 'saveFiles' );
+ if ( ! empty( $saved_file ) ) {
+ $file['file_location_slug'] = $saved_file;
+ }
+ $file['key'] = $field['metadata']['data'];
+ $saved_files[ $field['metadata']['data'] ] = $file;
+ } else {
+ $form_data->set_error( \ThemeIsle\GutenbergBlocks\Integration\Form_Data_Response::ERROR_FILE_UPLOAD, array( $file['error'] ) );
+ break;
+ }
+ }
+
+ if ( ! empty( $saved_files ) ) {
+ $form_data->set_uploaded_files_path( $saved_files );
+ }
+ }
+ } catch ( \Exception $e ) {
+ $form_data->set_error( \ThemeIsle\GutenbergBlocks\Integration\Form_Data_Response::ERROR_FILE_UPLOAD, array( $e->getMessage() ) );
+ } finally {
+ if ( $form_data->has_error() ) {
+ foreach ( $saved_files as $saved_file ) {
+ wp_delete_file( $saved_file['file_path'] );
+ }
+ }
+
+ return $form_data;
+ }
+ }
+
+ /**
+ * Delete the files uploaded from the File field via attachments.
+ *
+ * @param Form_Data_Request $form_data The files to delete.
+ * @since 2.2.5
+ */
+ public function clean_files_from_uploads( $form_data ) {
+
+ if (
+ ! isset( $form_data ) ||
+ ( ! class_exists( 'ThemeIsle\GutenbergBlocks\Integration\Form_Data_Request' ) ) ||
+ ! ( $form_data instanceof \ThemeIsle\GutenbergBlocks\Integration\Form_Data_Request ) ||
+ $form_data->has_error()
+ ) {
+ return $form_data;
+ }
+
+ try {
+ $form_options = $form_data->get_form_options();
+ $can_delete = true;
+
+ if ( isset( $form_options ) ) {
+ $can_delete = 'email' === $form_options->get_submissions_save_location();
+ }
+
+ if ( $can_delete && $form_data->has_uploaded_files() ) {
+ foreach ( $form_data->get_uploaded_files_path() as $file ) {
+ if ( ! empty( $file['file_path'] ) ) {
+ wp_delete_file( $file['file_path'] );
+ }
+ }
+ }
+ } catch ( \Exception $e ) {
+ $form_data->set_error( \ThemeIsle\GutenbergBlocks\Integration\Form_Data_Response::ERROR_RUNTIME_ERROR, array( $e->getMessage() ) );
+ } finally {
+ return $form_data;
+ }
+ }
+
+ /**
+ * Load the files to the media library.
+ *
+ * @param Form_Data_Request $form_data The files to load.
+ * @return Form_Data_Request
+ * @since 2.2.5
+ */
+ public function load_files_to_media_library( $form_data ) {
+ if (
+ ! isset( $form_data ) ||
+ ( ! class_exists( 'ThemeIsle\GutenbergBlocks\Integration\Form_Data_Request' ) ) ||
+ ! ( $form_data instanceof \ThemeIsle\GutenbergBlocks\Integration\Form_Data_Request ) ||
+ $form_data->has_error() ) {
+ return $form_data;
+ }
+
+ try {
+ if ( $form_data->has_uploaded_files() ) {
+
+ $media_files = array();
+ foreach ( $form_data->get_uploaded_files_path() as $file ) {
+
+ if ( empty( $file['file_location_slug'] ) || 'media-library' !== $file['file_location_slug'] ) {
+ continue;
+ }
+
+ $attachment = array(
+ 'post_mime_type' => $file['file_type'],
+ 'post_title' => $file['file_name'],
+ 'post_content' => '',
+ 'post_status' => 'inherit',
+ );
+
+ $attachment_id = wp_insert_attachment( $attachment, $file['file_path'] );
+
+ $media_files[ $file['key'] ] = array(
+ 'file_path' => $file['file_path'],
+ 'file_name' => $file['file_name'],
+ 'file_type' => $file['file_type'],
+ 'file_id' => $attachment_id,
+ );
+ }
+
+ if ( ! empty( $media_files ) ) {
+ $form_data->set_files_loaded_to_media_library( $media_files );
+ }
+ }
+ } catch ( \Exception $e ) {
+ $form_data->set_error( \ThemeIsle\GutenbergBlocks\Integration\Form_Data_Response::ERROR_RUNTIME_ERROR, array( $e->getMessage() ) );
+ } finally {
+ return $form_data;
+ }
+ }
+
+ /**
+ * Send autoresponder email to the subscriber.
+ *
+ * @param Form_Data_Request $form_data The files to load.
+ * @return Form_Data_Request
+ * @since 2.2.5
+ */
+ public function send_autoresponder( $form_data ) {
+
+ if (
+ ! isset( $form_data ) ||
+ ( ! class_exists( 'ThemeIsle\GutenbergBlocks\Integration\Form_Data_Request' ) ) ||
+ ! ( $form_data instanceof \ThemeIsle\GutenbergBlocks\Integration\Form_Data_Request ) ||
+ $form_data->has_error() ||
+ ! $form_data->get_form_options()->has_autoresponder()
+ ) {
+ return $form_data;
+ }
+
+ try {
+
+ $to = \ThemeIsle\GutenbergBlocks\Server\Form_Server::instance()->get_email_from_form_input( $form_data );
+ if ( empty( $to ) ) {
+ $form_data->add_warning( \ThemeIsle\GutenbergBlocks\Integration\Form_Data_Response::ERROR_AUTORESPONDER_MISSING_EMAIL_FIELD );
+ return $form_data;
+ }
+
+ $headers[] = 'Content-Type: text/html';
+ $headers[] = 'From: ' . ( $form_data->get_form_options()->has_from_name() ? sanitize_text_field( $form_data->get_form_options()->get_from_name() ) : get_bloginfo( 'name', 'display' ) );
+
+ $autoresponder = $form_data->get_form_options()->get_autoresponder();
+ $body = $this->replace_magic_tags( $autoresponder['body'], $form_data->get_form_inputs() );
+
+ // phpcs:ignore
+ if ( ! wp_mail( $to, $autoresponder['subject'], $body, $headers ) ) {
+ $form_data->add_warning( \ThemeIsle\GutenbergBlocks\Integration\Form_Data_Response::ERROR_AUTORESPONDER_COULD_NOT_SEND );
+ }
+ } catch ( \Exception $e ) {
+ $form_data->add_warning( \ThemeIsle\GutenbergBlocks\Integration\Form_Data_Response::ERROR_RUNTIME_ERROR, array( $e->getMessage() ) );
+ } finally {
+ return $form_data;
+ }
+ }
+
+ /**
+ * Replace magic tags with the values from the form inputs.
+ *
+ * @param string $content The content to replace the magic tags.
+ * @param array $form_inputs The form inputs.
+ * @since 2.2.5
+ *
+ * @return string
+ */
+ public function replace_magic_tags( $content, $form_inputs ) {
+ foreach ( $form_inputs as $field ) {
+ if ( isset( $field['id'] ) ) {
+ $content = str_replace( '%' . $field['id'] . '%', $field['value'], $content );
+ }
+ }
+
+ return $content;
+ }
+
+
+ /**
+ * The instance method for the static class.
+ * Defines and returns the instance of the static class.
+ *
+ * @static
+ * @since 1.7.1
+ * @access public
+ * @return Form_Pro_Features
+ */
+ public static function instance() {
+ if ( is_null( self::$instance ) ) {
+ self::$instance = new self();
+ self::$instance->init();
+ }
+
+ return self::$instance;
+ }
+
+ /**
+ * Throw error on object clone
+ *
+ * The whole idea of the singleton design pattern is that there is a single
+ * object therefore, we don't want the object to be cloned.
+ *
+ * @access public
+ * @since 1.7.1
+ * @return void
+ */
+ public function __clone() {
+ // Cloning instances of the class is forbidden.
+ _doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin’ huh?', 'otter-blocks' ), '1.0.0' );
+ }
+
+ /**
+ * Disable unserializing of the class
+ *
+ * @access public
+ * @since 1.7.1
+ * @return void
+ */
+ public function __wakeup() {
+ // Unserializing instances of the class is forbidden.
+ _doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin’ huh?', 'otter-blocks' ), '1.0.0' );
+ }
+}
diff --git a/plugins/otter-pro/inc/render/class-form-file-block.php b/plugins/otter-pro/inc/render/class-form-file-block.php
new file mode 100644
index 000000000..6f7416aea
--- /dev/null
+++ b/plugins/otter-pro/inc/render/class-form-file-block.php
@@ -0,0 +1,71 @@
+ 1 );
+ $allowed_files = isset( $attributes['allowedFileTypes'] ) ? implode( ',', $attributes['allowedFileTypes'] ) : '';
+
+ $output = '
+
+
+ %s',
+ 'trash',
+ esc_attr( $post->ID ),
+ esc_attr( wp_create_nonce( 'trash-post_' . $post->ID ) ),
+ esc_html__( 'Move to Trash', 'otter-blocks' )
+ );
+ ?>
+
+
+
+ ',
+ esc_html__( 'Update', 'otter-blocks' )
+ );
+ ?>
+
+
+ ';
+
+ $output .= '';
+
+ $output .= '';
+
+ $output .= ''
+ . $help_text
+ . '';
+
+ $output .= '
';
+ return $output;
+ }
+
+ /**
+ * Render the required sign.
+ *
+ * @param bool $is_required The required status of the field.
+ * @return string
+ */
+ public function render_required_sign( $is_required ) {
+ return $is_required ? '*' : '';
+ }
+}
diff --git a/readme.md b/readme.md
index 462fd0f72..72e540db3 100644
--- a/readme.md
+++ b/readme.md
@@ -3,7 +3,7 @@
**Tags:** gutenberg blocks, gutenberg, block,post grid block, google map block, columns block, advanced columns, section, row, layout, templates, lottie, progress bar, product review, review, accordion, tabs, page builder, countdown, contact form, masonry, popup, review builder
**Requires at least:** 5.9
**Tested up to:** 6.2
-**Requires PHP:** 5.4
+**Requires PHP:** 5.6
**Stable tag:** trunk
**License:** GPLv3
**License URI:** https://www.gnu.org/licenses/gpl-3.0.en.html
diff --git a/readme.txt b/readme.txt
index ded19a8b7..54bb3f9be 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: themeisle, hardeepasrani, soarerobertdaniel7, mariamunteanu1, arin
Tags: gutenberg blocks, gutenberg, block,post grid block, google map block, columns block, advanced columns, section, row, layout, templates, lottie, progress bar, product review, review, accordion, tabs, page builder, countdown, contact form, masonry, popup, review builder
Requires at least: 5.9
Tested up to: 6.2
-Requires PHP: 5.4
+Requires PHP: 5.6
Stable tag: trunk
License: GPLv3
License URI: https://www.gnu.org/licenses/gpl-3.0.en.html
diff --git a/src/blocks/blocks/accordion/group/edit.js b/src/blocks/blocks/accordion/group/edit.js
index 5206bf960..a1096d140 100644
--- a/src/blocks/blocks/accordion/group/edit.js
+++ b/src/blocks/blocks/accordion/group/edit.js
@@ -18,7 +18,7 @@ import { __ } from '@wordpress/i18n';
import metadata from './block.json';
import Inspector from './inspector.js';
import BlockAppender from '../../../components/block-appender-button';
-import { boxValues, hex2rgba } from '../../../helpers/helper-functions';
+import { _px, boxValues, hex2rgba } from '../../../helpers/helper-functions';
import {
blockInit,
getDefaultValueByField,
@@ -39,8 +39,6 @@ const PREFIX_TO_FAMILY = {
fab: 'Font Awesome 5 Brands'
};
-const px = value => value ? `${ value }px` : value;
-
/**
* Accordion Group component
* @param {import('./types').AccordionGroupProps} props
@@ -83,19 +81,19 @@ const Edit = ({
'--padding': boxValues( attributes.padding, { top: '18px', right: '24px', bottom: '18px', left: '24px' }),
'--padding-tablet': boxValues( attributes.paddingTablet, { top: '18px', right: '24px', bottom: '18px', left: '24px' }),
'--padding-mobile': boxValues( attributes.paddingMobile, { top: '18px', right: '24px', bottom: '18px', left: '24px' }),
- '--gap': px( attributes.gap )
+ '--gap': _px( attributes.gap )
};
const [ fontCSSNodeName, setFontNodeCSS ] = useCSSNode();
useEffect( () => {
setFontNodeCSS([
`> * > * > .wp-block-themeisle-blocks-accordion-item .wp-block-themeisle-blocks-accordion-item__title > * {
- ${ attributes.fontSize ? ( 'font-size:' + attributes.fontSize + 'px' ) : '' };
+ ${ attributes.fontSize ? ( 'font-size:' + _px( attributes.fontSize ) ) : '' };
${ attributes.fontFamily ? ( 'font-family:' + attributes.fontFamily ) : '' };
${ attributes.fontVariant ? ( 'font-variant:' + attributes.fontVariant ) : '' };
${ attributes.fontStyle ? ( 'font-style:' + attributes.fontStyle ) : '' };
${ attributes.textTransform ? ( 'text-transform:' + attributes.textTransform ) : '' };
- ${ attributes.letterSpacing ? ( 'letter-spacing:' + attributes.letterSpacing + 'px' ) : '' };
+ ${ attributes.letterSpacing ? ( 'letter-spacing:' + _px( attributes.letterSpacing ) ) : '' };
}`
]);
}, [ attributes.fontSize, attributes.fontFamily, attributes.fontVariant, attributes.fontStyle, attributes.textTransform, attributes.letterSpacing ]);
diff --git a/src/blocks/blocks/accordion/item/inspector.js b/src/blocks/blocks/accordion/item/inspector.js
index 8657036b9..ef61e7e84 100644
--- a/src/blocks/blocks/accordion/item/inspector.js
+++ b/src/blocks/blocks/accordion/item/inspector.js
@@ -28,16 +28,16 @@ const Inspector = ({
return;
}
- const parentClientId = select( 'core/block-editor' ).getBlockParents( clientId ).at( -1 );
- const parentBlock = select( 'core/block-editor' ).getBlock( parentClientId );
+ const parentClientId = select( 'core/block-editor' )?.getBlockParents( clientId ).at( -1 );
+ const parentBlock = select( 'core/block-editor' )?.getBlock( parentClientId );
- if ( parentBlock.attributes.alwaysOpen ) {
+ if ( parentBlock?.attributes.alwaysOpen ) {
return;
}
- parentBlock.innerBlocks.forEach( sibling => {
+ parentBlock?.innerBlocks?.forEach( sibling => {
if ( sibling.clientId !== clientId ) {
- dispatch( 'core/editor' ).updateBlockAttributes( sibling.clientId, { initialOpen: false });
+ dispatch( 'core/editor' )?.updateBlockAttributes( sibling.clientId, { initialOpen: false });
}
});
};
diff --git a/src/blocks/blocks/circle-counter/edit.js b/src/blocks/blocks/circle-counter/edit.js
index d05050335..0d5279d7b 100644
--- a/src/blocks/blocks/circle-counter/edit.js
+++ b/src/blocks/blocks/circle-counter/edit.js
@@ -30,11 +30,10 @@ import metadata from './block.json';
import Inspector from './inspector.js';
import CircularProgressBar from './components/circular-progress-bar.js';
import { blockInit } from '../../helpers/block-utility.js';
+import { _px } from '../../helpers/helper-functions';
const { attributes: defaultAttributes } = metadata;
-const px = value => value ? `${ value }px` : value;
-
/**
*
* @param {import('./types').CircleCounterPros} param0
@@ -116,7 +115,7 @@ const CircularProgressBarBlock = ({
}, [ attributes.percentage, attributes.height ]);
const inlineStyles = {
- '--font-size-title': px( attributes.fontSizeTitle )
+ '--font-size-title': _px( attributes.fontSizeTitle )
};
const blockProps = useBlockProps({
diff --git a/src/blocks/blocks/countdown/edit.tsx b/src/blocks/blocks/countdown/edit.tsx
index b357b1499..66d4c8435 100644
--- a/src/blocks/blocks/countdown/edit.tsx
+++ b/src/blocks/blocks/countdown/edit.tsx
@@ -37,6 +37,8 @@ import {
} from '../../helpers/block-utility';
import Inspector from './inspector.js';
import {
+ _percent,
+ _px,
boxValues,
getTimezone
} from '../../helpers/helper-functions.js';
@@ -46,8 +48,6 @@ import { CountdownProps } from './types';
const { attributes: defaultAttributes } = metadata;
-const optionalUnit = ( value: unknown, unit = 'px' ) => isNumber( value ) ? `${ value }${unit}` : value;
-
const Edit = ({
attributes,
setAttributes,
@@ -71,8 +71,8 @@ const Edit = ({
) {
const borderRadiusBox = pickBy( 'linked' === attributes?.borderRadiusType ?
- { left: optionalUnit( attributes.borderRadius, '%' ), right: optionalUnit( attributes.borderRadius, '%' ), bottom: optionalUnit( attributes.borderRadius, '%' ), top: optionalUnit( attributes.borderRadius, '%' ) } :
- { left: optionalUnit( attributes.borderRadiusBottomLeft, '%' ), right: optionalUnit( attributes.borderRadiusTopRight, '%' ), bottom: optionalUnit( attributes.borderRadiusBottomRight, '%' ), top: optionalUnit( attributes.borderRadiusTopLeft, '%' ) }, x => x );
+ { left: _percent( attributes.borderRadius ), right: _percent( attributes.borderRadius ), bottom: _percent( attributes.borderRadius ), top: _percent( attributes.borderRadius ) } :
+ { left: _percent( attributes.borderRadiusBottomLeft ), right: _percent( attributes.borderRadiusTopRight ), bottom: _percent( attributes.borderRadiusBottomRight ), top: _percent( attributes.borderRadiusTopLeft ) }, x => x );
if ( ! isEmpty( borderRadiusBox ) ) {
setAttributes({ borderRadiusBox, borderRadius: undefined, borderRadiusBottomLeft: undefined, borderRadiusTopRight: undefined, borderRadiusBottomRight: undefined, borderRadiusTopLeft: undefined, borderRadiusType: undefined });
@@ -119,21 +119,21 @@ const Edit = ({
'--container-width': attributes.containerWidth,
'--container-width-tablet': attributes.containerWidthTablet,
'--container-width-mobile': attributes.containerWidthMobile,
- '--height': optionalUnit( attributes.height ),
- '--height-tablet': optionalUnit( attributes.heightTablet ),
- '--height-mobile': optionalUnit( attributes.heightMobile ),
- '--border-width': optionalUnit( attributes.borderWidth ),
- '--border-width-tablet': optionalUnit( attributes.borderWidthTablet ),
- '--border-width-mobile': optionalUnit( attributes.borderWidthMobile ),
- '--gap': optionalUnit( attributes.gap ),
- '--gap-tablet': optionalUnit( attributes.gapTablet ),
- '--gap-mobile': optionalUnit( attributes.gapMobile ),
- '--value-font-size': optionalUnit( attributes.valueFontSize ),
- '--value-font-size-tablet': optionalUnit( attributes.valueFontSizeTablet ),
- '--value-font-size-mobile': optionalUnit( attributes.valueFontSizeMobile ),
- '--label-font-size': optionalUnit( attributes.labelFontSize ),
- '--label-font-size-tablet': optionalUnit( attributes.labelFontSizeTablet ),
- '--label-font-size-mobile': optionalUnit( attributes.labelFontSizeMobile ),
+ '--height': _px( attributes.height ),
+ '--height-tablet': _px( attributes.heightTablet ),
+ '--height-mobile': _px( attributes.heightMobile ),
+ '--border-width': _px( attributes.borderWidth ),
+ '--border-width-tablet': _px( attributes.borderWidthTablet ),
+ '--border-width-mobile': _px( attributes.borderWidthMobile ),
+ '--gap': _px( attributes.gap ),
+ '--gap-tablet': _px( attributes.gapTablet ),
+ '--gap-mobile': _px( attributes.gapMobile ),
+ '--value-font-size': _px( attributes.valueFontSize ),
+ '--value-font-size-tablet': _px( attributes.valueFontSizeTablet ),
+ '--value-font-size-mobile': _px( attributes.valueFontSizeMobile ),
+ '--label-font-size': _px( attributes.labelFontSize ),
+ '--label-font-size-tablet': _px( attributes.labelFontSizeTablet ),
+ '--label-font-size-mobile': _px( attributes.labelFontSizeMobile ),
'--alignment': attributes.alignment,
'--padding': boxValues( attributes.padding ),
'--padding-tablet': boxValues( attributes.paddingTablet ),
diff --git a/src/blocks/blocks/flip/inspector.js b/src/blocks/blocks/flip/inspector.js
index 537614d24..0c94b1b88 100644
--- a/src/blocks/blocks/flip/inspector.js
+++ b/src/blocks/blocks/flip/inspector.js
@@ -60,15 +60,14 @@ import {
removeBoxDefaultValues,
stringToBox,
_i,
- _px
+ _px,
+ numberToBox
} from '../../helpers/helper-functions.js';
import { alignBottom, alignTop, alignCenter as oAlignCenter } from '../../helpers/icons.js';
import { useResponsiveAttributes } from '../../helpers/utility-hooks.js';
-const wrapNumberInBox = ( x ) => isNumber( x ) ? stringToBox( _px( x ) ) : x;
-
const defaultFontSizes = [
{
name: '14',
@@ -470,7 +469,7 @@ const Inspector = ({
label={ __( 'Description', 'otter-blocks' ) }
>
+
{ attributes.helpText }
diff --git a/src/blocks/blocks/form/input/index.js b/src/blocks/blocks/form/input/index.js
index 21a3832d4..823cbda43 100644
--- a/src/blocks/blocks/form/input/index.js
+++ b/src/blocks/blocks/form/input/index.js
@@ -39,28 +39,38 @@ registerBlockType( name, {
{
name: 'themeisle-blocks/form-input-email',
description: __( 'Insert an email field', 'otter-blocks' ),
- icon: 'email',
+ icon: icon,
title: __( 'Email Field', 'otter-blocks' ),
attributes: {
type: 'email'
}
},
+ {
+ name: 'themeisle-blocks/form-input-date',
+ description: __( 'Insert a date field', 'otter-blocks' ),
+ icon: icon,
+ title: __( 'Date Field', 'otter-blocks' ),
+ attributes: {
+ type: 'date'
+ }
+ },
{
name: 'themeisle-blocks/form-input-number',
description: __( 'Insert a number field', 'otter-blocks' ),
- icon: 'calculator',
+ icon: icon,
title: __( 'Number Field', 'otter-blocks' ),
attributes: {
type: 'number'
}
},
{
- name: 'themeisle-blocks/form-input-date',
- description: __( 'Insert a date field', 'otter-blocks' ),
- icon: 'calendar-alt',
- title: __( 'Date Field', 'otter-blocks' ),
+ name: 'themeisle-blocks/form-input-url',
+ description: __( 'Insert an URL field', 'otter-blocks' ),
+ icon: icon,
+ title: __( 'URL Field', 'otter-blocks' ),
attributes: {
- type: 'date'
+ type: 'url',
+ placeholder: 'https://'
}
}
],
@@ -77,6 +87,26 @@ registerBlockType( name, {
...attrs
});
}
+ },
+ {
+ type: 'block',
+ blocks: [ 'themeisle-blocks/form-multiple-choice' ],
+ transform: ( attributes ) => {
+ const attrs = omit( attributes, [ 'type' ]);
+ return createBlock( 'themeisle-blocks/form-multiple-choice', {
+ ...attrs
+ });
+ }
+ },
+ {
+ type: 'block',
+ blocks: [ 'themeisle-blocks/form-file' ],
+ transform: ( attributes ) => {
+ const attrs = omit( attributes, [ 'type' ]);
+ return createBlock( 'themeisle-blocks/form-file', {
+ ...attrs
+ });
+ }
}
]
}
diff --git a/src/blocks/blocks/form/input/inspector.js b/src/blocks/blocks/form/input/inspector.js
index a80f1aee0..bfd1a4dc7 100644
--- a/src/blocks/blocks/form/input/inspector.js
+++ b/src/blocks/blocks/form/input/inspector.js
@@ -15,7 +15,9 @@ import {
TextControl,
ToggleControl
} from '@wordpress/components';
-import { FieldInputWidth } from '../common';
+import { FieldInputWidth, fieldTypesOptions, HideFieldLabelToggle, switchFormFieldTo } from '../common';
+import { useContext } from '@wordpress/element';
+import { FormContext } from '../edit';
/**
*
@@ -25,9 +27,13 @@ import { FieldInputWidth } from '../common';
const Inspector = ({
attributes,
setAttributes,
- selectParent,
- switchToTextarea
+ clientId
}) => {
+
+ const {
+ selectForm
+ } = useContext( FormContext );
+
return (
selectParent?.() }
+ onClick={ () => selectForm?.() }
>
{ __( 'Back to the Form', 'otter-blocks' ) }
@@ -44,33 +50,13 @@ const Inspector = ({
{
- if ( 'textarea' === type ) {
- switchToTextarea?.();
+ if ( 'textarea' === type || 'radio' === type || 'checkbox' === type || 'select' === type || 'file' === type ) {
+ switchFormFieldTo( type, clientId, attributes );
return;
}
+
setAttributes({ type });
}}
/>
@@ -81,13 +67,19 @@ const Inspector = ({
onChange={ label => setAttributes({ label }) }
/>
+ setAttributes({ placeholder }) }
- />
+ {
+ ( 'date' !== attributes.type || undefined === attributes.type ) && (
+ setAttributes({ placeholder }) }
+ />
+ )
+ }
diff --git a/src/blocks/blocks/form/inspector.js b/src/blocks/blocks/form/inspector.js
index 5b0aa53ce..198605425 100644
--- a/src/blocks/blocks/form/inspector.js
+++ b/src/blocks/blocks/form/inspector.js
@@ -65,6 +65,7 @@ import { makeBox } from '../../plugins/copy-paste/utils';
import { _px, setUtm } from '../../helpers/helper-functions.js';
import { SortableInputField } from './sortable-input-fields';
import AutoDisableSyncAttr from '../../components/auto-disable-sync-attr/index';
+import { selectAllFieldsFromForm } from './common';
const compare = x => {
return x?.[1] && x[0] !== x[1];
@@ -227,42 +228,73 @@ const FormOptions = ({ formOptions, setFormOption, attributes, setAttributes })
/>
+
{ ! Boolean( window.themeisleGutenberg?.hasPro ) && (
- false }
- label={ __( 'Autoresponder (Pro)', 'otter-blocks' ) }
- onDeselect={ () => {} }
- >
- {} }
- help={ __( 'Enter the subject of the autoresponder email.', 'otter-blocks' ) }
- disabled
- className="o-disabled"
- />
-
- {} }
- help={ __( 'Enter the body of the autoresponder email.', 'otter-blocks' ) }
- disabled
- className="o-disabled"
- />
-
-
+
- { __( 'Unlock this with Otter Pro.', 'otter-blocks' ) } }
- variant="upsell"
+
+ undefined !== formOptions.submissionsSaveLocation }
+ label={ __( 'Submissions', 'otter-blocks' ) }
+ onDeselect={ () => setFormOption({ submissionsSaveLocation: undefined }) }
+ isShownByDefault={ true }
+ >
+ {} }
+ options={
+ [
+ { label: __( 'Database (Pro)', 'otter-blocks' ), value: 'database' },
+ { label: __( 'Email Only', 'otter-blocks' ), value: 'email' },
+ { label: __( 'Database and Email (Pro)', 'otter-blocks' ), value: 'database-email' }
+ ]
+ }
+ help={ __( 'The submissions are send only via email. No data will be saved on the server, use this option to handle sensitive data.', 'otter-blocks' ) }
+ />
+
+
+ false }
+ label={ __( 'Autoresponder (Pro)', 'otter-blocks' ) }
+ onDeselect={ () => {} }
+ >
+ {} }
+ help={ __( 'Enter the subject of the autoresponder email.', 'otter-blocks' ) }
+ disabled
+ className="o-disabled"
+ />
+
+ {} }
+ help={ __( 'Enter the body of the autoresponder email.', 'otter-blocks' ) }
+ disabled
+ className="o-disabled"
/>
-
-
+ { __( 'Unlock this with Otter Pro.', 'otter-blocks' ) } }
+ variant="upsell"
+ />
+
+ { __( 'Enhance your email process with our new feature. Store submissions in a database for easy access.', 'otter-blocks' ) }
+{ __( 'Automatically send follow-up emails to your users with the Autoresponder feature.', 'otter-blocks' ) }
-
+ { __( 'Unlock this with Otter Pro.', 'otter-blocks' ) } }
+ variant="upsell"
+ />
+
+
+
+
) }
);
@@ -302,9 +334,7 @@ const Inspector = ({
hasInnerBlocks
} = useContext( FormContext );
- const inputFields = children.filter( inputField => {
- return 'themeisle-blocks/form-input' === inputField.name || 'themeisle-blocks/form-textarea' === inputField.name;
- });
+ const inputFields = selectAllFieldsFromForm( children );
const formIntegrationChanged = isChanged([
[ formOptions.provider, savedFormOptions?.integration?.provider ],
@@ -315,12 +345,12 @@ const Inspector = ({
const InputFieldList = SortableContainer( ({ items }) => {
return (
{ __( 'Automatically send follow-up emails to your users with the Autoresponder feature.', 'otter-blocks' ) }
+
- { items.map( ( inputField, index ) => {
+ { items.map( ( item, index ) => {
return (
+
+ );
+};
+
+export default Edit;
diff --git a/src/blocks/blocks/form/multiple-choice/index.js b/src/blocks/blocks/form/multiple-choice/index.js
new file mode 100644
index 000000000..2829b1a20
--- /dev/null
+++ b/src/blocks/blocks/form/multiple-choice/index.js
@@ -0,0 +1,95 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+import { registerBlockType } from '@wordpress/blocks';
+
+import { createBlock } from '@wordpress/blocks';
+
+import { omit } from 'lodash';
+
+/**
+ * Internal dependencies
+ */
+import metadata from './block.json';
+import { formFieldIcon as icon } from '../../../helpers/icons.js';
+import edit from './edit.js';
+
+const { name } = metadata;
+
+if ( ! window.themeisleGutenberg.isAncestorTypeAvailable ) {
+ metadata.parent = [ 'themeisle-blocks/form' ];
+}
+
+registerBlockType( name, {
+ ...metadata,
+ title: __( 'Multiple Choice Field', 'otter-blocks' ),
+ description: __( 'Display a checkbox or radio list.', 'otter-blocks' ),
+ icon,
+ variations: [
+ {
+ name: 'themeisle-blocks/form-input-checkbox',
+ description: __( 'Insert a checkbox list field', 'otter-blocks' ),
+ icon: icon,
+ title: __( 'Checkbox Field', 'otter-blocks' ),
+ attributes: {
+ type: 'checkbox'
+ }
+ },
+ {
+ name: 'themeisle-blocks/form-input-radio',
+ description: __( 'Insert a radio list field', 'otter-blocks' ),
+ icon: icon,
+ title: __( 'Radio Field', 'otter-blocks' ),
+ attributes: {
+ type: 'radio'
+ }
+ },
+ {
+ name: 'themeisle-blocks/form-input-select',
+ description: __( 'Insert a select field', 'otter-blocks' ),
+ icon: icon,
+ title: __( 'Select Field', 'otter-blocks' ),
+ attributes: {
+ type: 'select'
+ }
+ }
+ ],
+ edit,
+ save: () => null,
+ transforms: {
+ to: [
+ {
+ type: 'block',
+ blocks: [ 'themeisle-blocks/form-input' ],
+ transform: ( attributes ) => {
+ const attrs = omit( attributes, [ 'type', 'multipleChoice', 'options' ]);
+ return createBlock( 'themeisle-blocks/form-input', {
+ ...attrs
+ });
+ }
+ },
+ {
+ type: 'block',
+ blocks: [ 'themeisle-blocks/form-textarea' ],
+ transform: ( attributes ) => {
+ const attrs = omit( attributes, [ 'type', 'multipleChoice', 'options' ]);
+ return createBlock( 'themeisle-blocks/form-textarea', {
+ ...attrs
+ });
+ }
+ },
+ {
+ type: 'block',
+ blocks: [ 'themeisle-blocks/form-file' ],
+ transform: ( attributes ) => {
+ const attrs = omit( attributes, [ 'type' ]);
+ return createBlock( 'themeisle-blocks/form-file', {
+ ...attrs
+ });
+ }
+ }
+ ]
+ }
+});
diff --git a/src/blocks/blocks/form/multiple-choice/inspector.js b/src/blocks/blocks/form/multiple-choice/inspector.js
new file mode 100644
index 000000000..b7d130482
--- /dev/null
+++ b/src/blocks/blocks/form/multiple-choice/inspector.js
@@ -0,0 +1,140 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+import {
+ InspectorControls,
+ PanelColorSettings
+} from '@wordpress/block-editor';
+
+import {
+ Button,
+ PanelBody,
+ SelectControl,
+ TextareaControl,
+ TextControl,
+ ToggleControl
+} from '@wordpress/components';
+
+import { getActiveStyle, changeActiveStyle } from '../../../helpers/helper-functions.js';
+import { fieldTypesOptions, HideFieldLabelToggle, switchFormFieldTo } from '../common';
+import { useContext } from '@wordpress/element';
+import { FormContext } from '../edit.js';
+
+const styles = [
+ {
+ label: __( 'Inline List', 'otter-blocks' ),
+ value: 'inline-list'
+ }
+];
+
+/**
+ *
+ * @param {import('./types').FormMultipleChoiceInputInspectorProps} props
+ * @returns {JSX.Element}
+ */
+const Inspector = ({
+ attributes,
+ setAttributes,
+ clientId
+}) => {
+
+ const {
+ selectForm
+ } = useContext( FormContext );
+
+ return (
+
+
+
+
+ {
+ if ( 'radio' === type || 'checkbox' === type || 'select' === type ) {
+ setAttributes({ type });
+ return;
+ }
+ switchFormFieldTo( type, clientId, attributes );
+ }}
+ />
+
+ setAttributes({ label }) }
+ />
+
+ setAttributes({ options }) }
+ />
+
+ setAttributes({ helpText }) }
+ />
+
+ {
+ 'select' !== attributes?.type && (
+ {
+ const classes = changeActiveStyle( attributes.className, styles, value ? 'inline-list' : undefined );
+ setAttributes({ className: classes });
+ } }
+ />
+ )
+ }
+
+ {
+ 'select' === attributes?.type && (
+ setAttributes({ multipleSelection }) }
+ />
+ )
+ }
+
+ setAttributes({ isRequired }) }
+ />
+
+
+ setAttributes({ labelColor }),
+ label: __( 'Label Color', 'otter-blocks' )
+ }
+ ] }
+ />
+
+ );
+};
+
+export default Inspector;
diff --git a/src/blocks/blocks/form/multiple-choice/save.js b/src/blocks/blocks/form/multiple-choice/save.js
new file mode 100644
index 000000000..e13c26a26
--- /dev/null
+++ b/src/blocks/blocks/form/multiple-choice/save.js
@@ -0,0 +1,25 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+import {
+ RichText,
+ useBlockProps
+} from '@wordpress/block-editor';
+
+const Save = ({
+ attributes
+}) => {
+ const blockProps = useBlockProps.save({
+ id: attributes.id
+ });
+
+ return (
+
+export interface FormMultipleChoiceInputInspectorProps extends InspectorProps {}
diff --git a/src/blocks/blocks/form/sortable-input-fields.tsx b/src/blocks/blocks/form/sortable-input-fields.tsx
index 231df0a61..57d8c1454 100644
--- a/src/blocks/blocks/form/sortable-input-fields.tsx
+++ b/src/blocks/blocks/form/sortable-input-fields.tsx
@@ -23,7 +23,7 @@ const DragHandle = SortableHandle( () => {
});
type SortableTabProps = {
- inputField: FormInputProps
+ item: { parentClientId: string, inputField: FormInputProps}
actions: {
select?: ( clientId: string ) => void
delete?: ( clientId: string ) => void
@@ -35,11 +35,31 @@ const fieldNames: Record = {
'email': __( 'Email Field', 'otter-blocks' ),
'date': __( 'Date Field', 'otter-blocks' ),
'number': __( 'Number Field', 'otter-blocks' ),
- 'textarea': __( 'Textarea Field', 'otter-blocks' )
+ 'textarea': __( 'Textarea Field', 'otter-blocks' ),
+ 'select': __( 'Select Field', 'otter-blocks' ),
+ 'checkbox': __( 'Checkbox Field', 'otter-blocks' ),
+ 'radio': __( 'Radio Field', 'otter-blocks' ),
+ 'file': __( 'File Field', 'otter-blocks' ),
+ 'url': __( 'URL Field', 'otter-blocks' )
};
-export const SortableInputField = SortableElement( ({ inputField, actions } : SortableTabProps ) => {
- const fieldName = 'themeisle-blocks/form-input' === inputField.name ? ( inputField.attributes.type ?? 'text' ) : 'textarea';
+const extractFieldName = ( input: FormInputProps ) => {
+ const tag = input?.name?.replace( 'themeisle-blocks/', '' );
+
+ if ( 'form-input' === tag || 'form-multiple-choice' === tag ) {
+ return input.attributes.type ?? 'text';
+ }
+
+ if ( 'form-file' === tag ) {
+ return 'file';
+ }
+
+ return 'textarea';
+};
+
+export const SortableInputField = SortableElement( ({ item, actions } : SortableTabProps ) => {
+ const { inputField } = item;
+ const fieldName = extractFieldName( inputField );
return (
+
+
+
+
+
+ );
+};
+
+const SelectField = ({ attributes }) => {
+ return (
+
+ );
+};
+
+/**
+ * Form Input component
+ * @param {import('./types').FormMultipleChoiceInputProps} props
+ * @returns
+ */
+const Edit = ({
+ attributes,
+ setAttributes,
+ clientId
+}) => {
+ useEffect( () => {
+ const unsubscribe = blockInit( clientId, defaultAttributes );
+ return () => unsubscribe( attributes.id );
+ }, [ attributes.id ]);
+
+ const blockProps = useBlockProps();
+
+ return (
+
+
+
+
+ {
+ 'select' === attributes?.type ?
+
+ {
+ ( attributes?.options ?? '' )?.split( '\n' )?.map( ( label, index ) => {
+ return
+ )
+ }
+
+ {
+ attributes.helpText && (
+
+ { attributes.helpText }
+
+ )
+ }
+
+
+
+ );
+};
+
+export default Save;
diff --git a/src/blocks/blocks/form/multiple-choice/types.d.ts b/src/blocks/blocks/form/multiple-choice/types.d.ts
new file mode 100644
index 000000000..335bc706a
--- /dev/null
+++ b/src/blocks/blocks/form/multiple-choice/types.d.ts
@@ -0,0 +1,15 @@
+import {
+ BlockProps,
+ InspectorProps
+} from '../../../helpers/blocks';
+import { FormInputCommonProps } from '../common';
+
+type Attributes = FormInputCommonProps & {
+ type: string
+ inputWidth: number
+ options: string,
+ multipleSelection: boolean,
+}
+
+export type FormMultipleChoiceInputProps = BlockProps
diff --git a/src/blocks/blocks/form/style.scss b/src/blocks/blocks/form/style.scss
index 315927270..fec3f8149 100644
--- a/src/blocks/blocks/form/style.scss
+++ b/src/blocks/blocks/form/style.scss
@@ -1,5 +1,5 @@
.wp-block-themeisle-blocks-form {
-
+
--border-radius: 4px;
--border-color: inherit;
--border-width: 1px;
@@ -39,6 +39,10 @@
flex-wrap: wrap;
gap: var(--inputs-gap);
+ &> div {
+ margin: 0px;
+ }
+
p {
margin-bottom: 10px;
}
@@ -180,7 +184,7 @@
&.right > div {
align-items: flex-end;
-
+
.o-form-server-response {
padding-right: 0px;
}
@@ -189,7 +193,7 @@
&.o-right-tablet > div {
@media ( max-width: 1024px ) {
align-items: flex-end;
-
+
.o-form-server-response {
padding-right: 0px;
}
@@ -199,7 +203,7 @@
&.o-right-mobile > div {
@media ( max-width:640px ) {
align-items: flex-end;
-
+
.o-form-server-response {
padding-right: 0px;
}
@@ -208,7 +212,7 @@
&.left > div {
align-items: flex-start;
-
+
.o-form-server-response {
padding-left: 0px;
}
@@ -217,7 +221,7 @@
&.o-left-tablet > div {
@media ( max-width: 1024px ) {
align-items: flex-start;
-
+
.o-form-server-response {
padding-left: 0px;
}
@@ -227,7 +231,7 @@
&.o-left-mobile > div {
@media ( max-width:640px ) {
align-items: flex-start;
-
+
.o-form-server-response {
padding-left: 0px;
}
@@ -242,7 +246,7 @@
@media ( max-width: 1024px ) {
align-items: center;
}
- }
+ }
&.o-full-mobile > div, &.o-center-mobile > div {
@media ( max-width:640px ) {
@@ -253,7 +257,7 @@
}
- .wp-block-themeisle-blocks-form-input, .wp-block-themeisle-blocks-form-textarea {
+ .wp-block-themeisle-blocks-form-input, .wp-block-themeisle-blocks-form-textarea, .wp-block-themeisle-blocks-form-multiple-choice, .wp-block-themeisle-blocks-form-file {
display: flex;
flex-direction: column;
width: 100%;
@@ -270,14 +274,30 @@
}
}
- .otter-form-input, .otter-form-textarea-input {
+ .otter-form-input, .otter-form-textarea-input, select {
color: var(--input-color);
width: var(--input-width);
- padding: var(--padding);
- border-radius: var(--border-radius);
- border-width: var(--border-width);
- border-color: var(--border-color);
- border-style: solid;
+ font-size: var(--input-font-size);
+
+ &:not(input[type="file"]) {
+ padding: var(--padding);
+ border-radius: var(--border-radius);
+ border-width: var(--border-width);
+ border-color: var(--border-color);
+ border-style: solid;
+ background-color: var(--input-bg-color);
+ }
+
+ @media (max-width: 1024px) {
+ padding: var(--padding-tablet);
+ }
+
+ @media (max-width: 640px) {
+ padding: var(--padding-mobile);
+ }
+ }
+
+ .o-form-choice-label {
font-size: var(--input-font-size);
background: var(--input-bg-color);
box-sizing: border-box;
@@ -288,6 +308,48 @@
color: var(--help-label-color);
margin-bottom: 0px;
font-size: var(--help-font-size);
+ width: 100%;
+ }
+
+ &.is-style-hidden-label {
+ .otter-form-input-label, .otter-form-textarea-label {
+ display: none;
+ }
+ }
+
+ @media (min-width: 640px) {
+ flex-grow: 1;
+
+ &:is(.is-style-o-c-three-quarters, .is-style-o-c-two-thirds, .is-style-o-c-half, .is-style-o-c-one-third, .is-style-o-c-one-quarter) {
+ box-sizing: border-box;
+ margin-left: 0px;
+ margin-right: 0px;
+ }
+
+ &.is-style-o-c-three-quarters {
+ flex-basis: calc( 75% - var( --inputs-gap ) );
+ max-width: 75%;
+ }
+
+ &.is-style-o-c-two-thirds {
+ flex-basis: calc( 66.66666666666666% - var( --inputs-gap ) );
+ max-width: 66.66666666666666%;
+ }
+
+ &.is-style-o-c-half {
+ flex-basis: calc( 50% - var( --inputs-gap ) );
+ max-width: 50%;
+ }
+
+ &.is-style-o-c-one-third {
+ flex-basis: calc( 33.33333333333333% - var( --inputs-gap ) );
+ max-width: 33.33333333333333%;
+ }
+
+ &.is-style-o-c-one-quarter {
+ flex-basis: calc( 25% - var( --inputs-gap ) );
+ max-width: 25%;
+ }
}
@media (min-width: 640px) {
@@ -392,4 +454,42 @@
animation: spinner 0.6s linear infinite;
}
}
+
+ .wp-block-themeisle-blocks-form-multiple-choice.is-style-inline-list:not(:has(.o-form-choices select)) .o-form-choices {
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ gap: 8px;
+ }
+
+ .wp-block-themeisle-blocks-form-multiple-choice {
+ label, select {
+ color: var(--input-color);
+ }
+
+ select {
+ width: var(--input-width);
+ border-color: var(--input-color);
+ padding: var(--padding);
+
+ @media (max-width: 1024px) {
+ padding: var(--padding-tablet);
+ }
+
+ @media (max-width: 640px) {
+ padding: var(--padding-mobile);
+ }
+ }
+ }
+
+ .wp-block-themeisle-blocks-form-file input[type="file"] {
+ border: 0px;
+ }
+}
+
+.o-form-multiple-choice-field {
+ display: flex;
+ align-items: center;
+ flex-direction: row;
+ gap: 5px;
}
diff --git a/src/blocks/blocks/form/textarea/edit.js b/src/blocks/blocks/form/textarea/edit.js
index 2c370b903..ce17d5df5 100644
--- a/src/blocks/blocks/form/textarea/edit.js
+++ b/src/blocks/blocks/form/textarea/edit.js
@@ -10,19 +10,16 @@ import {
import {
Fragment,
- useEffect,
- useRef
+ useEffect
} from '@wordpress/element';
-import { createBlock } from '@wordpress/blocks';
-
/**
* Internal dependencies
*/
import metadata from './block.json';
import { blockInit } from '../../../helpers/block-utility.js';
import Inspector from './inspector.js';
-import { useDispatch, useSelect } from '@wordpress/data';
+import { _cssBlock } from '../../../helpers/helper-functions';
const { attributes: defaultAttributes } = metadata;
@@ -43,68 +40,23 @@ const Edit = ({
const blockProps = useBlockProps();
- const labelRef = useRef( null );
- const inputRef = useRef( null );
- const helpRef = useRef( null );
-
- const {
- parentClientId
- } = useSelect( select => {
- const {
- getBlock,
- getBlockRootClientId
- } = select( 'core/block-editor' );
-
- if ( ! clientId ) {
- return {
- parentClientId: ''
- };
- }
-
- const parentClientId = getBlockRootClientId( clientId );
-
- return {
- parentClientId: parentClientId ?? ''
- };
- }, [ clientId ]);
-
- const { selectBlock, replaceBlock } = useDispatch( 'core/block-editor' );
-
- const switchToInput = type => {
- const block = createBlock( 'themeisle-blocks/form-input', { ...attributes, type: type });
- replaceBlock( clientId, block );
- };
-
- useEffect( () => {
- const per = x => x ? x + '%' : x;
-
- /**
- * TODO: Refactor this based on #748
- */
-
- if ( inputRef.current ) {
- inputRef.current?.style?.setProperty( '--input-width', per( attributes.inputWidth ) );
- }
- if ( labelRef.current ) {
- labelRef.current?.style?.setProperty( '--label-color', attributes.labelColor || null );
- }
- if ( helpRef.current ) {
- helpRef.current?.style?.setProperty( '--label-color', attributes.labelColor || null );
- }
- }, [ inputRef.current, labelRef.current, attributes ]);
-
return (
selectBlock( parentClientId ) }
- switchToInput={ switchToInput }
+ clientId={ clientId }
/>
+