@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | /** |
| 35 | 35 | * Include WordPress core file so we can use core functions to check for active plugins. |
| 36 | 36 | */ |
| 37 | - include_once(ABSPATH . 'wp-admin/includes/plugin.php'); |
|
| 37 | + include_once(ABSPATH.'wp-admin/includes/plugin.php'); |
|
| 38 | 38 | |
| 39 | 39 | if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {
|
| 40 | 40 | deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');
|
@@ -68,8 +68,8 @@ discard block |
||
| 68 | 68 | * @global string $plugin_file_name Base file name. 'geodirectory/geodirectory.php'. |
| 69 | 69 | */ |
| 70 | 70 | global $wpdb, $plugin_prefix, $geodir_addon_list, $plugin_file_name; |
| 71 | -$plugin_prefix = $wpdb->prefix . 'geodir_'; |
|
| 72 | -$plugin_file_name = basename(plugin_dir_path(__FILE__)) . '/' . basename(__FILE__); |
|
| 71 | +$plugin_prefix = $wpdb->prefix.'geodir_'; |
|
| 72 | +$plugin_file_name = basename(plugin_dir_path(__FILE__)).'/'.basename(__FILE__); |
|
| 73 | 73 | |
| 74 | 74 | /* |
| 75 | 75 | * 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 @@ discard block |
||
| 84 | 84 | /** |
| 85 | 85 | * Define constants |
| 86 | 86 | */ |
| 87 | -if(!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));
|
|
| 87 | +if (!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path(__FILE__));
|
|
| 88 | 88 | |
| 89 | 89 | /* |
| 90 | 90 | * Declare database table names. All since version 1.0.0 |
| 91 | 91 | */ |
| 92 | 92 | |
| 93 | 93 | /** Define the database name for the countries table. */ |
| 94 | -if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');
|
|
| 94 | +if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix.'countries');
|
|
| 95 | 95 | /** Define the database name for the custom fields table. */ |
| 96 | -if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');
|
|
| 96 | +if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix.'custom_fields');
|
|
| 97 | 97 | /** Define the database name for the icons table. */ |
| 98 | -if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');
|
|
| 98 | +if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix.'post_icon');
|
|
| 99 | 99 | /** Define the database name for the attachments table. */ |
| 100 | -if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');
|
|
| 100 | +if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix.'attachments');
|
|
| 101 | 101 | /** Define the database name for the review table. */ |
| 102 | -if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');
|
|
| 102 | +if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix.'post_review');
|
|
| 103 | 103 | /** Define the database name for the custom sort fields table. */ |
| 104 | -if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');
|
|
| 104 | +if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix.'custom_sort_fields');
|
|
| 105 | 105 | |
| 106 | 106 | |
| 107 | 107 | /* |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | if (!defined('GEODIRECTORY_TEXTDOMAIN')) define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');
|
| 111 | 111 | |
| 112 | 112 | // Load geodirectory plugin textdomain. |
| 113 | -add_action( 'init', 'geodir_load_textdomain' ); |
|
| 113 | +add_action('init', 'geodir_load_textdomain');
|
|
| 114 | 114 | |
| 115 | 115 | /* |
| 116 | 116 | * A function to log GD errors no matter the type given. |
@@ -121,18 +121,18 @@ discard block |
||
| 121 | 121 | * @param mixed $log The thing that should be logged. |
| 122 | 122 | * @package GeoDirectory |
| 123 | 123 | */ |
| 124 | -function geodir_error_log($log){
|
|
| 124 | +function geodir_error_log($log) {
|
|
| 125 | 125 | /* |
| 126 | 126 | * A filter to override the WP_DEBUG setting for function geodir_error_log(). |
| 127 | 127 | * |
| 128 | 128 | * @since 1.5.7 |
| 129 | 129 | */ |
| 130 | - $should_log = apply_filters( 'geodir_log_errors', WP_DEBUG); |
|
| 131 | - if ( true === $should_log ) {
|
|
| 132 | - if ( is_array( $log ) || is_object( $log ) ) {
|
|
| 133 | - error_log( print_r( $log, true ) ); |
|
| 130 | + $should_log = apply_filters('geodir_log_errors', WP_DEBUG);
|
|
| 131 | + if (true === $should_log) {
|
|
| 132 | + if (is_array($log) || is_object($log)) {
|
|
| 133 | + error_log(print_r($log, true)); |
|
| 134 | 134 | } else {
|
| 135 | - error_log( $log ); |
|
| 135 | + error_log($log); |
|
| 136 | 136 | } |
| 137 | 137 | } |
| 138 | 138 | } |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | /* |
| 172 | 172 | * Admin init + activation hooks |
| 173 | 173 | */ |
| 174 | -if (is_admin() || defined( 'GD_TESTING_MODE' )) {
|
|
| 174 | +if (is_admin() || defined('GD_TESTING_MODE')) {
|
|
| 175 | 175 | |
| 176 | 176 | /** |
| 177 | 177 | * Include functions used in admin area only. |
@@ -196,14 +196,14 @@ discard block |
||
| 196 | 196 | * |
| 197 | 197 | * @since 1.0.0 |
| 198 | 198 | */ |
| 199 | - require_once(geodir_plugin_path() . '/upgrade.php'); |
|
| 199 | + require_once(geodir_plugin_path().'/upgrade.php'); |
|
| 200 | 200 | if (get_option('geodir_installed') != 1) {
|
| 201 | 201 | /** |
| 202 | 202 | * Define language constants, here as they are not loaded yet. |
| 203 | 203 | * |
| 204 | 204 | * @since 1.0.0 |
| 205 | 205 | */ |
| 206 | - require_once(geodir_plugin_path() . '/language.php'); |
|
| 206 | + require_once(geodir_plugin_path().'/language.php'); |
|
| 207 | 207 | /** |
| 208 | 208 | * Include the plugin install file that sets up the databases and any options on first run. |
| 209 | 209 | * |
@@ -221,13 +221,13 @@ discard block |
||
| 221 | 221 | * @since 1.5.6 |
| 222 | 222 | */ |
| 223 | 223 | global $pagenow; |
| 224 | - if ( 'plugins.php' === $pagenow ) |
|
| 224 | + if ('plugins.php' === $pagenow)
|
|
| 225 | 225 | {
|
| 226 | 226 | // Better update message |
| 227 | - $file = basename( __FILE__ ); |
|
| 228 | - $folder = basename( dirname( __FILE__ ) ); |
|
| 227 | + $file = basename(__FILE__); |
|
| 228 | + $folder = basename(dirname(__FILE__)); |
|
| 229 | 229 | $hook = "in_plugin_update_message-{$folder}/{$file}";
|
| 230 | - add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 ); |
|
| 230 | + add_action($hook, 'geodire_admin_upgrade_notice', 20, 2); |
|
| 231 | 231 | } |
| 232 | 232 | |
| 233 | 233 | } |