GeoDirectory / geodirectory

geodirectory-templates/login_frm.php

Spacing +3 added lines, -3 removed lines

@@ -49,13 +49,13 @@
     </h4>

     <?php

     if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'fw') {

-        echo "<p class=\"error_msg\"> " . INVALID_USER_FPW_MSG . " </p>";

+        echo "<p class=\"error_msg\"> ".INVALID_USER_FPW_MSG." </p>";

     } elseif (isset($_REQUEST['logemsg']) && $_REQUEST['logemsg'] == 1) {

-        echo "<p class=\"error_msg\"> " . INVALID_USER_PW_MSG . " </p>";

+        echo "<p class=\"error_msg\"> ".INVALID_USER_PW_MSG." </p>";

     }

 

     if (isset($_REQUEST['checkemail']) && $_REQUEST['checkemail'] == 'confirm')

-        echo '<p class="sucess_msg">' . PW_SEND_CONFIRM_MSG . '</p>';

+        echo '<p class="sucess_msg">'.PW_SEND_CONFIRM_MSG.'</p>';

 

     ?>

     <form name="cus_loginform" id="cus_loginform" action="<?php echo esc_url(geodir_curPageURL()); ?>"

geodirectory-functions/signup_function.php

Spacing +21 added lines, -21 removed lines

@@ -22,7 +22,7 @@ 
         if ($redirect) {

             ?>

             <script type="text/javascript">

-                window.location.href = '<?php echo geodir_login_url();?>';

+                window.location.href = '<?php echo geodir_login_url(); ?>';

             </script>

         <?php

         } else

@@ -47,7 +47,7 @@ 
             wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI']));

             exit();

         } else {

-            wp_redirect('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);

+            wp_redirect('https://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);

             exit();

         }

     }

@@ -60,7 +60,7 @@ 
      * @param string $message Login message.

      */

     $message = apply_filters('login_message', $message);

-    if (!empty($message)) echo $message . "\n";

+    if (!empty($message)) echo $message."\n";

 

 }

 

@@ -208,9 +208,9 @@ 
 

     wp_set_password($new_pass, $user->ID);

     update_user_meta($user->ID, 'default_password_nag', true); //Set up the Password change nag.

-    $message = '<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>';

-    $message .= '<p>' . sprintf(__('Username: %s', 'geodirectory'), $user->user_login) . "</p>";

-    $message .= '<p>' . sprintf(__('Password: %s', 'geodirectory'), $new_pass) . "</p>";

+    $message = '<p><b>'.__('Your login Information :', 'geodirectory').'</b></p>';

+    $message .= '<p>'.sprintf(__('Username: %s', 'geodirectory'), $user->user_login)."</p>";

+    $message .= '<p>'.sprintf(__('Password: %s', 'geodirectory'), $new_pass)."</p>";

     //$message .= '<p>You can login to : <a href="'.home_url().'/?ptype=login' . "\">Login</a> or the URL is :  ".home_url()."/?ptype=login</p>";

     //$message .= '<p>Thank You,<br> '.get_option('blogname').'</p>';

     $user_email = $user_data->user_email;

@@ -236,7 +236,7 @@ 
      */

     $message = apply_filters('password_reset_message', $message, $new_pass);

     //geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$user_name,$title,$message,$extra='');///forgot password email

-    geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $user_name, $title, $message, $extra = '', 'forgot_password', $post_id = '', $user->ID);///forgot password email

+    geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $user_name, $title, $message, $extra = '', 'forgot_password', $post_id = '', $user->ID); ///forgot password email

 

     return true;

 }

@@ -390,13 +390,13 @@ 
         ///////REGISTRATION EMAIL START//////

         $fromEmail = geodir_get_site_email_id();

         $fromEmailName = get_site_emailName();

-        $message = __('<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>

-<p>' . __('Username:', 'geodirectory') . ' ' . $user_login . '</p>

-<p>' . __('Password:', 'geodirectory') . ' ' . $user_pass . '</p>');

+        $message = __('<p><b>'.__('Your login Information :', 'geodirectory').'</b></p>

+<p>' . __('Username:', 'geodirectory').' '.$user_login.'</p>

+<p>' . __('Password:', 'geodirectory').' '.$user_pass.'</p>');

 

         /////////////customer email//////////////

         //geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$userName,$subject,$client_message,$extra='');///To client email

-        geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $userName, '', $message, '', 'registration', '', $user_id);/// registration email

+        geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $userName, '', $message, '', 'registration', '', $user_id); /// registration email

         //////REGISTRATION EMAIL END////////

     }

 

@@ -427,7 +427,7 @@ 
         $action = 'resetpass';

 

     // validate action so as to default to the login screen

-    if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_' . $action))

+    if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_'.$action))

         $action = 'login';

 

     nocache_headers();

