sync changes from pro

Author: louiswol94

src/php/class-active-snippets.php

@@ -137,24 +137,18 @@ public function load_plugin() {
 		// Cloud List Table shared functions.
 		require_once $includes_path . '/cloud/list-table-shared-ops.php';
 
-<<<<<<< HEAD
 		// Snippet files.
-		require_once $includes_path . '/flat-files/load.php';
-
 		$this->snippet_handler_registry = new Snippet_Handler_Registry( [
 			'php'  => new Php_Snippet_Handler(),
 			'html' => new Html_Snippet_Handler(),
 		] );
 
-		$fs = new WordPress_Filesystem_Adapter();
+		$fs = new WordPress_File_System_Adapter();
 
 		$config_repo = new Snippet_Config_Repository( $fs );
 
 		( new Snippet_Files( $this->snippet_handler_registry, $fs, $config_repo ) )->register_hooks();
 
-		$this->active_snippets = new Active_Snippets();
-=======
->>>>>>> core
 		$this->front_end = new Front_End();
 		$this->cloud_api = new Cloud_API();
 

src/php/class-plugin.php

@@ -189,21 +189,8 @@ public static function get_type_from_scope( string $scope ): string {
 	 *
 	 * @return string The snippet type – will be a filename extension.
 	 */
-<<<<<<< HEAD
 	public function get_type(): string {
-		if ( '-css' === substr( $this->scope, -4 ) ) {
-			return 'css';
-		} elseif ( '-js' === substr( $this->scope, -3 ) ) {
-			return 'js';
-		} elseif ( 'content' === substr( $this->scope, -7 ) ) {
-			return 'html';
-		} else {
-			return 'php';
-		}
-=======
-	protected function get_type(): string {
 		return self::get_type_from_scope( $this->scope );
->>>>>>> core
 	}
 
 	/**

src/php/class-snippet.php

@@ -4,6 +4,9 @@
 
 use Code_Snippets\DB;
 use Code_Snippets\Snippet;
+use Code_Snippets\Settings;
+use Code_Snippets\Snippet_Files;
+use function Code_Snippets\code_snippets;
 
 /**
  * Class for evaluating content snippets.
@@ -40,8 +43,13 @@ public function __construct( DB $db ) {
 	 * Initialise class functions.
 	 */
 	public function init() {
-		add_action( 'wp_head', [ $this, 'load_head_content' ] );
-		add_action( 'wp_footer', [ $this, 'load_footer_content' ] );
+		if ( Snippet_Files::is_active() ) {
+			add_action( 'wp_head', [ $this, 'load_head_content_from_flat_files' ] );
+			add_action( 'wp_footer', [ $this, 'load_footer_content_from_flat_files' ] );
+		} else {
+			add_action( 'wp_head', [ $this, 'load_head_content' ] );
+			add_action( 'wp_footer', [ $this, 'load_footer_content' ] );
+		}
 	}
 
 	/**
@@ -77,4 +85,46 @@ public function load_head_content() {
 	public function load_footer_content() {
 		$this->print_content_snippets( 'footer-content' );
 	}
+
+	public function load_head_content_from_flat_files() {
+		$this->load_content_snippets_from_flat_files( 'head-content' );
+	}
+
+	public function load_footer_content_from_flat_files() {
+		$this->load_content_snippets_from_flat_files( 'footer-content' );
+	}
+
+	private function populate_active_snippets_from_flat_files() {
+		$handler = code_snippets()->snippet_handler_registry->get_handler( 'html' );
+		$dir_name = $handler->get_dir_name();
+		$ext = $handler->get_file_extension();
+
+		$scopes = [ 'head-content', 'footer-content' ];
+		$all_snippets = Snippet_Files::get_active_snippets_from_flat_files( $scopes, $dir_name );
+
+		foreach ( $all_snippets as $snippet ) {
+			$scope = $snippet['scope'];
+
+			// Add file path information to the snippet for later use
+			$table_name = Snippet_Files::get_hashed_table_name( $snippet['table'] );
+			$base_path = Snippet_Files::get_base_dir( $table_name, $dir_name );
+			$snippet['file_path'] = $base_path . '/' . $snippet['id'] . '.' . $ext;
+
+			$this->active_snippets[ $scope ][] = $snippet;
+		}
+	}
+
+	private function load_content_snippets_from_flat_files( string $scope ) {
+		if ( is_null( $this->active_snippets ) ) {
+			$this->populate_active_snippets_from_flat_files();
+		}
+
+		if ( ! isset( $this->active_snippets[ $scope ] ) ) {
+			return;
+		}
+
+		foreach ( $this->active_snippets[ $scope ] as $snippet ) {
+			require_once $snippet['file_path'];
+		}
+	}
 }

src/php/evaluation/class-evaluate-content.php

@@ -4,9 +4,13 @@
 
 use Code_Snippets\DB;
 use Code_Snippets\REST_API\Snippets_REST_Controller;
+use Code_Snippets\Settings;
+use Code_Snippets\Snippet_Files;
 use function Code_Snippets\clean_active_snippets_cache;
 use function Code_Snippets\clean_snippets_cache;
 use function Code_Snippets\execute_snippet;
+use function Code_Snippets\code_snippets;
+use function Code_Snippets\execute_snippet_from_flat_file;
 
 /**
  * Class for evaluating functions snippets.
@@ -104,6 +108,28 @@ private function quick_deactivate_snippet( int $snippet_id, string $table_name )
 				[ '%d' ]
 			);
 			clean_snippets_cache( $table_name );
+
+			$network = $table_name === $this->db->ms_table;
+			do_action( 'code_snippets/deactivate_snippet', $snippet_id, $network );
+		}
+	}
+
+	private function evaluate_snippet_flat_file( array $snippet, string $file_path, ?array $edit_snippet = null ) {
+		$snippet_id = $snippet['id'];
+		$code = $snippet['code'];
+		$table_name = $snippet['table'];
+
+		// If the snippet is a single-use snippet, deactivate it before execution to ensure that the process always happens.
+		if ( 'single-use' === $snippet['scope'] ) {
+			$this->quick_deactivate_snippet( $snippet_id, $table_name );
+		}
+
+		if ( ! is_null( $edit_snippet ) && $edit_snippet['id'] === $snippet_id && $edit_snippet['table'] === $table_name ) {
+			return;
+		}
+
+		if ( apply_filters( 'code_snippets/allow_execute_snippet', true, $snippet_id, $table_name ) ) {
+			execute_snippet_from_flat_file( $code, $file_path, $snippet_id );
 		}
 	}
 
@@ -117,6 +143,14 @@ public function evaluate_early(): bool {
 			return false;
 		}
 
+		if ( Snippet_Files::is_active() ) {
+			return $this->evaluate_file_snippets();
+		}
+
+		return $this->evaluate_db_snippets();
+	}
+
+	public function evaluate_db_snippets(): bool {
 		$scopes = [ 'global', 'single-use', is_admin() ? 'admin' : 'front-end' ];
 		$active_snippets = $this->db->fetch_active_snippets( $scopes );
 		$edit_snippet = $this->get_currently_editing_snippet();
@@ -139,4 +173,21 @@ public function evaluate_early(): bool {
 
 		return true;
 	}
+
+	private function evaluate_file_snippets(): bool {
+		$type = 'php';
+		$scopes = [ 'global', 'single-use', is_admin() ? 'admin' : 'front-end' ];
+		$snippets = Snippet_Files::get_active_snippets_from_flat_files( $scopes, $type );
+		$edit_snippet = $this->get_currently_editing_snippet();
+
+		foreach ( $snippets as $snippet ) {
+			$table_name = Snippet_Files::get_hashed_table_name( $snippet['table'] );
+			$base_path = Snippet_Files::get_base_dir( $table_name, $type );
+			$file = $base_path . '/' . $snippet['id'] . '.' . $type;
+
+			$this->evaluate_snippet_flat_file( $snippet, $file, $edit_snippet );
+		}
+
+		return true;
+	}
 }

src/php/evaluation/class-evaluate-functions.php

@@ -38,10 +38,10 @@ public function save( string $base_dir, array $active_snippets ): void {
 	public function update( string $base_dir, Snippet $snippet, ?bool $remove = false ): void {
 		$active_snippets = $this->load( $base_dir );
 
-		if ( ! $remove ) {
-			$active_snippets[ $snippet->id ] = $snippet->get_fields();
-		} else {
+		if ( $remove ) {
 			unset( $active_snippets[ $snippet->id ] );
+		} else {
+			$active_snippets[ $snippet->id ] = $snippet->get_fields();
 		}
 
 		$this->save( $base_dir, $active_snippets );

src/php/flat-files/classes/class-config-repository.php

@@ -1,7 +1,7 @@
 <?php
 namespace Code_Snippets;
 
-class WordPress_Filesystem_Adapter implements File_System_Interface {
+class WordPress_File_System_Adapter implements File_System_Interface {
 	private $fs;
 
 	public function __construct() {