GeoDirectory / geodirectory

geodirectory.php

Indentation +91 added lines, -91 removed lines

@@ -31,30 +31,30 @@ 
  * CHECK FOR OLD COMPATIBILITY PACKS AND DISABLE IF THEY ARE ACTIVE

  */

 if (is_admin()) {

-    /**

-     * Include WordPress core file so we can use core functions to check for active plugins.

-     */

-    include_once(ABSPATH . 'wp-admin/includes/plugin.php');

+	/**

+	 * Include WordPress core file so we can use core functions to check for active plugins.

+	 */

+	include_once(ABSPATH . 'wp-admin/includes/plugin.php');

 

-    if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {

-        deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');

-    }

+	if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {

+		deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');

+	}

 

-    if (is_plugin_active('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php')) {

-        deactivate_plugins('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php');

-    }

+	if (is_plugin_active('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php')) {

+		deactivate_plugins('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php');

+	}

 

-    if (is_plugin_active('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php')) {

-        deactivate_plugins('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php');

-    }

+	if (is_plugin_active('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php')) {

+		deactivate_plugins('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php');

+	}

 

-    if (is_plugin_active('geodir_avada_compatibility/geodir_avada_compatibility.php')) {

-        deactivate_plugins('geodir_avada_compatibility/geodir_avada_compatibility.php');

-    }

+	if (is_plugin_active('geodir_avada_compatibility/geodir_avada_compatibility.php')) {

+		deactivate_plugins('geodir_avada_compatibility/geodir_avada_compatibility.php');

+	}

 

-    if (is_plugin_active('geodir_compat_pack_divi/geodir_divi_compatibility.php')) {

-        deactivate_plugins('geodir_compat_pack_divi/geodir_divi_compatibility.php');

-    }

+	if (is_plugin_active('geodir_compat_pack_divi/geodir_divi_compatibility.php')) {

+		deactivate_plugins('geodir_compat_pack_divi/geodir_divi_compatibility.php');

+	}

 

 }

 

@@ -130,19 +130,19 @@ 
  * @package GeoDirectory

  */

 function geodir_error_log($log){

-    /*

+	/*

      * A filter to override the WP_DEBUG setting for function geodir_error_log().

      *

      * @since 1.5.7

      */

-    $should_log = apply_filters( 'geodir_log_errors', WP_DEBUG);

-    if ( true === $should_log ) {

-        if ( is_array( $log ) || is_object( $log ) ) {

-            error_log( print_r( $log, true ) );

-        } else {

-            error_log( $log );

-        }

-    }

+	$should_log = apply_filters( 'geodir_log_errors', WP_DEBUG);

+	if ( true === $should_log ) {

+		if ( is_array( $log ) || is_object( $log ) ) {

+			error_log( print_r( $log, true ) );

+		} else {

+			error_log( $log );

+		}

+	}

 }

 /**

  * Include all plugin functions.

@@ -181,72 +181,72 @@ 
  */

 if (is_admin() || defined( 'GD_TESTING_MODE' ) || ( defined( 'WP_CLI' ) && WP_CLI )) {

 

-    /**

-     * Include functions used in admin area only.

-     *

-     * @since 1.0.0

-     */

-    require_once('geodirectory-admin/admin_functions.php');

-    /**

-     * Most actions/hooks used in admin area only are called from here.

-     *

-     * @since 1.6.11

-     */

-    require_once('geodirectory-admin/admin_dummy_data_functions.php');

-    /**

-     * Most actions/hooks used in admin area only are called from here.

-     *

-     * @since 1.0.0

-     */

-    require_once('geodirectory-admin/admin_hooks_actions.php');

-    /**

-     * Most admin JS and CSS is called from here.

-     *

-     * @since 1.0.0

-     */

-    require_once('geodirectory-admin/admin_template_tags.php');

-    /**

-     * Include Google Analytics Class.

-     *

-     * @since 1.6.11

-     */

-    require_once('geodirectory-admin/class.analytics.stats.php');

-    /**

-     * Include any functions needed for upgrades.

-     *

-     * @since 1.0.0

-     */

-    require_once(geodir_plugin_path() . '/upgrade.php');

-    if (get_option('geodir_installed') != 1) {

-        /**

-         * Define language constants, here as they are not loaded yet.

-         *

-         * @since 1.0.0

-         */

-        require_once(geodir_plugin_path() . '/language.php');

-        /**

-         * Include the plugin install file that sets up the databases and any options on first run.

-         *

-         * @since 1.0.0

-         */

-        require_once('geodirectory-admin/admin_install.php');

-        register_activation_hook(__FILE__, 'geodir_activation');

-    }

-    register_deactivation_hook(__FILE__, 'geodir_deactivation');

-

-    /*

+	/**

+	 * Include functions used in admin area only.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once('geodirectory-admin/admin_functions.php');

+	/**

+	 * Most actions/hooks used in admin area only are called from here.

+	 *

+	 * @since 1.6.11

+	 */

+	require_once('geodirectory-admin/admin_dummy_data_functions.php');

+	/**

+	 * Most actions/hooks used in admin area only are called from here.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once('geodirectory-admin/admin_hooks_actions.php');

+	/**

+	 * Most admin JS and CSS is called from here.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once('geodirectory-admin/admin_template_tags.php');

+	/**

+	 * Include Google Analytics Class.

+	 *

+	 * @since 1.6.11

+	 */

+	require_once('geodirectory-admin/class.analytics.stats.php');

+	/**

+	 * Include any functions needed for upgrades.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once(geodir_plugin_path() . '/upgrade.php');

+	if (get_option('geodir_installed') != 1) {

+		/**

+		 * Define language constants, here as they are not loaded yet.

+		 *

+		 * @since 1.0.0

+		 */

+		require_once(geodir_plugin_path() . '/language.php');

+		/**

+		 * Include the plugin install file that sets up the databases and any options on first run.

+		 *

+		 * @since 1.0.0

+		 */

+		require_once('geodirectory-admin/admin_install.php');

+		register_activation_hook(__FILE__, 'geodir_activation');

+	}

