Filters

.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

admin/abstract-api.php

@@ -40,6 +40,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
 	 *
@@ -67,4 +75,4 @@ protected function error( $code, $message ) {
 	protected function success( $data ) {
 		wp_send_json_success( $data );
 	}
-}
+}

admin/blocks/api.php

@@ -105,8 +105,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(
@@ -235,18 +235,15 @@ public function actionCreateGlobalBlock() {
 
 			if ( $status == 'publish' && is_null( $compiledData ) ) {
 				$this->error( 400, "The compiled data is missing" );
-			}
-
-			$bockManager = new Brizy_Admin_Blocks_Manager( Brizy_Admin_Blocks_Main::CP_GLOBAL );
+			}$bockManager = new Brizy_Admin_Blocks_Manager(Brizy_Admin_Blocks_Main::CP_GLOBAL);
 
 			/**
-			 * @var Brizy_Editor_Block $block ;
-			 */
-			$block = $bockManager->createEntity( $this->param( 'uid' ), $status );
-			$block->setMeta( stripslashes( $this->param( 'meta' ) ) );
-			$block->set_editor_data( $editorData );
-			$block->set_needs_compile( true );
-			$block->setHtml( $html );
+	         * @var Brizy_Editor_Block $block;
+	         */
+            $block       = $bockManager->createEntity($this->param('uid'), $status);
+            $block->setMeta(stripslashes($this->param('meta')));
+            $block->set_editor_data($editorData);
+            $block->set_needs_compile(true);$block->setHtml( $html );
 
 			if ( $status == 'publish' && $compiledData ) {
 
@@ -256,7 +253,7 @@ public function actionCreateGlobalBlock() {
 					$this->error( 400, "The compiled data is invalid" );
 				}
 
-				$block->set_encoded_compiled_html( $compiled['html'] );
+	        $block->set_encoded_compiled_html( $compiled['html'] );
 				$block->set_compiled_scripts( [
 					'free' => $compiled['assets']['freeScripts'],
 					'pro'  => ( isset( $compiled['assets']['proScripts'] ) ? $compiled['assets']['proScripts'] : [] ),
@@ -272,14 +269,15 @@ public function actionCreateGlobalBlock() {
 			}
 
 			if ( $this->param( 'tags' ) ) {
-				$block->setTags( stripslashes( $this->param( 'tags' ) ) );
-			}
 
-			if ( $position ) {
-				$block->setPosition(
-					Brizy_Editor_BlockPosition::createFromSerializedData( get_object_vars( json_decode( $position ) ) )
-				);
-			}
+		        $block->setTags(stripslashes($this->param('tags')));
+	        }
+
+            if ($position) {
+                $block->setPosition(
+                    Brizy_Editor_BlockPosition::createFromSerializedData(get_object_vars(json_decode($position)))
+                );
+            }
 
 			// rules
 			if ( $rulesData ) {
@@ -428,8 +426,8 @@ public function actionUpdateGlobalBlocks() {
 				}
 			}
 
-			$bockManager = new Brizy_Admin_Blocks_Manager( Brizy_Admin_Blocks_Main::CP_GLOBAL );
-			$blocks      = $bockManager->getEntity( (array) $this->param( 'uid' ) );
+            $bockManager = new Brizy_Admin_Blocks_Manager(Brizy_Admin_Blocks_Main::CP_GLOBAL);
+                $blocks       = $bockManager->getEntity((array)$this->param('uid'));
 
 			foreach ( (array) $this->param( 'uid' ) as $i => $uid ) {
 
@@ -519,13 +517,15 @@ public function actionUpdateGlobalBlocks() {
 
 					$block->save();
 
-					do_action( 'brizy_global_block_updated', $block );
-				}
-			}
+                    do_action('brizy_global_block_updated', $block);
+
+                }
+}
 
 			do_action( 'brizy_global_data_updated' );
 
-			$this->success( [] );
+
+            $this->success([]);
 
 		} catch ( Exception $exception ) {
 			$this->error( 400, $exception->getMessage() );
@@ -554,24 +554,25 @@ public function actionDeleteGlobalBlock() {
 	public function actionGetSavedBlocks() {
 		$this->verifyNonce( self::nonce );
 
-		try {
-			$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 ),
-				'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',
-				$bockManager->createResponseForEntities( $blocks, $fields ),
-				$fields,
-				$bockManager );
-			$this->success( $blocks );
-		} catch ( Exception $exception ) {
-			$this->error( 400, $exception->getMessage() );
-		}
-	}
+        try {
+            $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),
+                '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',
+                $bockManager->createResponseForEntities($blocks, $fields),
+                $fields,
+                $bockManager
+            );
+            $this->success($blocks);
+        } catch (Exception $exception) {
+            $this->error(400, $exception->getMessage());
+        }
+    }
 
 	public function actionGetSavedBlockByUid() {
 		$this->verifyNonce( self::nonce );
@@ -618,20 +619,20 @@ public function actionCreateSavedBlock() {
 			$this->error( 400, 'Invalid media data provided' );
 		}
 
-		try {
-			$bockManager = new Brizy_Admin_Blocks_Manager( Brizy_Admin_Blocks_Main::CP_SAVED );
-			$block       = $bockManager->createEntity( $this->param( 'uid' ) );
-			$block->setMedia( stripslashes( $this->param( 'media' ) ) );
-			$block->setMeta( stripslashes( $this->param( 'meta' ) ) );
+        try {
+            $bockManager = new Brizy_Admin_Blocks_Manager(Brizy_Admin_Blocks_Main::CP_SAVED);
+            $block       = $bockManager->createEntity($this->param('uid'));
+            $block->setMedia(stripslashes($this->param('media')));
+            $block->setMeta(stripslashes($this->param('meta')));
 
-			if ( $this->param( 'title' ) ) {
+            if($this->param('title')){
 				$block->setTitle( stripslashes( $this->param( 'title' ) ) );
 			}
 			if ( $this->param( 'tags' ) ) {
-				$block->setTags( stripslashes( $this->param( 'tags' ) ) );
-			}
+	        	$block->setTags(stripslashes($this->param('tags')));
+	        }
 
-			$block->set_editor_data( $this->sanitizeJson(stripslashes( $this->param( 'data' ) ) ));
+            $block->set_editor_data( $this->sanitizeJson(stripslashes( $this->param( 'data' ) ) ));
 			$block->set_needs_compile( true );
 			//$block->setCloudUpdateRequired( true );
 			$block->save();
@@ -688,13 +689,13 @@ public function actionUpdateSavedBlock() {
 			}
 
 
-			if ( (int) $this->param( 'is_autosave' ) ) {
-				$block->save( 1 );
-			} else {
-				$block->save();
-				do_action( 'brizy_saved_block_updated', $block );
-				do_action( 'brizy_global_data_updated' );
-			}
+	        if ((int)$this->param('is_autosave')) {
+                $block->save(1);
+            } else {
+                $block->save();
+                do_action('brizy_saved_block_updated', $block);
+                do_action('brizy_global_data_updated');
+            }
 
 			Brizy_Editor_Block::cleanClassCache();
 

admin/blocks/main.php

@@ -372,7 +372,7 @@ private function findReferencedInPage($wpPost)
             return [];
         }
 
-        $context = Brizy_Content_ContextFactory::createContext(Brizy_Editor_Project::get(), $wpPost);
+        $context = Brizy_Content_ContextFactory::createContext(Brizy_Editor_Project::get(), $wpPost->getWpPost());
         $placeholderProvider = new Brizy_Content_Providers_GlobalBlockProvider($context);
 
         $extractor = new \BrizyPlaceholders\Extractor($placeholderProvider);

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) {
@@ -201,16 +202,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

@@ -134,4 +134,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' ] );
 	}