GeoDirectory / geodirectory

geodirectory-admin/admin_hooks_actions.php

Spacing +231 added lines, -231 removed lines

@@ -62,7 +62,7 @@ 
  */

 function geodir_get_admin_option_form($current_tab)

 {

-    geodir_admin_option_form($current_tab);// defined in admin template tags.php

+    geodir_admin_option_form($current_tab); // defined in admin template tags.php

 }

 

 

@@ -70,7 +70,7 @@ 
 add_action('geodir_update_options_compatibility_settings', 'geodir_update_options_compatibility_settings');

 add_action('geodir_update_options_default_location_settings', 'geodir_location_form_submit');

 add_action('geodir_before_admin_panel', 'geodir_before_admin_panel'); // this function is in admin_functions.php

-add_action('geodir_before_update_options', 'geodir_before_update_options',10,2);

+add_action('geodir_before_update_options', 'geodir_before_update_options', 10, 2);

 

 //add_action('geodir_before_admin_panel', 'geodir_autoinstall_admin_header');

 

@@ -99,7 +99,7 @@ 
         

         // Disable VC editor for GD post types.

         if (class_exists('Vc_Role_Access_Controller')) {

-            add_filter( 'vc_role_access_with_post_types_can', '__return_false', 100 );

+            add_filter('vc_role_access_with_post_types_can', '__return_false', 100);

         }

     }

 

@@ -126,8 +126,8 @@ 
 add_action('admin_panel_init', 'geodir_admin_list_columns', 2);

 

 /* --- insert dummy post action ---*/

-add_action('geodir_insert_dummy_posts', 'geodir_insert_dummy_posts', 1,3);

-add_action('geodir_delete_dummy_posts', 'geodir_delete_dummy_posts', 1,3);

+add_action('geodir_insert_dummy_posts', 'geodir_insert_dummy_posts', 1, 3);

+add_action('geodir_delete_dummy_posts', 'geodir_delete_dummy_posts', 1, 3);

 

 

 /**

@@ -236,9 +236,9 @@ 
 

         // Filter-Payment-Manager

 

-        add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');

+        add_meta_box('geodir_post_images', $post_typename.' '.__('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');

 

-        add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');

+        add_meta_box('geodir_post_info', $post_typename.' '.__('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');

 

         // no need of this box as all fields moved to main information box

         //add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );

@@ -247,7 +247,7 @@ 
 

 }

 

-add_action('save_post', 'geodir_post_information_save',10,2);

+add_action('save_post', 'geodir_post_information_save', 10, 2);

 

 

 

@@ -274,10 +274,10 @@ 
 

             $gd_taxonomy = geodir_get_taxonomies($geodir_post_type);

 

-            if(!empty($gd_taxonomy)) {

+            if (!empty($gd_taxonomy)) {

                 foreach ($gd_taxonomy as $tax) {

 

-                    remove_meta_box($tax . 'div', $geodir_post_type, 'normal');

+                    remove_meta_box($tax.'div', $geodir_post_type, 'normal');

 

                 }

             }

@@ -363,14 +363,14 @@ 
 add_action('geodir_manage_available_fields_predefined', 'geodir_manage_available_fields_predefined');

 add_action('geodir_manage_available_fields_custom', 'geodir_manage_available_fields_custom');

 

-function geodir_manage_available_fields_predefined($sub_tab){

-    if($sub_tab=='custom_fields'){

+function geodir_manage_available_fields_predefined($sub_tab) {

+    if ($sub_tab == 'custom_fields') {

         geodir_custom_available_fields('predefined');

     }

 }

 

-function geodir_manage_available_fields_custom($sub_tab){

-    if($sub_tab=='custom_fields'){

+function geodir_manage_available_fields_custom($sub_tab) {

+    if ($sub_tab == 'custom_fields') {

         geodir_custom_available_fields('custom');

     }

 }

@@ -440,7 +440,7 @@ 
     global $wpdb;

     $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

     ?>

-    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/>

+    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type; ?>"/>

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>

     <ul>

     <?php

@@ -451,7 +451,7 @@ 
 

             $check_html_variable = $wpdb->get_var(

                 $wpdb->prepare(

-                    "SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",

+                    "SELECT htmlvar_name FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",

                     array($val['htmlvar_name'], $listing_type, $val['field_type'])

                 )

             );

@@ -459,23 +459,23 @@ 
             $display = $check_html_variable ? ' style="display:none;"' : '';

            ?>

 

-            <li   class="gd-cf-tooltip-wrap" <?php echo $display;?>>

+            <li   class="gd-cf-tooltip-wrap" <?php echo $display; ?>>

                 <?php

-                if(isset($val['description']) && $val['description']){

+                if (isset($val['description']) && $val['description']) {

                     echo '<div class="gdcf-tooltip">'.$val['description'].'</div>';

                 }?>

 

-                <a id="gd-<?php echo $val['field_type'];?>-_-<?php echo $val['htmlvar_name'];?>" data-field-type-key="<?php echo $val['htmlvar_name'];?>"  data-field-type="<?php echo $val['field_type'];?>"

-                   title="<?php echo $val['site_title'];?>"

-                   class="gd-draggable-form-items  gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);">

+                <a id="gd-<?php echo $val['field_type']; ?>-_-<?php echo $val['htmlvar_name']; ?>" data-field-type-key="<?php echo $val['htmlvar_name']; ?>"  data-field-type="<?php echo $val['field_type']; ?>"

+                   title="<?php echo $val['site_title']; ?>"

+                   class="gd-draggable-form-items  gd-<?php echo $val['field_type']; ?> geodir-sort-<?php echo $val['htmlvar_name']; ?>" href="javascript:void(0);">

                     <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {

                         echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>';

-                    }elseif(isset($val['field_icon']) && $val['field_icon'] ){

+                    }elseif (isset($val['field_icon']) && $val['field_icon']) {

                         echo '<b style="background-image: url("'.$val['field_icon'].'")"></b>';

-                    }else{

+                    } else {

                         echo '<i class="fa fa-cog" aria-hidden="true"></i>';

                     }?>

-                    <?php echo $val['site_title'];?>

+                    <?php echo $val['site_title']; ?>

                 </a>

             </li>

 

@@ -503,7 +503,7 @@ 
     <?php 

         global $wpdb;

         

-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));

+        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));

 

         if (!empty($fields)) {

             foreach ($fields as $field) {

@@ -528,14 +528,14 @@ 
  * @since 1.6.9

  * @package GeoDirectory

  */

-function geodir_custom_fields_custom($post_type=''){

+function geodir_custom_fields_custom($post_type = '') {

 

     $custom_fields = array();

 

     /**

      * @see `geodir_custom_fields`

      */

-    return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);

+    return apply_filters('geodir_custom_fields_custom', $custom_fields, $post_type);

 }

 

 

@@ -546,7 +546,7 @@ 
  * @since 1.6.6

  * @package GeoDirectory

  */

-function geodir_custom_fields($post_type=''){

+function geodir_custom_fields($post_type = '') {

     

     $custom_fields = array(

         'text' => array(

@@ -681,7 +681,7 @@ 
      * }

      * @param string $post_type The post type requested.

      */

-    return apply_filters('geodir_custom_fields',$custom_fields,$post_type);

+    return apply_filters('geodir_custom_fields', $custom_fields, $post_type);

 }

 

 /**

@@ -692,25 +692,25 @@ 
  * @param string $type The custom field type, predefined, custom or blank for default

  * @package GeoDirectory

  */

-function geodir_custom_available_fields($type='')

+function geodir_custom_available_fields($type = '')

 {

     $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

     ?>

-    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/>

+    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type; ?>"/>

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>" />

 

         <?php

-        if($type=='predefined'){

+        if ($type == 'predefined') {

             $cfs = geodir_custom_fields_predefined($listing_type);

-        }elseif($type=='custom'){

+        }elseif ($type == 'custom') {

             $cfs = geodir_custom_fields_custom($listing_type);

-        }else{

+        } else {

             $cfs = geodir_custom_fields($listing_type);

             ?>

             <ul class="full gd-cf-tooltip-wrap">

                 <li>

                     <div class="gdcf-tooltip">

-                        <?php _e('This adds a section separator with a title.', 'geodirectory');?>

+                        <?php _e('This adds a section separator with a title.', 'geodirectory'); ?>

                     </div>

                     <a id="gt-fieldset"

                        class="gd-draggable-form-items gt-fieldset"

@@ -721,7 +721,7 @@ 
 

                         <i class="fa fa-long-arrow-left " aria-hidden="true"></i>

                         <i class="fa fa-long-arrow-right " aria-hidden="true"></i>

-                        <?php _e('Fieldset (section separator)', 'geodirectory');?>

+                        <?php _e('Fieldset (section separator)', 'geodirectory'); ?>

                     </a>

                 </li>

             </ul>

@@ -729,15 +729,15 @@ 
             <?php

         }

 

-    if(!empty($cfs)) {

+    if (!empty($cfs)) {

         echo '<ul>';

-        foreach ( $cfs as $id => $cf ) {

+        foreach ($cfs as $id => $cf) {

             ?>

 

             <li class="gd-cf-tooltip-wrap">

                 <?php

-                if ( isset( $cf['description'] ) && $cf['description'] ) {

-                    echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>';

+                if (isset($cf['description']) && $cf['description']) {

+                    echo '<div class="gdcf-tooltip">'.$cf['description'].'</div>';

                 } ?>

 

                 <a id="gd-<?php echo $id; ?>"

@@ -747,10 +747,10 @@ 
                    class="gd-draggable-form-items <?php echo $cf['class']; ?>"

                    href="javascript:void(0);">

 

-                    <?php if ( isset( $cf['icon'] ) && strpos( $cf['icon'], 'fa fa-' ) !== false ) {

-                        echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>';

-                    } elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {

-                        echo '<b style="background-image: url("' . $cf['icon'] . '")"></b>';

+                    <?php if (isset($cf['icon']) && strpos($cf['icon'], 'fa fa-') !== false) {

+                        echo '<i class="'.$cf['icon'].'" aria-hidden="true"></i>';

+                    } elseif (isset($cf['icon']) && $cf['icon']) {

+                        echo '<b style="background-image: url("'.$cf['icon'].'")"></b>';

                     } else {

                         echo '<i class="fa fa-cog" aria-hidden="true"></i>';

                     } ?>

@@ -759,7 +759,7 @@ 
             </li>

             <?php

         }

-    }else{

+    } else {

         _e('There are no custom fields here yet.', 'geodirectory');

     }

         ?>

@@ -787,7 +787,7 @@ 
     <ul class="core">

     <?php 

         global $wpdb;

-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));

+        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));

 

         if (!empty($fields)) {

             foreach ($fields as $field) {

@@ -797,7 +797,7 @@ 
                 $field_type_key = $field->field_type_key;

                 $field_ins_upd = 'display';

 

-                geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key);

+                geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd, $field_type_key);

             }

         }

         ?></ul>

@@ -956,8 +956,8 @@ 
 

     if (!get_option('geodir_remove_unnecessary_fields')) {

 

-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))

-            $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");

+        if ($wpdb->get_var("SHOW COLUMNS FROM ".$plugin_prefix."gd_place_detail WHERE field = 'categories'"))

+            $wpdb->query("ALTER TABLE `".$plugin_prefix."gd_place_detail` DROP `categories`");

 

         update_option('geodir_remove_unnecessary_fields', '1');

 

@@ -986,7 +986,7 @@ 
             case 'diagnosis' :

                 if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {

                     $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

-                    call_user_func('geodir_diagnose_' . $diagnose_this);

+                    call_user_func('geodir_diagnose_'.$diagnose_this);

 

                 }

                 exit();

@@ -995,7 +995,7 @@ 
             case 'diagnosis-fix' :

                 if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')

                     $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

-                call_user_func('geodir_diagnose_' . $diagnose_this);

+                call_user_func('geodir_diagnose_'.$diagnose_this);

                 exit();

                 break;

         }