@@ -437,8 +437,8 @@ 
             $_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF']);

 

         $schema = (isset($_SERVER['HTTPS']) && geodir_strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://';

-        if (dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != home_url())

-            update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']));

+        if (dirname($schema.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF']) != home_url())

+            update_option('siteurl', dirname($schema.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF']));

     }

 

     //Set a cookie now to see if they are supported by the browser.

@@ -453,7 +453,7 @@ 
      *

      * @since 1.0.0

      */

-    do_action('login_form_' . $action);

+    do_action('login_form_'.$action);

 

     $http_post = ('POST' == $_SERVER['REQUEST_METHOD']);

 

@@ -493,7 +493,7 @@ 
          * @since 1.0.0

          */

         do_action('lost_password');

-            $message = '<div class="sucess_msg">' . ENTER_USER_EMAIL_NEW_PW_MSG . '</div>';

+            $message = '<div class="sucess_msg">'.ENTER_USER_EMAIL_NEW_PW_MSG.'</div>';

             $user_login = isset($_POST['user_login']) ? stripslashes($_POST['user_login']) : '';

 

             break;

@@ -507,7 +507,7 @@ 
                 exit();

             }

 

-            wp_redirect(geodir_login_url(array('error'=>'invalidkey','action'=>'lostpassword')));

+            wp_redirect(geodir_login_url(array('error'=>'invalidkey', 'action'=>'lostpassword')));

             exit();

 

             break;

@@ -682,7 +682,7 @@ 
 

             if (is_wp_error($user)) {

                 if (isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], 'ptype=property_submit') && $_POST['log'] != '' && $_POST['pwd'] != '') {

-                    wp_redirect($_SERVER['HTTP_REFERER'] . '&emsg=1');

+                    wp_redirect($_SERVER['HTTP_REFERER'].'&emsg=1');

                 }

             }

             if (!is_wp_error($user)) {

@@ -710,7 +710,7 @@ 
 

             // Some parts of this script use the main login form to display a message

             if (isset($_GET['loggedout']) && TRUE == $_GET['loggedout']) {

-                $successmsg = '<div class="sucess_msg">' . YOU_ARE_LOGED_OUT_MSG . '</div>';

+                $successmsg = '<div class="sucess_msg">'.YOU_ARE_LOGED_OUT_MSG.'</div>';

             } elseif (isset($_GET['registration']) && 'disabled' == $_GET['registration']) {

                 $successmsg = USER_REG_NOT_ALLOW_MSG;

             } elseif (isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail']) {

@@ -723,9 +723,9 @@ 
 

             if ((isset($_POST['log']) && $_POST['log'] != '' && $errors) || ((!isset($_POST['log']) || $_POST['log'] == '') && isset($_REQUEST['testcookie']) && $_REQUEST['testcookie'])) {

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

-                    wp_redirect($_REQUEST['pagetype'] . '&emsg=1');

+                    wp_redirect($_REQUEST['pagetype'].'&emsg=1');

                 } else {

-                    wp_redirect(geodir_login_url(array('logemsg'=>'1','redirect_to'=>urlencode($_REQUEST['redirect_to']))));

+                    wp_redirect(geodir_login_url(array('logemsg'=>'1', 'redirect_to'=>urlencode($_REQUEST['redirect_to']))));

                 }

                 gd_die();

             }

geodirectory-functions/cat-meta-functions/cat_meta.php

Spacing +22 added lines, -22 removed lines

@@ -24,12 +24,12 @@ 
      */
 
     $config = array(
-        'id' => 'demo_meta_box',                    // meta box id, unique per meta box
-        'title' => __('Demo Meta Box', 'geodirectory'),                    // meta box title
-        'pages' => geodir_get_taxonomies(),            // taxonomy name, accept categories, post_tag and custom taxonomies
-        'context' => 'normal',                        // where the meta box appear: normal (default), advanced, side; optional
-        'fields' => array(),                        // list of meta fields (can be added by field arrays)
-        'local_images' => false,                    // Use local or hosted images (meta box images for add/remove)
+        'id' => 'demo_meta_box', // meta box id, unique per meta box
+        'title' => __('Demo Meta Box', 'geodirectory'), // meta box title
+        'pages' => geodir_get_taxonomies(), // taxonomy name, accept categories, post_tag and custom taxonomies
+        'context' => 'normal', // where the meta box appear: normal (default), advanced, side; optional
+        'fields' => array(), // list of meta fields (can be added by field arrays)
+        'local_images' => false, // Use local or hosted images (meta box images for add/remove)
         'use_with_theme' => true                    //change path if used with theme set to true, false for a plugin or anything else for a custom path(default false).
     );
 
@@ -38,18 +38,18 @@ 
      * Initiate your meta box
      */
     $my_meta = new Tax_Meta_Class($config);
-    $my_meta->addWysiwyg($prefix . 'cat_top_desc', array('name' => __('Category Top Description', 'geodirectory'), 'desc' => __('This will appear at the top of the category listing.', 'geodirectory')));
-    $my_meta->addImage($prefix . 'cat_default_img', array('name' => __('Default Listing Image', 'geodirectory'), 'desc' => __('Choose a default "no image"', 'geodirectory')));
-    $my_meta->addImage($prefix . 'cat_icon', array('name' => __('Category Icon', 'geodirectory'), 'desc' => __('Choose a category icon', 'geodirectory'), 'validate_func' => '!empty'));
+    $my_meta->addWysiwyg($prefix.'cat_top_desc', array('name' => __('Category Top Description', 'geodirectory'), 'desc' => __('This will appear at the top of the category listing.', 'geodirectory')));
+    $my_meta->addImage($prefix.'cat_default_img', array('name' => __('Default Listing Image', 'geodirectory'), 'desc' => __('Choose a default "no image"', 'geodirectory')));
+    $my_meta->addImage($prefix.'cat_icon', array('name' => __('Category Icon', 'geodirectory'), 'desc' => __('Choose a category icon', 'geodirectory'), 'validate_func' => '!empty'));
     /*$my_meta->addCheckbox($prefix.'pointless',array('name'=> __('<b>Exclude</b> Rating sort option','geodirectory'),'style'=>'hidden'));*/// hidden setting to trick WPML
 
-    $my_meta->addSelect($prefix . 'cat_schema',
+    $my_meta->addSelect($prefix.'cat_schema',
     /*
      * Allows you to add/filter the cat schema types.
      *
      * @since 1.5.7
      */
-        apply_filters('geodir_cat_schemas',array(
+        apply_filters('geodir_cat_schemas', array(
             '' => __('Default (LocalBusiness)', 'geodirectory'),
             'AccountingService' => 'AccountingService',
             'Attorney' => 'Attorney',
@@ -141,7 +141,7 @@ 
             'WholesaleStore' => 'WholesaleStore',
             'Winery' => 'Winery'
         )),
-        array('name' => __('Schema Type', 'geodirectory'), 'desc' => __('Select the Schema to use for this category', 'geodirectory') . "", 'std' => array('selectkey2')));
+        array('name' => __('Schema Type', 'geodirectory'), 'desc' => __('Select the Schema to use for this category', 'geodirectory')."", 'std' => array('selectkey2')));
 
     /*$my_meta->addSelect($prefix.'cat_sort',array(''=>__('Default' , 'geodirectory'),
     'random'=>__('Random','geodirectory'),
@@ -179,8 +179,8 @@ 
 if (!empty($gd_taxonomies)) {
     foreach ($gd_taxonomies as $gd_taxonomy) {
 
-        add_filter('manage_edit-' . $gd_taxonomy . '_columns', 'addCat_column', 10, 2);
-        add_action('manage_' . $gd_taxonomy . '_custom_column', 'manage_category_custom_fields', 10, 3);
+        add_filter('manage_edit-'.$gd_taxonomy.'_columns', 'addCat_column', 10, 2);
+        add_action('manage_'.$gd_taxonomy.'_custom_column', 'manage_category_custom_fields', 10, 3);
 
     }
 }
@@ -214,9 +214,9 @@ 
 
             $file_info = pathinfo($term_icon_url['src']);
 
-            if (isset($file_info['dirname'] ) && $file_info['dirname'] != '.' && $file_info['dirname'] != '..')
+            if (isset($file_info['dirname']) && $file_info['dirname'] != '.' && $file_info['dirname'] != '..')
                 $sub_dir = $file_info['dirname'];
-            else{$sub_dir = '';}
+            else {$sub_dir = ''; }
 
             $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
             $uploads_baseurl = $uploads['baseurl'];
@@ -226,10 +226,10 @@ 
 
             $sub_dir = str_replace($uploads_baseurl, '', $sub_dir);
 
-            $uploads_url = $uploads_baseurl . $sub_dir;
+            $uploads_url = $uploads_baseurl.$sub_dir;
 
-            $term_icon_url['src'] = $uploads_url . '/' . $file_name;
-            echo '<img src="' . $term_icon_url['src'] . '" />';
+            $term_icon_url['src'] = $uploads_url.'/'.$file_name;
+            echo '<img src="'.$term_icon_url['src'].'" />';
 
         }
     }
@@ -237,7 +237,7 @@ 
     if ($column_name == 'cat_default_img') {
         $cat_default_img = get_tax_meta($term_id, 'ct_cat_default_img');
         if ($cat_default_img != '')
-            echo '<img src="' . $cat_default_img['src'] . '" style="max-height:60px;max-width:60px;"/>';
+            echo '<img src="'.$cat_default_img['src'].'" style="max-height:60px;max-width:60px;"/>';
 
     }
 }
@@ -268,8 +268,8 @@ 
                             jQuery("#addtag iframe").contents().find("body").html('');
                             jQuery('#addtag [rel="ct_cat_default_img"]').removeClass('at-delete_image_button').addClass('at-upload_image_button');
                             jQuery('#addtag [rel="ct_cat_icon"]').removeClass('at-delete_image_button').addClass('at-upload_image_button');
-                            jQuery('#addtag [rel="ct_cat_default_img"]').val('<?php _e('Upload Image','geodirectory');?>');
-                            jQuery('#addtag [rel="ct_cat_icon"]').val('<?php _e('Upload Image','geodirectory');?>');
+                            jQuery('#addtag [rel="ct_cat_default_img"]').val('<?php _e('Upload Image', 'geodirectory'); ?>');
+                            jQuery('#addtag [rel="ct_cat_icon"]').val('<?php _e('Upload Image', 'geodirectory'); ?>');
                         }
                     }, 1000);
 

geodirectory-functions/cat-meta-functions/Tax-meta-class.php

Spacing +96 added lines, -96 removed lines

@@ -113,7 +113,7 @@ 
             $this->add_missed_values();
             if (isset($meta_box['use_with_theme']))
                 if ($meta_box['use_with_theme'] === true) {
-                    $this->SelfPath = get_stylesheet_directory_uri() . '/library/cat-meta';
+                    $this->SelfPath = get_stylesheet_directory_uri().'/library/cat-meta';
                 } elseif ($meta_box['use_with_theme'] === false) {
                     $this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__)));
                 } else {
@@ -262,7 +262,7 @@ 
                 $li = "<li id='item_{$attachment_id}'>";
                 $li .= "<img src='{$attachment['url']}' alt='image_{$attachment_id}' />";
                 //$li 	.= "<a title='" . __( 'Delete this image' ) . "' class='at-delete-file' href='#' rel='{$nonce}|{$term_id}|{$id}|{$attachment_id}'>" . __( 'Delete' ) . "</a>";
-                $li .= "<a title='" . __('Remove this image', 'geodirectory') . "' class='at-delete-file' href='#' rel='{$nonce}|{$term_id}|{$id}|{$attachment_id}'><img src='" . $this->SelfPath . "/images/delete-16.png' alt='" . __('Remove', 'geodirectory') . "' /></a>";
+                $li .= "<a title='".__('Remove this image', 'geodirectory')."' class='at-delete-file' href='#' rel='{$nonce}|{$term_id}|{$id}|{$attachment_id}'><img src='".$this->SelfPath."/images/delete-16.png' alt='".__('Remove', 'geodirectory')."' /></a>";
                 $li .= "<input type='hidden' name='{$id}[]' value='{$attachment_id}' />";
                 $li .= "</li>";
                 $html .= $li;
@@ -335,7 +335,7 @@ 
             $attachment_id = isset($_GET['attachment_id']) ? intval($_GET['attachment_id']) : 0;
             $ok = false;
             if (strpos($field_id, '[') === false) {
-                check_admin_referer("at-delete-mupload_" . urldecode($field_id));
+                check_admin_referer("at-delete-mupload_".urldecode($field_id));
                 if ($term_id > 0)
                     $this->delete_tax_meta($term_id, $field_id);
                 //$ok = wp_delete_attachment( $attachment_id );
@@ -423,8 +423,8 @@ 
 
             if ($this->has_field('date') && $this->is_edit_page()) {
                 // Enqueu JQuery UI, use proper version.
-                wp_enqueue_style('tmc-jquery-ui-css', 'http://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/themes/base/jquery-ui.css');
-                wp_enqueue_script('tmc-jquery-ui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/jquery-ui.min.js', array('jquery'));
+                wp_enqueue_style('tmc-jquery-ui-css', 'http://ajax.googleapis.com/ajax/libs/jqueryui/'.$this->get_jqueryui_ver().'/themes/base/jquery-ui.css');
+                wp_enqueue_script('tmc-jquery-ui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/'.$this->get_jqueryui_ver().'/jquery-ui.min.js', array('jquery'));
             }
 
         }
@@ -441,8 +441,8 @@ 
             if ($this->has_field('time') && $this->is_edit_page()) {
 
                 // Enqueu JQuery UI, use proper version.
-                wp_enqueue_style('tmc-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/themes/base/jquery-ui.css', array(), false, true);
-                wp_enqueue_script('tmc-jquery-ui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/jquery-ui.min.js', array('jquery'), false, true);
+                wp_enqueue_style('tmc-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/'.$this->get_jqueryui_ver().'/themes/base/jquery-ui.css', array(), false, true);
+                wp_enqueue_script('tmc-jquery-ui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/'.$this->get_jqueryui_ver().'/jquery-ui.min.js', array('jquery'), false, true);
                 wp_enqueue_script('at-timepicker', 'https://github.com/trentrichardson/jQuery-Timepicker-Addon/raw/master/jquery-ui-timepicker-addon.js', array('tmc-jquery-ui'), false, true);
 
             }
@@ -462,13 +462,13 @@ 
             if (!empty($this->_meta_box['pages'])) {
                 foreach ($this->_meta_box['pages'] as $page) {
                     //add fields to edit form
-                    add_action($page . '_edit_form_fields', array(&$this, 'show_edit_form'));
+                    add_action($page.'_edit_form_fields', array(&$this, 'show_edit_form'));
                     //add fields to add new form
-                    add_action($page . '_add_form_fields', array(&$this, 'show_new_form'));
+                    add_action($page.'_add_form_fields', array(&$this, 'show_new_form'));
                     // this saves the edit fields
-                    add_action('edited_' . $page, array(&$this, 'save'), 10, 2);
+                    add_action('edited_'.$page, array(&$this, 'save'), 10, 2);
                     // this saves the add fields
-                    add_action('created_' . $page, array(&$this, 'save'), 10, 2);
+                    add_action('created_'.$page, array(&$this, 'save'), 10, 2);
                 }
             }
 
@@ -517,13 +517,13 @@ 
                     $meta = is_array($meta) ? array_map('esc_attr', $meta) : esc_attr($meta);
 
                 if ($field['validate_func']) {
-                    echo '<tr class="form-field form-required ' . $field['style'] . '">';
+                    echo '<tr class="form-field form-required '.$field['style'].'">';
                 } else {
-                    echo '<tr class="form-field ' . $field['style'] . '">';
+                    echo '<tr class="form-field '.$field['style'].'">';
                 }
 
                 // Call Separated methods for displaying each type of field.
-                call_user_func(array(&$this, 'show_field_' . $field['type']), $field, $meta);
+                call_user_func(array(&$this, 'show_field_'.$field['type']), $field, $meta);
                 echo '</tr>';
             }
             echo '</table>';
@@ -550,14 +550,14 @@ 
                 foreach ($meta as $me) {
                     //for labling toggles
                     $mmm = $me[$field['fields'][0]['id']];
-                    echo '<div class="at-repater-block">' . $mmm . '<br/><table class="repeater-table" style="display: none;">';
+                    echo '<div class="at-repater-block">'.$mmm.'<br/><table class="repeater-table" style="display: none;">';
                     if ($field['inline']) {
                         echo '<tr class="at-inline" VALIGN="top">';
                     }
                     foreach ($field['fields'] as $f) {
                         //reset var $id for repeater
                         $id = '';
-                        $id = $field['id'] . '[' . $c . '][' . $f['id'] . ']';
+                        $id = $field['id'].'['.$c.']['.$f['id'].']';
                         $m = $me[$f['id']];
                         $m = ($m !== '') ? $m : $f['std'];
                         if ('image' != $f['type'] && $f['type'] != 'repeater')
@@ -567,7 +567,7 @@ 
                         if (!$field['inline']) {
                             echo '<tr>';
                         }
-                        call_user_func(array(&$this, 'show_field_' . $f['type']), $f, $m);
+                        call_user_func(array(&$this, 'show_field_'.$f['type']), $f, $m);
                         if (!$field['inline']) {
                             echo '</tr>';
                         }
@@ -578,18 +578,18 @@ 
                     echo '</table>
 				<span class="at-re-toggle"><img src="';
                     if ($this->_Local_images) {
-                        echo $plugin_path . '/images/edit.png';
+                        echo $plugin_path.'/images/edit.png';
                     } else {
                         echo 'http://i.imgur.com/ka0E2.png';
                     }
                     echo '" alt="Edit" title="Edit"/></span> 
 				<img src="';
                     if ($this->_Local_images) {
-                        echo $plugin_path . '/images/remove.png';
+                        echo $plugin_path.'/images/remove.png';
                     } else {
                         echo 'http://i.imgur.com/g8Duj.png';
                     }
-                    echo '" alt="' . __('Remove', 'geodirectory') . '" title="' . __('Remove', 'geodirectory') . '" id="remove-' . $field['id'] . '"></div>';
+                    echo '" alt="'.__('Remove', 'geodirectory').'" title="'.__('Remove', 'geodirectory').'" id="remove-'.$field['id'].'"></div>';
                     $c = $c + 1;
 
                 }
@@ -598,11 +598,11 @@ 
 
             echo '<img src="';
             if ($this->_Local_images) {
-                echo $plugin_path . '/images/add.png';
+                echo $plugin_path.'/images/add.png';
             } else {
                 echo 'http://i.imgur.com/w5Tuc.png';
             }
-            echo '" alt="' . __('Add', 'geodirectory') . '" title="' . __('Add', 'geodirectory') . '" id="add-' . $field['id'] . '"><br/></div>';
+            echo '" alt="'.__('Add', 'geodirectory').'" title="'.__('Add', 'geodirectory').'" id="add-'.$field['id'].'"><br/></div>';
 
             //create all fields once more for js function and catch with object buffer
             ob_start();
@@ -613,12 +613,12 @@ 
             foreach ($field['fields'] as $f) {
                 //reset var $id for repeater
                 $id = '';
-                $id = $field['id'] . '[CurrentCounter][' . $f['id'] . ']';
+                $id = $field['id'].'[CurrentCounter]['.$f['id'].']';
                 $f['id'] = $id;
                 if (!$field['inline']) {
                     echo '<tr>';
                 }
-                call_user_func(array(&$this, 'show_field_' . $f['type']), $f, '');
+                call_user_func(array(&$this, 'show_field_'.$f['type']), $f, '');
                 if (!$field['inline']) {
                     echo '</tr>';
                 }
@@ -628,24 +628,24 @@ 
             }
             echo '</table><img src="';
             if ($this->_Local_images) {
-                echo $plugin_path . '/images/remove.png';
+                echo $plugin_path.'/images/remove.png';
             } else {
                 echo 'http://i.imgur.com/g8Duj.png';
             }
-            echo '" alt="' . __('Remove', 'geodirectory') . '" title="' . __('Remove', 'geodirectory') . '" id="remove-' . $field['id'] . '"></div>';
-            $counter = 'countadd_' . $field['id'];
+            echo '" alt="'.__('Remove', 'geodirectory').'" title="'.__('Remove', 'geodirectory').'" id="remove-'.$field['id'].'"></div>';
+            $counter = 'countadd_'.$field['id'];
             $js_code = ob_get_clean();
             $js_code = str_replace("'", "\"", $js_code);
-            $js_code = str_replace("CurrentCounter", "' + " . $counter . " + '", $js_code);
+            $js_code = str_replace("CurrentCounter", "' + ".$counter." + '", $js_code);
             echo '<script>
 				jQuery(document).ready(function() {
-					var ' . $counter . ' = ' . $c . ';
-					jQuery("#add-' . $field['id'] . '").live(\'click\', function() {
-						' . $counter . ' = ' . $counter . ' + 1;
-						jQuery(this).before(\'' . $js_code . '\');						
+					var ' . $counter.' = '.$c.';
+					jQuery("#add-' . $field['id'].'").live(\'click\', function() {
+						' . $counter.' = '.$counter.' + 1;
+						jQuery(this).before(\'' . $js_code.'\');						
 						update_repeater_fields();
 					});
-        			jQuery("#remove-' . $field['id'] . '").live(\'click\', function() {
+        			jQuery("#remove-' . $field['id'].'").live(\'click\', function() {
             			jQuery(this).parent().remove();
         			});
     			});
@@ -772,7 +772,7 @@ 
         public function show_field_paragraph($field)
         {
             //$this->show_field_begin( $field, $meta );
-            echo '<p>' . $field['value'] . '</p>';
+            echo '<p>'.$field['value'].'</p>';
             //$this->show_field_end( $field, $meta );
         }
 
@@ -803,12 +803,12 @@ 
         {
 
             if (!is_array($meta))
-                $meta = (array)$meta;
+                $meta = (array) $meta;
 
             $this->show_field_begin($field, $meta);
-            echo "<select class='at-select' name='{$field['id']}" . ($field['multiple'] ? "[]' id='{$field['id']}' multiple='multiple'" : "'") . ">";
+            echo "<select class='at-select' name='{$field['id']}".($field['multiple'] ? "[]' id='{$field['id']}' multiple='multiple'" : "'").">";
             foreach ($field['options'] as $key => $value) {
-                echo "<option value='{$key}'" . selected(in_array($key, $meta), true, false) . ">{$value}</option>";
+                echo "<option value='{$key}'".selected(in_array($key, $meta), true, false).">{$value}</option>";
             }
             echo "</select>";
             $this->show_field_end($field, $meta);
@@ -827,11 +827,11 @@ 
         {
 
             if (!is_array($meta))
-                $meta = (array)$meta;
+                $meta = (array) $meta;
 
             $this->show_field_begin($field, $meta);
             foreach ($field['options'] as $key => $value) {
-                echo "<input type='radio' class='at-radio' name='{$field['id']}' value='{$key}'" . checked(in_array($key, $meta), true, false) . " /> <span class='at-radio-label'>{$value}</span>";
+                echo "<input type='radio' class='at-radio' name='{$field['id']}' value='{$key}'".checked(in_array($key, $meta), true, false)." /> <span class='at-radio-label'>{$value}</span>";
             }
             $this->show_field_end($field, $meta);
         }
@@ -848,7 +848,7 @@ 
         {
 
             $this->show_field_begin($field, $meta);
-            echo "<input type='checkbox' class='rw-checkbox' name='{$field['id']}' id='{$field['id']}'" . checked(!empty($meta), true, false) . " /> {$field['desc']}";
+            echo "<input type='checkbox' class='rw-checkbox' name='{$field['id']}' id='{$field['id']}'".checked(!empty($meta), true, false)." /> {$field['desc']}";
             $this->show_field_end($field, $meta);
         }
 
@@ -890,18 +890,18 @@ 
             global $post;
 
             if (!is_array($meta))
-                $meta = (array)$meta;
+                $meta = (array) $meta;
 
             $this->show_field_begin($field, $meta);
             echo "{$field['desc']}<br />";
 
             if (!empty($meta)) {
                 $nonce = wp_create_nonce('at_ajax_delete');
-                echo '<div style="margin-bottom: 10px"><strong>' . __('Uploaded files', 'geodirectory') . '</strong></div>';
+                echo '<div style="margin-bottom: 10px"><strong>'.__('Uploaded files', 'geodirectory').'</strong></div>';
                 echo '<ol class="at-upload">';
                 foreach ($meta as $att) {
                     // if (wp_attachment_is_image($att)) continue; // what's image uploader for?
-                    echo "<li>" . wp_get_attachment_link($att, '', false, false, ' ') . " (<a class='at-delete-file' href='#' rel='{$nonce}|{$post->ID}|{$field['id']}|{$att}'>" . __('Remove', 'geodirectory') . "</a>)</li>";
+                    echo "<li>".wp_get_attachment_link($att, '', false, false, ' ')." (<a class='at-delete-file' href='#' rel='{$nonce}|{$post->ID}|{$field['id']}|{$att}'>".__('Remove', 'geodirectory')."</a>)</li>";
                 }
                 echo '</ol>';
             }
@@ -909,13 +909,13 @@ 
             // show form upload
 
             echo "<div class='at-file-upload-label'>";
-            echo "<strong>" . __('Upload new files', 'geodirectory') . "</strong>";
+            echo "<strong>".__('Upload new files', 'geodirectory')."</strong>";
             echo "</div>";
             echo "<div class='new-files'>";
             echo "<div class='file-input'>";
             echo "<input type='file' name='{$field['id']}[]' />";
             echo "</div><!-- End .file-input -->";
-            echo "<a class='at-add-file button' href='#'>" . __('Add more files', 'geodirectory') . "</a>";
+            echo "<a class='at-add-file button' href='#'>".__('Add more files', 'geodirectory')."</a>";
             echo "</div><!-- End .new-files -->";
             echo "</td>";
             $this->show_field_end($field, $meta);
@@ -932,7 +932,7 @@ 
         public function show_field_image($field, $meta)
         {
             $this->show_field_begin($field, $meta);
-            $html = wp_nonce_field("at-delete-mupload_{$field['id']}", "nonce-delete-mupload_" . $field['id'], false, false);
+            $html = wp_nonce_field("at-delete-mupload_{$field['id']}", "nonce-delete-mupload_".$field['id'], false, false);
             if (is_array($meta)) {
                 if (isset($meta[0]) && is_array($meta[0]))
                     $meta = $meta[0];
@@ -958,20 +958,20 @@ 
 
                 $sub_dir = str_replace($uploads_baseurl, '', $sub_dir);
 
-                $uploads_url = $uploads_baseurl . $sub_dir;
+                $uploads_url = $uploads_baseurl.$sub_dir;
 
-                $meta['src'] = $uploads_url . '/' . $file_name;
+                $meta['src'] = $uploads_url.'/'.$file_name;
 
 
-                $html .= "<span class='mupload_img_holder'><img src='" . $meta['src'] . "' style='max-height: 150px;max-width: 150px;' /></span>";
-                $html .= "<input type='hidden' name='" . $field['id'] . "[id]' id='" . $field['id'] . "[id]' value='" . $meta['id'] . "' />";
-                $html .= "<input type='hidden' class='" . $field['id'] . "[src]' name='" . $field['id'] . "[src]' id='" . $field['id'] . "[src]' value='" . $meta['src'] . "' />";
-                $html .= "<input class='at-delete_image_button' type='button' rel='" . $field['id'] . "' value='" . __('Remove Image', 'geodirectory') . "' />";
+                $html .= "<span class='mupload_img_holder'><img src='".$meta['src']."' style='max-height: 150px;max-width: 150px;' /></span>";
+                $html .= "<input type='hidden' name='".$field['id']."[id]' id='".$field['id']."[id]' value='".$meta['id']."' />";
+                $html .= "<input type='hidden' class='".$field['id']."[src]' name='".$field['id']."[src]' id='".$field['id']."[src]' value='".$meta['src']."' />";
+                $html .= "<input class='at-delete_image_button' type='button' rel='".$field['id']."' value='".__('Remove Image', 'geodirectory')."' />";
             } else {
                 $html .= "<span class='mupload_img_holder'></span>";
-                $html .= "<input type='hidden' name='" . $field['id'] . "[id]' id='" . $field['id'] . "[id]' value='' />";
-                $html .= "<input class='" . $field['id'] . "[src]' style='position:absolute;left:-500px;width:50px;' type='text' name='" . $field['id'] . "[src]' id='" . $field['id'] . "[src]' value='' />";
-                $html .= "<input class='at-upload_image_button' type='button' rel='" . $field['id'] . "' value='" . __('Upload Image', 'geodirectory') . "' />";
+                $html .= "<input type='hidden' name='".$field['id']."[id]' id='".$field['id']."[id]' value='' />";
+                $html .= "<input class='".$field['id']."[src]' style='position:absolute;left:-500px;width:50px;' type='text' name='".$field['id']."[src]' id='".$field['id']."[src]' value='' />";
+                $html .= "<input class='at-upload_image_button' type='button' rel='".$field['id']."' value='".__('Upload Image', 'geodirectory')."' />";
             }
             echo $html;
             $this->show_field_end($field, $meta);
@@ -995,7 +995,7 @@ 
 
             echo "<input class='at-color' type='text' name='{$field['id']}' id='{$field['id']}' value='{$meta}' size='8' />";
             //	echo "<a href='#' class='at-color-select button' rel='{$field['id']}'>" . __( 'Select a color' ) . "</a>";
-            echo "<input type='button' class='at-color-select button' rel='{$field['id']}' value='" . __('Select a color', 'geodirectory') . "'/>";
+            echo "<input type='button' class='at-color-select button' rel='{$field['id']}' value='".__('Select a color', 'geodirectory')."'/>";
             echo "<div style='display:none' class='at-color-picker' rel='{$field['id']}'></div>";
             $this->show_field_end($field, $meta);
 
@@ -1013,14 +1013,14 @@ 
         {
 
             if (!is_array($meta))
-                $meta = (array)$meta;
+                $meta = (array) $meta;
 
             $this->show_field_begin($field, $meta);
 
             $html = array();
 
             foreach ($field['options'] as $key => $value) {
-                $html[] = "<input type='checkbox' class='at-checkbox_list' name='{$field['id']}[]' value='{$key}'" . checked(in_array($key, $meta), true, false) . " /> {$value}";
+                $html[] = "<input type='checkbox' class='at-checkbox_list' name='{$field['id']}[]' value='{$key}'".checked(in_array($key, $meta), true, false)." /> {$value}";
             }
 
             echo implode('<br />', $html);
@@ -1073,7 +1073,7 @@ 
         {
             global $post;
 
-            if (!is_array($meta)) $meta = (array)$meta;
+            if (!is_array($meta)) $meta = (array) $meta;
             $this->show_field_begin($field, $meta);
             $options = $field['options'];
             $posts = get_posts($options['args']);
@@ -1081,13 +1081,13 @@ 
             // checkbox_list
             if ('checkbox_list' == $options['type']) {
                 foreach ($posts as $p) {
-                    echo "<input type='checkbox' name='{$field['id']}[]' value='$p->ID'" . checked(in_array($p->ID, $meta), true, false) . " /> $p->post_title<br/>";
+                    echo "<input type='checkbox' name='{$field['id']}[]' value='$p->ID'".checked(in_array($p->ID, $meta), true, false)." /> $p->post_title<br/>";
                 }
             } // select
             else {
-                echo "<select name='{$field['id']}" . ($field['multiple'] ? "[]' multiple='multiple' style='height:auto'" : "'") . ">";
+                echo "<select name='{$field['id']}".($field['multiple'] ? "[]' multiple='multiple' style='height:auto'" : "'").">";
                 foreach ($posts as $p) {
-                    echo "<option value='$p->ID'" . selected(in_array($p->ID, $meta), true, false) . ">$p->post_title</option>";
+                    echo "<option value='$p->ID'".selected(in_array($p->ID, $meta), true, false).">$p->post_title</option>";
                 }
                 echo "</select>";
             }
@@ -1111,7 +1111,7 @@ 
         {
             global $post;
 
-            if (!is_array($meta)) $meta = (array)$meta;
+            if (!is_array($meta)) $meta = (array) $meta;
             $this->show_field_begin($field, $meta);
             $options = $field['options'];
             $terms = get_terms($options['taxonomy'], $options['args']);
@@ -1119,13 +1119,13 @@ 
             // checkbox_list
             if ('checkbox_list' == $options['type']) {
                 foreach ($terms as $term) {
-                    echo "<input type='checkbox' name='{$field['id']}[]' value='$term->slug'" . checked(in_array($term->slug, $meta), true, false) . " /> $term->name<br/>";
+                    echo "<input type='checkbox' name='{$field['id']}[]' value='$term->slug'".checked(in_array($term->slug, $meta), true, false)." /> $term->name<br/>";
                 }
             } // select
             else {
-                echo "<select name='{$field['id']}" . ($field['multiple'] ? "[]' multiple='multiple' style='height:auto'" : "'") . ">";
+                echo "<select name='{$field['id']}".($field['multiple'] ? "[]' multiple='multiple' style='height:auto'" : "'").">";
                 foreach ($terms as $term) {
-                    echo "<option value='$term->slug'" . selected(in_array($term->slug, $meta), true, false) . ">$term->name</option>";
+                    echo "<option value='$term->slug'".selected(in_array($term->slug, $meta), true, false).">$term->name</option>";
                 }
                 echo "</select>";
             }
@@ -1181,7 +1181,7 @@ 
 
                     //$old_filename = $upload_dir['path'].'/'.$old_filename;
 
-                    $new_filename = $upload_dir['path'] . '/' . 'cat_icon_' . $term_id . '.png';
+                    $new_filename = $upload_dir['path'].'/'.'cat_icon_'.$term_id.'.png';
 
                     /*rename($old_filename, $new_filename);
 				
@@ -1223,9 +1223,9 @@ 
                 if ($type != "paragraph") {
 
                     // Call defined method to save meta value, if there's no methods, call common one.
-                    $save_func = 'save_field_' . $type;
+                    $save_func = 'save_field_'.$type;
                     if (method_exists($this, $save_func)) {
-                        call_user_func(array(&$this, 'save_field_' . $type), $term_id, $field, $old, $new);
+                        call_user_func(array(&$this, 'save_field_'.$type), $term_id, $field, $old, $new);
                     } else {
                         $this->save_field($term_id, $field, $old, $new);
                     }
@@ -1370,7 +1370,7 @@ 
                 if (!is_wp_error($id)) {
 
                     wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));
-                    add_post_meta($term_id, $name, $id, false);    // save file's url in meta fields
+                    add_post_meta($term_id, $name, $id, false); // save file's url in meta fields
 
                 } // End if
 
@@ -1415,7 +1415,7 @@ 
                 if (!is_wp_error($id)) {
 
                     wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));
-                    return $id;    // return file's url in meta fields
+                    return $id; // return file's url in meta fields
                 } // End if
             } // End foreach
         }
@@ -1430,9 +1430,9 @@ 
         {
 
             // Default values for meta box
-            $this->_meta_box = array_merge(array('context' => 'normal', 'priority' => 'high', 'pages' => array('post')), (array)$this->_meta_box);
+            $this->_meta_box = array_merge(array('context' => 'normal', 'priority' => 'high', 'pages' => array('post')), (array) $this->_meta_box);
 
-            if(is_array($this->_fields)) {
+            if (is_array($this->_fields)) {
                 // Default values for fields
                 foreach ($this->_fields as &$field) {
                     $multiple = in_array($field['type'], array('checkbox_list', 'file', 'image'));
@@ -1452,7 +1452,7 @@ 
          */
         public function has_field($type)
         {
-            if(is_array($this->_fields)) {
+            if (is_array($this->_fields)) {
                 foreach ($this->_fields as $field) {
                     if ($type == $field['type'])
                         return true;
@@ -2020,12 +2020,12 @@ 
                 $post_type = $taxObject->object_type[0];
             }
 
-            if($post_type=='post'){$post_type='';}
-            if($post_type){$post_type = $post_type.'_';}
+            if ($post_type == 'post') {$post_type = ''; }
+            if ($post_type) {$post_type = $post_type.'_'; }
 
             $t_id = (is_object($term_id)) ? $term_id->term_id : $term_id;
 
-            $m = get_option('tax_meta_' . $post_type  . $t_id);
+            $m = get_option('tax_meta_'.$post_type.$t_id);
             if (isset($m[$key])) {
                 return $m[$key];
             } else {
@@ -2042,15 +2042,15 @@ 
                 $post_type = $taxObject->object_type[0];
             }
 
-            if($post_type=='post'){$post_type='';}
-            if($post_type){$post_type = $post_type.'_';}
+            if ($post_type == 'post') {$post_type = ''; }
+            if ($post_type) {$post_type = $post_type.'_'; }
 
-            $m = get_option('tax_meta_' . $post_type  . $term_id);
+            $m = get_option('tax_meta_'.$post_type.$term_id);
 
             if (isset($m[$key])) {
                 unset($m[$key]);
             }
-            update_option('tax_meta_' . $post_type  . $term_id, $m);
+            update_option('tax_meta_'.$post_type.$term_id, $m);
         }
 
         //update meta
@@ -2062,13 +2062,13 @@ 
                 $post_type = $taxObject->object_type[0];
             }
 
-            if($post_type=='post'){$post_type='';}
-            if($post_type){$post_type = $post_type.'_';}
+            if ($post_type == 'post') {$post_type = ''; }
+            if ($post_type) {$post_type = $post_type.'_'; }
 
-            $m = get_option('tax_meta_' . $post_type  . $term_id);
+            $m = get_option('tax_meta_'.$post_type.$term_id);
 
             $m[$key] = $value;
-            update_option('tax_meta_' . $post_type  . $term_id, $m);
+            update_option('tax_meta_'.$post_type.$term_id, $m);
 
             /**
              * Called after the tax meta is updated.
@@ -2103,12 +2103,12 @@ 
             $post_type = $taxObject->object_type[0];
         }
 
-        if($post_type=='post'){$post_type='';}
-        if($post_type){$post_type = $post_type.'_';}
+        if ($post_type == 'post') {$post_type = ''; }
+        if ($post_type) {$post_type = $post_type.'_'; }
 
         $t_id = (is_object($term_id)) ? $term_id->term_id : $term_id;
 
-        $m = get_option('tax_meta_' . $post_type  . $t_id);
+        $m = get_option('tax_meta_'.$post_type.$t_id);
         if (isset($m[$key])) {
             return $m[$key];
         } else {
@@ -2125,15 +2125,15 @@ 
         $taxObject = get_taxonomy($_REQUEST['taxonomy']);
         $post_type = $taxObject->object_type[0];
 
-        if($post_type=='post'){$post_type='';}
-        if($post_type){$post_type = $post_type.'_';}
+        if ($post_type == 'post') {$post_type = ''; }
+        if ($post_type) {$post_type = $post_type.'_'; }
 
-        $m = get_option('tax_meta_' . $post_type . $term_id);
+        $m = get_option('tax_meta_'.$post_type.$term_id);
 
         if (isset($m[$key])) {
             unset($m[$key]);
         }
-        update_option('tax_meta_' . $post_type  . $term_id, $m);
+        update_option('tax_meta_'.$post_type.$term_id, $m);
     }
 }
 
@@ -2147,13 +2147,13 @@ 
             $post_type = $taxObject->object_type[0];
         }
 
-        if($post_type=='post'){$post_type='';}
-        if($post_type){$post_type = $post_type.'_';}
+        if ($post_type == 'post') {$post_type = ''; }
+        if ($post_type) {$post_type = $post_type.'_'; }
 
-        $m = get_option('tax_meta_' . $post_type  . $term_id);
+        $m = get_option('tax_meta_'.$post_type.$term_id);
 
         $m[$key] = $value;
-        update_option('tax_meta_' . $post_type . $term_id, $m);
+        update_option('tax_meta_'.$post_type.$term_id, $m);
 
         /** This action is documented in geodirectory-functions/cat-meta-functions/Tax-meta-class.php */
         do_action('gd_tax_meta_updated', false, true, $term_id, $post_type);

geodirectory-admin/admin_hooks_actions.php

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

 

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

@@ -237,7 +237,7 @@ 
 

 }

 

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

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

 

 

 

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

 

                 }

             }

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

@@ -427,18 +427,18 @@ 
 

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

                 )

             );

             

             $display = $check_html_variable ? ' style="display:none;"' : '';

             ?>

