moved to API from editor

.github/.build-env

@@ -1,4 +1,4 @@
-BUILD_ENVIRONMENT=develop
-FREE_BRANCH=develop
-PRO_BRANCH=develop
-EDITOR_BRANCH=dev
+BUILD_ENVIRONMENT=master
+FREE_BRANCH=master
+PRO_BRANCH=master
+EDITOR_BRANCH=master

README.md

@@ -4,7 +4,7 @@ Contributors: themefuse<br>
 Requires at least: 4.5<br>
 Tested up to: 6.2.2<br>
 Requires PHP: 5.6.20<br>
-Stable tag: 2.4.26<br>
+Stable tag: 2.4.27<br>
 License: GPLv3<br>
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -136,6 +136,9 @@ $bodyHtml = apply_filters( 'brizy_content', $html->get_body(), Brizy_Editor_Proj
 
 ## Changelog
 
+### 2.4.27 - 2023-08-08
+* New: Added new  blocks
+
 ### 2.4.26 - 2023-07-12
 * New: Added custom video URL for Block background 
 * New: Added copy/paste styles for Text element 

admin/abstract-api.php

@@ -38,6 +38,14 @@ protected function verifyNonce( $action ) {
 		}
 	}
 
+	protected function addAjaxAction($action,$callable) {
+		add_action( 'wp_ajax_' . Brizy_Editor::prefix($action), $callable );
+	}
+
+	protected function addNoPrivAjaxAction($action,$callable) {
+		add_action( 'wp_ajax_nopriv_' . Brizy_Editor::prefix($action), $callable );
+	}
+
 	/**
 	 * @param int|string $name
 	 *
@@ -65,4 +73,4 @@ protected function error( $code, $message ) {
 	protected function success( $data ) {
 		wp_send_json_success( $data );
 	}
-}
+}

admin/blocks/api.php

@@ -111,8 +111,8 @@ public function actionDownloadBlocks()
             $items = array_filter($items);
 
             if (count($items) == 0) {
-                $this->error(404, __('There are no blocks to be archived', 'brizy' ) );
-			}
+                $this->error(404, __('There are no blocks to be archived', 'brizy'));
+            }
 
             $fontManager = new Brizy_Admin_Fonts_Manager();
             $zip         = new Brizy_Editor_Zip_Archiver(
@@ -240,7 +240,7 @@ public function actionCreateGlobalBlock()
 	        /**
 	         * @var Brizy_Editor_Post $block;
 	         */
-            $block = $bockManager->createEntity($this->param('uid'), $status);
+            $block       = $bockManager->createEntity($this->param('uid'), $status);
             $block->setMeta(stripslashes($this->param('meta')));
             $block->set_editor_data($editorData);
             $block->set_needs_compile(true);
@@ -380,7 +380,7 @@ public function actionUpdateGlobalBlocks()
             }
 
             $bockManager = new Brizy_Admin_Blocks_Manager(Brizy_Admin_Blocks_Main::CP_GLOBAL);
-            $blocks = $bockManager->getEntity((array)$this->param('uid'));
+                $blocks       = $bockManager->getEntity((array)$this->param('uid'));
 
             foreach ((array)$this->param('uid') as $i => $uid) {
 
@@ -442,11 +442,13 @@ public function actionUpdateGlobalBlocks()
                     $block->save();
 
                     do_action('brizy_global_block_updated', $block);
+
                 }
-            }
+}
 
             do_action('brizy_global_data_updated');
 