+	register_deactivation_hook(__FILE__, 'geodir_deactivation');

+

+	/*

      * Show a upgrade warning message if applicable.

      *

      * @since 1.5.6

      */

-    global $pagenow;

-    if ( 'plugins.php' === $pagenow )

-    {

-        // Better update message

-        $file   = basename( __FILE__ );

-        $folder = basename( dirname( __FILE__ ) );

-        $hook = "in_plugin_update_message-{$folder}/{$file}";

-        add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 );

-    }

+	global $pagenow;

+	if ( 'plugins.php' === $pagenow )

+	{

+		// Better update message

+		$file   = basename( __FILE__ );

+		$folder = basename( dirname( __FILE__ ) );

+		$hook = "in_plugin_update_message-{$folder}/{$file}";

+		add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 );

+	}

 

 }
\ No newline at end of file

Spacing +25 added lines, -25 removed lines

@@ -34,7 +34,7 @@ 
     /**

      * Include WordPress core file so we can use core functions to check for active plugins.

      */

-    include_once(ABSPATH . 'wp-admin/includes/plugin.php');

+    include_once(ABSPATH.'wp-admin/includes/plugin.php');

 

     if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {

         deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');

@@ -68,8 +68,8 @@ 
  * @global string $plugin_file_name Base file name. 'geodirectory/geodirectory.php'.

  */

 global $wpdb, $plugin_prefix, $geodir_addon_list, $plugin_file_name;

-$plugin_prefix = $wpdb->prefix . 'geodir_';

-$plugin_file_name = basename(plugin_dir_path(__FILE__)) . '/' . basename(__FILE__);

+$plugin_prefix = $wpdb->prefix.'geodir_';

+$plugin_file_name = basename(plugin_dir_path(__FILE__)).'/'.basename(__FILE__);

 

 /*

  * This will store the cached post custom fields per package for each page load so not to run for each listing.

@@ -84,24 +84,24 @@ 
 /**

  * Define constants

  */

-if(!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));

+if (!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path(__FILE__));

 

 /*

  * Declare database table names. All since version 1.0.0

  */

 

 /** Define the database name for the countries table. */

-if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');

+if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix.'countries');

 /** Define the database name for the custom fields table. */

-if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');

+if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix.'custom_fields');

 /** Define the database name for the icons table. */

-if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');

+if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix.'post_icon');

 /** Define the database name for the attachments table. */

-if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');

+if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix.'attachments');

 /** Define the database name for the review table. */

-if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');

+if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix.'post_review');

 /** Define the database name for the custom sort fields table. */