@@ -1020,50 +1020,50 @@ 
 {

     global $wpdb;

     //$filter_arr['output_str'] .='###'.$table.'###';

-    if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";

+    if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") > 0) {

+        $filter_arr['output_str'] .= "<li>".__('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory')."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

-    } elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";

+    } elseif ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") > 0) {

+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name)."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

-        $filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";

+        $filter_arr['output_str'] .= "<li>".__('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory')."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

         if ($fix) {

-            $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count

-            $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count

+            $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM ".$table."_ms_bak"); // get backup table count

+            $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM ".$wpdb->prefix."$table"); // get new table count

 

             if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2

                 //$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;

 

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table

+                $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$table."_ms_bak2"); // rename bak table to new table

 

-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";

+                if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") == 0) {

+                    $filter_arr['output_str'] .= "<li>".__('-->FIXED: Renamed and backed up the tables', 'geodirectory')."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+                    $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";

                 }

 

             } elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it

 

-                $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table

+                $wpdb->query("RENAME TABLE ".$wpdb->prefix."$table TO ".$table."_ms_bak2"); // rename new table to bak2

+                $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$wpdb->prefix."$table"); // rename bak table to new table

 

-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";

+                if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table)."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+                    $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";

                 }

 

             } elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors

 

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2

+                $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$table."_ms_bak2"); // rename ms_bak table to ms_bak2

 

-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";

+                if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") == 0) {

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table)."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+                    $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";

                 }

 

             }

@@ -1071,54 +1071,54 @@ 
         }

 

 

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";

+    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") > 0) {

+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name)."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

         if ($fix) {

             if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it

                 if ($wpdb->query("DROP TABLE IF EXISTS $table")) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table)."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table)."</li>";

                 }

 

-            } elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original

-                if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

+            } elseif ($wpdb->get_var("SELECT COUNT(*) FROM ".$wpdb->prefix."$table") == 0) {// if main table is empty but original is not, delete main and rename original

+                if ($wpdb->query("DROP TABLE IF EXISTS ".$wpdb->prefix."$table")) {

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix.$table)."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix.$table)."</li>";

                 }

-                if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+                if ($wpdb->query("RENAME TABLE $table TO ".$wpdb->prefix."$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";

                 }

             } else {// else rename the original table to _ms_bak

-                if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

+                if ($wpdb->query("RENAME TABLE $table TO ".$table."_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table."_ms_bak")."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table."_ms_bak")."</li>";

                 }

             }

         }

 

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";

+    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") == 0) {

+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name)."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

         if ($fix) {

             // if original table exists but new does not, rename

-            if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+            if ($wpdb->query("RENAME TABLE $table TO ".$wpdb->prefix."$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+                $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";

             } else {

-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+                $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";

             }

 

         }

 

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";

+    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") == 0) {

+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name)."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

         if ($fix) {

@@ -1132,11 +1132,11 @@ 
             delete_option('geodir_custom_posts_db_version');

             delete_option('geodir_reviewratings_db_version');

             delete_option('geodiradvancesearch_db_version');

-            $filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";

+            $filter_arr['output_str'] .= "<li>".__('-->TRY: Please refresh page to run table install functions', 'geodirectory')."</li>";

         }

 

     } else {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";

+        $filter_arr['output_str'] .= "<li>".sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name)."</li>";

     }

     return $filter_arr;

 }

@@ -1177,21 +1177,21 @@ 
     }

 

     if ($stepped_process) {

-        $sql = $wpdb->prepare( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $ptype . "_detail LIMIT %d OFFSET %d", $step_max_items, $offset );

-        $posts = $wpdb->get_results( $sql );

+        $sql = $wpdb->prepare("SELECT * FROM ".$wpdb->prefix."geodir_".$ptype."_detail LIMIT %d OFFSET %d", $step_max_items, $offset);

+        $posts = $wpdb->get_results($sql);

 

         if (!empty($posts)) {

 

             foreach ($posts as $p) {

                 $p->post_type = $ptype;

-                $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));

+                $raw_tags = wp_get_object_terms($p->post_id, $p->post_type.'_tags', array('fields' => 'names'));

                 if (empty($raw_tags)) {

                     $post_tags = '';

                 } else {

                     $post_tags = implode(",", $raw_tags);

                 }

-                $tablename = $plugin_prefix . $p->post_type . '_detail';

-                $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

+                $tablename = $plugin_prefix.$p->post_type.'_detail';

+                $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

 

             }

             if ($step >= $max_step) {

@@ -1207,23 +1207,23 @@ 
         if (!empty($all_postypes)) {

             foreach ($all_postypes as $key) {

                 // update each GD CPT

-                $posts = $wpdb->get_results( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail");

+                $posts = $wpdb->get_results("SELECT * FROM ".$wpdb->prefix."geodir_".$key."_detail");

 

                 if (!empty($posts)) {

 

                     foreach ($posts as $p) {

                         $p->post_type = $key;

-                        $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));

+                        $raw_tags = wp_get_object_terms($p->post_id, $p->post_type.'_tags', array('fields' => 'names'));

                         if (empty($raw_tags)) {

                             $post_tags = '';

                         } else {

                             $post_tags = implode(",", $raw_tags);

                         }

-                        $tablename = $plugin_prefix . $p->post_type . '_detail';

-                        $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

+                        $tablename = $plugin_prefix.$p->post_type.'_detail';

+                        $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

 

                     }

-                    $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

+                    $output_str .= "<li>".$key.__(': Done', 'geodirectory')."</li>";

                 }

 

             }

@@ -1234,14 +1234,14 @@ 
 

     if ($is_error_during_diagnose) {

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

     }

 

     if ($stepped_process) {

-        $percent = ($step/$max_step) * 100;

+        $percent = ($step / $max_step) * 100;

         if ($output_str == 'done') {

             echo $output_str;

         } else {

@@ -1284,29 +1284,29 @@ 
     if (!empty($all_postypes)) {

         foreach ($all_postypes as $key) {

             // update each GD CTP

-            $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");

+            $posts = $wpdb->get_results("SELECT * FROM ".$wpdb->prefix."geodir_".$key."_detail d WHERE d.".$key."category='' ");

 

             if (!empty($posts)) {

 

                 foreach ($posts as $p) {

                     $p->post_type = $key;

-                    $raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));

+                    $raw_cats = wp_get_object_terms($p->post_id, $p->post_type.'category', array('fields' => 'ids'));

 

                     if (empty($raw_cats)) {

                         $post_categories = get_post_meta($p->post_id, 'post_categories', true);

 

-                        if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {

-                            $post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);

-                            foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {

+                        if (!empty($post_categories) && !empty($post_categories[$p->post_type.'category'])) {

+                            $post_categories[$p->post_type.'category'] = str_replace("d:", "", $post_categories[$p->post_type.'category']);

+                            foreach (explode(",", $post_categories[$p->post_type.'category']) as $cat_part) {

                                 if (is_numeric($cat_part)) {

-                                    $raw_cats[] = (int)$cat_part;

+                                    $raw_cats[] = (int) $cat_part;

                                 }

                             }

 

                         }

 

                         if (!empty($raw_cats)) {

-                            $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category');

+                            $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type.'category');

 

                         }

 

@@ -1316,14 +1316,14 @@ 
                     if (empty($raw_cats)) {

                         $post_cats = '';

                     } else {

-                        $post_cats = ',' . implode(",", $raw_cats) . ',';

+                        $post_cats = ','.implode(",", $raw_cats).',';

                     }

-                    $tablename = $plugin_prefix . $p->post_type . '_detail';

-                    $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));

+                    $tablename = $plugin_prefix.$p->post_type.'_detail';

+                    $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET ".$p->post_type."category=%s WHERE post_id =%d", $post_cats, $p->post_id));

                 }

 

             }

-            $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

+            $output_str .= "<li>".$key.__(': Done', 'geodirectory')."</li>";

 

         }

 

@@ -1331,7 +1331,7 @@ 
 

     if ($is_error_during_diagnose) {

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

@@ -1384,15 +1384,15 @@ 
     if (!empty($ver_arr)) {

         foreach ($ver_arr as $key => $val) {

             if (delete_option($val)) {

-                $output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";

+                $output_str .= "<li>".$key.__(' Version: Deleted', 'geodirectory')."</li>";

             } else {

-                $output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";

+                $output_str .= "<li>".$key.__(' Version: Not Found', 'geodirectory')."</li>";

             }

 

         }

 

         if ($output_str) {

-            $output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";

+            $output_str .= "<li><strong>".__(' Upgrade/install scripts will run on next page reload.', 'geodirectory')."</strong></li>";

         }

 

     }

@@ -1429,43 +1429,43 @@ 
     $output_str = '';

 

     // check review locations

-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {

-        $output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";

+    if ($wpdb->get_results("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {

+        $output_str .= "<li>".__('Review locations missing or broken', 'geodirectory')."</li>";

         $is_error_during_diagnose = true;

 

         if ($fix) {

             if (geodir_fix_review_location()) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Review locations fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Review locations fix failed', 'geodirectory')."</strong></li>";

             }

         }

 

     } else {

-        $output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";

+        $output_str .= "<li>".__('Review locations ok', 'geodirectory')."</li>";

     }

 

     // check review content

-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {

-        $output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";

+    if ($wpdb->get_results("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE comment_content IS NULL")) {

+        $output_str .= "<li>".__('Review content missing or broken', 'geodirectory')."</li>";

         $is_error_during_diagnose = true;

 

         if ($fix) {

             if (geodir_fix_review_content()) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Review content fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Review content fix failed', 'geodirectory')."</strong></li>";

             }

         }

 

     } else {

-        $output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";

+        $output_str .= "<li>".__('Review content ok', 'geodirectory')."</li>";

     }

 

 

     if ($is_error_during_diagnose) {

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

@@ -1529,7 +1529,7 @@ 
 

     if ($is_error_during_diagnose) {

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

@@ -1563,7 +1563,7 @@ 
     else {

         $page_found = $wpdb->get_var(

             $wpdb->prepare(

-                "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

+                "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s LIMIT 1;",

                 array($slug)

             )

         );

@@ -1609,18 +1609,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_home_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('GD Home page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('GD Home page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: GD Home page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: GD Home page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1634,18 +1634,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_add_listing_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Add Listing page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Add Listing page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Add Listing page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Add Listing page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1660,18 +1660,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_preview_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Listing Preview page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Listing Preview page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Listing Preview page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Listing Preview page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1685,18 +1685,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_success_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Listing Success page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Listing Success page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Listing Success page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Listing Success page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1710,18 +1710,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_info_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Info page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Info page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Info page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Info page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1735,18 +1735,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_login_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Login page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Login page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Login page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Login page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1760,18 +1760,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_location_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Location page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Location page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Location page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Location page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1780,13 +1780,13 @@ 
     /* Diagnose Location Page Ends */

     ////////////////////////////////

 

-    $page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );

+    $page_chk_arr = array('output_str'=>$output_str, 'is_error_during_diagnose'=>$is_error_during_diagnose);

     /**

      * This action is called at the end of the GD Tools page check function.

      *

      * @since 1.5.2

      */

-    $page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);

+    $page_chk_arr = apply_filters('geodir_diagnose_default_pages', $page_chk_arr);

 

     $output_str = $page_chk_arr['output_str'];

     $is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose'];

@@ -1796,7 +1796,7 @@ 
             flush_rewrite_rules();

         }

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

@@ -1824,10 +1824,10 @@ 
     $fix_button_txt = '';

 

     if ($is_error_during_diagnose) {

-        $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";

+        $output_str .= "<li>".__('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory').' '.geodir_plugin_path().'/db-language.php'."</li>";

 		$info_div_class = "geodir_problem_info";

     } else {

-        $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";

+        $output_str .= "<li>".__('Load custom fields in to file for translation: ok', 'geodirectory')."</li>";

 		$info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

     }

@@ -1869,17 +1869,17 @@ 
     global $wpdb, $wp_query, $plugin_prefix;

 

     if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {

-        $table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail';

+        $table = $plugin_prefix.$wp_query->query_vars['post_type'].'_detail';

 

-        $join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)';

+        $join = $clauses['join'].' INNER JOIN '.$table.' AS gd_posts ON (gd_posts.post_id = '.$wpdb->posts.'.ID)';

         $clauses['join'] = $join;

 

-        $fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : '';

+        $fields = $clauses['fields'] != '' ? $clauses['fields'].', ' : '';

         $fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire';

         $clauses['fields'] = $fields;

 

         $order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC';

-        $orderby = 'gd_expire ' . $order;

+        $orderby = 'gd_expire '.$order;

         $clauses['orderby'] = $orderby;

     }

     return $clauses;

@@ -1922,7 +1922,7 @@ 
         global $current_user;

         $upload_dir = wp_upload_dir();

 

-        $file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv';

+        $file = $upload_dir['path'].'/temp_'.$current_user->data->ID.'/geodir_tmp.csv';

         $handle = fopen($file, 'w');

 

         fwrite($handle, $input);

@@ -1967,7 +1967,7 @@ 
     $uploads_dir = $uploads['path'];

     $image_name_arr = explode('/', $filename);

     $filename = end($image_name_arr);

-    $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

+    $target_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$filename;

     $return = array();

     $return['file'] = $uploadedFile;

     $return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');

@@ -1984,8 +1984,8 @@ 
 

                 if (($handle = fopen($target_path, "r")) !== FALSE) {

                     while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {

-                        if(is_array($data) && !empty($data)) {

-                            $file[] = '"' . implode('","', $data) . '"';

+                        if (is_array($data) && !empty($data)) {

+                            $file[] = '"'.implode('","', $data).'"';

                         }

                     }

                     fclose($handle);

@@ -2102,10 +2102,10 @@ 
                     $tag_arr = explode(',', $post_tags);

                 }

 

-                $table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database

+                $table = $plugin_prefix.$buffer[5].'_detail'; // check table in database

 

                 $error = '';

-                if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {

+                if ($wpdb->get_var("SHOW TABLES LIKE '".$table."'") != $table) {

                     $invalid_post_type++;

                     continue;

                 }

@@ -2131,7 +2131,7 @@ 
                             if ($buffer[$c] != '0' && $buffer[$c] != '') {

                                 $submitdata = date('Y-m-d');

 

-                                $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));

+                                $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata."+".addslashes($buffer[$c])." days"));

                             } else {

                                 $gd_post_info['expire_date'] = 'Never';

                             }

@@ -2159,7 +2159,7 @@ 
 						

 						// Post status

 						if ($customKeyarray[$c] == 'post_status') {

-                            $post_status = sanitize_key( $buffer[$c] );

+                            $post_status = sanitize_key($buffer[$c]);

                         }

                     }

 