+
             $this->success([]);
 
         } catch (Exception $exception) {
@@ -479,18 +481,19 @@ public function actionGetSavedBlocks()
         $this->verifyNonce(self::nonce);
 
         try {
-            $fields = $this->param('fields') ? $this->param('fields') : [];
+            $fields      = $this->param('fields') ? $this->param('fields') : [];
             $bockManager = new Brizy_Admin_Blocks_Manager(Brizy_Admin_Blocks_Main::CP_SAVED);
-            $blocks = $bockManager->getEntities([
-                'paged' => (int)($this->param('page') ?: 1),
+            $blocks      = $bockManager->getEntities([
+            'paged' => (int)($this->param('page') ?: 1),
                 'posts_per_page' => (int)($this->param('count') ?: -1),
                 'order' => $this->param('order') ?: 'ASC',
                 'orderby' => $this->param('orderby') ?: 'ID'
-            ]);
-            $blocks = apply_filters('brizy_get_saved_blocks',
+            ]);$blocks      = apply_filters(
+                'brizy_get_saved_blocks',
                 $bockManager->createResponseForEntities($blocks, $fields),
                 $fields,
-                $bockManager);
+                $bockManager
+            );
             $this->success($blocks);
         } catch (Exception $exception) {
             $this->error(400, $exception->getMessage());
@@ -546,7 +549,7 @@ public function actionCreateSavedBlock()
 
         try {
             $bockManager = new Brizy_Admin_Blocks_Manager(Brizy_Admin_Blocks_Main::CP_SAVED);
-            $block = $bockManager->createEntity($this->param('uid'));
+            $block       = $bockManager->createEntity($this->param('uid'));
             $block->setMedia(stripslashes($this->param('media')));
             $block->setMeta(stripslashes($this->param('meta')));
 

admin/layouts/api.php

@@ -41,13 +41,13 @@ protected function getRequestNonce()
 
     protected function initializeApiActions()
     {
-        $pref = 'wp_ajax_' . Brizy_Editor::prefix();
-        add_action($pref . self::DOWNLOAD_LAYOUTS, array($this, 'actionDownloadLayouts'));
-        add_action($pref . self::GET_LAYOUT_BY_UID_ACTION, array($this, 'actionGetLayoutByUid'));
-        add_action($pref . self::GET_LAYOUTS_ACTION, array($this, 'actionGetLayouts'));
-        add_action($pref . self::CREATE_LAYOUT_ACTION, array($this, 'actionCreateLayout'));
-        add_action($pref . self::UPDATE_LAYOUT_ACTION, array($this, 'actionUpdateLayout'));
-        add_action($pref . self::DELETE_LAYOUT_ACTION, array($this, 'actionDeleteLayout'));
+        $pref = 'wp_ajax_'.Brizy_Editor::prefix();
+        add_action($pref.self::DOWNLOAD_LAYOUTS, array($this, 'actionDownloadLayouts'));
+        add_action($pref.self::GET_LAYOUT_BY_UID_ACTION, array($this, 'actionGetLayoutByUid'));
+        add_action($pref.self::GET_LAYOUTS_ACTION, array($this, 'actionGetLayouts'));
+        add_action($pref.self::CREATE_LAYOUT_ACTION, array($this, 'actionCreateLayout'));
+        add_action($pref.self::UPDATE_LAYOUT_ACTION, array($this, 'actionUpdateLayout'));
+        add_action($pref.self::DELETE_LAYOUT_ACTION, array($this, 'actionDeleteLayout'));
     }
 
     public function actionDownloadLayouts()
@@ -77,26 +77,26 @@ public function actionDownloadLayouts()
 
                 return null;
             }, $explode);
-            $items = array_filter($items);
+            $items   = array_filter($items);
             if (count($items) == 0) {
                 $this->error(404, __('There are no layouts to be archived'));
             }
 
-            $zipPath = "Layout-" . date(DATE_ATOM) . ".zip";
+            $zipPath     = "Layout-".date(DATE_ATOM).".zip";
             $fontManager = new Brizy_Admin_Fonts_Manager();
-            $zip = new Brizy_Editor_Zip_Archiver(
+            $zip         = new Brizy_Editor_Zip_Archiver(
                 Brizy_Editor_Project::get(),
                 $fontManager,
                 BRIZY_SYNC_VERSION
             );
-            $zipPath = $zip->createZip($items, $zipPath);
+            $zipPath     = $zip->createZip($items, $zipPath);
 
             header("Pragma: public");
             header("Expires: 0");
             header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
             header("Cache-Control: private", false);
             header("Content-Type: application/octet-stream");
-            header("Content-Disposition: attachment; filename=\"" . basename($zipPath) . "\";");
+            header("Content-Disposition: attachment; filename=\"".basename($zipPath)."\";");
             header("Content-Transfer-Encoding: binary");
 
             echo file_get_contents($zipPath);
@@ -143,18 +143,19 @@ public function actionGetLayouts()
             $layoutManager = new Brizy_Admin_Layouts_Manager();
 
             $fields = $this->param('fields') ? $this->param('fields') : [];
-            $layouts = $layoutManager->getEntities(
-                [
+
+            $layouts = $layoutManager->getEntities([
                     'paged' => (int)($this->param('page') ?: 1),
                     'posts_per_page' => (int)($this->param('count') ?: -1),
                     'order' => $this->param('order') ?: 'ASC',
                     'orderby' => $this->param('orderby') ?: 'ID'
-                ]
-            );
-            $layouts = apply_filters('brizy_get_layouts',
+                ]);
+            $layouts = apply_filters(
+                'brizy_get_layouts',
                 $layoutManager->createResponseForEntities($layouts, $fields),
                 $fields,
-                $layoutManager);
+                $layoutManager
+            );
             $this->success($layouts);
 
         } catch (Exception $exception) {
@@ -192,16 +193,18 @@ public function actionCreateLayout()
             $layout->set_editor_data($editorData);
             $layout->set_needs_compile(true);
 
-            if ($this->param('title')) {
-                $layout->setTitle(stripslashes($this->param('title')));
-            }
+	        if($this->param('title'))
+	        {
+		        $layout->setTitle(stripslashes($this->param('title')));
+	        }
 
-            if ($this->param('tags')) {
-                $layout->setTags(stripslashes($this->param('tags')));
-            }
+	        if($this->param('tags'))
+	        {
+		        $layout->setTags(stripslashes($this->param('tags')));
+	        }
 
 
-            //$layout->setCloudUpdateRequired( true );
+	        //$layout->setCloudUpdateRequired( true );
             $layout->setDataVersion(1);
             $layout->save();
 

admin/main.php

@@ -490,7 +490,6 @@ private function enable_brizy_for_post( $p ) {
 				wp_update_post( $p );
 			}
 			do_action( 'brizy_before_enabled_for_post', $p );
-
 			$post->enable_editor();
 			$post->set_template( Brizy_Config::BRIZY_BLANK_TEMPLATE_FILE_NAME );
 			$post->set_plugin_version( BRIZY_VERSION );

admin/rules/api.php

@@ -342,7 +342,7 @@ public function getGroupList() {
 
 		$groups = [];
 
-		if ( $templateType == 'single' || $templateType == 'single_product' || $context == 'popup-rules' || $context == 'global-block-rules' ) {
+        if ($templateType == 'single' || $templateType == 'single_product' || $context == 'popup-rules' || $context == 'global-block-rules' ) {
 			$groups[] = array(
 				'title' => 'Main Content',
 				'value' => Brizy_Admin_Rule::POSTS,
@@ -360,7 +360,7 @@ public function getGroupList() {
 				) : null;
 		}
 
-		if ( $templateType == 'archive' || $templateType == 'product_archive' || $context == 'popup-rules' || $context == 'global-block-rules' ) {
+        if ($templateType == 'archive' || $templateType == 'product_archive' || $context == 'popup-rules' || $context == 'global-block-rules' ) {
 
 			$archiveItems  = array_map( $closure, $this->getArchivesList( Brizy_Admin_Rule::ARCHIVE, $templateType ) );
 			$taxonomyItems = array_map( $closure, $this->getTaxonomyList( Brizy_Admin_Rule::TAXONOMY, $templateType ) );

admin/stories/main.php

@@ -59,7 +59,7 @@ static public function registerCustomPosts()
 	            'public'              => true,
 	            'description'         => __bt( 'brizy', 'Brizy' ) . ' ' . __( 'stories', 'brizy' ) . '.',
 	            'show_in_menu'        => Brizy_Admin_Settings::menu_slug(),
-	            'rewrite'             => [ 'slug' => self::CP_STORY ],
+	            'rewrite'             => [ 'slug' => apply_filters('brizy_story_rewrite_slug',self::CP_STORY) ],
 	            'capability_type'     => 'page',
 	            'exclude_from_search' => true,
 	            'supports'            => [ 'title', 'post_content', 'revisions' ],

brizy.php

@@ -5,7 +5,7 @@
  * Plugin URI: https://brizy.io/
  * Author: Brizy.io
  * Author URI: https://brizy.io/
- * Version: 2.4.26
+ * Version: 2.4.27
  * Text Domain: brizy
  * License: GPLv3
  * Domain Path: /languages
@@ -19,7 +19,7 @@
 
 define('BRIZY_DEVELOPMENT', false );
 define('BRIZY_LOG', false );
-define('BRIZY_VERSION', '2.4.26');
+define('BRIZY_VERSION', '2.4.27');
 define('BRIZY_MINIMUM_PRO_VERSION', '2.4.15');
 define('BRIZY_EDITOR_VERSION', BRIZY_DEVELOPMENT ? 'dev' : '264-wp' );
 define('BRIZY_SYNC_VERSION', '264');
@@ -132,4 +132,4 @@ function brizy_load_text_domain()
     load_plugin_textdomain('brizy', false, dirname(plugin_basename(__FILE__)) . '/languages');
 }
 
-new Brizy_Compatibilities_Init();
+new Brizy_Compatibilities_Init();

compatibilities/polylang.php

@@ -5,7 +5,7 @@
 class Brizy_Compatibilities_Polylang {
 
 	public function __construct() {
-		add_action( 'brizy_post_loop_args', [ $this, 'post_loop_args' ] );
+		add_filter( 'brizy_post_loop_args', [ $this, 'post_loop_args' ] );
 		add_filter( 'pll_home_url_white_list', [ $this, 'home_url_white_list' ] );
 	}
 

composer.json

@@ -13,7 +13,7 @@
     "knplabs/gaufrette": "0.7",
     "bagrinsergiu/brizy-migration-utils": "^1.4",
     "bagrinsergiu/brizy-merge-page-assets": "dev-master",
-    "bagrinsergiu/content-placeholder": "^2.0.8",
+    "bagrinsergiu/content-placeholder": "^2.0.9",
     "enshrined/svg-sanitize": "^0.13",
     "select2/select2": "^4.0",
     "symfony/dotenv": "^3",

config.dev.php

@@ -23,7 +23,7 @@ class Brizy_Config {
 	const PLATFORM_EMAIL = "[email protected]";
 
 	const UPGRADE_TO_PRO_URL = "https://www.brizy.io/pricing/?utm_source=wp-menu&utm_campaign=gopro&utm_medium=wp-dash/";
-    const EDITOR_TEMPLEATES_URL = "https://e-t-cloud.b-cdn.net/1.0.0/";
+    const EDITOR_TEMPLEATES_URL = "https://e-t-cloud.b-cdn.net/1.3.0/";
     const SUPPORT_URL = "https://support.brizy.io";
 	const ABOUT_URL = "https://brizy.io";
     const TERMS_OF_SERVICE_URL = "https://www.brizy.io/terms-and-conditions";
@@ -47,7 +47,7 @@ class Brizy_Config {
 	const CLOUD_LAYOUTS = '/api/layouts';
 	const CLOUD_SCREENSHOT = '/screenshot/%s';
 	const CLOUD_SCREENSHOTS = '/api/screenshots';
-    const CLOUD_CUSTOM_FILES = '/api/custom_files';
+	const CLOUD_CUSTOM_FILES = '/api/custom_files';
 	const WP_HTTP_TIMEOUT = 600;
 
 	static public function getCompilerUrls() {