-if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');

+if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix.'custom_sort_fields');

 

 /*

  * Define our Google Analytic app settings

@@ -109,7 +109,7 @@ 
 if (!defined('GEODIR_GA_CLIENTID')) define('GEODIR_GA_CLIENTID', '687912069872-sdpsjssrdt7t3ao1dnv1ib71hkckbt5s.apps.googleusercontent.com');

 if (!defined('GEODIR_GA_CLIENTSECRET')) define('GEODIR_GA_CLIENTSECRET', 'yBVkDpqJ1B9nAETHy738Zn8C'); //don't worry - this don't need to be secret in our case

 if (!defined('GEODIR_GA_REDIRECT')) define('GEODIR_GA_REDIRECT', 'urn:ietf:wg:oauth:2.0:oob');

-if (!defined('GEODIR_GA_SCOPE')) define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics');//.readonly

+if (!defined('GEODIR_GA_SCOPE')) define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics'); //.readonly

 

 

 /*

@@ -118,7 +118,7 @@ 
 if (!defined('GEODIRECTORY_TEXTDOMAIN')) define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');

 

 // Load geodirectory plugin textdomain.

-add_action( 'init', 'geodir_load_textdomain' );

+add_action('init', 'geodir_load_textdomain');

 

 /*

  * A function to log GD errors no matter the type given.

@@ -129,18 +129,18 @@ 
  * @param mixed $log The thing that should be logged.

  * @package GeoDirectory

  */