@@ -2177,8 +2177,8 @@ 
 					

 					// Default post status

 					$default_status = 'publish';

-					$post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

-					$post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

+					$post_status = !empty($post_status) ? sanitize_key($post_status) : $default_status;

+					$post_status = !empty($wp_post_statuses) && !isset($wp_post_statuses[$post_status]) ? $default_status : $post_status;

 

                     $my_post['post_title'] = $post_title;

                     $my_post['post_content'] = $post_desc;

@@ -2222,7 +2222,7 @@ 
                     $payment_info = array();

                     $package_info = array();

 

-                    $package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]);

+                    $package_info = (array) geodir_post_package_info($package_info, '', $buffer[5]);

                     $package_id = '';

                     if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {

                         $package_id = $gd_post_info['package_id'];

@@ -2232,7 +2232,7 @@ 
                         $payment_info['package_id'] = $package_info['pid'];

 

                         if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {

-                            $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));

+                            $payment_info['expire_date'] = date('Y-m-d', strtotime("+".$package_info['alive_days']." days"));

                         } else {

                             $payment_info['expire_date'] = 'Never';

                         }

@@ -2244,7 +2244,7 @@ 
 

                     $post_type = get_post_type($last_postid);

 

-                    $table = $plugin_prefix . $post_type . '_detail';

+                    $table = $plugin_prefix.$post_type.'_detail';

 

                     geodir_save_post_info($last_postid, $gd_post_info);

 

@@ -2265,7 +2265,7 @@ 
                             $attachment['post_id'] = $last_postid;

                             $attachment['title'] = $img_name_arr[0];

                             $attachment['content'] = '';

-                            $attachment['file'] = $sub_dir . '/' . $image_name;

+                            $attachment['file'] = $sub_dir.'/'.$image_name;

                             $attachment['mime_type'] = $uploaded_file_type;

                             $attachment['menu_order'] = $menu_order;

                             $attachment['is_featured'] = 0;

@@ -2274,15 +2274,15 @@ 
 

                             foreach ($attachment as $key => $val) {

                                 if ($val != '')

-                                    $attachment_set .= $key . " = '" . $val . "', ";

+                                    $attachment_set .= $key." = '".$val."', ";

                             }

                             $attachment_set = trim($attachment_set, ", ");

 

-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

+                            $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);

 

                             if ($menu_order == 1) {

                                 $post_type = get_post_type($last_postid);

-                                $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));

+                                $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($sub_dir.'/'.$image_name, $last_postid)));

                             }

                             $menu_order++;

                         }

@@ -2323,11 +2323,11 @@ 
 }

 

 // Add the tab in left sidebar menu fro import & export page.

-add_filter( 'geodir_settings_tabs_array', 'geodir_import_export_tab', 94 );

+add_filter('geodir_settings_tabs_array', 'geodir_import_export_tab', 94);

 

 // Handle ajax request for import/export.

-add_action( 'wp_ajax_geodir_import_export', 'geodir_ajax_import_export' );

-add_action( 'wp_ajax_nopriv_geodir_import_exportn', 'geodir_ajax_import_export' );

+add_action('wp_ajax_geodir_import_export', 'geodir_ajax_import_export');

+add_action('wp_ajax_nopriv_geodir_import_exportn', 'geodir_ajax_import_export');

 

 

 /**

@@ -2338,40 +2338,40 @@ 
  * @param $post_id int $post_id The post ID of the post being saved.

  * @param $post object $post The post object of the post being saved.

  */

