Seperate Markup and Code (#176)

* Move HTML Views out of the Logic Move HTML Views out of the Logic * WPCS Fixes WPCS Fixes
aspirepress · Nov 12, 2024 · f6e835d · f6e835d
1 parent 6bd7a0a
commit f6e835d
Show file tree

Hide file tree

Showing 4 changed files with 111 additions and 83 deletions.
diff --git a/includes/class-admin-settings.php b/includes/class-admin-settings.php
@@ -314,89 +314,13 @@ public function the_settings_page() {
 			],
 			network_admin_url( 'index.php?page=aspireupdate-settings' )
 		);
-		?>
-		<div class="wrap">
-			<h1><?php esc_html_e( 'AspireUpdate Settings', 'AspireUpdate' ); ?></h1>
-			<form id="aspireupdate-settings-form" method="post" action="index.php?page=aspireupdate-settings">
-				<?php
-				settings_fields( $this->option_group );
-				do_settings_sections( 'aspireupdate-settings' );
-				?>
-				<p class="submit">
-					<?php wp_nonce_field( 'aspireupdate-settings' ); ?>
-					<?php submit_button( '', 'primary', 'submit', false ); ?>
-
-					<a href="<?php echo esc_url( $reset_url ); ?>" class="button button-secondary" ><?php esc_html_e( 'Reset', 'AspireUpdate' ); ?></a>
-				</p>
-			</form>
-<pre id="voltron">
-...................................................................................................:?%,.............................................................................
-.................................................................................................,;*%:..............................................................................
-...............................................................................................,++?+,...............................................................................
-..............................................................................................;**?+.................................................................................
-............................................................................................:*+;?;:++++:,...........................................................................
-..........................................................................................:*+:;%*++::;;;+++:........................................................................
-........................................................................................,+*:,+S*::+%#@#+.,*?........................................................................
-......................................................................................,+*;,.,;:;?#@@@%;,;*+,........................................................................
-....................................................................................,+*;:..,+?S@@@@@%,.+*,..........................................................................
-...................................................................................:*+:*+,;:*#@@@@@@?.;*,...........................................................................
-.................................................................................,+*:;?;:?*%.;S@@@@#+.++............................................................................
-...............................................................................,*+::?S:;%:,%:,%@@@@#?.++............................................................................
-.............................................................................,+*;,*@%,;%:.,%:,?@@@@@%.++............................................................................
-............................................................................;*;,+#@?,+%:..,%::%@@@@@?.++............................................................................
-..........................................................................:*+,;S@@*,*?,...,%,:S@@@@@?.++............................................................................
-........................................................................,**::%@@#;,?%+;;;;+?.:S@@@@@?.;*:;;;:.......................................................................
-......................................................................,+*::?##@S::%??;,::::,,;S#####?,,::;;;%;......................................................................
-.....................................................................;*;,+S###%,:%??::?SSS%%SS#######SS%SS%:,?+.....................................................................
-...................................................................:*;,+S####?,;%%*,+S#####################S;,*+....................................................................
-.................................................................:*+::%##S##*,+%?+,*#SSSSSSSSSSSSSSSSSSSSSSSS+,**,..................................................................
-...............................................................,+*::?#SSSS#+,*%%;,?#SSSSS?*?#SSSSSSS##%SSSSSSS*,+*,.................................................................
-.............................................................,+*:,*SSSSSSS;,?S?::%SSSSSS*,.*@SSSSSSS@S.+SSSSSSS?,;?:.........................................................,;;;;;:
-............................................................;*;,+SSSSSS#S::%S?,.???%??%+,.,%#%SSSSSS#S..+SSSSSSS%,:?:.......................................................:%;;;;;S
-..........................................................:*+,;%#S%%%%#%,:%?%;:;;;;;:,,,:,,S#%%%%%%S@S,..,;++;;++;:;S;.....................................................,?+,?S+.%
-++:::::::::::::::::::::::::::;;.........................:*+,:?SS%%%%%#?,;%:,::::::+%,.,%S,,@S%%%%%%S@#?+;,:+?%*+;;::;:.....................................................;S.+#S*,%
-:?*,,,;+++++++++++++++++++++;,*+......................,+*:,*SS%%%%%S#*,*%,.......;?,+*,S%,;@S%%%%%%S@#%%S%?+;:;++;:.................................,+;...................,%;:%SS*,%
-..+?;.:%#SSSSSSSSSSSSSSSSSSS%;,?;...................,;*;,*SS%%%%%%S#;,??,.......;?,+@S:;:,*@%%%%%%%S@#%%%%%%S%*;:;+*+;,................:*;..........;%S+..................+?.+#%S*,%
-...,+*:.;SS%%%%%%%%%%%%%%%%%%%::?:.................;*;,;%S%%%%%%%SS:,%*........*?,+#SS;..,%#%%%%%%%S@#%%%%%%%%%S%?+;:;+*+:,..........:*+;?*,........;?:*?,...............,S::S%%S*,%
-.....:*+,,*SS%%%%%%%%%%%%%%%%S?,+*,..............:*+,:%S%%%%%%%%#%::%+........+?,+#%%#+.,,##%%%%%%%S@#%%%%%%%%%%%%%%%*+::;++;:,....,+*:,;:+?;.......;?:.;%:..............?*,?S%%S*,%
-.......+?;.:%#S%%%%%%%%%%%%%%%S*.*+............:++,:?#S%%%%%%%%#?,;%;........+*,+#%%%#?,.,@S%%%%%%%S@#%%%%%%%%%%%%%%%%%%?*;:;+*+::+*;,+%S%;:?*,.....;?:.::?+............;%,:#%%%S*,%
-........,+*:.;SS%%%%%%%%%%%%%%%S+.?;.........,+*:,*SS%%%%%%%%S#*.+%:........+*,*#%%%%S%:.+@%%%%%%%%S@#%%%%%%%%%%%%%%%%%%%%S%?;::;;;,:%S%%%S*,+?;....;?:.#*,??,.........,%+,%S%%%S*,%
-..........:**,,*SS%%%%%%%%%%%%%SS:,?:......,;*;,+SS%%%%%%%%%S#+,*%:.......,**,*#%%%%%%#;.*#%%%%%%%%S@#%%%%%%%%S@##S%%%%%%%%%%%%?*;;?S%%%%%%S%::?*,..;?:.#S?:+%;........+?,+#%%%%S+,%
-...........,;*;.:?#%%%%%%%%%%%%%S%,:%,....;*;,;%S%%%%%%%%%%SS;,*+,.......,**,*#%%%%%%%@+.%#%%%%%%%%%@#%%%%%%%%S@@@@#%%%%%%%%%%%S@@S%????????%S+,+?;.;?:.#%%%;;%+......,%;,S%%%%%S+,%
-.............,*?:.+S?????????????S?,;?,.:++,:?S%??????????S@;.;*.........**,*#%???????#?,#S?????????@#????????%@@S????????????S@#%????????????%?::?*;?:.#???%+:?*,....*?,*S?????S;.%
-...............:%+.;S?************S*.+?**:,*S%***********SS%?:,?+......,**,*#?********%%;@?*********@#********?S?***********%@#%***************?%+,+S%:.#?***?*:*?:..:%;,S?*****S;.%
-................,%+.+S*++++++++++++S;,+:,*S?*++++++++++*S%*+?%;,**....,?*.*#?+++++++++*S*#*++++++++*@#*+++++++++++++++++++?#@%*++++++++?*++++++++?*:;+,.#*++++*?:;%;.*?.??++++++S;.%
-.................,%;.*%+;++++;;;;;;+S,.;%%+;;;;;;;;;;;*#?;++;+S+,**,.,?+.*#*;++++++++;;#SS++++++++++##+++++++++++++;;;;;*S@%+;;+++;;;+?@S*;;+++++;+?;...#+++++;+*+:?%%,;?+;;;;;;%;.%
-..................:%:,*?;;;;;;;;;;;;*S?%+;;;;;;;;;;;;?S+;;;;;;;%*,**:?+.*#+;;;;;;;;;;;*#@%;;;;;;;;;+##;;;;;;;;;;;;;;;;;?#S*;;;;;;;;;?#@@@@*;;;;;;;;;?*,.#;;;;;;;;**:+;,?*;;;;;;;%;.%
-...................;?:,??::::::::::::*+:::::::::::::%S;::::::::;?*,+%;.?#+::::::::::;%@@@*:::::::::+##;::::::::::::::*S#*:::::::::;S@@@@@@#*:::::::::+?:#:::::::::;*;.+?;:::::::%;.%
-....................;?,,?*::::::::::::::::::::::::;%?:::::*%;::::??,..?#+::::::::::*#@@@@;:::::::::;#S:::::::::::::::%@*::::::::;?@@@@@@@@@@?::::::::::%@:::::::::::**%+::::::::%;.%
-.....................+*,,%*::::::::::::::::::::::+S?:::::*@@%;::::*?:?#+:::::::::;%@@@@@@;:::::::::;##;:::::::::::::::?#?:::::::;S@@@@@@@@@@@+::::::::+#@::::::::::::*?:::::::::?;.%
-.....................,**,,S+::::::::::::::::::::*S*:;;;:*#@@@S;;;;:*##+:::::::::*#@@@@@@S;:::::::::;##;::::;;;+::::::::?@S+::::::;?@@@@@@@@#*;;:::::;%%*@;::::::::::::::::::::::*:.%
-.......................?+.:%*;;;;;;;;;;;;;;;;;+*SS;;;;;+#@@@@@*+++;*S*;;;;;;;;+S@@@@@@@@%+;;;;;;;;;+@#+;;;;;;+%?;;;;;;;;?@@?+;;;;;;*S@@@@@%+;;;;;;;?S*,:@+;;;;++;;;;;;;;;;;;;;;;?;.%
-.......................,?;.:S?+++++++++++++*+*?;,?%*+***%@@@@%***+?S?+++++++*%@@@@@@@@@@?++++++++++*@#*++++++*S@?++++++++?#@S*++++++*%@@#?+++++++*S%:..:@*++++?S?+++++++++++++++%;.%
-........................:%;.;S?*************??:,:.*S????*%@@%???*?#%*???????#@@@@@@####@?*??????????@#?*????*?S@#?*****?**?#@@%*????**?%?*??????%S+,**,:@???*%?:*%???***********%;.%
-.........................:%:.;#%%%%%%%%%%%%%?,;%?+.;SS%%%%%%%%%%%#S%%%%%%%%SSS%%%%%%%?S#%%%%%%%%%%%%@@%%%%%%%%S@@#%%%%%%%%%%#@@S%%%%%%%%%%%%%%%#%::*%*,:@%%%S?,,,;S%%%%%%%%%%%%%S;.%
-..........................:%:.+#SSSSSSSSSSS*,+?,,**,:%#SSSSSSSSS@#SSSSSSSSSS%SSSSSSSSS##SSSSSSSSSS%S@@SSSSSSSSS@@@#SSSSSSSSSS#@@@SS%SSSSSSS%S##+,+*,;*,:@SSSS:,%%::%SSSSSSSSSSSSS;.S
-...........................:%,.*#SSSSSSSSS+,**,...+?:,?#SSSSSS#@#SSSSSSSSSSSSSSSSSSSS#@#SSSSSSSSSSS#@@SSSSSSSS#@@@@#SSSSSSSSSS#@@@@SSSSSSSS##?,:*+..;+,:@SS#;,%+;%;,?#SSSSSSSSSS#:.#
-............................;?,.?@######S;,?+......:?;.+##S#S#@#S####################@@#S###########@@#SSSSSSS#@@@@@#SSSSSSSSSS#@@@@##S#S#@S;,+*:...;+,:@##*,?*,.,?*,+##SSSSSSS##:.#
-.............................+?,,%@####%::?;........,*+.;S###@@#####################@@@#############@@#########@@@@@@############@@@@@###@?,:?+.....;+,:@@?,*?,....*?,;S#########:.#
-.............................,**,,%@##?,;?:...........+*,,%@#%%%%%%%%%%%%%%%%%%%%%%%%S@#############@#########################@@@@@@@@@#S+,+?:......;+,,?*,+%,......;?::%########;.#
-..............................,*+.,%@*,+*,.............;?:,+:.,,,,,,,,,,,,,,,,,,,,...;##############%,::::::::::::::::::::::::;;;;;;;;;:,:*+,.......;*+;;;+?:........;%+,?######S:.#
-...............................,?+.,;,**,...............:?+.,*;;;;;;;;;;;;;;;;;;;+?,.*@@@@@@@@@@@@@@?..**;;;;;;;;;;;;;;;;::::::::::::::::+:.........,::::::,..........:?*,+#@@@@%:.#
-................................,%;.,?+..................,**?;...................,#..+@@@@@@@@@@@@@@?..*+..............................................................,*?,:S@@@%:.#
-.................................:%+?:.....................;:....................,++,.+#@@@@@@@@@@@@S..*;................................................................;%:,%@@%:.#
-..................................:+,..............................................;?:.:S@@@@@@@@@@@%..*+.................................................................:%+,*@S:.#
-....................................................................................:?;.,%@@@@@@@@@@+.:?:..................................................................,?*,+?:.#
-.....................................................................................,?+.,?@@@@@@@@%,;?;....................................................................,*?:.,.#
-......................................................................................,**,.+@@@@@@*,;?:.......................................................................;%;..#
-........................................................................................;?:.;#@@#+.+?,.........................................................................:%+.#
-.........................................................................................:?;.:S#;.*?,...........................................................................,?*#
-..........................................................................................,**,,,,**..............................................................................,*S
-............................................................................................+?,,?+.................................................................................,
-.............................................................................................;?%;...................................................................................
-</pre>
-		</div>
-		<?php
+		Utilities::include_file(
+			'page-admin-settings.php',
+			[
+				'reset_url'    => $reset_url,
+				'option_group' => $this->option_group,
+			]
+		);
 	}
 
 	/**

diff --git a/includes/class-utilities.php b/includes/class-utilities.php
@@ -23,4 +23,21 @@ public static function get_top_level_domain() {
 		$domain_parts = explode( '.', $domain_name );
 		return sanitize_text_field( implode( '.', array_slice( $domain_parts, -2 ) ) );
 	}
+
+	/**
+	 * Return the content of the File after processing.
+	 *
+	 * @param string $file File name.
+	 * @param array  $args Data to pass to the file.
+	 */
+	public static function include_file( $file, $args = [] ) {
+		$file_path = __DIR__ . DIRECTORY_SEPARATOR . 'views' . DIRECTORY_SEPARATOR . $file;
+		if ( ( '' !== $file ) && file_exists( $file_path ) ) {
+			//phpcs:disable
+			// Usage of extract() is necessary in this content to simulate templating functionality.
+			extract( $args );
+			//phpcs:enable
+			include $file_path;
+		}
+	}
 }
diff --git a/includes/views/page-admin-settings.php b/includes/views/page-admin-settings.php
@@ -0,0 +1,21 @@
+<?php
+namespace AspireUpdate;
+
+$reset_url    = $args['reset_url'] ?? '';
+$option_group = $args['option_group'] ?? '';
+?>
+<div class="wrap">
+	<h1><?php esc_html_e( 'AspireUpdate Settings', 'AspireUpdate' ); ?></h1>
+	<form id="aspireupdate-settings-form" method="post" action="index.php?page=aspireupdate-settings">
+		<?php
+		settings_fields( $option_group );
+		do_settings_sections( 'aspireupdate-settings' );
+		?>
+		<p class="submit">
+			<?php wp_nonce_field( 'aspireupdate-settings' ); ?>
+			<?php submit_button( '', 'primary', 'submit', false ); ?>
+			<a href="<?php echo esc_url( $reset_url ); ?>" class="button button-secondary" ><?php esc_html_e( 'Reset', 'AspireUpdate' ); ?></a>
+		</p>
+	</form>
+	<?php Utilities::include_file( 'voltron.txt' ); ?>
+</div>