Use the full domain name (#214)

* Use the full domain name Use the full domain name instead of attempting to extract the top level TLD * network_site_url instead of get_site_url * Capitalize return description.
aspirepress · Nov 30, 2024 · b1104df · b1104df
1 parent f4326db
commit b1104df
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/includes/class-admin-settings.php b/includes/class-admin-settings.php
@@ -324,7 +324,7 @@ public function admin_enqueue_scripts( $hook ) {
 			[
 				'ajax_url'         => network_admin_url( 'admin-ajax.php' ),
 				'nonce'            => wp_create_nonce( 'aspireupdate-ajax' ),
-				'domain'           => Utilities::get_top_level_domain(),
+				'domain'           => Utilities::get_site_domain(),
 				'line_ending'      => PHP_EOL,
 				'unexpected_error' => esc_html__( 'Unexpected Error', 'aspireupdate' ),
 			]

diff --git a/includes/class-utilities.php b/includes/class-utilities.php
@@ -11,17 +11,14 @@
  * The Class for Admin Settings Page and functions to access Settings Values.
  */
 class Utilities {
-
 	/**
-	 * Get the top level domain name from the site URL.
+	 * Get the domain name from the site URL.
 	 *
-	 * @return string the top level domain name.
+	 * @return string The domain name.
 	 */
-	public static function get_top_level_domain() {
-		$site_url     = get_site_url();
-		$domain_name  = wp_parse_url( $site_url, PHP_URL_HOST );
-		$domain_parts = explode( '.', $domain_name );
-		return sanitize_text_field( implode( '.', array_slice( $domain_parts, -2 ) ) );
+	public static function get_site_domain() {
+		$site_url = network_site_url();
+		return wp_parse_url( $site_url, PHP_URL_HOST );
 	}
 
 	/**