-function geodir_error_log($log){

+function geodir_error_log($log) {

     /*

      * A filter to override the WP_DEBUG setting for function geodir_error_log().

      *

      * @since 1.5.7

      */

-    $should_log = apply_filters( 'geodir_log_errors', WP_DEBUG);

-    if ( true === $should_log ) {

-        if ( is_array( $log ) || is_object( $log ) ) {

-            error_log( print_r( $log, true ) );

+    $should_log = apply_filters('geodir_log_errors', WP_DEBUG);

+    if (true === $should_log) {

+        if (is_array($log) || is_object($log)) {

+            error_log(print_r($log, true));

         } else {

-            error_log( $log );

+            error_log($log);

         }

     }

 }

@@ -179,7 +179,7 @@ 
 /*

  * Admin init + activation hooks

  */

-if (is_admin() || defined( 'GD_TESTING_MODE' ) || ( defined( 'WP_CLI' ) && WP_CLI )) {

+if (is_admin() || defined('GD_TESTING_MODE') || (defined('WP_CLI') && WP_CLI)) {

 

     /**

      * Include functions used in admin area only.

@@ -216,14 +216,14 @@ 
      *

      * @since 1.0.0

      */

-    require_once(geodir_plugin_path() . '/upgrade.php');

+    require_once(geodir_plugin_path().'/upgrade.php');

     if (get_option('geodir_installed') != 1) {

         /**

          * Define language constants, here as they are not loaded yet.

          *

          * @since 1.0.0

          */

-        require_once(geodir_plugin_path() . '/language.php');

+        require_once(geodir_plugin_path().'/language.php');

         /**

          * Include the plugin install file that sets up the databases and any options on first run.

          *

@@ -240,13 +240,13 @@ 
      * @since 1.5.6

      */

     global $pagenow;

-    if ( 'plugins.php' === $pagenow )

+    if ('plugins.php' === $pagenow)

     {

         // Better update message

-        $file   = basename( __FILE__ );

-        $folder = basename( dirname( __FILE__ ) );

+        $file   = basename(__FILE__);

+        $folder = basename(dirname(__FILE__));

         $hook = "in_plugin_update_message-{$folder}/{$file}";

-        add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 );

+        add_action($hook, 'geodire_admin_upgrade_notice', 20, 2);

     }

 

 }
\ No newline at end of file

includes/class-gd-autoloader.php

Spacing +32 added lines, -32 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,13 +25,13 @@ 
 	 * The Constructor.
 	 */
 	public function __construct() {
-		if ( function_exists( "__autoload" ) ) {
-			spl_autoload_register( "__autoload" );
+		if (function_exists("__autoload")) {
+			spl_autoload_register("__autoload");
 		}
 
-		spl_autoload_register( array( $this, 'autoload' ) );
+		spl_autoload_register(array($this, 'autoload'));
 
-		$this->include_path = untrailingslashit( plugin_dir_path( GD_PLUGIN_FILE ) ) . '/includes/';
+		$this->include_path = untrailingslashit(plugin_dir_path(GD_PLUGIN_FILE)).'/includes/';
 	}
 
 	/**
@@ -40,8 +40,8 @@ 
 	 * @param  string $class
 	 * @return string
 	 */
-	private function get_file_name_from_class( $class ) {
-		return 'class-' . str_replace( '_', '-', $class ) . '.php';
+	private function get_file_name_from_class($class) {
+		return 'class-'.str_replace('_', '-', $class).'.php';
 	}
 
 	/**
@@ -50,9 +50,9 @@ 
 	 * @param  string $path
 	 * @return bool successful or not
 	 */
-	private function load_file( $path ) {
-		if ( $path && is_readable( $path ) ) {
-			include_once( $path );
+	private function load_file($path) {
+		if ($path && is_readable($path)) {
+			include_once($path);
 			return true;
 		}
 		return false;
@@ -63,36 +63,36 @@ 
 	 *
 	 * @param string $class
 	 */
-	public function autoload( $class ) {
-		$class = strtolower( $class );
+	public function autoload($class) {
+		$class = strtolower($class);
 
-		if ( 0 !== strpos( $class, 'gd_' ) ) {
+		if (0 !== strpos($class, 'gd_')) {
 			return;
 		}
 
-		$file  = $this->get_file_name_from_class( $class );
+		$file  = $this->get_file_name_from_class($class);
 		$path  = '';
 
-		if ( strpos( $class, 'wc_addons_gateway_' ) === 0 ) {
-			$path = $this->include_path . 'gateways/' . substr( str_replace( '_', '-', $class ), 18 ) . '/';
-		} elseif ( strpos( $class, 'gd_gateway_' ) === 0 ) {
-			$path = $this->include_path . 'gateways/' . substr( str_replace( '_', '-', $class ), 11 ) . '/';
-		} elseif ( strpos( $class, 'gd_shipping_' ) === 0 ) {
-			$path = $this->include_path . 'shipping/' . substr( str_replace( '_', '-', $class ), 12 ) . '/';
-		} elseif ( strpos( $class, 'gd_shortcode_' ) === 0 ) {
-			$path = $this->include_path . 'shortcodes/';
-		} elseif ( strpos( $class, 'gd_meta_box' ) === 0 ) {
-			$path = $this->include_path . 'admin/meta-boxes/';
-		} elseif ( strpos( $class, 'gd_admin' ) === 0 ) {
-			$path = $this->include_path . 'admin/';
-		} elseif ( strpos( $class, 'gd_payment_token_' ) === 0 ) {
-			$path = $this->include_path . 'payment-tokens/';
-		} elseif ( strpos( $class, 'gd_log_handler_' ) === 0 ) {
-			$path = $this->include_path . 'log-handlers/';
+		if (strpos($class, 'wc_addons_gateway_') === 0) {
+			$path = $this->include_path.'gateways/'.substr(str_replace('_', '-', $class), 18).'/';
+		} elseif (strpos($class, 'gd_gateway_') === 0) {
+			$path = $this->include_path.'gateways/'.substr(str_replace('_', '-', $class), 11).'/';
+		} elseif (strpos($class, 'gd_shipping_') === 0) {
+			$path = $this->include_path.'shipping/'.substr(str_replace('_', '-', $class), 12).'/';
+		} elseif (strpos($class, 'gd_shortcode_') === 0) {
+			$path = $this->include_path.'shortcodes/';
+		} elseif (strpos($class, 'gd_meta_box') === 0) {
+			$path = $this->include_path.'admin/meta-boxes/';
+		} elseif (strpos($class, 'gd_admin') === 0) {
+			$path = $this->include_path.'admin/';
+		} elseif (strpos($class, 'gd_payment_token_') === 0) {
+			$path = $this->include_path.'payment-tokens/';
+		} elseif (strpos($class, 'gd_log_handler_') === 0) {
+			$path = $this->include_path.'log-handlers/';
 		}
 
-		if ( empty( $path ) || ! $this->load_file( $path . $file ) ) {
-			$this->load_file( $this->include_path . $file );
+		if (empty($path) || !$this->load_file($path.$file)) {
+			$this->load_file($this->include_path.$file);
 		}
 	}
 }