-function geodir_update_location_prefix($post_id,$post){

-    if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){

-        update_option('geodir_location_prefix',$post->post_name);

+function geodir_update_location_prefix($post_id, $post) {

+    if ($post->post_type == 'page' && $post->post_name && $post_id == get_option('geodir_location_page')) {

+        update_option('geodir_location_prefix', $post->post_name);

     }

 

 }

 

-add_action('save_post', 'geodir_update_location_prefix',10,2);

+add_action('save_post', 'geodir_update_location_prefix', 10, 2);

 

-add_action( 'wp_ajax_geodir_ga_callback', 'geodir_ga_callback' );

+add_action('wp_ajax_geodir_ga_callback', 'geodir_ga_callback');

 

-function geodir_ga_callback(){

+function geodir_ga_callback() {

 

-if(isset($_REQUEST['code']) && $_REQUEST['code']) {

+if (isset($_REQUEST['code']) && $_REQUEST['code']) {

     $oAuthURL = "https://www.googleapis.com/oauth2/v3/token?";

     $code = "code=".$_REQUEST['code'];

     $grant_type = "&grant_type=authorization_code";

-    $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

+    $redirect_uri = "&redirect_uri=".admin_url('admin-ajax.php')."?action=geodir_ga_callback";

     $client_id = "&client_id=".get_option('geodir_ga_client_id');

     $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');

 

-    $auth_url = $oAuthURL . $code . $redirect_uri .  $grant_type . $client_id .$client_secret;

+    $auth_url = $oAuthURL.$code.$redirect_uri.$grant_type.$client_id.$client_secret;

 

     $response = wp_remote_post($auth_url, array('timeout' => 15));

 

     //print_r($response);

 

-    $error_msg =  __('Something went wrong','geodirectory');

-    if(!empty($response['response']['code']) && $response['response']['code']==200){

+    $error_msg = __('Something went wrong', 'geodirectory');

+    if (!empty($response['response']['code']) && $response['response']['code'] == 200) {

 

         $parts = json_decode($response['body']);

         //print_r($parts);

-        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}

-        else{

+        if (!isset($parts->access_token)) {echo $error_msg." - #1"; exit; }

+        else {

 

             update_option('gd_ga_access_token', $parts->access_token);

             update_option('gd_ga_refresh_token', $parts->refresh_token);

@@ -2380,18 +2380,18 @@ 
 

 

     }

-    elseif(!empty($response['response']['code'])) {

+    elseif (!empty($response['response']['code'])) {

         $parts = json_decode($response['body']);

 

-        if(isset($parts->error)){

-            echo $parts->error.": ".$parts->error_description;exit;

-        }else{

-            echo $error_msg." - #2";exit;

+        if (isset($parts->error)) {

+            echo $parts->error.": ".$parts->error_description; exit;

+        } else {

+            echo $error_msg." - #2"; exit;

         }

 

-    }else{

+    } else {

 

-        echo $error_msg." - #3";exit;

+        echo $error_msg." - #3"; exit;

 

     }

 }

@@ -2413,7 +2413,7 @@ 
 function geodir_uninstall_settings($general_settings) {

     $settings   = array();

     $settings[] = array('type' => 'title', 'id' => 'uninstall_settings', 'name' => __('Uninstall Settings', 'geodirectory'));

-    $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory' ));

+    $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory'));

     

     $plugins    = get_plugins();

     $un_plugins = apply_filters('geodir_plugins_uninstall_settings', array());

@@ -2425,7 +2425,7 @@ 
             if (in_array($plugin_name, $un_plugins)) {

                 $settings[] = array(

                     'type' => 'checkbox',

-                    'id' => 'geodir_un_' . $plugin_name,

+                    'id' => 'geodir_un_'.$plugin_name,

                     'name' => $data['Name'],

                     'desc' => __('Remove all data when deleted?', 'geodirectory'),

                     'std' => '0'

@@ -2459,7 +2459,7 @@ 
  * @since 1.6.9

  */

 function geodir_uninstall_settings_desc() {

-    echo '<p class="gd-un-settings-desc">' . __('Select the plugins that you would like to completely remove all of its data when the plugin is deleted.', 'geodirectory') . '</p>';

+    echo '<p class="gd-un-settings-desc">'.__('Select the plugins that you would like to completely remove all of its data when the plugin is deleted.', 'geodirectory').'</p>';

 }

 add_action('geodir_settings_uninstall_settings_main_start', 'geodir_uninstall_settings_desc');

 

@@ -2523,12 +2523,12 @@ 
 

 

     if ($delete) {

-            $output_str .= "<li><strong>" . __('Table dropped, refresh page to reinstall.', 'geodirectory') . "</strong></li>";

+            $output_str .= "<li><strong>".__('Table dropped, refresh page to reinstall.', 'geodirectory')."</strong></li>";

         ob_start();

         geodir_diagnose_version_clear();

         ob_end_clean();

-    }else{

-        $output_str .= "<li><strong>" . __('Seomething went wrong.', 'geodirectory') . "</strong></li>";

+    } else {

+        $output_str .= "<li><strong>".__('Seomething went wrong.', 'geodirectory')."</strong></li>";

     }

 

     if ($is_error_during_diagnose) {

geodirectory-admin/admin_template_tags.php

Spacing +118 added lines, -118 removed lines

@@ -52,7 +52,7 @@ 
                          * @param array $tabs The array of tabs to display.

                          */

                         $tabs = apply_filters('geodir_settings_tabs_array', $tabs);

-                        update_option('geodir_tabs', $tabs);// Important to show settings menu dropdown

+                        update_option('geodir_tabs', $tabs); // Important to show settings menu dropdown

 

                         foreach ($tabs as $name => $args) :

                             $label = $args['label'];

@@ -63,12 +63,12 @@ 
 

                                 $subtabs = $args['subtabs'];

 

-                                $query_string = '&subtab=' . $subtabs[0]['subtab'];

+                                $query_string = '&subtab='.$subtabs[0]['subtab'];

 

                             endif;

 

 

-                            $tab_link = admin_url('admin.php?page=geodirectory&tab=' . $name . $query_string);

+                            $tab_link = admin_url('admin.php?page=geodirectory&tab='.$name.$query_string);

 

                             if (isset($args['url']) && $args['url'] != '') {

                                 $tab_link = $args['url'];

@@ -78,7 +78,7 @@ 
                                 $tab_link = geodir_getlink($tab_link, $args['request']);

 

                             if (isset($args['target']) && $args['target'] != '') {

-                                $tab_target = " target='" . sanitize_text_field($args['target']) . "' ";

+                                $tab_target = " target='".sanitize_text_field($args['target'])."' ";

                             } else

                                 $tab_target = '';

 

@@ -93,7 +93,7 @@ 
                              * @see 'geodir_after_settings_tabs'

                              */

                             do_action('geodir_before_settings_tabs', $name);

-                            echo '<li ' . $tab_active . ' ><a href="' . esc_url($tab_link) . '"  ' . $tab_target . ' >' . $label . '</a></li>';

+                            echo '<li '.$tab_active.' ><a href="'.esc_url($tab_link).'"  '.$tab_target.' >'.$label.'</a></li>';

                             /**

                              * Called after the individual settings tabs are output.

                              *

@@ -137,11 +137,11 @@ 
                                         $form_action = isset($sub['form_action']) ? $sub['form_action'] : '';

                                     }

 

-                                    $sub_tabs_link = admin_url() . 'admin.php?page=geodirectory&tab=' . $current_tab . '&subtab=' . $sub['subtab'];

+                                    $sub_tabs_link = admin_url().'admin.php?page=geodirectory&tab='.$current_tab.'&subtab='.$sub['subtab'];

                                     if (isset($sub['request']) && is_array($sub['request']) && !empty($sub['request'])) {

                                         $sub_tabs_link = geodir_getlink($sub_tabs_link, $sub['request']);

                                     }

-                                    echo '<dd ' . $subtab_active . ' id="claim_listing"><a href="' . esc_url($sub_tabs_link) . '" >' . sanitize_text_field($sub['label']) . '</a></dd>';

+                                    echo '<dd '.$subtab_active.' id="claim_listing"><a href="'.esc_url($sub_tabs_link).'" >'.sanitize_text_field($sub['label']).'</a></dd>';

                                 }

                                 ?>

                             </dl>

@@ -151,7 +151,7 @@ 
                             echo "inner_contet_tabs";

                         } ?>">

                             <form method="post" id="mainform"

-                                  class="geodir_optionform <?php echo $current_tab . ' '; ?><?php if (isset($sub['subtab'])) {

+                                  class="geodir_optionform <?php echo $current_tab.' '; ?><?php if (isset($sub['subtab'])) {

                                       echo sanitize_text_field($sub['subtab']);

                                   } ?>" action="<?php echo $form_action; ?>" enctype="multipart/form-data">

                                 <input type="hidden" class="active_tab" name="active_tab"

@@ -159,7 +159,7 @@ 
                                            echo sanitize_text_field($_REQUEST['active_tab']);

                                        } ?>"/>

                                 <?php wp_nonce_field('geodir-settings', '_wpnonce', true, true); ?>

-                                <?php wp_nonce_field('geodir-settings-' . $current_tab, '_wpnonce-' . $current_tab, true, true); ?>

+                                <?php wp_nonce_field('geodir-settings-'.$current_tab, '_wpnonce-'.$current_tab, true, true); ?>

                                 <?php

                                 /**

                                  * Used to call the content of each GD settings tab page.

@@ -189,7 +189,7 @@ 
                      jQuery('#last_tab').val( jQuery(this).attr('href') );

                      return false;*/

                 });

-                <?php if (isset($_GET['subtab']) && $_GET['subtab']) echo 'jQuery(\'ul.subsubsub li a[href="#' . sanitize_text_field($_GET['subtab']) . '"]\').click();'; ?>

+                <?php if (isset($_GET['subtab']) && $_GET['subtab']) echo 'jQuery(\'ul.subsubsub li a[href="#'.sanitize_text_field($_GET['subtab']).'"]\').click();'; ?>

                 // Countries

                 jQuery('select#geodirectory_allowed_countries').change(function () {

                     if (jQuery(this).val() == "specific") {

@@ -222,7 +222,7 @@ 
                     jQuery('.geodirectory-nav-tab-wrapper a').click(function () {

                         if (changed) {

                             window.onbeforeunload = function () {

-                                return '<?php echo __( 'The changes you made will be lost if you navigate away from this page.', 'geodirectory'); ?>';

+                                return '<?php echo __('The changes you made will be lost if you navigate away from this page.', 'geodirectory'); ?>';

                             }

                         } else {

                             window.onbeforeunload = '';

@@ -285,14 +285,14 @@ 
 

     //echo $tab_name.'_array.php' ;

     global $geodir_settings, $is_default, $mapzoom;

-    if (file_exists(dirname(__FILE__) . '/option-pages/' . $tab_name . '_array.php')) {

+    if (file_exists(dirname(__FILE__).'/option-pages/'.$tab_name.'_array.php')) {

         /**

          * Contains settings array for given tab.

          *

          * @since 1.0.0

          * @package GeoDirectory

          */

-        include_once('option-pages/' . $tab_name . '_array.php');

+        include_once('option-pages/'.$tab_name.'_array.php');

     }

 

     $listing_type = isset($_REQUEST['listing_type']) ? $_REQUEST['listing_type'] : '';

@@ -327,7 +327,7 @@ 
             ?>

 

             <p class="submit">

-            <input <?php echo $hide_save_button;?> name="save" class="button-primary" type="submit" value="<?php _e('Save changes', 'geodirectory'); ?>" />

+            <input <?php echo $hide_save_button; ?> name="save" class="button-primary" type="submit" value="<?php _e('Save changes', 'geodirectory'); ?>" />

             <input type="hidden" name="subtab" id="last_tab" />

             </p>

             

@@ -398,7 +398,7 @@ 
 

                     ?>

 

-                    <h3><?php _e('Set Default Location', 'geodirectory');?></h3>

+                    <h3><?php _e('Set Default Location', 'geodirectory'); ?></h3>

 

                     <input type="hidden" name="add_location" value="location">

 

@@ -406,16 +406,16 @@ 
                         echo $location_result->location_id;

                     } ?>">

 

-                    <input type="hidden" name="address" id="<?php echo $prefix;?>address" value="">

+                    <input type="hidden" name="address" id="<?php echo $prefix; ?>address" value="">

 

                     <table class="form-table default_location_form">

                         <tbody>

                         <tr valign="top" class="single_select_page">

-                            <th class="titledesc" scope="row"><?php _e('City', 'geodirectory');?></th>

+                            <th class="titledesc" scope="row"><?php _e('City', 'geodirectory'); ?></th>

                             <td class="forminp">

                                 <div class="gtd-formfeild required">

                                     <input class="require" type="text" size="80" style="width:440px"

-                                           id="<?php echo $prefix;?>city" name="city"

+                                           id="<?php echo $prefix; ?>city" name="city"

                                            value="<?php if (isset($location_result->city)) {

                                                echo $location_result->city;

                                            } ?>"/>

@@ -427,11 +427,11 @@ 
                             </td>

                         </tr>

                         <tr valign="top" class="single_select_page">

-                            <th class="titledesc" scope="row"><?php _e('Region', 'geodirectory');?></th>

+                            <th class="titledesc" scope="row"><?php _e('Region', 'geodirectory'); ?></th>

                             <td class="forminp">

                                 <div class="gtd-formfeild required">

                                     <input class="require" type="text" size="80" style="width:440px"

-                                           id="<?php echo $prefix;?>region" name="region"

+                                           id="<?php echo $prefix; ?>region" name="region"

                                            value="<?php if (isset($location_result->region)) {

                                                echo $location_result->region;

                                            } ?>"/>

@@ -443,7 +443,7 @@ 
                             </td>

                         </tr>

                         <tr valign="top" class="single_select_page">

-                            <th class="titledesc" scope="row"><?php _e('Country', 'geodirectory');?></th>

+                            <th class="titledesc" scope="row"><?php _e('Country', 'geodirectory'); ?></th>

                             <td class="forminp">

                                 <div class="gtd-formfeild required" style="padding-top:10px;">

                                     <?php

@@ -452,7 +452,7 @@ 
                                     ?>

                                     <select id="<?php echo $prefix ?>country" class="chosen_select"

                                             data-location_type="country" name="<?php echo $prefix ?>country"

-                                            data-placeholder="<?php _e('Choose a country.', 'geodirectory');?>"

+                                            data-placeholder="<?php _e('Choose a country.', 'geodirectory'); ?>"

                                             data-addsearchtermonnorecord="1" data-ajaxchosen="0" data-autoredirect="0"

                                             data-showeverywhere="0">

                                         <?php geodir_get_country_dl($country, $prefix); ?>

@@ -469,7 +469,7 @@ 
                         </tr>

                         <tr valign="top" class="single_select_page gd-add-location-map">

                             <th class="titledesc"

-                                scope="row"><?php _e('Set Location on Map', 'geodirectory');?></th>

+                                scope="row"><?php _e('Set Location on Map', 'geodirectory'); ?></th>

                             <td class="forminp">

                                 <?php

                                 /**

@@ -477,15 +477,15 @@ 
                                  *

                                  * @since 1.0.0

                                  */

-                                include(geodir_plugin_path() . "/geodirectory-functions/map-functions/map_on_add_listing_page.php");?>

+                                include(geodir_plugin_path()."/geodirectory-functions/map-functions/map_on_add_listing_page.php"); ?>

                             </td>

                         </tr>

                         <tr valign="top" class="single_select_page">

-                            <th class="titledesc" scope="row"><?php _e('City Latitude', 'geodirectory');?></th>

+                            <th class="titledesc" scope="row"><?php _e('City Latitude', 'geodirectory'); ?></th>

                             <td class="forminp">

                                 <div class="gtd-formfeild required" style="padding-top:10px;">

                                     <input type="text" class="require" size="80" style="width:440px"

-                                           id="<?php echo $prefix;?>latitude" name="latitude"

+                                           id="<?php echo $prefix; ?>latitude" name="latitude"

                                            value="<?php if (isset($location_result->city_latitude)) {

                                                echo $location_result->city_latitude;

                                            } ?>"/>

@@ -498,11 +498,11 @@ 
                         </tr>

                         <tr valign="top" class="single_select_page">

                             <th class="titledesc"

-                                scope="row"><?php _e('City Longitude', 'geodirectory');?></th>

+                                scope="row"><?php _e('City Longitude', 'geodirectory'); ?></th>

                             <td class="forminp">

                                 <div class="gtd-formfeild required" style="padding-top:10px;">

                                     <input type="text" class="require" size="80" style="width:440px"

-                                           id="<?php echo $prefix;?>longitude" name="longitude"

+                                           id="<?php echo $prefix; ?>longitude" name="longitude"

                                            value="<?php if (isset($location_result->city_longitude)) {

                                                echo $location_result->city_longitude;

                                            } ?>"/>

@@ -537,7 +537,7 @@ 
                 </div>

             </div>

             <?php break;

-        case $listing_type . '_fields_settings' :

+        case $listing_type.'_fields_settings' :

 

             geodir_custom_post_type_form();

 

@@ -684,12 +684,12 @@ 
         $theme_name = str_replace(" ", "_", $theme->get('Name'));

     }

 

-    if (in_array($theme_name, array('Avada', 'Enfold', 'X', 'Divi', 'Genesis', 'Jupiter', 'Multi_News','Kleo','Twenty_Seventeen'))) {// list of themes that have php files

+    if (in_array($theme_name, array('Avada', 'Enfold', 'X', 'Divi', 'Genesis', 'Jupiter', 'Multi_News', 'Kleo', 'Twenty_Seventeen'))) {// list of themes that have php files

         $theme_settings['geodir_theme_compat_code'] = $theme_name;

     }

 

 

-    $theme_name = $theme_name . "_custom";

+    $theme_name = $theme_name."_custom";

     $theme_arr = get_option('gd_theme_compats');

     update_option('gd_theme_compat', $theme_name);

     /**

@@ -778,7 +778,7 @@ 
         <div class="gd-content-heading">

 

 

-            <h3><?php _e('Theme Compatibility Settings', 'geodirectory');?></h3>

+            <h3><?php _e('Theme Compatibility Settings', 'geodirectory'); ?></h3>

             <style>

                 .gd-theme-compat-table {

                     width: 100%;

@@ -809,11 +809,11 @@ 
                 </div>

             <?php }?>

 

-            <h4><?php _e('Select Theme Compatibility Pack', 'geodirectory');?></h4>

+            <h4><?php _e('Select Theme Compatibility Pack', 'geodirectory'); ?></h4>

 

             <select name="gd_theme_compat" id="gd_theme_compat">

-                <option value=""><?php _e('Select Theme', 'geodirectory');?></option>

-                <option value="custom"><?php _e('Custom', 'geodirectory');?></option>

+                <option value=""><?php _e('Select Theme', 'geodirectory'); ?></option>

+                <option value="custom"><?php _e('Custom', 'geodirectory'); ?></option>

                 <?php

                 $theme_arr = get_option('gd_theme_compats');

                 $theme_active = get_option('gd_theme_compat');

@@ -832,20 +832,20 @@ 
                 ?>

             </select>

             <button onclick="gd_comp_export();" type="button"

-                    class="button-primary"><?php _e('Export', 'geodirectory');?></button>

+                    class="button-primary"><?php _e('Export', 'geodirectory'); ?></button>

             <button onclick="gd_comp_import();" type="button"

-                    class="button-primary"><?php _e('Import', 'geodirectory');?></button>

+                    class="button-primary"><?php _e('Import', 'geodirectory'); ?></button>

 

             <div class="gd-comp-import-export">

                 <textarea id="gd-import-export-theme-comp"

-                          placeholder="<?php _e('Paste the JSON code here and then click import again', 'geodirectory');?>"></textarea>

+                          placeholder="<?php _e('Paste the JSON code here and then click import again', 'geodirectory'); ?>"></textarea>

             </div>

             <script>

 

                 function gd_comp_export() {

                     theme = jQuery('#gd_theme_compat').val();

                     if (theme == '' || theme == 'custom') {

-                        alert("<?php _e('Please select a theme to export','geodirectory');?>");

+                        alert("<?php _e('Please select a theme to export', 'geodirectory'); ?>");

                         return false;

                     }

                     jQuery('.gd-comp-import-export').show();

@@ -879,9 +879,9 @@ 
 

                     jQuery.post(ajaxurl, data, function (response) {

                         if (response == '0') {

-                            alert("<?php _e('Something went wrong','geodirectory');?>");

+                            alert("<?php _e('Something went wrong', 'geodirectory'); ?>");

                         } else {

-                            alert("<?php _e('Theme Compatibility Imported','geodirectory');?>");

+                            alert("<?php _e('Theme Compatibility Imported', 'geodirectory'); ?>");

                             jQuery('#gd-import-export-theme-comp').val('');

                             jQuery('.gd-comp-import-export').hide();

                             jQuery('#gd_theme_compat').append(new Option(response, response));

@@ -922,14 +922,14 @@ 
 

             </script>

 

-            <h4><?php _e('Main Wrapper Actions', 'geodirectory');?></h4>

+            <h4><?php _e('Main Wrapper Actions', 'geodirectory'); ?></h4>

 

             <table class="form-table gd-theme-compat-table">

                 <tbody>

                 <tr>

-                    <td><strong><?php _e('Hook', 'geodirectory');?></strong></td>

-                    <td><strong><?php _e('ID', 'geodirectory');?></strong></td>

-                    <td><strong><?php _e('Class', 'geodirectory');?></strong></td>

+                    <td><strong><?php _e('Hook', 'geodirectory'); ?></strong></td>

+                    <td><strong><?php _e('ID', 'geodirectory'); ?></strong></td>

+                    <td><strong><?php _e('Class', 'geodirectory'); ?></strong></td>

                 </tr>

 

 

@@ -947,7 +947,7 @@ 
 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_wrapper_open_replace"

                                   placeholder='<div id="[id]" class="[class]">'><?php if (isset($tc['geodir_wrapper_open_replace'])) {

                                 echo $tc['geodir_wrapper_open_replace'];

@@ -961,14 +961,14 @@ 
                         <small>geodir_wrapper_close</small>

                     </td>

                     <td><input disabled="disabled" type="text" name="geodir_wrapper_open_id"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                     <td><input disabled="disabled" type="text" name="geodir_wrapper_open_class"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                 </tr>

 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_wrapper_close_replace"

                                   placeholder='</div><!-- wrapper ends here-->'><?php if (isset($tc['geodir_wrapper_close_replace'])) {

                                 echo $tc['geodir_wrapper_close_replace'];

@@ -992,7 +992,7 @@ 
 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_wrapper_content_open_replace"

                                   placeholder='<div id="[id]" class="[class]" role="main" [width_css]>'><?php if (isset($tc['geodir_wrapper_content_open_replace'])) {

                                 echo $tc['geodir_wrapper_content_open_replace'];

@@ -1006,14 +1006,14 @@ 
                         <small>geodir_wrapper_content_close</small>

                     </td>

                     <td><input disabled="disabled" type="text" name="geodir_wrapper_content_close_id"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                     <td><input disabled="disabled" type="text" name="geodir_wrapper_content_close_class"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                 </tr>

 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_wrapper_content_close_replace"

                                   placeholder='</div><!-- content ends here-->'><?php if (isset($tc['geodir_wrapper_content_close_replace'])) {

                                 echo $tc['geodir_wrapper_content_close_replace'];

@@ -1035,7 +1035,7 @@ 
 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_article_open_replace"

                                   placeholder='<article  id="[id]" class="[class]" itemscope itemtype="[itemtype]">'><?php if (isset($tc['geodir_article_open_replace'])) {

                                 echo $tc['geodir_article_open_replace'];

@@ -1048,14 +1048,14 @@ 
                         <small>geodir_article_close</small>

                     </td>

                     <td><input disabled="disabled" type="text" name="geodir_article_close_id"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                     <td><input disabled="disabled" type="text" name="geodir_article_close_class"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                 </tr>

 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_article_close_replace"

                                   placeholder='</article><!-- article ends here-->'><?php if (isset($tc['geodir_article_close_replace'])) {

                                 echo $tc['geodir_article_close_replace'];

@@ -1078,7 +1078,7 @@ 
 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_sidebar_right_open_replace"

                                   placeholder='<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>'><?php if (isset($tc['geodir_sidebar_right_open_replace'])) {

                                 echo $tc['geodir_sidebar_right_open_replace'];

@@ -1091,14 +1091,14 @@ 
                         <small>geodir_sidebar_right_close</small>

                     </td>

                     <td><input disabled="disabled" type="text" name="geodir_sidebar_right_close_id"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                     <td><input disabled="disabled" type="text" name="geodir_sidebar_right_close_class"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                 </tr>

 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_sidebar_right_close_replace"

                                   placeholder='</aside><!-- sidebar ends here-->'><?php if (isset($tc['geodir_sidebar_right_close_replace'])) {

                                 echo $tc['geodir_sidebar_right_close_replace'];

@@ -1122,7 +1122,7 @@ 
 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_sidebar_left_open_replace"

                                   placeholder='<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>'><?php if (isset($tc['geodir_sidebar_left_open_replace'])) {

                                 echo $tc['geodir_sidebar_left_open_replace'];

@@ -1135,14 +1135,14 @@ 
                         <small>geodir_sidebar_left_close</small>

                     </td>

                     <td><input disabled="disabled" type="text" name="geodir_sidebar_left_close_id"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                     <td><input disabled="disabled" type="text" name="geodir_sidebar_left_close_class"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                 </tr>

 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_sidebar_left_close_replace"

                                   placeholder='</aside><!-- sidebar ends here-->'><?php if (isset($tc['geodir_sidebar_left_close_replace'])) {

                                 echo $tc['geodir_sidebar_left_close_replace'];

@@ -1164,7 +1164,7 @@ 
 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_main_content_open_replace"

                                   placeholder='<main  id="[id]" class="[class]"  role="main">'><?php if (isset($tc['geodir_main_content_open_replace'])) {

                                 echo $tc['geodir_main_content_open_replace'];

@@ -1177,14 +1177,14 @@ 
                         <small>geodir_main_content_close</small>

                     </td>

                     <td><input disabled="disabled" type="text" name="geodir_main_content_close_id"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                     <td><input disabled="disabled" type="text" name="geodir_main_content_close_class"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                 </tr>

 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_main_content_close_replace"

                                   placeholder='</main><!-- main ends here-->'><?php if (isset($tc['geodir_main_content_close_replace'])) {

                                 echo $tc['geodir_main_content_close_replace'];

@@ -1196,13 +1196,13 @@ 
                 </tbody>

             </table>

 

-            <h4><?php _e('Other Actions', 'geodirectory');?></h4>

+            <h4><?php _e('Other Actions', 'geodirectory'); ?></h4>

 

             <table class="form-table gd-theme-compat-table">

                 <tbody>

                 <tr>

-                    <td><strong><?php _e('Hook', 'geodirectory');?></strong></td>

-                    <td><strong><?php _e('Content', 'geodirectory');?></strong></td>

+                    <td><strong><?php _e('Hook', 'geodirectory'); ?></strong></td>

+                    <td><strong><?php _e('Content', 'geodirectory'); ?></strong></td>

                 </tr>

 

 

@@ -1231,13 +1231,13 @@ 
             </table>

 

 

-            <h4><?php _e('Other Filters', 'geodirectory');?></h4>

+            <h4><?php _e('Other Filters', 'geodirectory'); ?></h4>

 

             <table class="form-table gd-theme-compat-table">

                 <tbody>

                 <tr>

-                    <td><strong><?php _e('Filter', 'geodirectory');?></strong></td>

-                    <td><strong><?php _e('Content', 'geodirectory');?></strong></td>

+                    <td><strong><?php _e('Filter', 'geodirectory'); ?></strong></td>

+                    <td><strong><?php _e('Content', 'geodirectory'); ?></strong></td>

                 </tr>

 

                 <tr>

@@ -1391,13 +1391,13 @@ 
                  *

                  * @since 1.4.0

                  */

-                do_action('gd_compat_other_filters');?>

+                do_action('gd_compat_other_filters'); ?>

 

                 </tbody>

             </table>

 

 

-            <h4><?php _e('Required CSS', 'geodirectory');?></h4>

+            <h4><?php _e('Required CSS', 'geodirectory'); ?></h4>

 

             <table class="form-table gd-theme-compat-table">

                 <tbody>

@@ -1412,7 +1412,7 @@ 
                 </tbody>

             </table>

 

-            <h4><?php _e('Required JS', 'geodirectory');?></h4>

+            <h4><?php _e('Required JS', 'geodirectory'); ?></h4>

 

             <table class="form-table gd-theme-compat-table">

                 <tbody>

@@ -1430,7 +1430,7 @@ 
 

             <p class="submit">

                 <input name="save" class="button-primary" type="submit"

-                       value="<?php _e('Save changes', 'geodirectory');?>">

+                       value="<?php _e('Save changes', 'geodirectory'); ?>">

             </p>

 

         </div>

@@ -1464,7 +1464,7 @@ 
          * @param string $listing_type Post type.

          */

         ?>

-        <h3><?php echo apply_filters('geodir_custom_fields_panel_head', '', $sub_tab, $listing_type);?></h3>

+        <h3><?php echo apply_filters('geodir_custom_fields_panel_head', '', $sub_tab, $listing_type); ?></h3>

     </div>

     <div id="container_general" class="clearfix">

         <div class="general-form-builder-frame">

@@ -1479,7 +1479,7 @@ 
                  * @param string $listing_type Post type.

                  */

                 ?>

-                <h3 class="hndle"><span><?php echo apply_filters('geodir_cf_panel_available_fields_head', '', $sub_tab, $listing_type);?>

+                <h3 class="hndle"><span><?php echo apply_filters('geodir_cf_panel_available_fields_head', '', $sub_tab, $listing_type); ?>

 							</span></h3>

                 <?php

                 /**

@@ -1490,9 +1490,9 @@ 
                  * @param string $listing_type Post type.

                  */

                 ?>

-                <p><?php echo apply_filters('geodir_cf_panel_available_fields_note', '', $sub_tab, $listing_type);?></p>

+                <p><?php echo apply_filters('geodir_cf_panel_available_fields_note', '', $sub_tab, $listing_type); ?></p>

 

-                <h3><?php _e('Setup New Field','geodirectory');?></h3>

+                <h3><?php _e('Setup New Field', 'geodirectory'); ?></h3>

                 <div class="inside">

 

                     <div id="gt-form-builder-tab" class="gt-tabs-panel">

@@ -1511,9 +1511,9 @@ 
 

                 </div>

 

-                <?php if($sub_tab=='custom_fields'){ ?>

+                <?php if ($sub_tab == 'custom_fields') { ?>

 

-                <h3><?php _e('Predefined Fields','geodirectory');?></h3>

+                <h3><?php _e('Predefined Fields', 'geodirectory'); ?></h3>

                 <div class="inside">

 

                     <div id="gt-form-builder-tab" class="gt-tabs-panel">

@@ -1532,7 +1532,7 @@ 
 

                 </div>

 

-                <h3><?php _e('Custom Fields','geodirectory');?></h3>

+                <h3><?php _e('Custom Fields', 'geodirectory'); ?></h3>

                 <div class="inside">

 

                     <div id="gt-form-builder-tab" class="gt-tabs-panel">

@@ -1569,7 +1569,7 @@ 
                      * @param string $listing_type Post type.

                      */

                     ?>

-                    <span><?php echo apply_filters('geodir_cf_panel_selected_fields_head', '', $sub_tab, $listing_type);?></span>

+                    <span><?php echo apply_filters('geodir_cf_panel_selected_fields_head', '', $sub_tab, $listing_type); ?></span>

                 </h3>

                 <?php

                 /**

@@ -1580,7 +1580,7 @@ 
                  * @param string $listing_type Post type.

                  */

                 ?>

-                <p><?php echo apply_filters('geodir_cf_panel_selected_fields_note', '', $sub_tab, $listing_type);?></p>

+                <p><?php echo apply_filters('geodir_cf_panel_selected_fields_note', '', $sub_tab, $listing_type); ?></p>

 

                 <div class="inside">

 

@@ -1621,7 +1621,7 @@ 
         <div class="gd-content-heading">

 

 

-            <h3><?php _e('GD Diagnostic Tools', 'geodirectory');?></h3>

+            <h3><?php _e('GD Diagnostic Tools', 'geodirectory'); ?></h3>

             <style>

                 .gd-tools-table {

                     width: 100%;

@@ -1640,40 +1640,40 @@ 
             <table class="form-table gd-tools-table">

                 <tbody>

                 <tr>

-                    <td><strong><?php _e('Tool', 'geodirectory');?></strong></td>

-                    <td><strong><?php _e('Description', 'geodirectory');?></strong></td>

-                    <td><strong><?php _e('Action', 'geodirectory');?></strong></td>

+                    <td><strong><?php _e('Tool', 'geodirectory'); ?></strong></td>

+                    <td><strong><?php _e('Description', 'geodirectory'); ?></strong></td>

+                    <td><strong><?php _e('Action', 'geodirectory'); ?></strong></td>

                 </tr>

 

 

                 <tr>

-                    <td><?php _e('GD pages check', 'geodirectory');?></td>

+                    <td><?php _e('GD pages check', 'geodirectory'); ?></td>

                     <td>

-                        <small><?php _e('Checks if the GD pages are installed correctly or not.', 'geodirectory');?></small>

+                        <small><?php _e('Checks if the GD pages are installed correctly or not.', 'geodirectory'); ?></small>

                     </td>

                     <td>

-                        <input type="button" value="<?php _e('Run', 'geodirectory');?>"

+                        <input type="button" value="<?php _e('Run', 'geodirectory'); ?>"

                                class="button-primary geodir_diagnosis_button" data-diagnose="default_pages"/>

                     </td>

                 </tr>

 

 

                 <tr>

-                    <td><?php _e('Multisite DB conversion check', 'geodirectory');?></td>

+                    <td><?php _e('Multisite DB conversion check', 'geodirectory'); ?></td>

                     <td>

-                        <small><?php _e('Checks if the GD database tables have been converted to use multisite correctly.', 'geodirectory');?></small>

+                        <small><?php _e('Checks if the GD database tables have been converted to use multisite correctly.', 'geodirectory'); ?></small>

                     </td>

-                    <td><input type="button" value="<?php _e('Run', 'geodirectory');?>"

+                    <td><input type="button" value="<?php _e('Run', 'geodirectory'); ?>"

                                class="button-primary geodir_diagnosis_button" data-diagnose="multisite_conversion"/>

                     </td>

                 </tr>

 

                 <tr>

-                    <td><?php _e('Ratings check', 'geodirectory');?></td>

+                    <td><?php _e('Ratings check', 'geodirectory'); ?></td>

                     <td>

-                        <small><?php _e('Checks ratings for correct location and content settings', 'geodirectory');?></small>

+                        <small><?php _e('Checks ratings for correct location and content settings', 'geodirectory'); ?></small>

                     </td>

-                    <td><input type="button" value="<?php _e('Run', 'geodirectory');?>"

+                    <td><input type="button" value="<?php _e('Run', 'geodirectory'); ?>"

                                class="button-primary geodir_diagnosis_button" data-diagnose="ratings"/>

                     </td>

                 </tr>

@@ -1688,9 +1688,9 @@ 
                         $multiple = "";

                     }

                     ?>

-                    <td><?php _e('Sync GD tags', 'geodirectory');?></td>

+                    <td><?php _e('Sync GD tags', 'geodirectory'); ?></td>

                     <td>

-                        <small><?php _e('This tool can be used when tags are showing in the backend but missing from the front end.', 'geodirectory');?></small>

+                        <small><?php _e('This tool can be used when tags are showing in the backend but missing from the front end.', 'geodirectory'); ?></small>

                         <?php

                         if ($l_count > $step_max_items) {

                             ?>

@@ -1706,7 +1706,7 @@ 
                                                 <?php echo $value['labels']['name']; ?>

                                             </td>

                                             <td>

-                                                <input type="button" value="<?php _e('Run', 'geodirectory');?>"

+                                                <input type="button" value="<?php _e('Run', 'geodirectory'); ?>"

                                                        class="button-primary geodir_diagnosis_button" data-ptype="<?php echo $key; ?>" data-diagnose="tags_sync"/>

                                             </td>

                                         </tr>

@@ -1720,48 +1720,48 @@ 
                         ?>

                     </td>

                     <td>

-                        <input type="button" value="<?php _e('Run', 'geodirectory');?>"

+                        <input type="button" value="<?php _e('Run', 'geodirectory'); ?>"

                                class="button-primary geodir_diagnosis_button" <?php echo $multiple; ?> data-diagnose="tags_sync"/>

 

                     </td>

                 </tr>

 

                 <tr>

-                    <td><?php _e('Sync GD Categories', 'geodirectory');?></td>

+                    <td><?php _e('Sync GD Categories', 'geodirectory'); ?></td>

                     <td>

-                        <small><?php _e('This tool can be used when categories are missing from the details table but showing in other places in the backend (only checks posts with missing category info in details table)', 'geodirectory');?></small>

+                        <small><?php _e('This tool can be used when categories are missing from the details table but showing in other places in the backend (only checks posts with missing category info in details table)', 'geodirectory'); ?></small>

                     </td>

-                    <td><input type="button" value="<?php _e('Run', 'geodirectory');?>"

+                    <td><input type="button" value="<?php _e('Run', 'geodirectory'); ?>"

                                class="button-primary geodir_diagnosis_button" data-diagnose="cats_sync"/>

                     </td>

                 </tr>

 

 

                 <tr>

-                    <td><?php _e('Clear all GD version numbers', 'geodirectory');?></td>

+                    <td><?php _e('Clear all GD version numbers', 'geodirectory'); ?></td>

                     <td>

-                        <small><?php _e('This tool will clear all GD version numbers so any upgrade functions will run again.', 'geodirectory');?></small>

+                        <small><?php _e('This tool will clear all GD version numbers so any upgrade functions will run again.', 'geodirectory'); ?></small>

                     </td>

-                    <td><input type="button" value="<?php _e('Run', 'geodirectory');?>"

+                    <td><input type="button" value="<?php _e('Run', 'geodirectory'); ?>"

                                class="button-primary geodir_diagnosis_button" data-diagnose="version_clear"/>

                     </td>

                 </tr>

 				<tr>

-					<td><?php _e('Load custom fields translation', 'geodirectory');?></td>

+					<td><?php _e('Load custom fields translation', 'geodirectory'); ?></td>

 					<td>

-						<small><?php _e('This tool will load strings from the database into a file to translate via po editor.Ex: custom fields', 'geodirectory');?></small>

+						<small><?php _e('This tool will load strings from the database into a file to translate via po editor.Ex: custom fields', 'geodirectory'); ?></small>

 					</td>

 					<td>

-						<input type="button" value="<?php _e('Run', 'geodirectory');?>" class="button-primary geodir_diagnosis_button" data-diagnose="load_db_language"/>

+						<input type="button" value="<?php _e('Run', 'geodirectory'); ?>" class="button-primary geodir_diagnosis_button" data-diagnose="load_db_language"/>

 					</td>

 				</tr>

                 <tr>

-                    <td><?php _e('Reload Countries table', 'geodirectory');?></td>

+                    <td><?php _e('Reload Countries table', 'geodirectory'); ?></td>

                     <td>

-                        <small><?php _e('This tool will drop and re-add the countries table, it is meant to refresh the list when countries are added/removed, if you have duplicate country problems you should merge those first or you could have orphaned posts.', 'geodirectory');?></small>

+                        <small><?php _e('This tool will drop and re-add the countries table, it is meant to refresh the list when countries are added/removed, if you have duplicate country problems you should merge those first or you could have orphaned posts.', 'geodirectory'); ?></small>

                     </td>

                     <td>

-                        <input type="button" value="<?php _e('Run', 'geodirectory');?>" class="button-primary geodir_diagnosis_button" data-diagnose="reload_db_countries"/>

+                        <input type="button" value="<?php _e('Run', 'geodirectory'); ?>" class="button-primary geodir_diagnosis_button" data-diagnose="reload_db_countries"/>

                     </td>

                 </tr>

                 <?php

@@ -1771,7 +1771,7 @@ 
                  * Called after the last setting on the GD>Tools page.

                  * @since 1.0.0

                  */

-                do_action('geodir_diagnostic_tool');?>

+                do_action('geodir_diagnostic_tool'); ?>

 

                 </tbody>

             </table>

geodirectory-functions/helper_functions.php

Spacing +89 added lines, -89 removed lines

@@ -13,11 +13,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_add_listing_page_id(){
+function geodir_add_listing_page_id() {
     $gd_page_id = get_option('geodir_add_listing_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -30,11 +30,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_preview_page_id(){
+function geodir_preview_page_id() {
     $gd_page_id = get_option('geodir_preview_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -47,11 +47,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_success_page_id(){
+function geodir_success_page_id() {
     $gd_page_id = get_option('geodir_success_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -64,11 +64,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_location_page_id(){
+function geodir_location_page_id() {
     $gd_page_id = get_option('geodir_location_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -81,11 +81,11 @@ 
  * @since 1.5.4
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_home_page_id(){
+function geodir_home_page_id() {
     $gd_page_id = get_option('geodir_home_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -98,11 +98,11 @@ 
  * @since 1.5.3
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_info_page_id(){
+function geodir_info_page_id() {
     $gd_page_id = get_option('geodir_info_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -115,11 +115,11 @@ 
  * @since 1.5.3
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_login_page_id(){
+function geodir_login_page_id() {
     $gd_page_id = get_option('geodir_login_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -133,20 +133,20 @@ 
  * @since 1.5.3
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_login_url($args=array()){
+function geodir_login_url($args = array()) {
     $gd_page_id = get_option('geodir_login_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     if (function_exists('geodir_location_geo_home_link')) {
         remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
     }
 
-    if (geodir_is_wpml()){
+    if (geodir_is_wpml()) {
         $home_url = icl_get_home_url();
-    }else{
+    } else {
         $home_url = home_url();
     }
 
@@ -154,17 +154,17 @@ 
         add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
     }
 
-    if($gd_page_id){
+    if ($gd_page_id) {
         $post = get_post($gd_page_id);
         $slug = $post->post_name;
         //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
         $login_url = trailingslashit($home_url)."$slug/";
-    }else{
+    } else {
         $login_url = trailingslashit($home_url)."?geodir_signup=true";
     }
 
-    if($args){
-        $login_url = add_query_arg($args,$login_url );
+    if ($args) {
+        $login_url = add_query_arg($args, $login_url);
     }
 
     /**
@@ -178,7 +178,7 @@ 
      * @param array $args The array of query args used.
      * @param int $gd_page_id The page id of the GD login page.
      */
-    return apply_filters('geodir_login_url',$login_url,$args,$gd_page_id);
+    return apply_filters('geodir_login_url', $login_url, $args, $gd_page_id);
 }
 
 /**
@@ -189,20 +189,20 @@ 
  * @since 1.5.16 Added WPML lang code to url.
  * @return string Info page url.
  */
-function geodir_info_url($args=array()){
+function geodir_info_url($args = array()) {
     $gd_page_id = get_option('geodir_info_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     if (function_exists('geodir_location_geo_home_link')) {
         remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
     }
 
-    if (geodir_is_wpml()){
+    if (geodir_is_wpml()) {
         $home_url = icl_get_home_url();
-    }else{
+    } else {
         $home_url = home_url();
     }
 
@@ -210,17 +210,17 @@ 
         add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
     }
 
-    if($gd_page_id){
+    if ($gd_page_id) {
         $post = get_post($gd_page_id);
         $slug = $post->post_name;
         //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
         $info_url = trailingslashit($home_url)."$slug/";
-    }else{
+    } else {
         $info_url = trailingslashit($home_url);
     }
 
-    if($args){
-        $info_url = add_query_arg($args,$info_url );
+    if ($args) {
+        $info_url = add_query_arg($args, $info_url);
     }
 
     return $info_url;
@@ -238,7 +238,7 @@ 
  * @param string $charset Character set to use for conversion.
  * @return string Returns converted string.
  */
-function geodir_ucwords($string, $charset='UTF-8') {
+function geodir_ucwords($string, $charset = 'UTF-8') {
     if (function_exists('mb_convert_case')) {
         return mb_convert_case($string, MB_CASE_TITLE, $charset);
     } else {
@@ -258,7 +258,7 @@ 
  * @param string $charset Character set to use for conversion.
  * @return string Returns converted string.
  */
-function geodir_strtolower($string, $charset='UTF-8') {
+function geodir_strtolower($string, $charset = 'UTF-8') {
     if (function_exists('mb_convert_case')) {
         return mb_convert_case($string, MB_CASE_LOWER, $charset);
     } else {
@@ -278,7 +278,7 @@ 
  * @param string $charset Character set to use for conversion.
  * @return string Returns converted string.
  */
-function geodir_strtoupper($string, $charset='UTF-8') {
+function geodir_strtoupper($string, $charset = 'UTF-8') {
     if (function_exists('mb_convert_case')) {
         return mb_convert_case($string, MB_CASE_UPPER, $charset);
     } else {
@@ -309,7 +309,7 @@ 
 	
 	$url = trim($parts[0]);
 	if ($formatted && $url != '') {
-		$url = str_replace( ' ', '%20', $url );
+		$url = str_replace(' ', '%20', $url);
 		$url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url);
 		
 		if (0 !== stripos($url, 'mailto:')) {
@@ -319,8 +319,8 @@ 
 		
 		$url = str_replace(';//', '://', $url);
 		
-		if (strpos($url, ':') === false && ! in_array($url[0], array('/', '#', '?')) && !preg_match('/^[a-z0-9-]+?\.php/i', $url)) {
-			$url = 'http://' . $url;
+		if (strpos($url, ':') === false && !in_array($url[0], array('/', '#', '?')) && !preg_match('/^[a-z0-9-]+?\.php/i', $url)) {
+			$url = 'http://'.$url;
 		}
 		
 		$url = wp_kses_normalize_entities($url);
@@ -462,7 +462,7 @@ 
  * @package GeoDirectory
  */
 function _gd_die_handler() {
-    if ( defined( 'GD_TESTING_MODE' ) ) {
+    if (defined('GD_TESTING_MODE')) {
         return '_gd_die_handler';
     } else {
         die();
@@ -480,10 +480,10 @@ 
  * @param string $title   Optional. Error title.
  * @param int $status     Optional. Status code.
  */
-function gd_die( $message = '', $title = '', $status = 400 ) {
-    add_filter( 'wp_die_ajax_handler', '_gd_die_handler', 10, 3 );
-    add_filter( 'wp_die_handler', '_gd_die_handler', 10, 3 );
-    wp_die( $message, $title, array( 'response' => $status ));
+function gd_die($message = '', $title = '', $status = 400) {
+    add_filter('wp_die_ajax_handler', '_gd_die_handler', 10, 3);
+    add_filter('wp_die_handler', '_gd_die_handler', 10, 3);
+    wp_die($message, $title, array('response' => $status));
 }
 
 /*
@@ -493,7 +493,7 @@ 
  * @param string $php_format The PHP date format.
  * @return string The jQuery format date string.
  */
-function geodir_date_format_php_to_jqueryui( $php_format ) {
+function geodir_date_format_php_to_jqueryui($php_format) {
 	$symbols = array(
 		// Day
 		'd' => 'dd',
@@ -533,27 +533,27 @@ 
 	$jqueryui_format = "";
 	$escaping = false;
 
-	for ( $i = 0; $i < strlen( $php_format ); $i++ ) {
+	for ($i = 0; $i < strlen($php_format); $i++) {
 		$char = $php_format[$i];
 
 		// PHP date format escaping character
-		if ( $char === '\\' ) {
+		if ($char === '\\') {
 			$i++;
 
-			if ( $escaping ) {
+			if ($escaping) {
 				$jqueryui_format .= $php_format[$i];
 			} else {
-				$jqueryui_format .= '\'' . $php_format[$i];
+				$jqueryui_format .= '\''.$php_format[$i];
 			}
 
 			$escaping = true;
 		} else {
-			if ( $escaping ) {
+			if ($escaping) {
 				$jqueryui_format .= "'";
 				$escaping = false;
 			}
 
-			if ( isset( $symbols[$char] ) ) {
+			if (isset($symbols[$char])) {
 				$jqueryui_format .= $symbols[$char];
 			} else {
 				$jqueryui_format .= $char;
@@ -572,7 +572,7 @@ 
  * @return string The untranslated date string.
  * @since 1.6.5
  */
-function geodir_maybe_untranslate_date($date){
+function geodir_maybe_untranslate_date($date) {
 	$english_long_months = array(
 		'January',
 		'February',
@@ -588,7 +588,7 @@ 
 		'December',
 	);
 
-	$non_english_long_months  = array(
+	$non_english_long_months = array(
 		__('January'),
 		__('February'),
 		__('March'),
@@ -602,7 +602,7 @@ 
 		__('November'),
 		__('December'),
 	);
-	$date = str_replace($non_english_long_months,$english_long_months,$date);
+	$date = str_replace($non_english_long_months, $english_long_months, $date);
 
 
 	$english_short_months = array(
@@ -621,21 +621,21 @@ 
 	);
 
 	$non_english_short_months = array(
-		' '._x( 'Jan', 'January abbreviation' ).' ',
-		' '._x( 'Feb', 'February abbreviation' ).' ',
-		' '._x( 'Mar', 'March abbreviation' ).' ',
-		' '._x( 'Apr', 'April abbreviation' ).' ',
-		' '._x( 'May', 'May abbreviation' ).' ',
-		' '._x( 'Jun', 'June abbreviation' ).' ',
-		' '._x( 'Jul', 'July abbreviation' ).' ',
-		' '._x( 'Aug', 'August abbreviation' ).' ',
-		' '._x( 'Sep', 'September abbreviation' ).' ',
-		' '._x( 'Oct', 'October abbreviation' ).' ',
-		' '._x( 'Nov', 'November abbreviation' ).' ',
-		' '._x( 'Dec', 'December abbreviation' ).' ',
+		' '._x('Jan', 'January abbreviation').' ',
+		' '._x('Feb', 'February abbreviation').' ',
+		' '._x('Mar', 'March abbreviation').' ',
+		' '._x('Apr', 'April abbreviation').' ',
+		' '._x('May', 'May abbreviation').' ',
+		' '._x('Jun', 'June abbreviation').' ',
+		' '._x('Jul', 'July abbreviation').' ',
+		' '._x('Aug', 'August abbreviation').' ',
+		' '._x('Sep', 'September abbreviation').' ',
+		' '._x('Oct', 'October abbreviation').' ',
+		' '._x('Nov', 'November abbreviation').' ',
+		' '._x('Dec', 'December abbreviation').' ',
 	);
 
-	$date = str_replace($non_english_short_months,$english_short_months,$date);
+	$date = str_replace($non_english_short_months, $english_short_months, $date);
 
 
 	return $date;
@@ -707,7 +707,7 @@ 
  * @return string Trimmed string.
  */
 function geodir_excerpt($text, $length = 100, $options = array()) {
-    if (!(int)$length > 0) {
+    if (!(int) $length > 0) {
         return $text;
     }
     $default = array(
@@ -769,7 +769,7 @@ 
         $length = $truncateLength;
 
         foreach ($openTags as $tag) {
-            $suffix .= '</' . $tag . '>';
+            $suffix .= '</'.$tag.'>';
         }
     } else {
         if (geodir_strlen($text, $options) <= $length) {
@@ -791,7 +791,7 @@ 
         }
     }
 
-    return $prefix . $result . $suffix;
+    return $prefix.$result.$suffix;
 }
 
 /**
@@ -828,7 +828,7 @@ 
     $pattern = '/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i';
     $replace = preg_replace_callback(
         $pattern,
-        function ($match) use ($strlen) {
+        function($match) use ($strlen) {
             $utf8 = html_entity_decode($match[0], ENT_HTML5 | ENT_QUOTES, 'UTF-8');
 
             return str_repeat(' ', $strlen($utf8, 'UTF-8'));
@@ -889,7 +889,7 @@ 
     }
 
     if (empty($options['html'])) {
-        return (string)$substr($text, $start, $length);
+        return (string) $substr($text, $start, $length);
     }
 
     $totalOffset = 0;
@@ -914,7 +914,7 @@ 
 
         $len = geodir_strlen($part, $options);
         if ($offset !== 0 || $totalLength + $len > $length) {
-            if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8') ) {
+            if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8')) {
                 // Entities cannot be passed substr.
                 continue;
             }
@@ -960,39 +960,39 @@ 
     return '';
 }
 
-function geodir_tool_restore_cpt_from_taxonomies(){
+function geodir_tool_restore_cpt_from_taxonomies() {
 
 	$cpts = get_option('geodir_post_types');
 
-	if(!empty($cpts)){return;}
+	if (!empty($cpts)) {return; }
 
 	$taxonomies = get_option('geodir_taxonomies');
 
-	if(empty($taxonomies)){return;}
+	if (empty($taxonomies)) {return; }
 
 	$cpts = array();
 
-	foreach($taxonomies as $key => $val){
+	foreach ($taxonomies as $key => $val) {
 
-		if(strpos($val['listing_slug'], '/') === false) {
-			$cpts[$val['object_type']] = array('cpt'=>$val['object_type'],'slug'=>$val['listing_slug']);
+		if (strpos($val['listing_slug'], '/') === false) {
+			$cpts[$val['object_type']] = array('cpt'=>$val['object_type'], 'slug'=>$val['listing_slug']);
 		}
 
 	}
 
-	if(empty($cpts)){return;}
+	if (empty($cpts)) {return; }
 
 
 	$cpts_restore = $cpts;
 
-	foreach($cpts as $cpt){
+	foreach ($cpts as $cpt) {
 
 
-		$is_custom = $cpt['cpt']=='gd_place' ? 0 : 1;
+		$is_custom = $cpt['cpt'] == 'gd_place' ? 0 : 1;
 
-		$cpts_restore[$cpt['cpt']] = array (
+		$cpts_restore[$cpt['cpt']] = array(
 				'labels' =>
-					array (
+					array(
 						'name' => $cpt['slug'],
 						'singular_name' => $cpt['slug'],
 						'add_new' => 'Add New',
@@ -1020,14 +1020,14 @@ 
 				'public' => true,
 				'query_var' => true,
 				'rewrite' =>
-					array (
+					array(
 						'slug' => $cpt['slug'],
 						'with_front' => false,
 						'hierarchical' => true,
 						'feeds' => true,
 					),
 				'supports' =>
-					array (
+					array(
 						0 => 'title',
 						1 => 'editor',
 						2 => 'author',
@@ -1037,14 +1037,14 @@ 
 						6 => 'comments',
 					),
 				'taxonomies' =>
-					array (
+					array(
 						0 => $cpt['cpt'].'category',
 						1 => $cpt['cpt'].'_tags',
 					),
 				'is_custom' => $is_custom,
 				'listing_order' => '1',
 				'seo' =>
-					array (
+					array(
 						'meta_keyword' => '',
 						'meta_description' => '',
 					),
@@ -1056,7 +1056,7 @@ 
 	}
 
 
-	update_option('geodir_post_types',$cpts_restore);
+	update_option('geodir_post_types', $cpts_restore);
 
 }
 
@@ -1068,13 +1068,13 @@ 
 	$count = 0;
 	
 	if ($post_type) {
-		$count = $count + $wpdb->get_var("select count(post_id) from " . $wpdb->prefix . "geodir_" . $post_type . "_detail");
+		$count = $count + $wpdb->get_var("select count(post_id) from ".$wpdb->prefix."geodir_".$post_type."_detail");
 	} else {
 		$all_postypes = geodir_get_posttypes();
 
 		if (!empty($all_postypes)) {
 			foreach ($all_postypes as $key) {
-				$count = $count + $wpdb->get_var("select count(post_id) from " . $wpdb->prefix . "geodir_" . $key . "_detail");
+				$count = $count + $wpdb->get_var("select count(post_id) from ".$wpdb->prefix."geodir_".$key."_detail");
 			}
 		}	
 	}