GeoDirectory / geodirectory

geodirectory-admin/admin_hooks_actions.php

Spacing +223 added lines, -223 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');

 

@@ -228,9 +228,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' );

@@ -239,7 +239,7 @@ 
 

 }

 

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

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

 

 

 

@@ -266,10 +266,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');

 

                 }

             }

@@ -355,14 +355,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');

     }

 }

@@ -432,7 +432,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

@@ -443,7 +443,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'])

                 )

             );

@@ -451,23 +451,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>

 

@@ -495,7 +495,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) {

@@ -520,14 +520,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);

 }

 

 

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

  * @package GeoDirectory

  */

-function geodir_custom_fields($post_type=''){

+function geodir_custom_fields($post_type = '') {

     

     $custom_fields = array(

         'text' => array(

@@ -673,7 +673,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);

 }

 

 /**

@@ -684,25 +684,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"

@@ -713,7 +713,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>

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

         }

 

-    if(!empty($cfs)) {

+    if (!empty($cfs)) {

 

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

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

             ?>

             <ul>

             <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; ?>"

@@ -739,10 +739,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>';

                     } ?>

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

             <?php

         }

-    }else{

+    } else {

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

     }

         ?>

@@ -779,7 +779,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) {

@@ -789,7 +789,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>

@@ -867,7 +867,7 @@ 
 

     switch ($sub_tab) {

         case 'custom_fields':

-            $note = sprintf(__('Click on any box below to add a field of that type to the add %s listing form. You can use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type));;

+            $note = sprintf(__('Click on any box below to add a field of that type to the add %s listing form. You can use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type)); ;

             break;

 

         case 'sorting_options':

@@ -921,7 +921,7 @@ 
 

     switch ($sub_tab) {

         case 'custom_fields':

-            $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type));;

+            $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type)); ;

             break;

 

         case 'sorting_options':

@@ -948,8 +948,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');

 

@@ -977,14 +977,14 @@ 
             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();

                 break;

 

             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;

         }

@@ -1009,50 +1009,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>";

                 }

 

             }

@@ -1060,54 +1060,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) {

@@ -1121,11 +1121,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;

 }

@@ -1154,23 +1154,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 d");

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

 

             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>";

             }

 

         }

@@ -1179,7 +1179,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 = '';

@@ -1216,29 +1216,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');

 

                         }

 

@@ -1248,14 +1248,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>";

 

         }

 

@@ -1263,7 +1263,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 = '';

@@ -1316,15 +1316,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>";

         }

 

     }

@@ -1361,43 +1361,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 = '';

@@ -1461,7 +1461,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 = '';

@@ -1495,7 +1495,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)

             )

         );

@@ -1541,18 +1541,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>";

             }

         }

     }

@@ -1566,18 +1566,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>";

             }

         }

     }

@@ -1592,18 +1592,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>";

             }

         }

     }

@@ -1617,18 +1617,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>";

             }

         }

     }

@@ -1642,18 +1642,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>";

             }

         }

     }

@@ -1667,18 +1667,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>";

             }

         }

     }

@@ -1692,18 +1692,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>";

             }

         }

     }

@@ -1712,13 +1712,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'];

@@ -1728,7 +1728,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 = '';

@@ -1756,10 +1756,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 = '';

     }

@@ -1801,17 +1801,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;

@@ -1854,7 +1854,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);

@@ -1899,7 +1899,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');

@@ -1916,8 +1916,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);

@@ -2034,10 +2034,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;

                 }

@@ -2063,7 +2063,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';

                             }

@@ -2091,7 +2091,7 @@ 
 						

 						// Post status

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

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

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

                         }

                     }

 

@@ -2109,8 +2109,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;

@@ -2154,7 +2154,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'];

@@ -2164,7 +2164,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';

                         }

@@ -2176,7 +2176,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);

 

@@ -2197,7 +2197,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;

@@ -2206,15 +2206,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++;

                         }

@@ -2255,11 +2255,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');

 

 

 /**

@@ -2270,40 +2270,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);

@@ -2312,25 +2312,25 @@ 
 

 

     }

-    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;

 

     }

 }

     exit;

 }

 

-add_filter( 'icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4 );

+add_filter('icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4);

 

 if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {

 	add_action('geodir_before_admin_panel', 'geodir_wpml_permalink_setting_notice');

@@ -2381,13 +2381,13 @@ 
     

     $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'));

     

     if (!empty($gd_plugins)) {

         foreach ($gd_plugins as $plugin => $name) {

             $setting = array(

                 'type' => 'checkbox',

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

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

                 'name' => $name,

                 'desc' => wp_sprintf(__('Remove all of its data when the <b>%s</b> is deleted', 'geodirectory'), $plugin),

                 'std' => '0'

@@ -2401,7 +2401,7 @@ 
              * @param bool $return If True then plugin will be displayed in uninstall settings. Default true.

              * @param array $plugin The plugin name.

              */

-            $has_uninstall = apply_filters('geodir_has_uninstall_settings', true, $plugin) && apply_filters('geodir_has_uninstall_' . $plugin, true, $plugin);

+            $has_uninstall = apply_filters('geodir_has_uninstall_settings', true, $plugin) && apply_filters('geodir_has_uninstall_'.$plugin, true, $plugin);

             

             if ($has_uninstall) {

                 $settings[] = $setting;

@@ -2434,7 +2434,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');