-            <li <?php echo $display;?>>

-            <a id="gt-<?php echo $val['field_type'];?>-_-<?php echo $val['htmlvar_name'];?>"

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

-               class="gt-draggable-form-items gt-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>"

-               href="javascript:void(0);"><b></b><?php _e($val['site_title'], 'geodirectory');?></a>

+            <li <?php echo $display; ?>>

+            <a id="gt-<?php echo $val['field_type']; ?>-_-<?php echo $val['htmlvar_name']; ?>"

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

+               class="gt-draggable-form-items gt-<?php echo $val['field_type']; ?> geodir-sort-<?php echo $val['htmlvar_name']; ?>"

+               href="javascript:void(0);"><b></b><?php _e($val['site_title'], 'geodirectory'); ?></a>

             </li>

             <?php

         }

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

@@ -492,39 +492,39 @@ 
 {

     $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 class="full">

-        <li><a id="gt-fieldset" class="gt-draggable-form-items gt-fieldset" href="javascript:void(0);"><?php _e('Fieldset', 'geodirectory');?></a></li>

+        <li><a id="gt-fieldset" class="gt-draggable-form-items gt-fieldset" href="javascript:void(0);"><?php _e('Fieldset', 'geodirectory'); ?></a></li>

     </ul>

     <ul>

         <li><a id="gt-text" class="gt-draggable-form-items gt-text"

-               href="javascript:void(0);"><b></b><?php _e('Text', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Text', 'geodirectory'); ?></a></li>

         <li><a id="gt-datepicker" class="gt-draggable-form-items gt-datepicker"

-               href="javascript:void(0);"><b></b><?php _e('Date', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Date', 'geodirectory'); ?></a></li>

         <li><a id="gt-textarea" class="gt-draggable-form-items gt-textarea"

-               href="javascript:void(0);"><b></b><?php _e('Textarea', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Textarea', 'geodirectory'); ?></a></li>

         <li><a id="gt-time" class="gt-draggable-form-items gt-time"

-               href="javascript:void(0);"><b></b><?php _e('Time', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Time', 'geodirectory'); ?></a></li>

         <li><a id="gt-checkbox" class="gt-draggable-form-items gt-checkbox"

-               href="javascript:void(0);"><b></b><?php _e('Checkbox', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Checkbox', 'geodirectory'); ?></a></li>

         <li><a id="gt-phone" class="gt-draggable-form-items gt-phone"

-               href="javascript:void(0);"><b></b><?php _e('Phone', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Phone', 'geodirectory'); ?></a></li>

         <li><a id="gt-radio" class="gt-draggable-form-items gt-radio"

-               href="javascript:void(0);"><b></b><?php _e('Radio', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Radio', 'geodirectory'); ?></a></li>

         <li><a id="gt-email" class="gt-draggable-form-items gt-email"

-               href="javascript:void(0);"><b></b><?php _e('Email', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Email', 'geodirectory'); ?></a></li>

         <li><a id="gt-select" class="gt-draggable-form-items gt-select"

-               href="javascript:void(0);"><b></b><?php _e('Select', 'geodirectory');?></a></li>

-        <!--<li><a id="gt-taxonomy" class="gt-draggable-form-items gt-select" href="javascript:void(0);"><b></b><?php _e('Taxonomy', 'geodirectory');?></a></li>-->

+               href="javascript:void(0);"><b></b><?php _e('Select', 'geodirectory'); ?></a></li>

+        <!--<li><a id="gt-taxonomy" class="gt-draggable-form-items gt-select" href="javascript:void(0);"><b></b><?php _e('Taxonomy', 'geodirectory'); ?></a></li>-->

         <li><a id="gt-multiselect" class="gt-draggable-form-items gt-multiselect"

-               href="javascript:void(0);"><b></b><?php _e('Multi Select', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Multi Select', 'geodirectory'); ?></a></li>

         <li><a id="gt-url" class="gt-draggable-form-items gt-url"

-               href="javascript:void(0);"><b></b><?php _e('URL', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('URL', 'geodirectory'); ?></a></li>

         <li><a id="gt-html" class="gt-draggable-form-items gt-html"

-               href="javascript:void(0);"><b></b><?php _e('HTML', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('HTML', 'geodirectory'); ?></a></li>

         <li><a id="gt-file" class="gt-draggable-form-items gt-file"

-               href="javascript:void(0);"><b></b><?php _e('File Upload', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('File Upload', 'geodirectory'); ?></a></li>

 

     </ul>

 

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

@@ -635,7 +635,7 @@ 
 

     switch ($sub_tab) {

         case 'custom_fields':

-            $note = sprintf(__('Click on any box below to add a field of that type on add %s listing form. You must be 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 on add %s listing form. You must be use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type)); ;

             break;

 

         case 'sorting_options':

@@ -689,7 +689,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':

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

 

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

         }

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

                 }

 

             }

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

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

 }

@@ -922,23 +922,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>";

             }

 

         }

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

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

 

                         }

 

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

 

         }

 

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

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

         }

 

     }

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

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

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

             )

         );

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

             }

         }

     }

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

             }

         }

     }

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

             }

         }

     }

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

             }

         }

     }

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

             }

         }

     }

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

             }

         }

     }

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

             }

         }

     }

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

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

@@ -1523,10 +1523,10 @@ 
     $output_str = '';

 

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

     }

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

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

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

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

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

                 }

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

                             }

@@ -1858,7 +1858,7 @@ 
 						

 						// Post status

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

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

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

                         }

                     }

 

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

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

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

                         }

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

 

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

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

                         }

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

 

 

 /**

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

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