WordImpress / Give

includes/admin/system-info.php

Spacing +141 added lines, -141 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,7 +24,7 @@ 
  */
 function give_system_info_callback() {
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
+	if ( ! current_user_can('manage_give_settings')) {
 		return;
 	}
 
@@ -32,7 +32,7 @@ 
 	<textarea readonly="readonly" onclick="this.focus(); this.select()" id="system-info-textarea" name="give-sysinfo" title="To copy the system info, click below then press Ctrl + C (PC) or Cmd + C (Mac)."><?php echo give_tools_sysinfo_get(); ?></textarea>
 	<p class="submit">
 		<input type="hidden" name="give-action" value="download_sysinfo"/>
-		<?php submit_button( 'Download System Info File', 'secondary', 'give-download-sysinfo', false ); ?>
+		<?php submit_button('Download System Info File', 'secondary', 'give-download-sysinfo', false); ?>
 	</p>
 	<style>
 		.give_forms_page_give-settings .give-submit-wrap {
@@ -55,63 +55,63 @@ 
 function give_tools_sysinfo_get() {
 	global $wpdb, $give_options;
 
-	if ( ! class_exists( 'Browser' ) ) {
-		require_once GIVE_PLUGIN_DIR . 'includes/libraries/browser.php';
+	if ( ! class_exists('Browser')) {
+		require_once GIVE_PLUGIN_DIR.'includes/libraries/browser.php';
 	}
 
 	$browser = new Browser();
 
 	// Get theme info
-	if ( get_bloginfo( 'version' ) < '3.4' ) {
-		$theme_data = wp_get_theme( get_stylesheet_directory() . '/style.css' );
-		$theme      = $theme_data['Name'] . ' ' . $theme_data['Version'];
+	if (get_bloginfo('version') < '3.4') {
+		$theme_data = wp_get_theme(get_stylesheet_directory().'/style.css');
+		$theme      = $theme_data['Name'].' '.$theme_data['Version'];
 	} else {
 		$theme_data = wp_get_theme();
-		$theme      = $theme_data->Name . ' ' . $theme_data->Version;
+		$theme      = $theme_data->Name.' '.$theme_data->Version;
 	}
 
 	// Try to identify the hosting provider
 	$host = give_get_host();
 
-	$return = '### Begin System Info ###' . "\n\n";
+	$return = '### Begin System Info ###'."\n\n";
 
 	// Start with the basics...
-	$return .= '-- Site Info' . "\n\n";
-	$return .= 'Site URL:                 ' . site_url() . "\n";
-	$return .= 'Home URL:                 ' . home_url() . "\n";
-	$return .= 'Multisite:                ' . ( is_multisite() ? 'Yes' : 'No' ) . "\n";
+	$return .= '-- Site Info'."\n\n";
+	$return .= 'Site URL:                 '.site_url()."\n";
+	$return .= 'Home URL:                 '.home_url()."\n";
+	$return .= 'Multisite:                '.(is_multisite() ? 'Yes' : 'No')."\n";
 
-	$return = apply_filters( 'give_sysinfo_after_site_info', $return );
+	$return = apply_filters('give_sysinfo_after_site_info', $return);
 
 	// Can we determine the site's host?
-	if ( $host ) {
-		$return .= "\n" . '-- Hosting Provider' . "\n\n";
-		$return .= 'Host:                     ' . $host . "\n";
+	if ($host) {
+		$return .= "\n".'-- Hosting Provider'."\n\n";
+		$return .= 'Host:                     '.$host."\n";
 
-		$return = apply_filters( 'give_sysinfo_after_host_info', $return );
+		$return = apply_filters('give_sysinfo_after_host_info', $return);
 	}
 
 	// The local users' browser information, handled by the Browser class
-	$return .= "\n" . '-- User Browser' . "\n\n";
+	$return .= "\n".'-- User Browser'."\n\n";
 	$return .= $browser;
 
-	$return = apply_filters( 'give_sysinfo_after_user_browser', $return );
+	$return = apply_filters('give_sysinfo_after_user_browser', $return);
 
 	// WordPress configuration
-	$return .= "\n" . '-- WordPress Configuration' . "\n\n";
-	$return .= 'Version:                  ' . get_bloginfo( 'version' ) . "\n";
-	$return .= 'Language:                 ' . ( defined( 'WPLANG' ) && WPLANG ? WPLANG : 'en_US' ) . "\n";
-	$return .= 'Permalink Structure:      ' . ( get_option( 'permalink_structure' ) ? get_option( 'permalink_structure' ) : 'Default' ) . "\n";
-	$return .= 'Active Theme:             ' . $theme . "\n";
-	$return .= 'Show On Front:            ' . get_option( 'show_on_front' ) . "\n";
+	$return .= "\n".'-- WordPress Configuration'."\n\n";
+	$return .= 'Version:                  '.get_bloginfo('version')."\n";
+	$return .= 'Language:                 '.(defined('WPLANG') && WPLANG ? WPLANG : 'en_US')."\n";
+	$return .= 'Permalink Structure:      '.(get_option('permalink_structure') ? get_option('permalink_structure') : 'Default')."\n";
+	$return .= 'Active Theme:             '.$theme."\n";
+	$return .= 'Show On Front:            '.get_option('show_on_front')."\n";
 
 	// Only show page specs if frontpage is set to 'page'
-	if ( get_option( 'show_on_front' ) == 'page' ) {
-		$front_page_id = get_option( 'page_on_front' );
-		$blog_page_id  = get_option( 'page_for_posts' );
+	if (get_option('show_on_front') == 'page') {
+		$front_page_id = get_option('page_on_front');
+		$blog_page_id  = get_option('page_for_posts');
 
-		$return .= 'Page On Front:            ' . ( $front_page_id != 0 ? get_the_title( $front_page_id ) . ' (#' . $front_page_id . ')' : 'Unset' ) . "\n";
-		$return .= 'Page For Posts:           ' . ( $blog_page_id != 0 ? get_the_title( $blog_page_id ) . ' (#' . $blog_page_id . ')' : 'Unset' ) . "\n";
+		$return .= 'Page On Front:            '.($front_page_id != 0 ? get_the_title($front_page_id).' (#'.$front_page_id.')' : 'Unset')."\n";
+		$return .= 'Page For Posts:           '.($blog_page_id != 0 ? get_the_title($blog_page_id).' (#'.$blog_page_id.')' : 'Unset')."\n";
 	}
 
 	// Make sure wp_remote_post() is working
@@ -120,203 +120,203 @@ 
 	$params = array(
 		'sslverify'  => false,
 		'timeout'    => 60,
-		'user-agent' => 'Give/' . GIVE_VERSION,
+		'user-agent' => 'Give/'.GIVE_VERSION,
 		'body'       => $request
 	);
 
-	$response = wp_remote_post( 'https://www.paypal.com/cgi-bin/webscr', $params );
+	$response = wp_remote_post('https://www.paypal.com/cgi-bin/webscr', $params);
 
-	if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+	if ( ! is_wp_error($response) && $response['response']['code'] >= 200 && $response['response']['code'] < 300) {
 		$WP_REMOTE_POST = 'wp_remote_post() works';
 	} else {
 		$WP_REMOTE_POST = 'wp_remote_post() does not work';
 	}
 
-	$return .= 'Remote Post:              ' . $WP_REMOTE_POST . "\n";
-	$return .= 'Table Prefix:             ' . 'Length: ' . strlen( $wpdb->prefix ) . '   Status: ' . ( strlen( $wpdb->prefix ) > 16 ? 'ERROR: Too long' : 'Acceptable' ) . "\n";
-	$return .= 'Admin AJAX:               ' . ( give_test_ajax_works() ? 'Accessible' : 'Inaccessible' ) . "\n";
-	$return .= 'WP_DEBUG:                 ' . ( defined( 'WP_DEBUG' ) ? WP_DEBUG ? 'Enabled' : 'Disabled' : 'Not set' ) . "\n";
-	$return .= 'Memory Limit:             ' . WP_MEMORY_LIMIT . "\n";
-	$return .= 'Registered Post Stati:    ' . implode( ', ', get_post_stati() ) . "\n";
+	$return .= 'Remote Post:              '.$WP_REMOTE_POST."\n";
+	$return .= 'Table Prefix:             '.'Length: '.strlen($wpdb->prefix).'   Status: '.(strlen($wpdb->prefix) > 16 ? 'ERROR: Too long' : 'Acceptable')."\n";
+	$return .= 'Admin AJAX:               '.(give_test_ajax_works() ? 'Accessible' : 'Inaccessible')."\n";
+	$return .= 'WP_DEBUG:                 '.(defined('WP_DEBUG') ? WP_DEBUG ? 'Enabled' : 'Disabled' : 'Not set')."\n";
+	$return .= 'Memory Limit:             '.WP_MEMORY_LIMIT."\n";
+	$return .= 'Registered Post Stati:    '.implode(', ', get_post_stati())."\n";
 
-	$return = apply_filters( 'give_sysinfo_after_wordpress_config', $return );
+	$return = apply_filters('give_sysinfo_after_wordpress_config', $return);
 
 	// GIVE configuration
-	$return .= "\n" . '-- Give Configuration' . "\n\n";
-	$return .= 'Version:                  ' . GIVE_VERSION . "\n";
-	$return .= 'Upgraded From:            ' . get_option( 'give_version_upgraded_from', 'None' ) . "\n";
-	$return .= 'Test Mode:                ' . ( give_is_test_mode() ? "Enabled\n" : "Disabled\n" );
-	$return .= 'Currency Code:            ' . give_get_currency() . "\n";
-	$return .= 'Currency Position:        ' . give_get_option( 'currency_position', 'before' ) . "\n";
-	$return .= 'Decimal Separator:        ' . give_get_option( 'decimal_separator', '.' ) . "\n";
-	$return .= 'Thousands Separator:      ' . give_get_option( 'thousands_separator', ',' ) . "\n";
+	$return .= "\n".'-- Give Configuration'."\n\n";
+	$return .= 'Version:                  '.GIVE_VERSION."\n";
+	$return .= 'Upgraded From:            '.get_option('give_version_upgraded_from', 'None')."\n";
+	$return .= 'Test Mode:                '.(give_is_test_mode() ? "Enabled\n" : "Disabled\n");
+	$return .= 'Currency Code:            '.give_get_currency()."\n";
+	$return .= 'Currency Position:        '.give_get_option('currency_position', 'before')."\n";
+	$return .= 'Decimal Separator:        '.give_get_option('decimal_separator', '.')."\n";
+	$return .= 'Thousands Separator:      '.give_get_option('thousands_separator', ',')."\n";
 
-	$return = apply_filters( 'give_sysinfo_after_give_config', $return );
+	$return = apply_filters('give_sysinfo_after_give_config', $return);
 
 	// GIVE pages
-	$return .= "\n" . '-- Give Page Configuration' . "\n\n";
-	$return .= 'Success Page:             ' . ( ! empty( $give_options['success_page'] ) ? get_permalink( $give_options['success_page'] ) . "\n" : "Unset\n" );
-	$return .= 'Failure Page:             ' . ( ! empty( $give_options['failure_page'] ) ? get_permalink( $give_options['failure_page'] ) . "\n" : "Unset\n" );
-	$return .= 'Give Forms Slug:           ' . ( defined( 'GIVE_SLUG' ) ? '/' . GIVE_SLUG . "\n" : "/donations\n" );
+	$return .= "\n".'-- Give Page Configuration'."\n\n";
+	$return .= 'Success Page:             '.( ! empty($give_options['success_page']) ? get_permalink($give_options['success_page'])."\n" : "Unset\n");
+	$return .= 'Failure Page:             '.( ! empty($give_options['failure_page']) ? get_permalink($give_options['failure_page'])."\n" : "Unset\n");
+	$return .= 'Give Forms Slug:           '.(defined('GIVE_SLUG') ? '/'.GIVE_SLUG."\n" : "/donations\n");
 
-	$return = apply_filters( 'give_sysinfo_after_give_pages', $return );
+	$return = apply_filters('give_sysinfo_after_give_pages', $return);
 
 	// GIVE gateways
-	$return .= "\n" . '-- Give Gateway Configuration' . "\n\n";
+	$return .= "\n".'-- Give Gateway Configuration'."\n\n";
 
 	$active_gateways = give_get_enabled_payment_gateways();
-	if ( $active_gateways ) {
-		$default_gateway_is_active = give_is_gateway_active( give_get_default_gateway( null ) );
-		if ( $default_gateway_is_active ) {
-			$default_gateway = give_get_default_gateway( null );
-			$default_gateway = $active_gateways[ $default_gateway ]['admin_label'];
+	if ($active_gateways) {
+		$default_gateway_is_active = give_is_gateway_active(give_get_default_gateway(null));
+		if ($default_gateway_is_active) {
+			$default_gateway = give_get_default_gateway(null);
+			$default_gateway = $active_gateways[$default_gateway]['admin_label'];
 		} else {
 			$default_gateway = 'Test Payment';
 		}
 
 		$gateways = array();
-		foreach ( $active_gateways as $gateway ) {
+		foreach ($active_gateways as $gateway) {
 			$gateways[] = $gateway['admin_label'];
 		}
 
-		$return .= 'Enabled Gateways:         ' . implode( ', ', $gateways ) . "\n";
-		$return .= 'Default Gateway:          ' . $default_gateway . "\n";
+		$return .= 'Enabled Gateways:         '.implode(', ', $gateways)."\n";
+		$return .= 'Default Gateway:          '.$default_gateway."\n";
 	} else {
-		$return .= 'Enabled Gateways:         None' . "\n";
+		$return .= 'Enabled Gateways:         None'."\n";
 	}
 
-	$return = apply_filters( 'give_sysinfo_after_give_gateways', $return );
+	$return = apply_filters('give_sysinfo_after_give_gateways', $return);
 
 	// GIVE Templates
-	$dir = get_stylesheet_directory() . '/give_templates/*';
-	if ( is_dir( $dir ) && ( count( glob( "$dir/*" ) ) !== 0 ) ) {
-		$return .= "\n" . '-- Give Template Overrides' . "\n\n";
+	$dir = get_stylesheet_directory().'/give_templates/*';
+	if (is_dir($dir) && (count(glob("$dir/*")) !== 0)) {
+		$return .= "\n".'-- Give Template Overrides'."\n\n";
 
-		foreach ( glob( $dir ) as $file ) {
-			$return .= 'Filename:                 ' . basename( $file ) . "\n";
+		foreach (glob($dir) as $file) {
+			$return .= 'Filename:                 '.basename($file)."\n";
 		}
 
-		$return = apply_filters( 'give_sysinfo_after_give_templates', $return );
+		$return = apply_filters('give_sysinfo_after_give_templates', $return);
 	}
 
 	// Must-use plugins
 	$muplugins = get_mu_plugins();
-	if ( count( $muplugins > 0 ) ) {
-		$return .= "\n" . '-- Must-Use Plugins' . "\n\n";
+	if (count($muplugins > 0)) {
+		$return .= "\n".'-- Must-Use Plugins'."\n\n";
 
-		foreach ( $muplugins as $plugin => $plugin_data ) {
-			$return .= $plugin_data['Name'] . ': ' . $plugin_data['Version'] . "\n";
+		foreach ($muplugins as $plugin => $plugin_data) {
+			$return .= $plugin_data['Name'].': '.$plugin_data['Version']."\n";
 		}
 
-		$return = apply_filters( 'give_sysinfo_after_wordpress_mu_plugins', $return );
+		$return = apply_filters('give_sysinfo_after_wordpress_mu_plugins', $return);
 	}
 
 	// WordPress active plugins
-	$return .= "\n" . '-- WordPress Active Plugins' . "\n\n";
+	$return .= "\n".'-- WordPress Active Plugins'."\n\n";
 
 	$plugins        = get_plugins();
-	$active_plugins = get_option( 'active_plugins', array() );
+	$active_plugins = get_option('active_plugins', array());
 
-	foreach ( $plugins as $plugin_path => $plugin ) {
-		if ( ! in_array( $plugin_path, $active_plugins ) ) {
+	foreach ($plugins as $plugin_path => $plugin) {
+		if ( ! in_array($plugin_path, $active_plugins)) {
 			continue;
 		}
 
-		$return .= $plugin['Name'] . ': ' . $plugin['Version'] . "\n";
+		$return .= $plugin['Name'].': '.$plugin['Version']."\n";
 	}
 
-	$return = apply_filters( 'give_sysinfo_after_wordpress_plugins', $return );
+	$return = apply_filters('give_sysinfo_after_wordpress_plugins', $return);
 
 	// WordPress inactive plugins
-	$return .= "\n" . '-- WordPress Inactive Plugins' . "\n\n";
+	$return .= "\n".'-- WordPress Inactive Plugins'."\n\n";
 
-	foreach ( $plugins as $plugin_path => $plugin ) {
-		if ( in_array( $plugin_path, $active_plugins ) ) {
+	foreach ($plugins as $plugin_path => $plugin) {
+		if (in_array($plugin_path, $active_plugins)) {
 			continue;
 		}
 
-		$return .= $plugin['Name'] . ': ' . $plugin['Version'] . "\n";
+		$return .= $plugin['Name'].': '.$plugin['Version']."\n";
 	}
 
-	$return = apply_filters( 'give_sysinfo_after_wordpress_plugins_inactive', $return );
+	$return = apply_filters('give_sysinfo_after_wordpress_plugins_inactive', $return);
 
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		// WordPress Multisite active plugins
-		$return .= "\n" . '-- Network Active Plugins' . "\n\n";
+		$return .= "\n".'-- Network Active Plugins'."\n\n";
 
 		$plugins        = wp_get_active_network_plugins();
-		$active_plugins = get_site_option( 'active_sitewide_plugins', array() );
+		$active_plugins = get_site_option('active_sitewide_plugins', array());
 
-		foreach ( $plugins as $plugin_path ) {
-			$plugin_base = plugin_basename( $plugin_path );
+		foreach ($plugins as $plugin_path) {
+			$plugin_base = plugin_basename($plugin_path);
 
-			if ( ! array_key_exists( $plugin_base, $active_plugins ) ) {
+			if ( ! array_key_exists($plugin_base, $active_plugins)) {
 				continue;
 			}
 
-			$plugin = get_plugin_data( $plugin_path );
-			$return .= $plugin['Name'] . ': ' . $plugin['Version'] . "\n";
+			$plugin = get_plugin_data($plugin_path);
+			$return .= $plugin['Name'].': '.$plugin['Version']."\n";
 		}
 
-		$return = apply_filters( 'give_sysinfo_after_wordpress_ms_plugins', $return );
+		$return = apply_filters('give_sysinfo_after_wordpress_ms_plugins', $return);
 	}
 
 	// Server configuration (really just versioning)
-	$return .= "\n" . '-- Webserver Configuration' . "\n\n";
-	$return .= 'PHP Version:              ' . PHP_VERSION . "\n";
-	$return .= 'MySQL Version:            ' . $wpdb->db_version() . "\n";
-	$return .= 'Webserver Info:           ' . $_SERVER['SERVER_SOFTWARE'] . "\n";
+	$return .= "\n".'-- Webserver Configuration'."\n\n";
+	$return .= 'PHP Version:              '.PHP_VERSION."\n";
+	$return .= 'MySQL Version:            '.$wpdb->db_version()."\n";
+	$return .= 'Webserver Info:           '.$_SERVER['SERVER_SOFTWARE']."\n";
 
-	$return = apply_filters( 'give_sysinfo_after_webserver_config', $return );
+	$return = apply_filters('give_sysinfo_after_webserver_config', $return);
 
 	// PHP configs... now we're getting to the important stuff
-	$return .= "\n" . '-- PHP Configuration' . "\n\n";
-	$return .= 'Safe Mode:                ' . ( ini_get( 'safe_mode' ) ? 'Enabled' : 'Disabled' . "\n" );
-	$return .= 'Memory Limit:             ' . ini_get( 'memory_limit' ) . "\n";
-	$return .= 'Upload Max Size:          ' . ini_get( 'upload_max_filesize' ) . "\n";
-	$return .= 'Post Max Size:            ' . ini_get( 'post_max_size' ) . "\n";
-	$return .= 'Upload Max Filesize:      ' . ini_get( 'upload_max_filesize' ) . "\n";
-	$return .= 'Time Limit:               ' . ini_get( 'max_execution_time' ) . "\n";
-	$return .= 'Max Input Vars:           ' . ini_get( 'max_input_vars' ) . "\n";
-	$return .= 'URL-aware fopen:          ' . ( ini_get( 'allow_url_fopen' ) ? 'On (' . ini_get( 'allow_url_fopen' ) . ')' : 'N/A' ) . "\n";
-	$return .= 'Display Errors:           ' . ( ini_get( 'display_errors' ) ? 'On (' . ini_get( 'display_errors' ) . ')' : 'N/A' ) . "\n";
-
-	$return = apply_filters( 'give_sysinfo_after_php_config', $return );
+	$return .= "\n".'-- PHP Configuration'."\n\n";
+	$return .= 'Safe Mode:                '.(ini_get('safe_mode') ? 'Enabled' : 'Disabled'."\n");
+	$return .= 'Memory Limit:             '.ini_get('memory_limit')."\n";
+	$return .= 'Upload Max Size:          '.ini_get('upload_max_filesize')."\n";
+	$return .= 'Post Max Size:            '.ini_get('post_max_size')."\n";
+	$return .= 'Upload Max Filesize:      '.ini_get('upload_max_filesize')."\n";
+	$return .= 'Time Limit:               '.ini_get('max_execution_time')."\n";
+	$return .= 'Max Input Vars:           '.ini_get('max_input_vars')."\n";
+	$return .= 'URL-aware fopen:          '.(ini_get('allow_url_fopen') ? 'On ('.ini_get('allow_url_fopen').')' : 'N/A')."\n";
+	$return .= 'Display Errors:           '.(ini_get('display_errors') ? 'On ('.ini_get('display_errors').')' : 'N/A')."\n";
+
+	$return = apply_filters('give_sysinfo_after_php_config', $return);
 
 	// PHP extensions and such
-	$return .= "\n" . '-- PHP Extensions' . "\n\n";
-	$return .= 'cURL:                     ' . ( function_exists( 'curl_init' ) ? 'Supported' : 'Not Supported' ) . "\n";
+	$return .= "\n".'-- PHP Extensions'."\n\n";
+	$return .= 'cURL:                     '.(function_exists('curl_init') ? 'Supported' : 'Not Supported')."\n";
 
 	//cURL version
-	if ( function_exists( 'curl_init' ) && function_exists( 'curl_version' ) ) {
+	if (function_exists('curl_init') && function_exists('curl_version')) {
 		$curl_values = curl_version();
-		$return .= 'cURL Version:             ' . $curl_values["version"] . "\n";
+		$return .= 'cURL Version:             '.$curl_values["version"]."\n";
 	}
-	$return .= 'zlib:                     ' . ( function_exists( 'gzcompress' ) ? 'Supported' : 'Not Supported' ) . "\n";
-	$return .= 'GD:                       ' . ( ( extension_loaded( 'gd' ) && function_exists( 'gd_info' ) ) ? 'Supported' : 'Not Supported' ) . "\n";
-	$return .= 'fsockopen:                ' . ( function_exists( 'fsockopen' ) ? 'Supported' : 'Not Supported' ) . "\n";
-	$return .= 'SOAP Client:              ' . ( class_exists( 'SoapClient' ) ? 'Installed' : 'Not Installed' ) . "\n";
-	$return .= 'Suhosin:                  ' . ( extension_loaded( 'suhosin' ) ? 'Installed' : 'Not Installed' ) . "\n";
+	$return .= 'zlib:                     '.(function_exists('gzcompress') ? 'Supported' : 'Not Supported')."\n";
+	$return .= 'GD:                       '.((extension_loaded('gd') && function_exists('gd_info')) ? 'Supported' : 'Not Supported')."\n";
+	$return .= 'fsockopen:                '.(function_exists('fsockopen') ? 'Supported' : 'Not Supported')."\n";
+	$return .= 'SOAP Client:              '.(class_exists('SoapClient') ? 'Installed' : 'Not Installed')."\n";
+	$return .= 'Suhosin:                  '.(extension_loaded('suhosin') ? 'Installed' : 'Not Installed')."\n";
 
-	$return = apply_filters( 'give_sysinfo_after_php_ext', $return );
+	$return = apply_filters('give_sysinfo_after_php_ext', $return);
 
 	// Session stuff
-	$return .= "\n" . '-- Session Configuration' . "\n\n";
-	$return .= 'Give Use Sessions:        ' . ( defined( 'GIVE_USE_PHP_SESSIONS' ) && GIVE_USE_PHP_SESSIONS ? 'Enforced' : ( Give()->session->use_php_sessions() ? 'Enabled' : 'Disabled' ) ) . "\n";
-	$return .= 'Session:                  ' . ( isset( $_SESSION ) ? 'Enabled' : 'Disabled' ) . "\n";
+	$return .= "\n".'-- Session Configuration'."\n\n";
+	$return .= 'Give Use Sessions:        '.(defined('GIVE_USE_PHP_SESSIONS') && GIVE_USE_PHP_SESSIONS ? 'Enforced' : (Give()->session->use_php_sessions() ? 'Enabled' : 'Disabled'))."\n";
+	$return .= 'Session:                  '.(isset($_SESSION) ? 'Enabled' : 'Disabled')."\n";
 
 	// The rest of this is only relevant is session is enabled
-	if ( isset( $_SESSION ) ) {
-		$return .= 'Session Name:             ' . esc_html( ini_get( 'session.name' ) ) . "\n";
-		$return .= 'Cookie Path:              ' . esc_html( ini_get( 'session.cookie_path' ) ) . "\n";
-		$return .= 'Save Path:                ' . esc_html( ini_get( 'session.save_path' ) ) . "\n";
-		$return .= 'Use Cookies:              ' . ( ini_get( 'session.use_cookies' ) ? 'On' : 'Off' ) . "\n";
-		$return .= 'Use Only Cookies:         ' . ( ini_get( 'session.use_only_cookies' ) ? 'On' : 'Off' ) . "\n";
+	if (isset($_SESSION)) {
+		$return .= 'Session Name:             '.esc_html(ini_get('session.name'))."\n";
+		$return .= 'Cookie Path:              '.esc_html(ini_get('session.cookie_path'))."\n";
+		$return .= 'Save Path:                '.esc_html(ini_get('session.save_path'))."\n";
+		$return .= 'Use Cookies:              '.(ini_get('session.use_cookies') ? 'On' : 'Off')."\n";
+		$return .= 'Use Only Cookies:         '.(ini_get('session.use_only_cookies') ? 'On' : 'Off')."\n";
 	}
 
-	$return = apply_filters( 'give_sysinfo_after_session_config', $return );
+	$return = apply_filters('give_sysinfo_after_session_config', $return);
 
-	$return .= "\n" . '### End System Info ###';
+	$return .= "\n".'### End System Info ###';
 
 	return $return;
 }
@@ -330,17 +330,17 @@ 
  */
 function give_tools_sysinfo_download() {
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
+	if ( ! current_user_can('manage_give_settings')) {
 		return;
 	}
 
 	nocache_headers();
 
-	header( 'Content-Type: text/plain' );
-	header( 'Content-Disposition: attachment; filename="give-system-info.txt"' );
+	header('Content-Type: text/plain');
+	header('Content-Disposition: attachment; filename="give-system-info.txt"');
 
-	echo wp_strip_all_tags( $_POST['give-sysinfo'] );
+	echo wp_strip_all_tags($_POST['give-sysinfo']);
 	give_die();
 }
 
-add_action( 'give_download_sysinfo', 'give_tools_sysinfo_download' );
\ No newline at end of file
+add_action('give_download_sysinfo', 'give_tools_sysinfo_download');
\ No newline at end of file