GeoDirectory / geodirectory

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

Doc Comments +15 added lines

@@ -2054,6 +2054,11 @@ 
         }
 
         //update meta
+
+        /**
+         * @param string $term_id
+         * @param string $key
+         */
         public function update_tax_meta($term_id, $key, $value, $post_type = '')
         {
 
@@ -2095,6 +2100,12 @@ 
 
 //get term meta field
 if (!function_exists('get_tax_meta')) {
+
+    /**
+     * @param string $key
+     *
+     * @return string
+     */
     function get_tax_meta($term_id, $key, $multi = false, $post_type = '')
     {
 
@@ -2139,6 +2150,10 @@ 
 
 //update meta
 if (!function_exists('update_tax_meta')) {
+
+    /**
+     * @param string $key
+     */
     function update_tax_meta($term_id, $key, $value, $post_type = '')
     {
 

Braces +106 added lines, -69 removed lines

@@ -102,8 +102,9 @@ 
         {
 
             // If we are not in admin area exit.
-            if (!is_admin())
-                return;
+            if (!is_admin()) {
+                            return;
+            }
 
             // Assign meta box values to local variables and add it's missed values.
             $this->_meta_box = $meta_box;
@@ -111,15 +112,15 @@ 
             $this->_fields = &$this->_meta_box['fields'];
             $this->_Local_images = (isset($meta_box['local_images'])) ? true : false;
             $this->add_missed_values();
-            if (isset($meta_box['use_with_theme']))
-                if ($meta_box['use_with_theme'] === true) {
+            if (isset($meta_box['use_with_theme'])) {
+                            if ($meta_box['use_with_theme'] === true) {
                     $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 {
                     $this->SelfPath = $meta_box['use_with_theme'];
-                }
-            else {
+                } else {
                 $this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__)));
             }
 
@@ -190,8 +191,9 @@ 
         {
 
             // Check if the field is an image or file. If not, return.
-            if (!$this->has_field('image') && !$this->has_field('file'))
-                return;
+            if (!$this->has_field('image') && !$this->has_field('file')) {
+                            return;
+            }
 
 
             add_action('wp_enqueue_scripts', array(&$this, 'enqueue_tax_meta_scripts'), 100);
@@ -235,8 +237,9 @@ 
         {
 
             // If post variables are empty, return.
-            if (!isset($_POST['at-insert']) || empty($_POST['attachments']))
-                return;
+            if (!isset($_POST['at-insert']) || empty($_POST['attachments'])) {
+                            return;
+            }
 
             // Security Check
             check_admin_referer('media-form');
@@ -256,8 +259,9 @@ 
                 $attachment = stripslashes_deep($attachment);
 
                 // If not selected or url is empty, continue in loop.
-                if (empty($attachment['selected']) || empty($attachment['url']))
-                    continue;
+                if (empty($attachment['selected']) || empty($attachment['url'])) {
+                                    continue;
+                }
 
                 $li = "<li id='item_{$attachment_id}'>";
                 $li .= "<img src='{$attachment['url']}' alt='image_{$attachment_id}' />";
@@ -308,13 +312,15 @@ 
 
 
             // If data is not set, die.
-            if (!isset($_POST['data']))
-                die();
+            if (!isset($_POST['data'])) {
+                            die();
+            }
 
             list($nonce, $term_id, $key, $attach_id) = explode('|', $_POST['data']);
 
-            if (!wp_verify_nonce($nonce, 'at_ajax_delete'))
-                die('1');
+            if (!wp_verify_nonce($nonce, 'at_ajax_delete')) {
+                            die('1');
+            }
 
             $this->delete_tax_meta($term_id, $key, $attach_id);
 
@@ -336,8 +342,9 @@ 
             $ok = false;
             if (strpos($field_id, '[') === false) {
                 check_admin_referer("at-delete-mupload_" . urldecode($field_id));
-                if ($term_id > 0)
-                    $this->delete_tax_meta($term_id, $field_id);
+                if ($term_id > 0) {
+                                    $this->delete_tax_meta($term_id, $field_id);
+                }
                 //$ok = wp_delete_attachment( $attachment_id );
                 $ok = 1;
             } else {
@@ -349,8 +356,9 @@ 
                 $saved = $this->get_tax_meta($term_id, $f[0], true);
                 if (isset($saved[$f[1]][$f[2]])) {
                     unset($saved[$f[1]][$f[2]]);
-                    if ($term_id > 0)
-                        update_post_meta($term_id, $f[0], $saved);
+                    if ($term_id > 0) {
+                                            update_post_meta($term_id, $f[0], $saved);
+                    }
                     //$ok = wp_delete_attachment( $attachment_id );
                     $ok = 1;
                 }
@@ -375,13 +383,15 @@ 
         public function reorder_images()
         {
 
-            if (!isset($_POST['data']))
-                die();
+            if (!isset($_POST['data'])) {
+                            die();
+            }
 
             list($order, $term_id, $key, $nonce) = explode('|', $_POST['data']);
 
-            if (!wp_verify_nonce($nonce, 'at_ajax_reorder'))
-                die('1');
+            if (!wp_verify_nonce($nonce, 'at_ajax_reorder')) {
+                            die('1');
+            }
 
             parse_str($order, $items);
             $items = $items['item'];
@@ -513,8 +523,9 @@ 
             foreach ($this->_fields as $field) {
                 $meta = $this->get_tax_meta($term_id, $field['id'], !$field['multiple']);
                 $meta = ($meta !== '') ? $meta : $field['std'];
-                if ('image' != $field['type'] && $field['type'] != 'repeater')
-                    $meta = is_array($meta) ? array_map('esc_attr', $meta) : esc_attr($meta);
+                if ('image' != $field['type'] && $field['type'] != 'repeater') {
+                                    $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'] . '">';
@@ -560,8 +571,9 @@ 
                         $id = $field['id'] . '[' . $c . '][' . $f['id'] . ']';
                         $m = $me[$f['id']];
                         $m = ($m !== '') ? $m : $f['std'];
-                        if ('image' != $f['type'] && $f['type'] != 'repeater')
-                            $m = is_array($m) ? array_map('esc_attr', $m) : esc_attr($m);
+                        if ('image' != $f['type'] && $f['type'] != 'repeater') {
+                                                    $m = is_array($m) ? array_map('esc_attr', $m) : esc_attr($m);
+                        }
                         //set new id for field in array format
                         $f['id'] = $id;
                         if (!$field['inline']) {
@@ -802,8 +814,9 @@ 
         public function show_field_select($field, $meta)
         {
 
-            if (!is_array($meta))
-                $meta = (array)$meta;
+            if (!is_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'" : "'") . ">";
@@ -826,8 +839,9 @@ 
         public function show_field_radio($field, $meta)
         {
 
-            if (!is_array($meta))
-                $meta = (array)$meta;
+            if (!is_array($meta)) {
+                            $meta = (array)$meta;
+            }
 
             $this->show_field_begin($field, $meta);
             foreach ($field['options'] as $key => $value) {
@@ -889,8 +903,9 @@ 
 
             global $post;
 
-            if (!is_array($meta))
-                $meta = (array)$meta;
+            if (!is_array($meta)) {
+                            $meta = (array)$meta;
+            }
 
             $this->show_field_begin($field, $meta);
             echo "{$field['desc']}<br />";
@@ -934,8 +949,9 @@ 
             $this->show_field_begin($field, $meta);
             $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];
+                if (isset($meta[0]) && is_array($meta[0])) {
+                                    $meta = $meta[0];
+                }
             }
 
             $uploads = wp_upload_dir();
@@ -947,8 +963,9 @@ 
                 //print_r($uploads);
                 //print_r($file_info);
 
-                if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')
-                    $sub_dir = $file_info['dirname'];
+                if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
+                                    $sub_dir = $file_info['dirname'];
+                }
 
                 $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs	
                 $uploads_baseurl = $uploads['baseurl'];
@@ -988,8 +1005,9 @@ 
         public function show_field_color($field, $meta)
         {
 
-            if (empty($meta))
-                $meta = '#';
+            if (empty($meta)) {
+                            $meta = '#';
+            }
 
             $this->show_field_begin($field, $meta);
 
@@ -1012,8 +1030,9 @@ 
         public function show_field_checkbox_list($field, $meta)
         {
 
-            if (!is_array($meta))
-                $meta = (array)$meta;
+            if (!is_array($meta)) {
+                            $meta = (array)$meta;
+            }
 
             $this->show_field_begin($field, $meta);
 
@@ -1073,7 +1092,9 @@ 
         {
             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']);
@@ -1111,7 +1132,9 @@ 
         {
             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']);
@@ -1145,17 +1168,20 @@ 
         {
 
             $taxnow = '';
-            if (isset($_POST['taxonomy']))
-                $taxnow = $_POST['taxonomy'];
+            if (isset($_POST['taxonomy'])) {
+                            $taxnow = $_POST['taxonomy'];
+            }
 
             if (!isset($term_id)                                                        // Check Revision
                 || (!in_array($taxnow, $this->_meta_box['pages']))                            // Check if current taxonomy type is supported.
                 || (!check_admin_referer(basename(__FILE__), 'tax_meta_class_nonce'))        // Check nonce - Security
                 || (!current_user_can('manage_categories'))
-            )                                // Check permission
+            ) {
+            	// Check permission
             {
                 return $term_id;
             }
+            }
 
 
             foreach ($this->_fields as $field) {
@@ -1249,8 +1275,9 @@ 
         {
             $name = $field['id'];
             $this->delete_tax_meta($term_id, $name);
-            if ($new === '' || $new === array())
-                return;
+            if ($new === '' || $new === array()) {
+                            return;
+            }
 
             $this->update_tax_meta($term_id, $name, $new);
         }
@@ -1270,8 +1297,9 @@ 
             $name = $field['id'];
 
             $this->delete_tax_meta($term_id, $name);
-            if ($new === '' || $new === array() || $new['id'] == '' || $new['src'] == '')
-                return;
+            if ($new === '' || $new === array() || $new['id'] == '' || $new['src'] == '') {
+                            return;
+            }
 
             $this->update_tax_meta($term_id, $name, $new);
         }
@@ -1318,8 +1346,9 @@ 
                                 break;
                         }
                     }
-                    if (!$this->is_array_empty($n))
-                        $temp[] = $n;
+                    if (!$this->is_array_empty($n)) {
+                                            $temp[] = $n;
+                    }
                 }
                 if (isset($temp) && count($temp) > 0 && !$this->is_array_empty($temp)) {
                     $this->update_tax_meta($term_id, $field['id'], $temp);
@@ -1347,14 +1376,16 @@ 
         {
 
             $name = $field['id'];
-            if (empty($_FILES[$name]))
-                return;
+            if (empty($_FILES[$name])) {
+                            return;
+            }
             $this->fix_file_array($_FILES[$name]);
             foreach ($_FILES[$name] as $position => $fileitem) {
 
                 $file = wp_handle_upload($fileitem, array('test_form' => false));
-                if (empty($file['file']))
-                    continue;
+                if (empty($file['file'])) {
+                                    continue;
+                }
                 $filename = $file['file'];
 
                 $attachment = array(
@@ -1392,14 +1423,16 @@ 
         {
 
             $name = $field['id'];
-            if (empty($_FILES[$name]))
-                return;
+            if (empty($_FILES[$name])) {
+                            return;
+            }
             $this->fix_file_array($_FILES[$name]);
             foreach ($_FILES[$name] as $position => $fileitem) {
 
                 $file = wp_handle_upload($fileitem, array('test_form' => false));
-                if (empty($file['file']))
-                    continue;
+                if (empty($file['file'])) {
+                                    continue;
+                }
                 $filename = $file['file'];
 
                 $attachment = array(
@@ -1454,8 +1487,9 @@ 
         {
             if(is_array($this->_fields)) {
                 foreach ($this->_fields as $field) {
-                    if ($type == $field['type'])
-                        return true;
+                    if ($type == $field['type']) {
+                                            return true;
+                    }
                 }
             }
             return false;
@@ -1993,18 +2027,21 @@ 
          */
         public function is_array_empty($array)
         {
-            if (!is_array($array))
-                return true;
+            if (!is_array($array)) {
+                            return true;
+            }
 
             foreach ($array as $a) {
                 if (is_array($a)) {
                     foreach ($a as $sub_a) {
-                        if (!empty($sub_a) && $sub_a != '')
-                            return false;
+                        if (!empty($sub_a) && $sub_a != '') {
+                                                    return false;
+                        }
                     }
                 } else {
-                    if (!empty($a) && $a != '')
-                        return false;
+                    if (!empty($a) && $a != '') {
+                                            return false;
+                    }
                 }
             }
             return true;

Indentation +2028 added lines, -2028 removed lines

@@ -28,260 +28,260 @@ 
 
 if (!class_exists('Tax_Meta_Class')) :
 
-    /**
-     * All Types Meta Box class.
-     *
-     * @package All Types Meta Box
-     * @since 1.0
-     *
-     * @todo Nothing.
-     */
-
-
-    class Tax_Meta_Class
-    {
-
-        /**
-         * Holds meta box object
-         *
-         * @var object
-         * @access protected
-         */
-        protected $_meta_box;
-
-        /**
-         * Holds meta box fields.
-         *
-         * @var array
-         * @access protected
-         */
-        protected $_prefix;
-
-        /**
-         * Holds Prefix for meta box fields.
-         *
-         * @var array
-         * @access protected
-         */
-        protected $_fields;
-
-        /**
-         * Use local images.
-         *
-         * @var bool
-         * @access protected
-         */
-        protected $_Local_images;
-
-        /**
-         * What form is this? edit or new term.
-         *
-         * @var string
-         * @access protected
-         * $since 1.0
-         */
-        protected $_form_type;
-        /**
-         * SelfPath to allow themes as well as plugins.
-         *
-         * @var string
-         * @access protected
-         * $since 1.0
-         */
-        protected $SelfPath;
-
-        /**
-         * Constructor
-         *
-         * @since 1.0
-         * @access public
-         *
-         * @param array $meta_box
-         */
-        public function __construct($meta_box)
-        {
-
-            // If we are not in admin area exit.
-            if (!is_admin())
-                return;
-
-            // Assign meta box values to local variables and add it's missed values.
-            $this->_meta_box = $meta_box;
-            $this->_prefix = (isset($meta_box['prefix'])) ? $meta_box['prefix'] : '';
-            $this->_fields = &$this->_meta_box['fields'];
-            $this->_Local_images = (isset($meta_box['local_images'])) ? true : false;
-            $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';
-                } elseif ($meta_box['use_with_theme'] === false) {
-                    $this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__)));
-                } else {
-                    $this->SelfPath = $meta_box['use_with_theme'];
-                }
-            else {
-                $this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__)));
-            }
-
-
-            // Add Actions
-            add_action('admin_init', array(&$this, 'add'));
-
-            // Check for special fields and add needed actions for them.
-            $this->check_field_upload();
-            $this->check_field_color();
-            $this->check_field_date();
-            $this->check_field_time();
-
-            // Load common js, css files
-            // Must enqueue for all pages as we need js for the media upload, too.
-            add_action('admin_print_styles', array(&$this, 'load_scripts_styles'));
-
-        }
-
-        /**
-         * Load all Javascript and CSS
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function load_scripts_styles()
-        {
-
-            // Get Plugin Path
-            $plugin_path = $this->SelfPath;
-            //only load styles and js when needed
-            /* 
+	/**
+	 * All Types Meta Box class.
+	 *
+	 * @package All Types Meta Box
+	 * @since 1.0
+	 *
+	 * @todo Nothing.
+	 */
+
+
+	class Tax_Meta_Class
+	{
+
+		/**
+		 * Holds meta box object
+		 *
+		 * @var object
+		 * @access protected
+		 */
+		protected $_meta_box;
+
+		/**
+		 * Holds meta box fields.
+		 *
+		 * @var array
+		 * @access protected
+		 */
+		protected $_prefix;
+
+		/**
+		 * Holds Prefix for meta box fields.
+		 *
+		 * @var array
+		 * @access protected
+		 */
+		protected $_fields;
+
+		/**
+		 * Use local images.
+		 *
+		 * @var bool
+		 * @access protected
+		 */
+		protected $_Local_images;
+
+		/**
+		 * What form is this? edit or new term.
+		 *
+		 * @var string
+		 * @access protected
+		 * $since 1.0
+		 */
+		protected $_form_type;
+		/**
+		 * SelfPath to allow themes as well as plugins.
+		 *
+		 * @var string
+		 * @access protected
+		 * $since 1.0
+		 */
+		protected $SelfPath;
+
+		/**
+		 * Constructor
+		 *
+		 * @since 1.0
+		 * @access public
+		 *
+		 * @param array $meta_box
+		 */
+		public function __construct($meta_box)
+		{
+
+			// If we are not in admin area exit.
+			if (!is_admin())
+				return;
+
+			// Assign meta box values to local variables and add it's missed values.
+			$this->_meta_box = $meta_box;
+			$this->_prefix = (isset($meta_box['prefix'])) ? $meta_box['prefix'] : '';
+			$this->_fields = &$this->_meta_box['fields'];
+			$this->_Local_images = (isset($meta_box['local_images'])) ? true : false;
+			$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';
+				} elseif ($meta_box['use_with_theme'] === false) {
+					$this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__)));
+				} else {
+					$this->SelfPath = $meta_box['use_with_theme'];
+				}
+			else {
+				$this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__)));
+			}
+
+
+			// Add Actions
+			add_action('admin_init', array(&$this, 'add'));
+
+			// Check for special fields and add needed actions for them.
+			$this->check_field_upload();
+			$this->check_field_color();
+			$this->check_field_date();
+			$this->check_field_time();
+
+			// Load common js, css files
+			// Must enqueue for all pages as we need js for the media upload, too.
+			add_action('admin_print_styles', array(&$this, 'load_scripts_styles'));
+
+		}
+
+		/**
+		 * Load all Javascript and CSS
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function load_scripts_styles()
+		{
+
+			// Get Plugin Path
+			$plugin_path = $this->SelfPath;
+			//only load styles and js when needed
+			/* 
 		 * since 1.0
 		 */
-            $taxnow = isset($_REQUEST['taxonomy']) ? $_REQUEST['taxonomy'] : '';
-
-            if (!empty($this->_meta_box['pages'])) {
-                if (in_array($taxnow, $this->_meta_box['pages'])) {
-                    // Enqueue Meta Box Style
-                    //wp_enqueue_style( 'tax-meta-clss', $plugin_path . '/css/Tax-meta-class.css' );
-                    // Enqueue Meta Box Scripts
-                    //wp_enqueue_script( 'tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array( 'jquery' ), null, true );
-
-                }
-            }
-
-        }
-
-        /**
-         * Check the Field Upload, Add needed Actions
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function enqueue_tax_meta_scripts()
-        {
-            // Make upload feature work event when custom post type doesn't support 'editor'
-            wp_enqueue_script('media-upload');
-            wp_enqueue_script('thickbox');
-            add_thickbox();
-            wp_enqueue_script('jquery-ui-core');
-            wp_enqueue_script('jquery-ui-sortable');
-
-
-        }
-
-        public function check_field_upload()
-        {
-
-            // Check if the field is an image or file. If not, return.
-            if (!$this->has_field('image') && !$this->has_field('file'))
-                return;
-
-
-            add_action('wp_enqueue_scripts', array(&$this, 'enqueue_tax_meta_scripts'), 100);
-
-            // Add data encoding type for file uploading.	
-            add_action('post_edit_form_tag', array(&$this, 'add_enctype'));
-
-
-            // Add filters for media upload.
-            add_filter('media_upload_gallery', array(&$this, 'insert_images'));
-            add_filter('media_upload_library', array(&$this, 'insert_images'));
-            add_filter('media_upload_image', array(&$this, 'insert_images'));
-
-            // Delete all attachments when delete custom post type.
-            add_action('wp_ajax_at_delete_file', array(&$this, 'delete_file'));
-            add_action('wp_ajax_at_reorder_images', array(&$this, 'reorder_images'));
-            // Delete file via Ajax
-            add_action('wp_ajax_at_delete_mupload', array($this, 'wp_ajax_delete_image'));
-        }
-
-        /**
-         * Add data encoding type for file uploading
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function add_enctype()
-        {
-            echo ' enctype="multipart/form-data"';
-        }
-
-        /**
-         * Process images added to meta field.
-         *
-         * Modified from Faster Image Insert plugin.
-         *
-         * @return void
-         * @author Cory Crowley
-         */
-        public function insert_images()
-        {
-
-            // If post variables are empty, return.
-            if (!isset($_POST['at-insert']) || empty($_POST['attachments']))
-                return;
-
-            // Security Check
-            check_admin_referer('media-form');
-
-            // Create Security Nonce
-            $nonce = wp_create_nonce('at_ajax_delete');
-
-            // Get Post Id and Field Id
-            $term_id = $_POST['post_id'];
-            $id = $_POST['field_id'];
-
-            // Modify the insertion string
-            $html = '';
-            foreach ($_POST['attachments'] as $attachment_id => $attachment) {
-
-                // Strip Slashes
-                $attachment = stripslashes_deep($attachment);
-
-                // If not selected or url is empty, continue in loop.
-                if (empty($attachment['selected']) || empty($attachment['url']))
-                    continue;
-
-                $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 .= "<input type='hidden' name='{$id}[]' value='{$attachment_id}' />";
-                $li .= "</li>";
-                $html .= $li;
-
-            } // End For Each
-
-            return media_send_to_editor($html);
-
-        }
-
-        /**
-         * Delete attachments associated with the post.
-         *
-         * @since 1.0
-         * @access public
-         *
-         * @param int|string $term_id The term ID.
-         */
-        /*public function delete_attachments( $term_id ) {
+			$taxnow = isset($_REQUEST['taxonomy']) ? $_REQUEST['taxonomy'] : '';
+
+			if (!empty($this->_meta_box['pages'])) {
+				if (in_array($taxnow, $this->_meta_box['pages'])) {
+					// Enqueue Meta Box Style
+					//wp_enqueue_style( 'tax-meta-clss', $plugin_path . '/css/Tax-meta-class.css' );
+					// Enqueue Meta Box Scripts
+					//wp_enqueue_script( 'tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array( 'jquery' ), null, true );
+
+				}
+			}
+
+		}
+
+		/**
+		 * Check the Field Upload, Add needed Actions
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function enqueue_tax_meta_scripts()
+		{
+			// Make upload feature work event when custom post type doesn't support 'editor'
+			wp_enqueue_script('media-upload');
+			wp_enqueue_script('thickbox');
+			add_thickbox();
+			wp_enqueue_script('jquery-ui-core');
+			wp_enqueue_script('jquery-ui-sortable');
+
+
+		}
+
+		public function check_field_upload()
+		{
+
+			// Check if the field is an image or file. If not, return.
+			if (!$this->has_field('image') && !$this->has_field('file'))
+				return;
+
+
+			add_action('wp_enqueue_scripts', array(&$this, 'enqueue_tax_meta_scripts'), 100);
+
+			// Add data encoding type for file uploading.	
+			add_action('post_edit_form_tag', array(&$this, 'add_enctype'));
+
+
+			// Add filters for media upload.
+			add_filter('media_upload_gallery', array(&$this, 'insert_images'));
+			add_filter('media_upload_library', array(&$this, 'insert_images'));
+			add_filter('media_upload_image', array(&$this, 'insert_images'));
+
+			// Delete all attachments when delete custom post type.
+			add_action('wp_ajax_at_delete_file', array(&$this, 'delete_file'));
+			add_action('wp_ajax_at_reorder_images', array(&$this, 'reorder_images'));
+			// Delete file via Ajax
+			add_action('wp_ajax_at_delete_mupload', array($this, 'wp_ajax_delete_image'));
+		}
+
+		/**
+		 * Add data encoding type for file uploading
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function add_enctype()
+		{
+			echo ' enctype="multipart/form-data"';
+		}
+
+		/**
+		 * Process images added to meta field.
+		 *
+		 * Modified from Faster Image Insert plugin.
+		 *
+		 * @return void
+		 * @author Cory Crowley
+		 */
+		public function insert_images()
+		{
+
+			// If post variables are empty, return.
+			if (!isset($_POST['at-insert']) || empty($_POST['attachments']))
+				return;
+
+			// Security Check
+			check_admin_referer('media-form');
+
+			// Create Security Nonce
+			$nonce = wp_create_nonce('at_ajax_delete');
+
+			// Get Post Id and Field Id
+			$term_id = $_POST['post_id'];
+			$id = $_POST['field_id'];
+
+			// Modify the insertion string
+			$html = '';
+			foreach ($_POST['attachments'] as $attachment_id => $attachment) {
+
+				// Strip Slashes
+				$attachment = stripslashes_deep($attachment);
+
+				// If not selected or url is empty, continue in loop.
+				if (empty($attachment['selected']) || empty($attachment['url']))
+					continue;
+
+				$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 .= "<input type='hidden' name='{$id}[]' value='{$attachment_id}' />";
+				$li .= "</li>";
+				$html .= $li;
+
+			} // End For Each
+
+			return media_send_to_editor($html);
+
+		}
+
+		/**
+		 * Delete attachments associated with the post.
+		 *
+		 * @since 1.0
+		 * @access public
+		 *
+		 * @param int|string $term_id The term ID.
+		 */
+		/*public function delete_attachments( $term_id ) {
 		
 		// Get Attachments
 		$attachments = get_posts( array( 'numberposts' => -1, 'post_type' => 'attachment', 'post_parent' => $term_id ) );
@@ -295,349 +295,349 @@ 
 		
 	}*/
 
-        /**
-         * Ajax callback for deleting files.
-         *
-         * Modified from a function used by "Verve Meta Boxes" plugin ( http://goo.gl/aw64H )
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function delete_file()
-        {
-
-
-            // If data is not set, die.
-            if (!isset($_POST['data']))
-                die();
-
-            list($nonce, $term_id, $key, $attach_id) = explode('|', $_POST['data']);
-
-            if (!wp_verify_nonce($nonce, 'at_ajax_delete'))
-                die('1');
-
-            $this->delete_tax_meta($term_id, $key, $attach_id);
-
-            die('0');
-
-        }
-
-        /**
-         * Ajax callback for deleting files.
-         * Modified from a function used by "Verve Meta Boxes" plugin (http://goo.gl/LzYSq)
-         * @since 1.0
-         * @access public
-         */
-        public function wp_ajax_delete_image()
-        {
-            $term_id = isset($_GET['post_id']) ? intval($_GET['post_id']) : 0;
-            $field_id = isset($_GET['field_id']) ? $_GET['field_id'] : 0;
-            $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));
-                if ($term_id > 0)
-                    $this->delete_tax_meta($term_id, $field_id);
-                //$ok = wp_delete_attachment( $attachment_id );
-                $ok = 1;
-            } else {
-                $f = explode('[', urldecode($field_id));
-                $f_fiexed = array();
-                foreach ($f as $k => $v) {
-                    $f[$k] = str_replace(']', '', $v);
-                }
-                $saved = $this->get_tax_meta($term_id, $f[0], true);
-                if (isset($saved[$f[1]][$f[2]])) {
-                    unset($saved[$f[1]][$f[2]]);
-                    if ($term_id > 0)
-                        update_post_meta($term_id, $f[0], $saved);
-                    //$ok = wp_delete_attachment( $attachment_id );
-                    $ok = 1;
-                }
-            }
-
-
-            if ($ok) {
-                echo json_encode(array('status' => 'success'));
-                die();
-            } else {
-                echo json_encode(array('message' => __('Cannot delete file. Something\'s wrong.', 'geodirectory')));
-                die();
-            }
-        }
-
-        /**
-         * Ajax callback for reordering Images.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function reorder_images()
-        {
-
-            if (!isset($_POST['data']))
-                die();
-
-            list($order, $term_id, $key, $nonce) = explode('|', $_POST['data']);
-
-            if (!wp_verify_nonce($nonce, 'at_ajax_reorder'))
-                die('1');
-
-            parse_str($order, $items);
-            $items = $items['item'];
-            $order = 1;
-            foreach ($items as $item) {
-                wp_update_post(array('ID' => $item, 'post_parent' => $term_id, 'menu_order' => $order));
-                $order++;
-            }
-
-            die('0');
-
-        }
-
-        /**
-         * Check Field Color
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function check_field_color()
-        {
-
-            if ($this->has_field('color') && $this->is_edit_page()) {
-                // Enqueu built-in script and style for color picker.
-                wp_enqueue_style('farbtastic');
-                wp_enqueue_script('farbtastic');
-            }
-
-        }
-
-        /**
-         * Check Field Date
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function check_field_date()
-        {
-
-            if ($this->has_field('date') && $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');
-                wp_enqueue_script('tmc-jquery-ui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/jquery-ui.min.js', array('jquery'));
-            }
-
-        }
-
-        /**
-         * Check Field Time
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function check_field_time()
-        {
-
-            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_script('at-timepicker', 'https://github.com/trentrichardson/jQuery-Timepicker-Addon/raw/master/jquery-ui-timepicker-addon.js', array('tmc-jquery-ui'), false, true);
-
-            }
-
-        }
-
-        /**
-         * Add Meta Box for multiple post types.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function add()
-        {
-
-            // Loop through array
-            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 fields to add 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);
-                    // this saves the add fields
-                    add_action('created_' . $page, array(&$this, 'save'), 10, 2);
-                }
-            }
-
-        }
-
-        /**
-         * Callback function to show fields on add new taxonomy term form.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function show_new_form($term_id)
-        {
-            $this->_form_type = 'new';
-            $this->show($term_id);
-        }
-
-        /**
-         * Callback function to show fields on term edit form.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function show_edit_form($term_id)
-        {
-            $this->_form_type = 'edit';
-            $this->show($term_id);
-        }
-
-
-        /**
-         * Callback function to show fields in meta box.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function show($term_id)
-        {
-
-            wp_nonce_field(basename(__FILE__), 'tax_meta_class_nonce');
-
-            foreach ($this->_fields as $field) {
-                $meta = $this->get_tax_meta($term_id, $field['id'], !$field['multiple']);
-                $meta = ($meta !== '') ? $meta : $field['std'];
-                if ('image' != $field['type'] && $field['type'] != 'repeater')
-                    $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'] . '">';
-                } else {
-                    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);
-                echo '</tr>';
-            }
-            echo '</table>';
-        }
-
-        /**
-         * Show Repeater Fields.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_repeater($field, $meta)
-        {
-            // Get Plugin Path
-            $plugin_path = $this->SelfPath;
-            $this->show_field_begin($field, $meta);
-            echo "<div class='at-repeat' id='{$field['id']}'>";
-
-            $c = 0;
-
-            if (count($meta) > 0 && is_array($meta)) {
-                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;">';
-                    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'] . ']';
-                        $m = $me[$f['id']];
-                        $m = ($m !== '') ? $m : $f['std'];
-                        if ('image' != $f['type'] && $f['type'] != 'repeater')
-                            $m = is_array($m) ? array_map('esc_attr', $m) : esc_attr($m);
-                        //set new id for field in array format
-                        $f['id'] = $id;
-                        if (!$field['inline']) {
-                            echo '<tr>';
-                        }
-                        call_user_func(array(&$this, 'show_field_' . $f['type']), $f, $m);
-                        if (!$field['inline']) {
-                            echo '</tr>';
-                        }
-                    }
-                    if ($field['inline']) {
-                        echo '</tr>';
-                    }
-                    echo '</table>
+		/**
+		 * Ajax callback for deleting files.
+		 *
+		 * Modified from a function used by "Verve Meta Boxes" plugin ( http://goo.gl/aw64H )
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function delete_file()
+		{
+
+
+			// If data is not set, die.
+			if (!isset($_POST['data']))
+				die();
+
+			list($nonce, $term_id, $key, $attach_id) = explode('|', $_POST['data']);
+
+			if (!wp_verify_nonce($nonce, 'at_ajax_delete'))
+				die('1');
+
+			$this->delete_tax_meta($term_id, $key, $attach_id);
+
+			die('0');
+
+		}
+
+		/**
+		 * Ajax callback for deleting files.
+		 * Modified from a function used by "Verve Meta Boxes" plugin (http://goo.gl/LzYSq)
+		 * @since 1.0
+		 * @access public
+		 */
+		public function wp_ajax_delete_image()
+		{
+			$term_id = isset($_GET['post_id']) ? intval($_GET['post_id']) : 0;
+			$field_id = isset($_GET['field_id']) ? $_GET['field_id'] : 0;
+			$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));
+				if ($term_id > 0)
+					$this->delete_tax_meta($term_id, $field_id);
+				//$ok = wp_delete_attachment( $attachment_id );
+				$ok = 1;
+			} else {
+				$f = explode('[', urldecode($field_id));
+				$f_fiexed = array();
+				foreach ($f as $k => $v) {
+					$f[$k] = str_replace(']', '', $v);
+				}
+				$saved = $this->get_tax_meta($term_id, $f[0], true);
+				if (isset($saved[$f[1]][$f[2]])) {
+					unset($saved[$f[1]][$f[2]]);
+					if ($term_id > 0)
+						update_post_meta($term_id, $f[0], $saved);
+					//$ok = wp_delete_attachment( $attachment_id );
+					$ok = 1;
+				}
+			}
+
+
+			if ($ok) {
+				echo json_encode(array('status' => 'success'));
+				die();
+			} else {
+				echo json_encode(array('message' => __('Cannot delete file. Something\'s wrong.', 'geodirectory')));
+				die();
+			}
+		}
+
+		/**
+		 * Ajax callback for reordering Images.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function reorder_images()
+		{
+
+			if (!isset($_POST['data']))
+				die();
+
+			list($order, $term_id, $key, $nonce) = explode('|', $_POST['data']);
+
+			if (!wp_verify_nonce($nonce, 'at_ajax_reorder'))
+				die('1');
+
+			parse_str($order, $items);
+			$items = $items['item'];
+			$order = 1;
+			foreach ($items as $item) {
+				wp_update_post(array('ID' => $item, 'post_parent' => $term_id, 'menu_order' => $order));
+				$order++;
+			}
+
+			die('0');
+
+		}
+
+		/**
+		 * Check Field Color
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function check_field_color()
+		{
+
+			if ($this->has_field('color') && $this->is_edit_page()) {
+				// Enqueu built-in script and style for color picker.
+				wp_enqueue_style('farbtastic');
+				wp_enqueue_script('farbtastic');
+			}
+
+		}
+
+		/**
+		 * Check Field Date
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function check_field_date()
+		{
+
+			if ($this->has_field('date') && $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');
+				wp_enqueue_script('tmc-jquery-ui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/jquery-ui.min.js', array('jquery'));
+			}
+
+		}
+
+		/**
+		 * Check Field Time
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function check_field_time()
+		{
+
+			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_script('at-timepicker', 'https://github.com/trentrichardson/jQuery-Timepicker-Addon/raw/master/jquery-ui-timepicker-addon.js', array('tmc-jquery-ui'), false, true);
+
+			}
+
+		}
+
+		/**
+		 * Add Meta Box for multiple post types.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function add()
+		{
+
+			// Loop through array
+			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 fields to add 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);
+					// this saves the add fields
+					add_action('created_' . $page, array(&$this, 'save'), 10, 2);
+				}
+			}
+
+		}
+
+		/**
+		 * Callback function to show fields on add new taxonomy term form.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_new_form($term_id)
+		{
+			$this->_form_type = 'new';
+			$this->show($term_id);
+		}
+
+		/**
+		 * Callback function to show fields on term edit form.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_edit_form($term_id)
+		{
+			$this->_form_type = 'edit';
+			$this->show($term_id);
+		}
+
+
+		/**
+		 * Callback function to show fields in meta box.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show($term_id)
+		{
+
+			wp_nonce_field(basename(__FILE__), 'tax_meta_class_nonce');
+
+			foreach ($this->_fields as $field) {
+				$meta = $this->get_tax_meta($term_id, $field['id'], !$field['multiple']);
+				$meta = ($meta !== '') ? $meta : $field['std'];
+				if ('image' != $field['type'] && $field['type'] != 'repeater')
+					$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'] . '">';
+				} else {
+					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);
+				echo '</tr>';
+			}
+			echo '</table>';
+		}
+
+		/**
+		 * Show Repeater Fields.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_repeater($field, $meta)
+		{
+			// Get Plugin Path
+			$plugin_path = $this->SelfPath;
+			$this->show_field_begin($field, $meta);
+			echo "<div class='at-repeat' id='{$field['id']}'>";
+
+			$c = 0;
+
+			if (count($meta) > 0 && is_array($meta)) {
+				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;">';
+					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'] . ']';
+						$m = $me[$f['id']];
+						$m = ($m !== '') ? $m : $f['std'];
+						if ('image' != $f['type'] && $f['type'] != 'repeater')
+							$m = is_array($m) ? array_map('esc_attr', $m) : esc_attr($m);
+						//set new id for field in array format
+						$f['id'] = $id;
+						if (!$field['inline']) {
+							echo '<tr>';
+						}
+						call_user_func(array(&$this, 'show_field_' . $f['type']), $f, $m);
+						if (!$field['inline']) {
+							echo '</tr>';
+						}
+					}
+					if ($field['inline']) {
+						echo '</tr>';
+					}
+					echo '</table>
 				<span class="at-re-toggle"><img src="';
-                    if ($this->_Local_images) {
-                        echo $plugin_path . '/images/edit.png';
-                    } else {
-                        echo 'http://i.imgur.com/ka0E2.png';
-                    }
-                    echo '" alt="Edit" title="Edit"/></span> 
+					if ($this->_Local_images) {
+						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';
-                    } else {
-                        echo 'http://i.imgur.com/g8Duj.png';
-                    }
-                    echo '" alt="' . __('Remove', 'geodirectory') . '" title="' . __('Remove', 'geodirectory') . '" id="remove-' . $field['id'] . '"></div>';
-                    $c = $c + 1;
-
-                }
-                $this->show_field_end($field, $meta);
-            }
-
-            echo '<img src="';
-            if ($this->_Local_images) {
-                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>';
-
-            //create all fields once more for js function and catch with object buffer
-            ob_start();
-            echo '<div class="at-repater-block"><table class="repeater-table">';
-            if ($field['inline']) {
-                echo '<tr class="at-inline" VALIGN="top">';
-            }
-            foreach ($field['fields'] as $f) {
-                //reset var $id for repeater
-                $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, '');
-                if (!$field['inline']) {
-                    echo '</tr>';
-                }
-            }
-            if ($field['inline']) {
-                echo '</tr>';
-            }
-            echo '</table><img src="';
-            if ($this->_Local_images) {
-                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'];
-            $js_code = ob_get_clean();
-            $js_code = str_replace("'", "\"", $js_code);
-            $js_code = str_replace("CurrentCounter", "' + " . $counter . " + '", $js_code);
-            echo '<script>
+					if ($this->_Local_images) {
+						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>';
+					$c = $c + 1;
+
+				}
+				$this->show_field_end($field, $meta);
+			}
+
+			echo '<img src="';
+			if ($this->_Local_images) {
+				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>';
+
+			//create all fields once more for js function and catch with object buffer
+			ob_start();
+			echo '<div class="at-repater-block"><table class="repeater-table">';
+			if ($field['inline']) {
+				echo '<tr class="at-inline" VALIGN="top">';
+			}
+			foreach ($field['fields'] as $f) {
+				//reset var $id for repeater
+				$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, '');
+				if (!$field['inline']) {
+					echo '</tr>';
+				}
+			}
+			if ($field['inline']) {
+				echo '</tr>';
+			}
+			echo '</table><img src="';
+			if ($this->_Local_images) {
+				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'];
+			$js_code = ob_get_clean();
+			$js_code = str_replace("'", "\"", $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() {
@@ -650,7 +650,7 @@ 
         			});
     			});
     		</script>';
-            echo '<br/><style>
+			echo '<br/><style>
 .at-inline{line-height: 1 !important;}
 .at-inline .at-field{border: 0px !important;}
 .at-inline .at-label{margin: 0 0 1px !important;}
@@ -658,532 +658,532 @@ 
 .at-inline .at-textarea{width: 100px; height: 75px;}
 .at-repater-block{background-color: #FFFFFF;border: 1px solid;margin: 2px;}
 </style>';
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Begin Field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_begin($field, $meta)
-        {
-            if (isset($field['group'])) {
-                if ($field['group'] == "start") {
-                    echo "<td class='at-field'>";
-                }
-            } else {
-                if ($this->_form_type == 'edit') {
-                    echo '<th valign="top" scope="row">';
-                } else {
-                    if ($field['validate_func']) {
-                        echo '<td><div class="form-field form-required">';
-                    } else {
-                        echo '<td><div class="form-field">';
-                    }
-                }
-            }
-            if ($field['name'] != '' || $field['name'] != FALSE) {
-                //echo "<div class='at-label'>";
-                echo "<label for='{$field['id']}'>{$field['name']}</label>";
-                //echo "</div>";
-            }
-            if ($this->_form_type == 'edit') {
-                echo '</th><td>';
-            }
-        }
-
-        /**
-         * End Field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_end($field, $meta = NULL, $group = false)
-        {
-            if (isset($field['group'])) {
-                if ($group == 'end') {
-                    if ($field['desc'] != '') {
-                        echo "<p class='desc-field'>{$field['desc']}</p></td>";
-                    } else {
-                        echo "</td>";
-                    }
-                } else {
-                    if ($field['desc'] != '') {
-                        echo "<p class='desc-field'>{$field['desc']}</p><br/>";
-                    } else {
-                        echo '<br/>';
-                    }
-                }
-            } else {
-                if ($field['desc'] != '') {
-                    echo "<p class='desc-field'>{$field['desc']}</p>";
-                }
-                if ($this->_form_type == 'edit') {
-                    echo '</td>';
-                } else {
-                    echo '</td></div>';
-                }
-            }
-        }
-
-        /**
-         * Show Field Text.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_text($field, $meta)
-        {
-            $this->show_field_begin($field, $meta);
-            echo "<input type='text' class='at-text' name='{$field['id']}' id='{$field['id']}' value='{$meta}' size='30' />";
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Field hidden.
-         *
-         * @param string $field
-         * @param string|mixed $meta
-         * @since 0.1.3
-         * @access public
-         */
-        public function show_field_hidden($field, $meta)
-        {
-            //$this->show_field_begin( $field, $meta );
-            echo "<input type='hidden' class='at-text' name='{$field['id']}' id='{$field['id']}' value='{$meta}'/>";
-            //$this->show_field_end( $field, $meta );
-        }
-
-        /**
-         * Show Field Paragraph.
-         *
-         * @param string $field
-         * @since 0.1.3
-         * @access public
-         */
-        public function show_field_paragraph($field)
-        {
-            //$this->show_field_begin( $field, $meta );
-            echo '<p>' . $field['value'] . '</p>';
-            //$this->show_field_end( $field, $meta );
-        }
-
-        /**
-         * Show Field Textarea.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_textarea($field, $meta)
-        {
-            $this->show_field_begin($field, $meta);
-            echo "<textarea class='at-textarea large-text' name='{$field['id']}' id='{$field['id']}' cols='60' rows='10'>{$meta}</textarea>";
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Field Select.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_select($field, $meta)
-        {
-
-            if (!is_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'" : "'") . ">";
-            foreach ($field['options'] as $key => $value) {
-                echo "<option value='{$key}'" . selected(in_array($key, $meta), true, false) . ">{$value}</option>";
-            }
-            echo "</select>";
-            $this->show_field_end($field, $meta);
-
-        }
-
-        /**
-         * Show Radio Field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_radio($field, $meta)
-        {
-
-            if (!is_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>";
-            }
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Checkbox Field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_checkbox($field, $meta)
-        {
-
-            $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']}";
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Wysiwig Field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_wysiwyg($field, $meta)
-        {
-            $this->show_field_begin($field, $meta);
-            // Add TinyMCE script for WP version < 3.3
-            global $wp_version;
-
-            if (version_compare($wp_version, '3.2.1') < 1) {
-                echo "<textarea class='at-wysiwyg theEditor large-text' name='{$field['id']}' id='{$field['id']}' cols='60' rows='10'>{$meta}</textarea>";
-            } else {
-                // Use new wp_editor() since WP 3.3
-                wp_editor(stripslashes(html_entity_decode($meta)), $field['id'], array('editor_class' => 'at-wysiwyg'));
-            }
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show File Field.
-         *
-         * @global object $post The current post object.
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_file($field, $meta)
-        {
-
-            global $post;
-
-            if (!is_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 '<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 '</ol>';
-            }
-
-            // show form upload
-
-            echo "<div class='at-file-upload-label'>";
-            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 "</div><!-- End .new-files -->";
-            echo "</td>";
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Image Field.
-         *
-         * @param array $field
-         * @param array $meta
-         * @since 1.0
-         * @access public
-         */
-        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);
-            if (is_array($meta)) {
-                if (isset($meta[0]) && is_array($meta[0]))
-                    $meta = $meta[0];
-            }
-
-            $uploads = wp_upload_dir();
-            if (is_array($meta) && isset($meta['src']) && $meta['src'] != '') {
-
-                $file_info = pathinfo($meta['src']);
-
-                //print_r($meta);
-                //print_r($uploads);
-                //print_r($file_info);
-
-                if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')
-                    $sub_dir = $file_info['dirname'];
-
-                $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs	
-                $uploads_baseurl = $uploads['baseurl'];
-                $uploads_path = $uploads['path'];
-
-                $file_name = $file_info['basename'];
-
-                $sub_dir = str_replace($uploads_baseurl, '', $sub_dir);
-
-                $uploads_url = $uploads_baseurl . $sub_dir;
-
-                $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') . "' />";
-            } 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') . "' />";
-            }
-            echo $html;
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Color Field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_color($field, $meta)
-        {
-
-            if (empty($meta))
-                $meta = '#';
-
-            $this->show_field_begin($field, $meta);
-
-            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 "<div style='display:none' class='at-color-picker' rel='{$field['id']}'></div>";
-            $this->show_field_end($field, $meta);
-
-        }
-
-        /**
-         * Show Checkbox List Field
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_checkbox_list($field, $meta)
-        {
-
-            if (!is_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}";
-            }
-
-            echo implode('<br />', $html);
-
-            $this->show_field_end($field, $meta);
-
-        }
-
-        /**
-         * Show Date Field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_date($field, $meta)
-        {
-            $this->show_field_begin($field, $meta);
-            echo "<input type='text' class='at-date' name='{$field['id']}' id='{$field['id']}' rel='{$field['format']}' value='{$meta}' size='30' />";
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show time field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_time($field, $meta)
-        {
-            $this->show_field_begin($field, $meta);
-            echo "<input type='text' class='at-time' name='{$field['id']}' id='{$field['id']}' rel='{$field['format']}' value='{$meta}' size='30' />";
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Posts field.
-         * used creating a posts/pages/custom types checkboxlist or a select dropdown
-         *
-         * @global object $post The current post object.
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_posts($field, $meta)
-        {
-            global $post;
-
-            if (!is_array($meta)) $meta = (array)$meta;
-            $this->show_field_begin($field, $meta);
-            $options = $field['options'];
-            $posts = get_posts($options['args']);
-
-            // 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/>";
-                }
-            } // select
-            else {
-                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 "</select>";
-            }
-
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Taxonomy field.
-         * used creating a category/tags/custom taxonomy checkboxlist or a select dropdown
-         *
-         * @global object $post The current post object.
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         *
-         * @uses get_terms()
-         */
-        public function show_field_taxonomy($field, $meta)
-        {
-            global $post;
-
-            if (!is_array($meta)) $meta = (array)$meta;
-            $this->show_field_begin($field, $meta);
-            $options = $field['options'];
-            $terms = get_terms($options['taxonomy'], $options['args']);
-
-            // 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/>";
-                }
-            } // select
-            else {
-                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 "</select>";
-            }
-
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Save Data from Metabox
-         *
-         * @param string $term_id The term ID.
-         * @since 1.0
-         * @access public
-         * @return string
-         */
-        public function save($term_id)
-        {
-
-            $taxnow = '';
-            if (isset($_POST['taxonomy']))
-                $taxnow = $_POST['taxonomy'];
-
-            if (!isset($term_id)                                                        // Check Revision
-                || (!in_array($taxnow, $this->_meta_box['pages']))                            // Check if current taxonomy type is supported.
-                || (!check_admin_referer(basename(__FILE__), 'tax_meta_class_nonce'))        // Check nonce - Security
-                || (!current_user_can('manage_categories'))
-            )                                // Check permission
-            {
-                return $term_id;
-            }
-
-
-            foreach ($this->_fields as $field) {
-
-                $name = $field['id'];
-                $type = $field['type'];
-                $old = $this->get_tax_meta($term_id, $name, !$field['multiple']);
-                $new = (isset($_POST[$name])) ? $_POST[$name] : (($field['multiple']) ? array() : '');
-
-                // Validate meta value
-                if (class_exists('Tax_Meta_Validate') && method_exists('Tax_Meta_Validate', $field['validate_func'])) {
-                    $new = call_user_func(array('Tax_Meta_Validate', $field['validate_func']), $new);
-                }
-
-
-                if ($name == 'ct_cat_icon') {
-
-                    $upload_dir = wp_upload_dir();
-
-                    $image_name_arr = explode('/', $new['src']);
-                    //$old_filename = end($image_name_arr);
-                    //$img_name_arr = explode('.',$old_filename);
-
-                    //$old_filename = $upload_dir['path'].'/'.$old_filename;
-
-                    $new_filename = $upload_dir['path'] . '/' . 'cat_icon_' . $term_id . '.png';
-
-                    /*rename($old_filename, $new_filename);
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Begin Field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_begin($field, $meta)
+		{
+			if (isset($field['group'])) {
+				if ($field['group'] == "start") {
+					echo "<td class='at-field'>";
+				}
+			} else {
+				if ($this->_form_type == 'edit') {
+					echo '<th valign="top" scope="row">';
+				} else {
+					if ($field['validate_func']) {
+						echo '<td><div class="form-field form-required">';
+					} else {
+						echo '<td><div class="form-field">';
+					}
+				}
+			}
+			if ($field['name'] != '' || $field['name'] != FALSE) {
+				//echo "<div class='at-label'>";
+				echo "<label for='{$field['id']}'>{$field['name']}</label>";
+				//echo "</div>";
+			}
+			if ($this->_form_type == 'edit') {
+				echo '</th><td>';
+			}
+		}
+
+		/**
+		 * End Field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_end($field, $meta = NULL, $group = false)
+		{
+			if (isset($field['group'])) {
+				if ($group == 'end') {
+					if ($field['desc'] != '') {
+						echo "<p class='desc-field'>{$field['desc']}</p></td>";
+					} else {
+						echo "</td>";
+					}
+				} else {
+					if ($field['desc'] != '') {
+						echo "<p class='desc-field'>{$field['desc']}</p><br/>";
+					} else {
+						echo '<br/>';
+					}
+				}
+			} else {
+				if ($field['desc'] != '') {
+					echo "<p class='desc-field'>{$field['desc']}</p>";
+				}
+				if ($this->_form_type == 'edit') {
+					echo '</td>';
+				} else {
+					echo '</td></div>';
+				}
+			}
+		}
+
+		/**
+		 * Show Field Text.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_text($field, $meta)
+		{
+			$this->show_field_begin($field, $meta);
+			echo "<input type='text' class='at-text' name='{$field['id']}' id='{$field['id']}' value='{$meta}' size='30' />";
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Field hidden.
+		 *
+		 * @param string $field
+		 * @param string|mixed $meta
+		 * @since 0.1.3
+		 * @access public
+		 */
+		public function show_field_hidden($field, $meta)
+		{
+			//$this->show_field_begin( $field, $meta );
+			echo "<input type='hidden' class='at-text' name='{$field['id']}' id='{$field['id']}' value='{$meta}'/>";
+			//$this->show_field_end( $field, $meta );
+		}
+
+		/**
+		 * Show Field Paragraph.
+		 *
+		 * @param string $field
+		 * @since 0.1.3
+		 * @access public
+		 */
+		public function show_field_paragraph($field)
+		{
+			//$this->show_field_begin( $field, $meta );
+			echo '<p>' . $field['value'] . '</p>';
+			//$this->show_field_end( $field, $meta );
+		}
+
+		/**
+		 * Show Field Textarea.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_textarea($field, $meta)
+		{
+			$this->show_field_begin($field, $meta);
+			echo "<textarea class='at-textarea large-text' name='{$field['id']}' id='{$field['id']}' cols='60' rows='10'>{$meta}</textarea>";
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Field Select.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_select($field, $meta)
+		{
+
+			if (!is_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'" : "'") . ">";
+			foreach ($field['options'] as $key => $value) {
+				echo "<option value='{$key}'" . selected(in_array($key, $meta), true, false) . ">{$value}</option>";
+			}
+			echo "</select>";
+			$this->show_field_end($field, $meta);
+
+		}
+
+		/**
+		 * Show Radio Field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_radio($field, $meta)
+		{
+
+			if (!is_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>";
+			}
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Checkbox Field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_checkbox($field, $meta)
+		{
+
+			$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']}";
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Wysiwig Field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_wysiwyg($field, $meta)
+		{
+			$this->show_field_begin($field, $meta);
+			// Add TinyMCE script for WP version < 3.3
+			global $wp_version;
+
+			if (version_compare($wp_version, '3.2.1') < 1) {
+				echo "<textarea class='at-wysiwyg theEditor large-text' name='{$field['id']}' id='{$field['id']}' cols='60' rows='10'>{$meta}</textarea>";
+			} else {
+				// Use new wp_editor() since WP 3.3
+				wp_editor(stripslashes(html_entity_decode($meta)), $field['id'], array('editor_class' => 'at-wysiwyg'));
+			}
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show File Field.
+		 *
+		 * @global object $post The current post object.
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_file($field, $meta)
+		{
+
+			global $post;
+
+			if (!is_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 '<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 '</ol>';
+			}
+
+			// show form upload
+
+			echo "<div class='at-file-upload-label'>";
+			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 "</div><!-- End .new-files -->";
+			echo "</td>";
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Image Field.
+		 *
+		 * @param array $field
+		 * @param array $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		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);
+			if (is_array($meta)) {
+				if (isset($meta[0]) && is_array($meta[0]))
+					$meta = $meta[0];
+			}
+
+			$uploads = wp_upload_dir();
+			if (is_array($meta) && isset($meta['src']) && $meta['src'] != '') {
+
+				$file_info = pathinfo($meta['src']);
+
+				//print_r($meta);
+				//print_r($uploads);
+				//print_r($file_info);
+
+				if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')
+					$sub_dir = $file_info['dirname'];
+
+				$uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs	
+				$uploads_baseurl = $uploads['baseurl'];
+				$uploads_path = $uploads['path'];
+
+				$file_name = $file_info['basename'];
+
+				$sub_dir = str_replace($uploads_baseurl, '', $sub_dir);
+
+				$uploads_url = $uploads_baseurl . $sub_dir;
+
+				$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') . "' />";
+			} 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') . "' />";
+			}
+			echo $html;
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Color Field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_color($field, $meta)
+		{
+
+			if (empty($meta))
+				$meta = '#';
+
+			$this->show_field_begin($field, $meta);
+
+			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 "<div style='display:none' class='at-color-picker' rel='{$field['id']}'></div>";
+			$this->show_field_end($field, $meta);
+
+		}
+
+		/**
+		 * Show Checkbox List Field
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_checkbox_list($field, $meta)
+		{
+
+			if (!is_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}";
+			}
+
+			echo implode('<br />', $html);
+
+			$this->show_field_end($field, $meta);
+
+		}
+
+		/**
+		 * Show Date Field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_date($field, $meta)
+		{
+			$this->show_field_begin($field, $meta);
+			echo "<input type='text' class='at-date' name='{$field['id']}' id='{$field['id']}' rel='{$field['format']}' value='{$meta}' size='30' />";
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show time field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_time($field, $meta)
+		{
+			$this->show_field_begin($field, $meta);
+			echo "<input type='text' class='at-time' name='{$field['id']}' id='{$field['id']}' rel='{$field['format']}' value='{$meta}' size='30' />";
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Posts field.
+		 * used creating a posts/pages/custom types checkboxlist or a select dropdown
+		 *
+		 * @global object $post The current post object.
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_posts($field, $meta)
+		{
+			global $post;
+
+			if (!is_array($meta)) $meta = (array)$meta;
+			$this->show_field_begin($field, $meta);
+			$options = $field['options'];
+			$posts = get_posts($options['args']);
+
+			// 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/>";
+				}
+			} // select
+			else {
+				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 "</select>";
+			}
+
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Taxonomy field.
+		 * used creating a category/tags/custom taxonomy checkboxlist or a select dropdown
+		 *
+		 * @global object $post The current post object.
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 *
+		 * @uses get_terms()
+		 */
+		public function show_field_taxonomy($field, $meta)
+		{
+			global $post;
+
+			if (!is_array($meta)) $meta = (array)$meta;
+			$this->show_field_begin($field, $meta);
+			$options = $field['options'];
+			$terms = get_terms($options['taxonomy'], $options['args']);
+
+			// 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/>";
+				}
+			} // select
+			else {
+				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 "</select>";
+			}
+
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Save Data from Metabox
+		 *
+		 * @param string $term_id The term ID.
+		 * @since 1.0
+		 * @access public
+		 * @return string
+		 */
+		public function save($term_id)
+		{
+
+			$taxnow = '';
+			if (isset($_POST['taxonomy']))
+				$taxnow = $_POST['taxonomy'];
+
+			if (!isset($term_id)                                                        // Check Revision
+				|| (!in_array($taxnow, $this->_meta_box['pages']))                            // Check if current taxonomy type is supported.
+				|| (!check_admin_referer(basename(__FILE__), 'tax_meta_class_nonce'))        // Check nonce - Security
+				|| (!current_user_can('manage_categories'))
+			)                                // Check permission
+			{
+				return $term_id;
+			}
+
+
+			foreach ($this->_fields as $field) {
+
+				$name = $field['id'];
+				$type = $field['type'];
+				$old = $this->get_tax_meta($term_id, $name, !$field['multiple']);
+				$new = (isset($_POST[$name])) ? $_POST[$name] : (($field['multiple']) ? array() : '');
+
+				// Validate meta value
+				if (class_exists('Tax_Meta_Validate') && method_exists('Tax_Meta_Validate', $field['validate_func'])) {
+					$new = call_user_func(array('Tax_Meta_Validate', $field['validate_func']), $new);
+				}
+
+
+				if ($name == 'ct_cat_icon') {
+
+					$upload_dir = wp_upload_dir();
+
+					$image_name_arr = explode('/', $new['src']);
+					//$old_filename = end($image_name_arr);
+					//$img_name_arr = explode('.',$old_filename);
+
+					//$old_filename = $upload_dir['path'].'/'.$old_filename;
+
+					$new_filename = $upload_dir['path'] . '/' . 'cat_icon_' . $term_id . '.png';
+
+					/*rename($old_filename, $new_filename);
 				
 				//subdir
 				$new['src'] = $upload_dir['url'].'/'.'cat_icon_'.$term_id.'.png';
@@ -1191,7 +1191,7 @@ 
 				update_attached_file( $new['id'], $new['src'] );*/
 
 
-                    /*	
+					/*	
 		
 		$new['src'] = $upload_dir['url'].'/'.'cat_icon_'.$term_id.'.png';
 		
@@ -1216,67 +1216,67 @@ 
 		$attach_id = wp_insert_attachment( $attachment, $filename);*/
 
 
-                }
-
-
-                //skip on Paragraph field
-                if ($type != "paragraph") {
-
-                    // Call defined method to save meta value, if there's no methods, call common one.
-                    $save_func = 'save_field_' . $type;
-                    if (method_exists($this, $save_func)) {
-                        call_user_func(array(&$this, 'save_field_' . $type), $term_id, $field, $old, $new);
-                    } else {
-                        $this->save_field($term_id, $field, $old, $new);
-                    }
-                }
-
-            } // End foreach
-
-        }
-
-        /**
-         * Common function for saving fields.
-         *
-         * @param string $term_id The term ID.
-         * @param string $field
-         * @param string $old
-         * @param string|mixed $new
-         * @since 1.0
-         * @access public
-         */
-        public function save_field($term_id, $field, $old, $new)
-        {
-            $name = $field['id'];
-            $this->delete_tax_meta($term_id, $name);
-            if ($new === '' || $new === array())
-                return;
-
-            $this->update_tax_meta($term_id, $name, $new);
-        }
-
-        /**
-         * function for saving image field.
-         *
-         * @param string $term_id The term ID.
-         * @param string $field
-         * @param string $old
-         * @param string|mixed $new
-         * @since 1.0
-         * @access public
-         */
-        public function save_field_image($term_id, $field, $old, $new)
-        {
-            $name = $field['id'];
-
-            $this->delete_tax_meta($term_id, $name);
-            if ($new === '' || $new === array() || $new['id'] == '' || $new['src'] == '')
-                return;
-
-            $this->update_tax_meta($term_id, $name, $new);
-        }
-
-        /*
+				}
+
+
+				//skip on Paragraph field
+				if ($type != "paragraph") {
+
+					// Call defined method to save meta value, if there's no methods, call common one.
+					$save_func = 'save_field_' . $type;
+					if (method_exists($this, $save_func)) {
+						call_user_func(array(&$this, 'save_field_' . $type), $term_id, $field, $old, $new);
+					} else {
+						$this->save_field($term_id, $field, $old, $new);
+					}
+				}
+
+			} // End foreach
+
+		}
+
+		/**
+		 * Common function for saving fields.
+		 *
+		 * @param string $term_id The term ID.
+		 * @param string $field
+		 * @param string $old
+		 * @param string|mixed $new
+		 * @since 1.0
+		 * @access public
+		 */
+		public function save_field($term_id, $field, $old, $new)
+		{
+			$name = $field['id'];
+			$this->delete_tax_meta($term_id, $name);
+			if ($new === '' || $new === array())
+				return;
+
+			$this->update_tax_meta($term_id, $name, $new);
+		}
+
+		/**
+		 * function for saving image field.
+		 *
+		 * @param string $term_id The term ID.
+		 * @param string $field
+		 * @param string $old
+		 * @param string|mixed $new
+		 * @since 1.0
+		 * @access public
+		 */
+		public function save_field_image($term_id, $field, $old, $new)
+		{
+			$name = $field['id'];
+
+			$this->delete_tax_meta($term_id, $name);
+			if ($new === '' || $new === array() || $new['id'] == '' || $new['src'] == '')
+				return;
+
+			$this->update_tax_meta($term_id, $name, $new);
+		}
+
+		/*
 	 * Save Wysiwyg Field.
 	 *
 	 * @param string $term_id The term ID. 
@@ -1286,806 +1286,806 @@ 
 	 * @since 1.0
 	 * @access public 
 	 */
-        public function save_field_wysiwyg($term_id, $field, $old, $new)
-        {
-            $this->save_field($term_id, $field, $old, $new);
-        }
-
-        /**
-         * Save repeater Fields.
-         *
-         * @param string $term_id The term ID.
-         * @param string $field
-         * @param string|mixed $old
-         * @param string|mixed $new
-         * @since 1.0
-         * @access public
-         */
-        public function save_field_repeater($term_id, $field, $old, $new)
-        {
-            if (is_array($new) && count($new) > 0) {
-                foreach ($new as $n) {
-                    foreach ($field['fields'] as $f) {
-                        $type = $f['type'];
-                        switch ($type) {
-                            case 'wysiwyg':
-                                $n[$f['id']] = wpautop($n[$f['id']]);
-                                break;
-                            case 'file':
-                                $n[$f['id']] = $this->save_field_file_repeater($term_id, $f, '', $n[$f['id']]);
-                                break;
-                            default:
-                                break;
-                        }
-                    }
-                    if (!$this->is_array_empty($n))
-                        $temp[] = $n;
-                }
-                if (isset($temp) && count($temp) > 0 && !$this->is_array_empty($temp)) {
-                    $this->update_tax_meta($term_id, $field['id'], $temp);
-                } else {
-                    //	remove old meta if exists
-                    delete_post_meta($term_id, $field['id']);
-                }
-            } else {
-                //	remove old meta if exists
-                delete_post_meta($term_id, $field['id']);
-            }
-        }
-
-        /**
-         * Save File Field.
-         *
-         * @param string $term_id The term ID.
-         * @param string $field
-         * @param string $old
-         * @param string $new
-         * @since 1.0
-         * @access public
-         */
-        public function save_field_file($term_id, $field, $old, $new)
-        {
-
-            $name = $field['id'];
-            if (empty($_FILES[$name]))
-                return;
-            $this->fix_file_array($_FILES[$name]);
-            foreach ($_FILES[$name] as $position => $fileitem) {
-
-                $file = wp_handle_upload($fileitem, array('test_form' => false));
-                if (empty($file['file']))
-                    continue;
-                $filename = $file['file'];
-
-                $attachment = array(
-                    'post_mime_type' => $file['type'],
-                    'guid' => $file['url'],
-                    'post_parent' => $term_id,
-                    'post_title' => preg_replace('/\.[^.]+$/', '', basename($filename)),
-                    'post_content' => ''
-                );
-
-                $id = wp_insert_attachment($attachment, $filename, $term_id);
-
-                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
-
-                } // End if
-
-            } // End foreach
-
-        }
-
-        /**
-         * Save repeater File Field.
-         * @param string $term_id The term ID.
-         * @param string $field
-         * @param string $old
-         * @param string $new
-         * @since 1.0
-         * @access public
-         * @return int|void
-         */
-        public function save_field_file_repeater($term_id, $field, $old, $new)
-        {
-
-            $name = $field['id'];
-            if (empty($_FILES[$name]))
-                return;
-            $this->fix_file_array($_FILES[$name]);
-            foreach ($_FILES[$name] as $position => $fileitem) {
-
-                $file = wp_handle_upload($fileitem, array('test_form' => false));
-                if (empty($file['file']))
-                    continue;
-                $filename = $file['file'];
-
-                $attachment = array(
-                    'post_mime_type' => $file['type'],
-                    'guid' => $file['url'],
-                    'post_parent' => $term_id,
-                    'post_title' => preg_replace('/\.[^.]+$/', '', basename($filename)),
-                    'post_content' => ''
-                );
-
-                $id = wp_insert_attachment($attachment, $filename);
-
-                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
-                } // End if
-            } // End foreach
-        }
-
-        /**
-         * Add missed values for meta box.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function add_missed_values()
-        {
-
-            // Default values for meta box
-            $this->_meta_box = array_merge(array('context' => 'normal', 'priority' => 'high', 'pages' => array('post')), (array)$this->_meta_box);
-
-            if(is_array($this->_fields)) {
-                // Default values for fields
-                foreach ($this->_fields as &$field) {
-                    $multiple = in_array($field['type'], array('checkbox_list', 'file', 'image'));
-                    $std = $multiple ? array() : '';
-                    $format = 'date' == $field['type'] ? 'yy-mm-dd' : ('time' == $field['type'] ? 'hh:mm' : '');
-                    $field = array_merge(array('multiple' => $multiple, 'std' => $std, 'desc' => '', 'format' => $format, 'validate_func' => ''), $field);
-                } // End foreach
-            }
-        }
-
-        /**
-         * Check if field with $type exists.
-         *
-         * @param string $type
-         * @since 1.0
-         * @access public
-         */
-        public function has_field($type)
-        {
-            if(is_array($this->_fields)) {
-                foreach ($this->_fields as $field) {
-                    if ($type == $field['type'])
-                        return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Check if current page is edit page.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function is_edit_page()
-        {
-            global $pagenow;
-            return ($pagenow == 'edit-tags.php' || $pagenow == 'term.php');
-        }
-
-        /**
-         * Fixes the odd indexing of multiple file uploads.
-         *
-         * Goes from the format:
-         * $_FILES['field']['key']['index']
-         * to
-         * The More standard and appropriate:
-         * $_FILES['field']['index']['key']
-         *
-         * @param string $files
-         * @since 1.0
-         * @access public
-         */
-        public function fix_file_array(&$files)
-        {
-
-            $output = array();
-
-            foreach ($files as $key => $list) {
-                foreach ($list as $index => $value) {
-                    $output[$index][$key] = $value;
-                }
-            }
-
-            return $files = $output;
-
-        }
-
-        /**
-         * Get proper JQuery UI version.
-         *
-         * Used in order to not conflict with WP Admin Scripts.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function get_jqueryui_ver()
-        {
-
-            global $wp_version;
-
-            if (version_compare($wp_version, '3.1', '>=')) {
-                return '1.8.10';
-            }
-
-            return '1.7.3';
-
-        }
-
-        /**
-         *  Add Field to meta box (generic function)
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         */
-        public function addField($id, $args)
-        {
-            $new_field = array('id' => $id, 'std' => '', 'desc' => '', 'style' => '');
-            $new_field = array_merge($new_field, $args);
-            $this->_fields[] = $new_field;
-        }
-
-
-        /**
-         *  Add Text Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'style' =>    // custom style for field, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addText($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'text', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Text Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Hidden Field to meta box
-         * @author Ohad Raz
-         * @since 0.1.3
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'style' =>    // custom style for field, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addHidden($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'hidden', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Text Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Paragraph to meta box
-         * @author Ohad Raz
-         * @since 0.1.3
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $value  paragraph html
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addParagraph($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'paragraph', 'id' => $id, 'value' => '', 'style' => '');
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Checkbox Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addCheckbox($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'checkbox', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Checkbox Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add CheckboxList Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $options (array)  array of key => value pairs for select options
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         *
-         * @return : remember to call: $checkbox_list = $this->get_tax_meta(get_the_ID(), 'meta_name', false);
-         *   which means the last param as false to get the values in an array
-         */
-        public function addCheckboxList($id, $options, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'checkbox_list', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Checkbox List Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Textarea Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'style' =>    // custom style for field, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addTextarea($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'textarea', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Textarea Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Select Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string field id, i.e. the meta key
-         * @param $options (array)  array of key => value pairs for select options
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, (array) optional
-         *    'multiple' => // select multiple values, optional. Default is false.
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addSelect($id, $options, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'select', 'id' => $id, 'std' => array(), 'desc' => '', 'style' => '', 'name' => __('Select Field', 'geodirectory'), 'multiple' => false, 'options' => $options);
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-
-        /**
-         *  Add Radio Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string field id, i.e. the meta key
-         * @param $options (array)  array of key => value pairs for radio options
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addRadio($id, $options, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'radio', 'id' => $id, 'std' => array(), 'desc' => '', 'style' => '', 'name' => __('Radio Field', 'geodirectory'), 'options' => $options);
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Date Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         *    'format' => // date format, default yy-mm-dd. Optional. Default "'d MM, yy'"  See more formats here: http://goo.gl/Wcwxn
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addDate($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'date', 'id' => $id, 'std' => '', 'desc' => '', 'format' => 'yy-mm-dd', 'name' => __('Date Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Time Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string- field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         *    'format' => // time format, default hh:mm. Optional. See more formats here: http://goo.gl/83woX
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addTime($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'time', 'id' => $id, 'std' => '', 'desc' => '', 'format' => 'hh:mm', 'name' => __('Time Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Color Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addColor($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'color', 'id' => $id, 'std' => '', 'desc' => '', 'name' => __('ColorPicker Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Image Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addImage($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'image', 'id' => $id, 'desc' => '', 'style' => '', 'name' => __('Image Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add File Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addFile($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'file', 'id' => $id, 'desc' => '', 'style' => '', 'name' => __('File Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add WYSIWYG Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'style' =>    // custom style for field, string optional Default 'width: 300px; height: 400px'
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addWysiwyg($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'wysiwyg', 'id' => $id, 'std' => '', 'desc' => '', 'style' => 'width: 300px; height: 400px', 'name' => __('WYSIWYG Editor Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Taxonomy Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $options mixed|array options of taxonomy field
-         *    'taxonomy' =>    // taxonomy name can be category,post_tag or any custom taxonomy default is category
-         * 'type' =>  // how to show taxonomy? 'select' (default) or 'checkbox_list'
-         * 'args' =>  // arguments to query taxonomy, see http://goo.gl/uAANN default ('hide_empty' => false)
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addTaxonomy($id, $options, $args, $repeater = false)
-        {
-            $q = array('hide_empty' => 0);
-            $tax = 'category';
-            $type = 'select';
-            $temp = array($tax, $type, $q);
-            $options = array_merge($temp, $options);
-            $new_field = array('type' => 'taxonomy', 'id' => $id, 'desc' => '', 'name' => __('Taxonomy Field', 'geodirectory'), 'options' => $options);
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add posts Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $options mixed|array options of taxonomy field
-         *    'post_type' =>    // post type name, 'post' (default) 'page' or any custom post type
-         * 'type' =>  // how to show posts? 'select' (default) or 'checkbox_list'
-         * 'args' =>  // arguments to query posts, see http://goo.gl/is0yK default ('posts_per_page' => -1)
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addPosts($id, $options, $args, $repeater = false)
-        {
-            $q = array('posts_per_page' => -1);
-            $temp = array('post_type' => 'post', 'type' => 'select', 'args' => $q);
-            $options = array_merge($temp, $options);
-            $new_field = array('type' => 'posts', 'id' => $id, 'desc' => '', 'name' => __('Posts Field', 'geodirectory'), 'options' => $options);
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add repeater Field Block to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'style' =>    // custom style for field, string optional
-         *    'validate_func' => // validate function, string optional
-         *    'fields' => //fields to repeater
-         */
-        public function addRepeaterBlock($id, $args)
-        {
-            $new_field = array('type' => 'repeater', 'id' => $id, 'name' => __('Reapeater Field', 'geodirectory'), 'fields' => array(), 'inline' => false);
-            $new_field = array_merge($new_field, $args);
-            $this->_fields[] = $new_field;
-        }
-
-
-        /**
-         * Finish Declaration of Meta Box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         */
-        public function Finish()
-        {
-            $this->add_missed_values();
-            $this->check_field_upload();
-            $this->check_field_color();
-            $this->check_field_date();
-            $this->check_field_time();
-        }
-
-        /**
-         * Helper function to check for empty arrays
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $args mixed|array
-         */
-        public function is_array_empty($array)
-        {
-            if (!is_array($array))
-                return true;
-
-            foreach ($array as $a) {
-                if (is_array($a)) {
-                    foreach ($a as $sub_a) {
-                        if (!empty($sub_a) && $sub_a != '')
-                            return false;
-                    }
-                } else {
-                    if (!empty($a) && $a != '')
-                        return false;
-                }
-            }
-            return true;
-        }
-
-
-        //get term meta field
-        public function get_tax_meta($term_id, $key, $multi = false, $post_type = '')
-        {
-
-            if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
-                $taxObject = get_taxonomy($_REQUEST['taxonomy']);
-                $post_type = $taxObject->object_type[0];
-            }
-
-            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);
-            if (isset($m[$key])) {
-                return $m[$key];
-            } else {
-                return '';
-            }
-        }
-
-        //delete meta
-        public function delete_tax_meta($term_id, $key, $post_type = '')
-        {
-
-            if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
-                $taxObject = get_taxonomy($_REQUEST['taxonomy']);
-                $post_type = $taxObject->object_type[0];
-            }
-
-            if($post_type=='post'){$post_type='';}
-            if($post_type){$post_type = $post_type.'_';}
-
-            $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 meta
-        public function update_tax_meta($term_id, $key, $value, $post_type = '')
-        {
-
-            if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
-                $taxObject = get_taxonomy($_REQUEST['taxonomy']);
-                $post_type = $taxObject->object_type[0];
-            }
-
-            if($post_type=='post'){$post_type='';}
-            if($post_type){$post_type = $post_type.'_';}
-
-            $m = get_option('tax_meta_' . $post_type  . $term_id);
-
-            $m[$key] = $value;
-            update_option('tax_meta_' . $post_type  . $term_id, $m);
-
-            /**
-             * Called after the tax meta is updated.
-             *
-             * Used to update things after a GD category is saved.
-             *
-             * @since 1.0.0
-             * @param bool $false False.
-             * @param bool $true True.
-             * @param int $term_id The term id being updated.
-             * @param string $post_type The post type of the cat being updated.
-             */
-            do_action('gd_tax_meta_updated', false, true, $term_id, $post_type);
-        }
-
-
-    } // End Class
+		public function save_field_wysiwyg($term_id, $field, $old, $new)
+		{
+			$this->save_field($term_id, $field, $old, $new);
+		}
+
+		/**
+		 * Save repeater Fields.
+		 *
+		 * @param string $term_id The term ID.
+		 * @param string $field
+		 * @param string|mixed $old
+		 * @param string|mixed $new
+		 * @since 1.0
+		 * @access public
+		 */
+		public function save_field_repeater($term_id, $field, $old, $new)
+		{
+			if (is_array($new) && count($new) > 0) {
+				foreach ($new as $n) {
+					foreach ($field['fields'] as $f) {
+						$type = $f['type'];
+						switch ($type) {
+							case 'wysiwyg':
+								$n[$f['id']] = wpautop($n[$f['id']]);
+								break;
+							case 'file':
+								$n[$f['id']] = $this->save_field_file_repeater($term_id, $f, '', $n[$f['id']]);
+								break;
+							default:
+								break;
+						}
+					}
+					if (!$this->is_array_empty($n))
+						$temp[] = $n;
+				}
+				if (isset($temp) && count($temp) > 0 && !$this->is_array_empty($temp)) {
+					$this->update_tax_meta($term_id, $field['id'], $temp);
+				} else {
+					//	remove old meta if exists
+					delete_post_meta($term_id, $field['id']);
+				}
+			} else {
+				//	remove old meta if exists
+				delete_post_meta($term_id, $field['id']);
+			}
+		}
+
+		/**
+		 * Save File Field.
+		 *
+		 * @param string $term_id The term ID.
+		 * @param string $field
+		 * @param string $old
+		 * @param string $new
+		 * @since 1.0
+		 * @access public
+		 */
+		public function save_field_file($term_id, $field, $old, $new)
+		{
+
+			$name = $field['id'];
+			if (empty($_FILES[$name]))
+				return;
+			$this->fix_file_array($_FILES[$name]);
+			foreach ($_FILES[$name] as $position => $fileitem) {
+
+				$file = wp_handle_upload($fileitem, array('test_form' => false));
+				if (empty($file['file']))
+					continue;
+				$filename = $file['file'];
+
+				$attachment = array(
+					'post_mime_type' => $file['type'],
+					'guid' => $file['url'],
+					'post_parent' => $term_id,
+					'post_title' => preg_replace('/\.[^.]+$/', '', basename($filename)),
+					'post_content' => ''
+				);
+
+				$id = wp_insert_attachment($attachment, $filename, $term_id);
+
+				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
+
+				} // End if
+
+			} // End foreach
+
+		}
+
+		/**
+		 * Save repeater File Field.
+		 * @param string $term_id The term ID.
+		 * @param string $field
+		 * @param string $old
+		 * @param string $new
+		 * @since 1.0
+		 * @access public
+		 * @return int|void
+		 */
+		public function save_field_file_repeater($term_id, $field, $old, $new)
+		{
+
+			$name = $field['id'];
+			if (empty($_FILES[$name]))
+				return;
+			$this->fix_file_array($_FILES[$name]);
+			foreach ($_FILES[$name] as $position => $fileitem) {
+
+				$file = wp_handle_upload($fileitem, array('test_form' => false));
+				if (empty($file['file']))
+					continue;
+				$filename = $file['file'];
+
+				$attachment = array(
+					'post_mime_type' => $file['type'],
+					'guid' => $file['url'],
+					'post_parent' => $term_id,
+					'post_title' => preg_replace('/\.[^.]+$/', '', basename($filename)),
+					'post_content' => ''
+				);
+
+				$id = wp_insert_attachment($attachment, $filename);
+
+				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
+				} // End if
+			} // End foreach
+		}
+
+		/**
+		 * Add missed values for meta box.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function add_missed_values()
+		{
+
+			// Default values for meta box
+			$this->_meta_box = array_merge(array('context' => 'normal', 'priority' => 'high', 'pages' => array('post')), (array)$this->_meta_box);
+
+			if(is_array($this->_fields)) {
+				// Default values for fields
+				foreach ($this->_fields as &$field) {
+					$multiple = in_array($field['type'], array('checkbox_list', 'file', 'image'));
+					$std = $multiple ? array() : '';
+					$format = 'date' == $field['type'] ? 'yy-mm-dd' : ('time' == $field['type'] ? 'hh:mm' : '');
+					$field = array_merge(array('multiple' => $multiple, 'std' => $std, 'desc' => '', 'format' => $format, 'validate_func' => ''), $field);
+				} // End foreach
+			}
+		}
+
+		/**
+		 * Check if field with $type exists.
+		 *
+		 * @param string $type
+		 * @since 1.0
+		 * @access public
+		 */
+		public function has_field($type)
+		{
+			if(is_array($this->_fields)) {
+				foreach ($this->_fields as $field) {
+					if ($type == $field['type'])
+						return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Check if current page is edit page.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function is_edit_page()
+		{
+			global $pagenow;
+			return ($pagenow == 'edit-tags.php' || $pagenow == 'term.php');
+		}
+
+		/**
+		 * Fixes the odd indexing of multiple file uploads.
+		 *
+		 * Goes from the format:
+		 * $_FILES['field']['key']['index']
+		 * to
+		 * The More standard and appropriate:
+		 * $_FILES['field']['index']['key']
+		 *
+		 * @param string $files
+		 * @since 1.0
+		 * @access public
+		 */
+		public function fix_file_array(&$files)
+		{
+
+			$output = array();
+
+			foreach ($files as $key => $list) {
+				foreach ($list as $index => $value) {
+					$output[$index][$key] = $value;
+				}
+			}
+
+			return $files = $output;
+
+		}
+
+		/**
+		 * Get proper JQuery UI version.
+		 *
+		 * Used in order to not conflict with WP Admin Scripts.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function get_jqueryui_ver()
+		{
+
+			global $wp_version;
+
+			if (version_compare($wp_version, '3.1', '>=')) {
+				return '1.8.10';
+			}
+
+			return '1.7.3';
+
+		}
+
+		/**
+		 *  Add Field to meta box (generic function)
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 */
+		public function addField($id, $args)
+		{
+			$new_field = array('id' => $id, 'std' => '', 'desc' => '', 'style' => '');
+			$new_field = array_merge($new_field, $args);
+			$this->_fields[] = $new_field;
+		}
+
+
+		/**
+		 *  Add Text Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'style' =>    // custom style for field, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addText($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'text', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Text Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Hidden Field to meta box
+		 * @author Ohad Raz
+		 * @since 0.1.3
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'style' =>    // custom style for field, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addHidden($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'hidden', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Text Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Paragraph to meta box
+		 * @author Ohad Raz
+		 * @since 0.1.3
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $value  paragraph html
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addParagraph($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'paragraph', 'id' => $id, 'value' => '', 'style' => '');
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Checkbox Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addCheckbox($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'checkbox', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Checkbox Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add CheckboxList Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $options (array)  array of key => value pairs for select options
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 *
+		 * @return : remember to call: $checkbox_list = $this->get_tax_meta(get_the_ID(), 'meta_name', false);
+		 *   which means the last param as false to get the values in an array
+		 */
+		public function addCheckboxList($id, $options, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'checkbox_list', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Checkbox List Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Textarea Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'style' =>    // custom style for field, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addTextarea($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'textarea', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Textarea Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Select Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string field id, i.e. the meta key
+		 * @param $options (array)  array of key => value pairs for select options
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, (array) optional
+		 *    'multiple' => // select multiple values, optional. Default is false.
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addSelect($id, $options, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'select', 'id' => $id, 'std' => array(), 'desc' => '', 'style' => '', 'name' => __('Select Field', 'geodirectory'), 'multiple' => false, 'options' => $options);
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+
+		/**
+		 *  Add Radio Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string field id, i.e. the meta key
+		 * @param $options (array)  array of key => value pairs for radio options
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addRadio($id, $options, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'radio', 'id' => $id, 'std' => array(), 'desc' => '', 'style' => '', 'name' => __('Radio Field', 'geodirectory'), 'options' => $options);
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Date Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 *    'format' => // date format, default yy-mm-dd. Optional. Default "'d MM, yy'"  See more formats here: http://goo.gl/Wcwxn
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addDate($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'date', 'id' => $id, 'std' => '', 'desc' => '', 'format' => 'yy-mm-dd', 'name' => __('Date Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Time Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string- field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 *    'format' => // time format, default hh:mm. Optional. See more formats here: http://goo.gl/83woX
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addTime($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'time', 'id' => $id, 'std' => '', 'desc' => '', 'format' => 'hh:mm', 'name' => __('Time Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Color Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addColor($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'color', 'id' => $id, 'std' => '', 'desc' => '', 'name' => __('ColorPicker Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Image Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addImage($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'image', 'id' => $id, 'desc' => '', 'style' => '', 'name' => __('Image Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add File Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addFile($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'file', 'id' => $id, 'desc' => '', 'style' => '', 'name' => __('File Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add WYSIWYG Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'style' =>    // custom style for field, string optional Default 'width: 300px; height: 400px'
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addWysiwyg($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'wysiwyg', 'id' => $id, 'std' => '', 'desc' => '', 'style' => 'width: 300px; height: 400px', 'name' => __('WYSIWYG Editor Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Taxonomy Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $options mixed|array options of taxonomy field
+		 *    'taxonomy' =>    // taxonomy name can be category,post_tag or any custom taxonomy default is category
+		 * 'type' =>  // how to show taxonomy? 'select' (default) or 'checkbox_list'
+		 * 'args' =>  // arguments to query taxonomy, see http://goo.gl/uAANN default ('hide_empty' => false)
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addTaxonomy($id, $options, $args, $repeater = false)
+		{
+			$q = array('hide_empty' => 0);
+			$tax = 'category';
+			$type = 'select';
+			$temp = array($tax, $type, $q);
+			$options = array_merge($temp, $options);
+			$new_field = array('type' => 'taxonomy', 'id' => $id, 'desc' => '', 'name' => __('Taxonomy Field', 'geodirectory'), 'options' => $options);
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add posts Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $options mixed|array options of taxonomy field
+		 *    'post_type' =>    // post type name, 'post' (default) 'page' or any custom post type
+		 * 'type' =>  // how to show posts? 'select' (default) or 'checkbox_list'
+		 * 'args' =>  // arguments to query posts, see http://goo.gl/is0yK default ('posts_per_page' => -1)
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addPosts($id, $options, $args, $repeater = false)
+		{
+			$q = array('posts_per_page' => -1);
+			$temp = array('post_type' => 'post', 'type' => 'select', 'args' => $q);
+			$options = array_merge($temp, $options);
+			$new_field = array('type' => 'posts', 'id' => $id, 'desc' => '', 'name' => __('Posts Field', 'geodirectory'), 'options' => $options);
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add repeater Field Block to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'style' =>    // custom style for field, string optional
+		 *    'validate_func' => // validate function, string optional
+		 *    'fields' => //fields to repeater
+		 */
+		public function addRepeaterBlock($id, $args)
+		{
+			$new_field = array('type' => 'repeater', 'id' => $id, 'name' => __('Reapeater Field', 'geodirectory'), 'fields' => array(), 'inline' => false);
+			$new_field = array_merge($new_field, $args);
+			$this->_fields[] = $new_field;
+		}
+
+
+		/**
+		 * Finish Declaration of Meta Box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 */
+		public function Finish()
+		{
+			$this->add_missed_values();
+			$this->check_field_upload();
+			$this->check_field_color();
+			$this->check_field_date();
+			$this->check_field_time();
+		}
+
+		/**
+		 * Helper function to check for empty arrays
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $args mixed|array
+		 */
+		public function is_array_empty($array)
+		{
+			if (!is_array($array))
+				return true;
+
+			foreach ($array as $a) {
+				if (is_array($a)) {
+					foreach ($a as $sub_a) {
+						if (!empty($sub_a) && $sub_a != '')
+							return false;
+					}
+				} else {
+					if (!empty($a) && $a != '')
+						return false;
+				}
+			}
+			return true;
+		}
+
+
+		//get term meta field
+		public function get_tax_meta($term_id, $key, $multi = false, $post_type = '')
+		{
+
+			if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
+				$taxObject = get_taxonomy($_REQUEST['taxonomy']);
+				$post_type = $taxObject->object_type[0];
+			}
+
+			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);
+			if (isset($m[$key])) {
+				return $m[$key];
+			} else {
+				return '';
+			}
+		}
+
+		//delete meta
+		public function delete_tax_meta($term_id, $key, $post_type = '')
+		{
+
+			if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
+				$taxObject = get_taxonomy($_REQUEST['taxonomy']);
+				$post_type = $taxObject->object_type[0];
+			}
+
+			if($post_type=='post'){$post_type='';}
+			if($post_type){$post_type = $post_type.'_';}
+
+			$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 meta
+		public function update_tax_meta($term_id, $key, $value, $post_type = '')
+		{
+
+			if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
+				$taxObject = get_taxonomy($_REQUEST['taxonomy']);
+				$post_type = $taxObject->object_type[0];
+			}
+
+			if($post_type=='post'){$post_type='';}
+			if($post_type){$post_type = $post_type.'_';}
+
+			$m = get_option('tax_meta_' . $post_type  . $term_id);
+
+			$m[$key] = $value;
+			update_option('tax_meta_' . $post_type  . $term_id, $m);
+
+			/**
+			 * Called after the tax meta is updated.
+			 *
+			 * Used to update things after a GD category is saved.
+			 *
+			 * @since 1.0.0
+			 * @param bool $false False.
+			 * @param bool $true True.
+			 * @param int $term_id The term id being updated.
+			 * @param string $post_type The post type of the cat being updated.
+			 */
+			do_action('gd_tax_meta_updated', false, true, $term_id, $post_type);
+		}
+
+
+	} // End Class
 
 endif; // End Check Class Exists
 
@@ -2095,67 +2095,67 @@ 
 
 //get term meta field
 if (!function_exists('get_tax_meta')) {
-    function get_tax_meta($term_id, $key, $multi = false, $post_type = '')
-    {
-
-        if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
-            $taxObject = get_taxonomy($_REQUEST['taxonomy']);
-            $post_type = $taxObject->object_type[0];
-        }
-
-        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);
-        if (isset($m[$key])) {
-            return $m[$key];
-        } else {
-            return '';
-        }
-    }
+	function get_tax_meta($term_id, $key, $multi = false, $post_type = '')
+	{
+
+		if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
+			$taxObject = get_taxonomy($_REQUEST['taxonomy']);
+			$post_type = $taxObject->object_type[0];
+		}
+
+		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);
+		if (isset($m[$key])) {
+			return $m[$key];
+		} else {
+			return '';
+		}
+	}
 }
 
 //delete meta
 if (!function_exists('delete_tax_meta')) {
-    function delete_tax_meta($term_id, $key)
-    {
+	function delete_tax_meta($term_id, $key)
+	{
 
-        $taxObject = get_taxonomy($_REQUEST['taxonomy']);
-        $post_type = $taxObject->object_type[0];
+		$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);
-    }
+		if (isset($m[$key])) {
+			unset($m[$key]);
+		}
+		update_option('tax_meta_' . $post_type  . $term_id, $m);
+	}
 }
 
 //update meta
 if (!function_exists('update_tax_meta')) {
-    function update_tax_meta($term_id, $key, $value, $post_type = '')
-    {
+	function update_tax_meta($term_id, $key, $value, $post_type = '')
+	{
 
-        if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
-            $taxObject = get_taxonomy($_REQUEST['taxonomy']);
-            $post_type = $taxObject->object_type[0];
-        }
+		if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
+			$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);
 
-        $m[$key] = $value;
-        update_option('tax_meta_' . $post_type . $term_id, $m);
+		$m[$key] = $value;
+		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);
-    }
+		/** 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);
+	}
 }
\ No newline at end of file

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', 'https://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', 'https://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-functions/compatibility/Avada.php

Doc Comments +1 added lines, -1 removed lines

@@ -179,7 +179,7 @@
  * @since 1.0.0
  * @package GeoDirectory
  * @param array $classes Class array.
- * @return array Modified class array.
+ * @return string[] Modified class array.
  */
 function gd_compat_body_class($classes)
 {

Indentation +103 added lines, -103 removed lines

@@ -18,10 +18,10 @@ 
  */
 function gd_strip_breadcrumb_wrappers($breadcrumb)
 {
-    $breadcrumb = str_replace(array("<li>","</li>"), "", $breadcrumb);
-    $breadcrumb = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">', '<ul class="fusion-breadcrumbs"><li>', $breadcrumb);
-    $breadcrumb = str_replace('</ul></div>', '</li></ul>', $breadcrumb);
-    return $breadcrumb;
+	$breadcrumb = str_replace(array("<li>","</li>"), "", $breadcrumb);
+	$breadcrumb = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">', '<ul class="fusion-breadcrumbs"><li>', $breadcrumb);
+	$breadcrumb = str_replace('</ul></div>', '</li></ul>', $breadcrumb);
+	return $breadcrumb;
 }
 
 add_filter('geodir_breadcrumb_separator', 'gd_change_breadcrumb_separator');
@@ -35,8 +35,8 @@ 
  */
 function gd_change_breadcrumb_separator($separator)
 {
-    $separator = ' / ';
-    return $separator;
+	$separator = ' / ';
+	return $separator;
 }
 
 add_action('avada_override_current_page_title_bar','gd_avada_current_page_title_bar_change');
@@ -49,11 +49,11 @@ 
  */
 function gd_avada_current_page_title_bar_change($c_pageID)
 {
-    if (geodir_is_geodir_page()) {
-        gd_avada_current_page_title_bar();
-    }else{
-        avada_current_page_title_bar( $c_pageID );
-    }
+	if (geodir_is_geodir_page()) {
+		gd_avada_current_page_title_bar();
+	}else{
+		avada_current_page_title_bar( $c_pageID );
+	}
 
 }
 
@@ -65,44 +65,44 @@ 
  */
 function gd_avada_current_page_title_bar()
 {
-    ob_start();
-    geodir_breadcrumb();
-    $secondary_content = ob_get_contents();
-    ob_get_clean();
-
-    $title = '';
-    $subtitle = '';
-
-    if (geodir_is_page('listing')) {
-        ob_start(); // Start buffering;
-        geodir_action_listings_title();
-        $title = ob_get_clean();
-        avada_page_title_bar($title, $subtitle, $secondary_content);
-    }elseif (geodir_is_page('add-listing')) {
-        ob_start(); // Start buffering;
-        geodir_action_add_listing_page_title();
-        $title = ob_get_clean();
-        avada_page_title_bar($title, $subtitle, $secondary_content);
-    }elseif (geodir_is_page('author')) {
-        ob_start(); // Start buffering;
-        geodir_action_author_page_title();
-        $title = ob_get_clean();
-        avada_page_title_bar($title, $subtitle, $secondary_content);
-    }elseif (geodir_is_page('detail') || geodir_is_page('preview')) {
-        if ( $title = get_post_meta( get_the_ID(), 'pyre_page_title_custom_text', true ) ) {}
-        else {
-            $title = get_the_title();
-        }
-        avada_page_title_bar($title, $subtitle, $secondary_content);
-    }elseif (geodir_is_page('search')) {
-        ob_start(); // Start buffering;
-        geodir_action_search_page_title();
-        $title = ob_get_clean();
-        avada_page_title_bar($title, $subtitle, $secondary_content);
-    }else{
-        $title = get_the_title();
-        avada_page_title_bar($title, $subtitle, $secondary_content);
-    }
+	ob_start();
+	geodir_breadcrumb();
+	$secondary_content = ob_get_contents();
+	ob_get_clean();
+
+	$title = '';
+	$subtitle = '';
+
+	if (geodir_is_page('listing')) {
+		ob_start(); // Start buffering;
+		geodir_action_listings_title();
+		$title = ob_get_clean();
+		avada_page_title_bar($title, $subtitle, $secondary_content);
+	}elseif (geodir_is_page('add-listing')) {
+		ob_start(); // Start buffering;
+		geodir_action_add_listing_page_title();
+		$title = ob_get_clean();
+		avada_page_title_bar($title, $subtitle, $secondary_content);
+	}elseif (geodir_is_page('author')) {
+		ob_start(); // Start buffering;
+		geodir_action_author_page_title();
+		$title = ob_get_clean();
+		avada_page_title_bar($title, $subtitle, $secondary_content);
+	}elseif (geodir_is_page('detail') || geodir_is_page('preview')) {
+		if ( $title = get_post_meta( get_the_ID(), 'pyre_page_title_custom_text', true ) ) {}
+		else {
+			$title = get_the_title();
+		}
+		avada_page_title_bar($title, $subtitle, $secondary_content);
+	}elseif (geodir_is_page('search')) {
+		ob_start(); // Start buffering;
+		geodir_action_search_page_title();
+		$title = ob_get_clean();
+		avada_page_title_bar($title, $subtitle, $secondary_content);
+	}else{
+		$title = get_the_title();
+		avada_page_title_bar($title, $subtitle, $secondary_content);
+	}
 }
 
 /**
@@ -113,34 +113,34 @@ 
  */
 function gd_compat_php_avada()
 {
-    // change widget wrappers
-    //add_filter( 'geodir_before_widget', 'geodir_before_widget_compat',10,1 );
-    //add_filter( 'geodir_after_widget', 'geodir_after_widget_compat',10,1 );
-
-    // REMOVE BREADCRUMB
-    remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
-
-    // REMOVE PAGE TITLES
-    remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
-    remove_action('geodir_add_listing_page_title', 'geodir_action_add_listing_page_title', 10);
-    remove_action('geodir_details_main_content', 'geodir_action_page_title', 20);
-    remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
-    remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
-
-    // make top section wide
-    remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10);
-    remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10);
-    remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10);
-    remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
-
-    //gd_compat_add_top_section_back();
+	// change widget wrappers
+	//add_filter( 'geodir_before_widget', 'geodir_before_widget_compat',10,1 );
+	//add_filter( 'geodir_after_widget', 'geodir_after_widget_compat',10,1 );
+
+	// REMOVE BREADCRUMB
+	remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
+
+	// REMOVE PAGE TITLES
+	remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
+	remove_action('geodir_add_listing_page_title', 'geodir_action_add_listing_page_title', 10);
+	remove_action('geodir_details_main_content', 'geodir_action_page_title', 20);
+	remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
+	remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
+
+	// make top section wide
+	remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10);
+	remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10);
+	remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10);
+	remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
+
+	//gd_compat_add_top_section_back();
 
 }
 
@@ -152,17 +152,17 @@ 
  * @package GeoDirectory
  */
 function gd_compat_add_top_section_back() {
-    if (geodir_is_page('home') || geodir_is_page('location')) {
-        geodir_action_geodir_sidebar_home_top();
-    } elseif (geodir_is_page('listing')) {
-        geodir_action_geodir_sidebar_listings_top();
-    } elseif (geodir_is_page('detail')) {
-        geodir_action_geodir_sidebar_detail_top();
-    } elseif (geodir_is_page('search')) {
-        geodir_action_geodir_sidebar_search_top();
-    } elseif (geodir_is_page('author')) {
-        geodir_action_geodir_sidebar_author_top();
-    }
+	if (geodir_is_page('home') || geodir_is_page('location')) {
+		geodir_action_geodir_sidebar_home_top();
+	} elseif (geodir_is_page('listing')) {
+		geodir_action_geodir_sidebar_listings_top();
+	} elseif (geodir_is_page('detail')) {
+		geodir_action_geodir_sidebar_detail_top();
+	} elseif (geodir_is_page('search')) {
+		geodir_action_geodir_sidebar_search_top();
+	} elseif (geodir_is_page('author')) {
+		geodir_action_geodir_sidebar_author_top();
+	}
 }
 
 add_filter('body_class', 'gd_compat_body_class');
@@ -176,12 +176,12 @@ 
  */
 function gd_compat_body_class($classes)
 {
-    if (geodir_is_geodir_page()) {
-        $classes[] = 'wpgeo-avada';
-    } else {
-        $classes[] = '';
-    }
-    return $classes;
+	if (geodir_is_geodir_page()) {
+		$classes[] = 'wpgeo-avada';
+	} else {
+		$classes[] = '';
+	}
+	return $classes;
 }
 
 
@@ -195,7 +195,7 @@ 
  */
 function geodir_before_widget_compat($var)
 {
-    return '<div id="%1$s" class="geodir-widget %2$s">';
+	return '<div id="%1$s" class="geodir-widget %2$s">';
 }
 
 /**
@@ -208,7 +208,7 @@ 
  */
 function geodir_after_widget_compat($var)
 {
-    return '</div>';
+	return '</div>';
 }
 
 add_filter('geodir_search_form_class', 'geodir_search_form_class_avada');
@@ -222,8 +222,8 @@ 
  */
 function geodir_search_form_class_avada($class)
 {
-    $class .= ' search';
-    return $class;
+	$class .= ' search';
+	return $class;
 }
 
 
@@ -232,11 +232,11 @@ 
 
 // Avada sets the search page to use wither post or page, we need it to be 'any'
 function gd_avada_search_filter( $query ) {
-    if ( geodir_is_page('search') && is_search() && $query->is_search) {
-        $query->set('post_type', 'any');
-    }
-    return $query;
+	if ( geodir_is_page('search') && is_search() && $query->is_search) {
+		$query->set('post_type', 'any');
+	}
+	return $query;
 }
 if ( ! is_admin() ) {
-    add_filter( 'pre_get_posts', 'gd_avada_search_filter',11 );
+	add_filter( 'pre_get_posts', 'gd_avada_search_filter',11 );
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -18,7 +18,7 @@ 
  */
 function gd_strip_breadcrumb_wrappers($breadcrumb)
 {
-    $breadcrumb = str_replace(array("<li>","</li>"), "", $breadcrumb);
+    $breadcrumb = str_replace(array("<li>", "</li>"), "", $breadcrumb);
     $breadcrumb = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">', '<ul class="fusion-breadcrumbs"><li>', $breadcrumb);
     $breadcrumb = str_replace('</ul></div>', '</li></ul>', $breadcrumb);
     return $breadcrumb;
@@ -39,7 +39,7 @@ 
     return $separator;
 }
 
-add_action('avada_override_current_page_title_bar','gd_avada_current_page_title_bar_change');
+add_action('avada_override_current_page_title_bar', 'gd_avada_current_page_title_bar_change');
 /**
  * new title bar functions for gd pages.
  *
@@ -51,8 +51,8 @@ 
 {
     if (geodir_is_geodir_page()) {
         gd_avada_current_page_title_bar();
-    }else{
-        avada_current_page_title_bar( $c_pageID );
+    } else {
+        avada_current_page_title_bar($c_pageID);
     }
 
 }
@@ -89,7 +89,7 @@ 
         $title = ob_get_clean();
         avada_page_title_bar($title, $subtitle, $secondary_content);
     }elseif (geodir_is_page('detail') || geodir_is_page('preview')) {
-        if ( $title = get_post_meta( get_the_ID(), 'pyre_page_title_custom_text', true ) ) {}
+        if ($title = get_post_meta(get_the_ID(), 'pyre_page_title_custom_text', true)) {}
         else {
             $title = get_the_title();
         }
@@ -99,7 +99,7 @@ 
         geodir_action_search_page_title();
         $title = ob_get_clean();
         avada_page_title_bar($title, $subtitle, $secondary_content);
-    }else{
+    } else {
         $title = get_the_title();
         avada_page_title_bar($title, $subtitle, $secondary_content);
     }
@@ -231,12 +231,12 @@ 
 gd_compat_php_avada();
 
 // Avada sets the search page to use wither post or page, we need it to be 'any'
-function gd_avada_search_filter( $query ) {
-    if ( geodir_is_page('search') && is_search() && $query->is_search) {
+function gd_avada_search_filter($query) {
+    if (geodir_is_page('search') && is_search() && $query->is_search) {
         $query->set('post_type', 'any');
     }
     return $query;
 }
-if ( ! is_admin() ) {
-    add_filter( 'pre_get_posts', 'gd_avada_search_filter',11 );
+if (!is_admin()) {
+    add_filter('pre_get_posts', 'gd_avada_search_filter', 11);
 }
\ No newline at end of file

Braces +7 added lines, -8 removed lines

@@ -51,7 +51,7 @@ 
 {
     if (geodir_is_geodir_page()) {
         gd_avada_current_page_title_bar();
-    }else{
+    } else{
         avada_current_page_title_bar( $c_pageID );
     }
 
@@ -78,28 +78,27 @@ 
         geodir_action_listings_title();
         $title = ob_get_clean();
         avada_page_title_bar($title, $subtitle, $secondary_content);
-    }elseif (geodir_is_page('add-listing')) {
+    } elseif (geodir_is_page('add-listing')) {
         ob_start(); // Start buffering;
         geodir_action_add_listing_page_title();
         $title = ob_get_clean();
         avada_page_title_bar($title, $subtitle, $secondary_content);
-    }elseif (geodir_is_page('author')) {
+    } elseif (geodir_is_page('author')) {
         ob_start(); // Start buffering;
         geodir_action_author_page_title();
         $title = ob_get_clean();
         avada_page_title_bar($title, $subtitle, $secondary_content);
-    }elseif (geodir_is_page('detail') || geodir_is_page('preview')) {
-        if ( $title = get_post_meta( get_the_ID(), 'pyre_page_title_custom_text', true ) ) {}
-        else {
+    } elseif (geodir_is_page('detail') || geodir_is_page('preview')) {
+        if ( $title = get_post_meta( get_the_ID(), 'pyre_page_title_custom_text', true ) ) {} else {
             $title = get_the_title();
         }
         avada_page_title_bar($title, $subtitle, $secondary_content);
-    }elseif (geodir_is_page('search')) {
+    } elseif (geodir_is_page('search')) {
         ob_start(); // Start buffering;
         geodir_action_search_page_title();
         $title = ob_get_clean();
         avada_page_title_bar($title, $subtitle, $secondary_content);
-    }else{
+    } else{
         $title = get_the_title();
         avada_page_title_bar($title, $subtitle, $secondary_content);
     }

geodirectory-functions/compatibility/Enfold.php

Doc Comments +1 added lines, -1 removed lines

@@ -133,7 +133,7 @@
  * @since 1.0.0
  * @package GeoDirectory
  * @param array $classes Class array.
- * @return array Modified class array.
+ * @return string[] Modified class array.
  */
 function wpgeo_enfold_body_class($classes)
 {

Indentation +135 added lines, -135 removed lines

@@ -17,84 +17,84 @@ 
 function enfold_action_calls()
 {
 
-    /* ACTIONS
+	/* ACTIONS
     ****************************************************************************************/
 
-    // Add body class for styling purposes
-    add_filter('body_class', 'wpgeo_enfold_body_class');
+	// Add body class for styling purposes
+	add_filter('body_class', 'wpgeo_enfold_body_class');
 
-    // Pages using the page-builder shouldn't redirect on successful payment
-    if (isset($_REQUEST['pay_action'])) {
-        add_action('init', 'geodir_allow_payment_urls_enfold', 15);
-    }
+	// Pages using the page-builder shouldn't redirect on successful payment
+	if (isset($_REQUEST['pay_action'])) {
+		add_action('init', 'geodir_allow_payment_urls_enfold', 15);
+	}
 
-    // LOCATION MANAGER MENU ACTIONS - set the location menu item before the Enfold search
-    if (function_exists('geodir_location_menu_items')) {
-        remove_filter('wp_nav_menu_items', 'geodir_location_menu_items', 110);
-        add_filter('wp_nav_menu_items', 'geodir_location_menu_items', 8, 2);
-    }
-    // GEODIR MENU ACTIONS - set the GeoDir menu items before the Enfold search
-    remove_filter('wp_nav_menu_items', 'geodir_menu_items', 100);
-    add_filter('wp_nav_menu_items', 'geodir_menu_items', 7, 2);
+	// LOCATION MANAGER MENU ACTIONS - set the location menu item before the Enfold search
+	if (function_exists('geodir_location_menu_items')) {
+		remove_filter('wp_nav_menu_items', 'geodir_location_menu_items', 110);
+		add_filter('wp_nav_menu_items', 'geodir_location_menu_items', 8, 2);
+	}
+	// GEODIR MENU ACTIONS - set the GeoDir menu items before the Enfold search
+	remove_filter('wp_nav_menu_items', 'geodir_menu_items', 100);
+	add_filter('wp_nav_menu_items', 'geodir_menu_items', 7, 2);
 
-    // HOME TOP SIDEBAR
-    remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    //add_action( 'ava_after_main_container', 'enfold_home_sidebar' );
+	// HOME TOP SIDEBAR
+	remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	//add_action( 'ava_after_main_container', 'enfold_home_sidebar' );
 
 
-    // WRAPPER OPEN ACTIONS
-    remove_action('geodir_wrapper_open', 'geodir_action_wrapper_open', 10);
-    add_action('geodir_wrapper_open', 'enfold_action_wrapper_open', 9);
-    add_action('geodir_wrapper_open', 'enfold_detail_title', 8, 2); // ADD GEODIR TITLE
+	// WRAPPER OPEN ACTIONS
+	remove_action('geodir_wrapper_open', 'geodir_action_wrapper_open', 10);
+	add_action('geodir_wrapper_open', 'enfold_action_wrapper_open', 9);
+	add_action('geodir_wrapper_open', 'enfold_detail_title', 8, 2); // ADD GEODIR TITLE
 
 
-    // WRAPPER CONTENT OPEN ACTIONS
-    remove_action('geodir_wrapper_content_open', 'geodir_action_wrapper_content_open', 10);
-    add_action('geodir_wrapper_content_open', 'enfold_action_wrapper_content_open', 9, 3);
+	// WRAPPER CONTENT OPEN ACTIONS
+	remove_action('geodir_wrapper_content_open', 'geodir_action_wrapper_content_open', 10);
+	add_action('geodir_wrapper_content_open', 'enfold_action_wrapper_content_open', 9, 3);
 
 
-    // SIDEBAR RIGHT OPEN ACTIONS
-    remove_action('geodir_sidebar_right_open', 'geodir_action_sidebar_right_open', 10);
-    add_action('geodir_sidebar_right_open', 'enfold_action_sidebar_right_open', 10, 4);
+	// SIDEBAR RIGHT OPEN ACTIONS
+	remove_action('geodir_sidebar_right_open', 'geodir_action_sidebar_right_open', 10);
+	add_action('geodir_sidebar_right_open', 'enfold_action_sidebar_right_open', 10, 4);
 
-    // SIDEBAR LEFT OPEN ACTIONS
-    remove_action('geodir_sidebar_left_open', 'geodir_action_sidebar_left_open', 10);
-    add_action('geodir_sidebar_left_open', 'enfold_action_sidebar_left_open', 10, 4);
+	// SIDEBAR LEFT OPEN ACTIONS
+	remove_action('geodir_sidebar_left_open', 'geodir_action_sidebar_left_open', 10);
+	add_action('geodir_sidebar_left_open', 'enfold_action_sidebar_left_open', 10, 4);
 
 
-    // HOME PAGE BREADCRUMBS
-    remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
+	// HOME PAGE BREADCRUMBS
+	remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
 
-    // LISTINGS PAGE BREADCRUMBS & TITLES
-    remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
+	// LISTINGS PAGE BREADCRUMBS & TITLES
+	remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
 
-    // DETAILS PAGE BREADCRUMBS & TITLES
-    remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_details_main_content', 'geodir_action_page_title', 20);
+	// DETAILS PAGE BREADCRUMBS & TITLES
+	remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_details_main_content', 'geodir_action_page_title', 20);
 
-    // SEARCH PAGE BREADCRUMBS & TITLES
-    remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
+	// SEARCH PAGE BREADCRUMBS & TITLES
+	remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
 
-    // AUTHOR PAGE BREADCRUMBS & TITLES
-    remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
+	// AUTHOR PAGE BREADCRUMBS & TITLES
+	remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
 
-    // DISABLE ENFOLD MAPS CALL
-    add_filter('avf_load_google_map_api', 'gd_enfold_remove_maps_api', 10, 1);
+	// DISABLE ENFOLD MAPS CALL
+	add_filter('avf_load_google_map_api', 'gd_enfold_remove_maps_api', 10, 1);
 
-    // make top section wide
-    remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10);
-    remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10);
-    remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10);
-    remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
+	// make top section wide
+	remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10);
+	remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10);
+	remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10);
+	remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
 
-    add_action('geodir_wrapper_open', 'gd_enfold_compat_add_top_section_back', 5);
+	add_action('geodir_wrapper_open', 'gd_enfold_compat_add_top_section_back', 5);
 
 } // Close enfold_action_calls
 
@@ -108,17 +108,17 @@ 
 function gd_enfold_compat_add_top_section_back()
 {
 
-    if (is_page_geodir_home() || geodir_is_page('location')) {
-        add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_home_top', 8);
-    } elseif (geodir_is_page('listing')) {
-        add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_listings_top', 8);
-    } elseif (geodir_is_page('detail')) {
-        add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_detail_top', 8);
-    } elseif (geodir_is_page('search')) {
-        add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_search_top', 8);
-    } elseif (geodir_is_page('author')) {
-        add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_author_top', 8);
-    }
+	if (is_page_geodir_home() || geodir_is_page('location')) {
+		add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_home_top', 8);
+	} elseif (geodir_is_page('listing')) {
+		add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_listings_top', 8);
+	} elseif (geodir_is_page('detail')) {
+		add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_detail_top', 8);
+	} elseif (geodir_is_page('search')) {
+		add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_search_top', 8);
+	} elseif (geodir_is_page('author')) {
+		add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_author_top', 8);
+	}
 
 
 }
@@ -137,8 +137,8 @@ 
  */
 function wpgeo_enfold_body_class($classes)
 {
-    $classes[] = 'wpgeo-enfold';
-    return $classes;
+	$classes[] = 'wpgeo-enfold';
+	return $classes;
 }
 
 /**
@@ -149,8 +149,8 @@ 
  */
 function geodir_allow_payment_urls_enfold()
 {
-    global $builder;
-    remove_action('template_redirect', array($builder, 'template_redirect'), 1000);
+	global $builder;
+	remove_action('template_redirect', array($builder, 'template_redirect'), 1000);
 }
 
 
@@ -162,8 +162,8 @@ 
  */
 function enfold_action_wrapper_open()
 {
-    echo "<div class='container_wrap container_wrap_first main_color " . avia_layout_class('main', false) . "'>";
-    echo "<div class='container template-blog '>";
+	echo "<div class='container_wrap container_wrap_first main_color " . avia_layout_class('main', false) . "'>";
+	echo "<div class='container template-blog '>";
 }
 
 /**
@@ -177,38 +177,38 @@ 
  */
 function enfold_detail_title($page, $class)
 {
-    //echo '###'.$page;
-    global $wp;
-    if (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id() && !geodir_is_page('login')) {
-        add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
-        echo avia_title();
-    } elseif ($page == 'details-page') {
-        add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
-        echo avia_title();
-    } elseif ($page == 'listings-page' || $page == 'search-page') {
-        add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
-        ob_start(); // Start buffering;
-        geodir_action_listings_title();
-        $gd_title = ob_get_clean();
-        $title_p = explode('">', $gd_title);
-        $title = str_replace('</h1></header>', "", $title_p[2]);
-        //print_r($title_p);
-        echo avia_title(array('title' => $title));
-    } elseif ($page == 'author-page') {
-        add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
-        ob_start(); // Start buffering;
-        geodir_action_author_page_title();
-        $gd_title = ob_get_clean();
-        $gd_title = str_replace('<h1>', "", $gd_title);
-        $gd_title = str_replace('</h1>', "", $gd_title);
-        echo avia_title(array('title' => $gd_title));
-    } elseif ($page == 'add-listing-page') {
-        add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
-        echo avia_title();
-    } elseif ($page == 'add-listing-page') {
-        add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
-        echo avia_title();
-    }
+	//echo '###'.$page;
+	global $wp;
+	if (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id() && !geodir_is_page('login')) {
+		add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
+		echo avia_title();
+	} elseif ($page == 'details-page') {
+		add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
+		echo avia_title();
+	} elseif ($page == 'listings-page' || $page == 'search-page') {
+		add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
+		ob_start(); // Start buffering;
+		geodir_action_listings_title();
+		$gd_title = ob_get_clean();
+		$title_p = explode('">', $gd_title);
+		$title = str_replace('</h1></header>', "", $title_p[2]);
+		//print_r($title_p);
+		echo avia_title(array('title' => $title));
+	} elseif ($page == 'author-page') {
+		add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
+		ob_start(); // Start buffering;
+		geodir_action_author_page_title();
+		$gd_title = ob_get_clean();
+		$gd_title = str_replace('<h1>', "", $gd_title);
+		$gd_title = str_replace('</h1>', "", $gd_title);
+		echo avia_title(array('title' => $gd_title));
+	} elseif ($page == 'add-listing-page') {
+		add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
+		echo avia_title();
+	} elseif ($page == 'add-listing-page') {
+		add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2);
+		echo avia_title();
+	}
 
 }
 
@@ -223,22 +223,22 @@ 
  */
 function enfold_detail_breadcrum($trail, $args)
 {
-    ob_start(); // Start buffering;
-    geodir_breadcrumb();
-    $gd_crums = ob_get_clean();
-    if ($gd_crums) {
-        $gd_crums = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs"><li>', "", $gd_crums);
-        $gd_crums = str_replace('</li></ul></div>', "", $gd_crums);
-        $gd_crums = str_replace('&nbsp;>&nbsp;', " > ", $gd_crums);
-        $gd_crums = str_replace('</li><li>', "", $gd_crums);
-        $gd_crums = explode(" > ", $gd_crums);
-        $trail_end = array_pop($gd_crums);
-        $gd_crums['trail_end'] = $trail_end;
-        //print_r($gd_crums);
-        //print_r($trail);
-        $trail = $gd_crums;
-    }
-    return $trail;
+	ob_start(); // Start buffering;
+	geodir_breadcrumb();
+	$gd_crums = ob_get_clean();
+	if ($gd_crums) {
+		$gd_crums = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs"><li>', "", $gd_crums);
+		$gd_crums = str_replace('</li></ul></div>', "", $gd_crums);
+		$gd_crums = str_replace('&nbsp;>&nbsp;', " > ", $gd_crums);
+		$gd_crums = str_replace('</li><li>', "", $gd_crums);
+		$gd_crums = explode(" > ", $gd_crums);
+		$trail_end = array_pop($gd_crums);
+		$gd_crums['trail_end'] = $trail_end;
+		//print_r($gd_crums);
+		//print_r($trail);
+		$trail = $gd_crums;
+	}
+	return $trail;
 }
 
 
@@ -253,12 +253,12 @@ 
  */
 function enfold_action_wrapper_content_open($type = '', $id = '', $class = '')
 {
-    if (geodir_is_page('login')) {
-        echo "<main class='template-page content twelve alpha units " . $class . "' " . avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)) . ">";
-    } else {
-        echo "<main class='template-page content " . avia_layout_class('content', false) . " units " . $class . "' " . avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)) . ">";
-    }
-    echo '<div class="entry-content-wrapper">';
+	if (geodir_is_page('login')) {
+		echo "<main class='template-page content twelve alpha units " . $class . "' " . avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)) . ">";
+	} else {
+		echo "<main class='template-page content " . avia_layout_class('content', false) . " units " . $class . "' " . avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)) . ">";
+	}
+	echo '<div class="entry-content-wrapper">';
 }
 
 
@@ -274,9 +274,9 @@ 
  */
 function enfold_action_sidebar_right_open($type = '', $id = '', $class = '', $itemtype = '')
 {
-    $sidebar_smartphone = avia_get_option('smartphones_sidebar') == 'smartphones_sidebar' ? 'smartphones_sidebar_active' : "";
-    echo "<aside class='sidebar sidebar_right " . $sidebar_smartphone . " " . avia_layout_class('sidebar', false) . " units' " . avia_markup_helper(array('context' => 'sidebar', 'echo' => false)) . ">";
-    echo "<div class='inner_sidebar extralight-border'>";
+	$sidebar_smartphone = avia_get_option('smartphones_sidebar') == 'smartphones_sidebar' ? 'smartphones_sidebar_active' : "";
+	echo "<aside class='sidebar sidebar_right " . $sidebar_smartphone . " " . avia_layout_class('sidebar', false) . " units' " . avia_markup_helper(array('context' => 'sidebar', 'echo' => false)) . ">";
+	echo "<div class='inner_sidebar extralight-border'>";
 }
 
 /**
@@ -291,9 +291,9 @@ 
  */
 function enfold_action_sidebar_left_open($type = '', $id = '', $class = '', $itemtype = '')
 {
-    $sidebar_smartphone = avia_get_option('smartphones_sidebar') == 'smartphones_sidebar' ? 'smartphones_sidebar_active' : "";
-    echo "<aside class='sidebar sidebar_left " . $sidebar_smartphone . " " . avia_layout_class('sidebar', false) . " units' " . avia_markup_helper(array('context' => 'sidebar', 'echo' => false)) . ">";
-    echo "<div class='inner_sidebar extralight-border'>";
+	$sidebar_smartphone = avia_get_option('smartphones_sidebar') == 'smartphones_sidebar' ? 'smartphones_sidebar_active' : "";
+	echo "<aside class='sidebar sidebar_left " . $sidebar_smartphone . " " . avia_layout_class('sidebar', false) . " units' " . avia_markup_helper(array('context' => 'sidebar', 'echo' => false)) . ">";
+	echo "<div class='inner_sidebar extralight-border'>";
 }
 
 
@@ -307,7 +307,7 @@ 
  */
 function gd_enfold_remove_maps_api($call)
 {
-    return false;
+	return false;
 }
 
 

Spacing +5 added lines, -5 removed lines

@@ -162,7 +162,7 @@ 
  */
 function enfold_action_wrapper_open()
 {
-    echo "<div class='container_wrap container_wrap_first main_color " . avia_layout_class('main', false) . "'>";
+    echo "<div class='container_wrap container_wrap_first main_color ".avia_layout_class('main', false)."'>";
     echo "<div class='container template-blog '>";
 }
 
@@ -254,9 +254,9 @@ 
 function enfold_action_wrapper_content_open($type = '', $id = '', $class = '')
 {
     if (geodir_is_page('login')) {
-        echo "<main class='template-page content twelve alpha units " . $class . "' " . avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)) . ">";
+        echo "<main class='template-page content twelve alpha units ".$class."' ".avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)).">";
     } else {
-        echo "<main class='template-page content " . avia_layout_class('content', false) . " units " . $class . "' " . avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)) . ">";
+        echo "<main class='template-page content ".avia_layout_class('content', false)." units ".$class."' ".avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)).">";
     }
     echo '<div class="entry-content-wrapper">';
 }
@@ -275,7 +275,7 @@ 
 function enfold_action_sidebar_right_open($type = '', $id = '', $class = '', $itemtype = '')
 {
     $sidebar_smartphone = avia_get_option('smartphones_sidebar') == 'smartphones_sidebar' ? 'smartphones_sidebar_active' : "";
-    echo "<aside class='sidebar sidebar_right " . $sidebar_smartphone . " " . avia_layout_class('sidebar', false) . " units' " . avia_markup_helper(array('context' => 'sidebar', 'echo' => false)) . ">";
+    echo "<aside class='sidebar sidebar_right ".$sidebar_smartphone." ".avia_layout_class('sidebar', false)." units' ".avia_markup_helper(array('context' => 'sidebar', 'echo' => false)).">";
     echo "<div class='inner_sidebar extralight-border'>";
 }
 
@@ -292,7 +292,7 @@ 
 function enfold_action_sidebar_left_open($type = '', $id = '', $class = '', $itemtype = '')
 {
     $sidebar_smartphone = avia_get_option('smartphones_sidebar') == 'smartphones_sidebar' ? 'smartphones_sidebar_active' : "";
-    echo "<aside class='sidebar sidebar_left " . $sidebar_smartphone . " " . avia_layout_class('sidebar', false) . " units' " . avia_markup_helper(array('context' => 'sidebar', 'echo' => false)) . ">";
+    echo "<aside class='sidebar sidebar_left ".$sidebar_smartphone." ".avia_layout_class('sidebar', false)." units' ".avia_markup_helper(array('context' => 'sidebar', 'echo' => false)).">";
     echo "<div class='inner_sidebar extralight-border'>";
 }
 

geodirectory-functions/compatibility/X.php

Doc Comments +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
  * @since 1.0.0
  * @package GeoDirectory
  * @param array $classes Class array.
- * @return array Modified class array.
+ * @return string[] Modified class array.
  */
 function geodir_x_body_class($classes)
 {

Indentation +211 added lines, -211 removed lines

@@ -19,60 +19,60 @@ 
 function geodir_x_action_calls()
 {
 
-    /* ACTIONS
+	/* ACTIONS
     ****************************************************************************************/
 
-    // Add body class for styling purposes
-    add_filter('body_class', 'geodir_x_body_class');
+	// Add body class for styling purposes
+	add_filter('body_class', 'geodir_x_body_class');
 
-    // HOME TOP SIDEBAR
-    //remove_action( 'geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10 );
-    //remove_action( 'geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10 );
-    //add_action( 'geodir_wrapper_open', 'geodir_x_home_sidebar', 5 );
-    add_action('geodir_before_search_form', 'geodir_x_search_container_open');
-    add_action('geodir_after_search_form', 'geodir_x_search_container_close');
+	// HOME TOP SIDEBAR
+	//remove_action( 'geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10 );
+	//remove_action( 'geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10 );
+	//add_action( 'geodir_wrapper_open', 'geodir_x_home_sidebar', 5 );
+	add_action('geodir_before_search_form', 'geodir_x_search_container_open');
+	add_action('geodir_after_search_form', 'geodir_x_search_container_close');
 
-    // WRAPPER OPEN ACTIONS
-    remove_action('geodir_wrapper_open', 'geodir_action_wrapper_open', 10);
-    add_action('geodir_wrapper_open', 'geodir_x_action_wrapper_open', 9);
+	// WRAPPER OPEN ACTIONS
+	remove_action('geodir_wrapper_open', 'geodir_action_wrapper_open', 10);
+	add_action('geodir_wrapper_open', 'geodir_x_action_wrapper_open', 9);
 
-    // WRAPPER CLOSE ACTIONS
-    remove_action('geodir_wrapper_close', 'geodir_action_wrapper_close', 10);
-    add_action('geodir_wrapper_close', 'geodir_x_action_wrapper_close', 11);
+	// WRAPPER CLOSE ACTIONS
+	remove_action('geodir_wrapper_close', 'geodir_action_wrapper_close', 10);
+	add_action('geodir_wrapper_close', 'geodir_x_action_wrapper_close', 11);
 
-    // WRAPPER CONTENT OPEN ACTIONS
-    remove_action('geodir_wrapper_content_open', 'geodir_action_wrapper_content_open', 10);
-    add_action('geodir_wrapper_content_open', 'geodir_x_action_wrapper_content_open', 9, 3);
+	// WRAPPER CONTENT OPEN ACTIONS
+	remove_action('geodir_wrapper_content_open', 'geodir_action_wrapper_content_open', 10);
+	add_action('geodir_wrapper_content_open', 'geodir_x_action_wrapper_content_open', 9, 3);
 
-    // WRAPPER CONTENT CLOSE ACTIONS
-    remove_action('geodir_wrapper_content_close', 'geodir_action_wrapper_content_close', 10);
-    add_action('geodir_wrapper_content_close', 'geodir_x_action_wrapper_content_close', 11);
+	// WRAPPER CONTENT CLOSE ACTIONS
+	remove_action('geodir_wrapper_content_close', 'geodir_action_wrapper_content_close', 10);
+	add_action('geodir_wrapper_content_close', 'geodir_x_action_wrapper_content_close', 11);
 
-    // SIDEBAR RIGHT OPEN ACTIONS
-    remove_action('geodir_sidebar_right_open', 'geodir_action_sidebar_right_open', 10);
-    add_action('geodir_sidebar_right_open', 'geodir_x_action_sidebar_right_open', 10, 4);
+	// SIDEBAR RIGHT OPEN ACTIONS
+	remove_action('geodir_sidebar_right_open', 'geodir_action_sidebar_right_open', 10);
+	add_action('geodir_sidebar_right_open', 'geodir_x_action_sidebar_right_open', 10, 4);
 
-    // SIDEBAR RIGHT CLOSE ACTIONS
-    remove_action('geodir_sidebar_right_close', 'geodir_action_sidebar_right_close', 10);
-    add_action('geodir_sidebar_right_close', 'geodir_x_action_sidebar_right_close', 10, 1);
+	// SIDEBAR RIGHT CLOSE ACTIONS
+	remove_action('geodir_sidebar_right_close', 'geodir_action_sidebar_right_close', 10);
+	add_action('geodir_sidebar_right_close', 'geodir_x_action_sidebar_right_close', 10, 1);
 
-    // REMOVE BREADCRUMBS
-    remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
+	// REMOVE BREADCRUMBS
+	remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
 
-    // make top section wide
-    remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10);
-    remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10);
-    remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10);
-    remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
+	// make top section wide
+	remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10);
+	remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10);
+	remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10);
+	remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
 
-    add_action('geodir_wrapper_open', 'gd_X_compat_add_top_section_back', 5);
+	add_action('geodir_wrapper_open', 'gd_X_compat_add_top_section_back', 5);
 
 
 } // Close geodir_x_action_calls
@@ -89,17 +89,17 @@ 
 function gd_X_compat_add_top_section_back()
 {
 
-    if (is_page_geodir_home() || geodir_is_page('location')) {
-        geodir_action_geodir_sidebar_home_top();
-    } elseif (geodir_is_page('listing')) {
-        geodir_action_geodir_sidebar_listings_top();
-    } elseif (geodir_is_page('detail')) {
-        geodir_action_geodir_sidebar_detail_top();
-    } elseif (geodir_is_page('search')) {
-        geodir_action_geodir_sidebar_search_top();
-    } elseif (geodir_is_page('author')) {
-        geodir_action_geodir_sidebar_author_top();
-    }
+	if (is_page_geodir_home() || geodir_is_page('location')) {
+		geodir_action_geodir_sidebar_home_top();
+	} elseif (geodir_is_page('listing')) {
+		geodir_action_geodir_sidebar_listings_top();
+	} elseif (geodir_is_page('detail')) {
+		geodir_action_geodir_sidebar_detail_top();
+	} elseif (geodir_is_page('search')) {
+		geodir_action_geodir_sidebar_search_top();
+	} elseif (geodir_is_page('author')) {
+		geodir_action_geodir_sidebar_author_top();
+	}
 
 
 }
@@ -117,8 +117,8 @@ 
  */
 function geodir_x_body_class($classes)
 {
-    $classes[] = 'geodir-x';
-    return $classes;
+	$classes[] = 'geodir-x';
+	return $classes;
 }
 
 /**
@@ -130,14 +130,14 @@ 
  */
 function geodir_x_home_sidebar()
 {
-    //if ( geodir_is_geodir_page() ) {
-    global $wp;
-    if ($wp->query_vars['page_id'] == geodir_location_page_id() || is_home() && !geodir_is_page('login')) {
-        echo '<div class="x-main full">';
-        dynamic_sidebar('geodir_home_top');
-        echo '</div>';
-    }
-    //}
+	//if ( geodir_is_geodir_page() ) {
+	global $wp;
+	if ($wp->query_vars['page_id'] == geodir_location_page_id() || is_home() && !geodir_is_page('login')) {
+		echo '<div class="x-main full">';
+		dynamic_sidebar('geodir_home_top');
+		echo '</div>';
+	}
+	//}
 }
 
 /**
@@ -148,7 +148,7 @@ 
  */
 function geodir_x_search_container_open()
 {
-    echo '<div class="x-container-fluid x-container max">';
+	echo '<div class="x-container-fluid x-container max">';
 }
 
 /**
@@ -159,7 +159,7 @@ 
  */
 function geodir_x_search_container_close()
 {
-    echo '</div>';
+	echo '</div>';
 }
 
 /**
@@ -170,16 +170,16 @@ 
  */
 function geodir_x_action_wrapper_open()
 {
-    global $stack;
-    if ($stack == 'integrity') {
-        echo '<div class="x-container-fluid x-container max width offset">';
-    } elseif ($stack == 'renew') {
-        echo '<div class="x-container-fluid x-container max width offset cf">';
-    } elseif ($stack == 'icon') {
-        echo '<div class="x-main full" role="main">';
-    } elseif ($stack == 'ethos') {
-        echo '<div class="x-container-fluid x-container max width main"><div class="offset cf">';
-    }
+	global $stack;
+	if ($stack == 'integrity') {
+		echo '<div class="x-container-fluid x-container max width offset">';
+	} elseif ($stack == 'renew') {
+		echo '<div class="x-container-fluid x-container max width offset cf">';
+	} elseif ($stack == 'icon') {
+		echo '<div class="x-main full" role="main">';
+	} elseif ($stack == 'ethos') {
+		echo '<div class="x-container-fluid x-container max width main"><div class="offset cf">';
+	}
 }
 
 /**
@@ -190,12 +190,12 @@ 
  */
 function geodir_x_action_wrapper_close()
 {
-    global $stack;
-    if ($stack == 'ethos') {
-        echo '</div></div>';
-    } else {
-        echo '</div>';
-    }
+	global $stack;
+	if ($stack == 'ethos') {
+		echo '</div></div>';
+	} else {
+		echo '</div>';
+	}
 }
 
 /**
@@ -209,7 +209,7 @@ 
  */
 function geodir_x_action_wrapper_content_open($type = '', $id = '', $class = '')
 {
-    echo '<div class="x-main left ' . $class . '" role="main">';
+	echo '<div class="x-main left ' . $class . '" role="main">';
 }
 
 /**
@@ -220,7 +220,7 @@ 
  */
 function geodir_x_action_wrapper_content_close()
 {
-    echo '</div>';
+	echo '</div>';
 }
 
 /**
@@ -235,7 +235,7 @@ 
  */
 function geodir_x_action_sidebar_right_open($type = '', $id = '', $class = '', $itemtype = '')
 {
-    echo '<aside class="x-sidebar right" role="complementary" itemscope itemtype="' . $itemtype . '">';
+	echo '<aside class="x-sidebar right" role="complementary" itemscope itemtype="' . $itemtype . '">';
 }
 
 /**
@@ -247,7 +247,7 @@ 
  */
 function geodir_x_action_sidebar_right_close($type = '')
 {
-    echo '</aside>';
+	echo '</aside>';
 }
 
 add_filter('geodir_breadcrumb', 'geodir_x_breadcrumb');
@@ -261,12 +261,12 @@ 
  */
 function geodir_x_breadcrumb($breadcrumb)
 {
-    $breadcrumb = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">', '', $breadcrumb);
-    $breadcrumb = str_replace('<li>', '', $breadcrumb);
-    $breadcrumb = str_replace('</li>', '', $breadcrumb);
-    $breadcrumb = str_replace('Home', '<span class="home"><i class="x-icon-home"></i></span>', $breadcrumb);
-    $breadcrumb = str_replace('</ul></div>', '', $breadcrumb);
-    return $breadcrumb;
+	$breadcrumb = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">', '', $breadcrumb);
+	$breadcrumb = str_replace('<li>', '', $breadcrumb);
+	$breadcrumb = str_replace('</li>', '', $breadcrumb);
+	$breadcrumb = str_replace('Home', '<span class="home"><i class="x-icon-home"></i></span>', $breadcrumb);
+	$breadcrumb = str_replace('</ul></div>', '', $breadcrumb);
+	return $breadcrumb;
 }
 
 add_filter('geodir_breadcrumb_separator', 'geodir_x_breadcrumb_separator');
@@ -280,125 +280,125 @@ 
  */
 function geodir_x_breadcrumb_separator($separator)
 {
-    $separator = str_replace(' > ', ' <span class="delimiter"><i class="x-icon-angle-right"></i></span> ', $separator);
-    return $separator;
+	$separator = str_replace(' > ', ' <span class="delimiter"><i class="x-icon-angle-right"></i></span> ', $separator);
+	return $separator;
 }
 
 if (!function_exists('x_breadcrumbs')) :
-    /**
-     * breadcrumbs.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     */
-    function x_breadcrumbs()
-    {
-
-        if (x_get_option('x_breadcrumb_display', '1')) {
-
-            //
-            // 1. Delimiter between crumbs.
-            // 2. Output text for the "Home" link.
-            // 3. Link to the home page.
-            // 4. Tag before the current crumb.
-            // 5. Tag after the current crumb.
-            // 6. Get page title.
-            // 7. Get blog title.
-            // 8. Get shop title.
-            //
-
-            GLOBAL $post,$wp;
-
-            if (geodir_is_page('detail') || geodir_is_page('listing') || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id())) {
-                geodir_breadcrumb();
-            } else {
-
-                $stack = x_get_stack();
-                $delimiter = ' <span class="delimiter"><i class="x-icon-angle-right"></i></span> '; // 1
-                $home_text = '<span class="home"><i class="x-icon-home"></i></span>';               // 2
-                $home_link = home_url();                                                            // 3
-                $current_before = '<span class="current">';                                              // 4
-                $current_after = '</span>';                                                             // 5
-                $page_title = get_the_title();                                                       // 6
-                $blog_title = get_the_title(get_option('page_for_posts', true));                 // 7
-                $shop_title = get_theme_mod('x_' . $stack . '_shop_title');                        // 8
-
-                if (function_exists('woocommerce_get_page_id')) {
-                    $shop_url = x_get_shop_link();
-                    $shop_link = '<a href="' . $shop_url . '">' . $shop_title . '</a>';
-                }
-
-                if (is_front_page()) {
-                    echo '<div class="x-breadcrumbs">' . $current_before . $home_text . $current_after . '</div>';
-                } elseif (is_home()) {
-                    echo '<div class="x-breadcrumbs"><a href="' . $home_link . '">' . $home_text . '</a>' . $delimiter . $current_before . $blog_title . $current_after . '</div>';
-                } else {
-                    echo '<div class="x-breadcrumbs"><a href="' . $home_link . '">' . $home_text . '</a>' . $delimiter;
-                    if (is_category()) {
-                        $the_cat = get_category(get_query_var('cat'), false);
-                        if ($the_cat->parent != 0) echo get_category_parents($the_cat->parent, TRUE, $delimiter);
-                        echo $current_before . single_cat_title('', false) . $current_after;
-                    } elseif (x_is_product_category()) {
-                        echo $shop_link . $delimiter . $current_before . single_cat_title('', false) . $current_after;
-                    } elseif (x_is_product_tag()) {
-                        echo $shop_link . $delimiter . $current_before . single_tag_title('', false) . $current_after;
-                    } elseif (is_search()) {
-                        echo $current_before . __('Search Results for ', '__x__') . '&#8220;' . get_search_query() . '&#8221;' . $current_after;
-                    } elseif (is_singular('post')) {
-                        if (get_option('page_for_posts') == is_front_page()) {
-                            echo $current_before . $page_title . $current_after;
-                        } else {
-                            echo '<a href="' . get_permalink(get_option('page_for_posts')) . '" title="' . esc_attr(__('See All Posts', '__x__')) . '">' . $blog_title . '</a>' . $delimiter . $current_before . $page_title . $current_after;
-                        }
-                    } elseif (x_is_portfolio()) {
-                        echo $current_before . get_the_title() . $current_after;
-                    } elseif (x_is_portfolio_item()) {
-                        $link = x_get_parent_portfolio_link();
-                        $title = x_get_parent_portfolio_title();
-                        echo '<a href="' . $link . '" title="' . esc_attr(__('See All Posts', '__x__')) . '">' . $title . '</a>' . $delimiter . $current_before . $page_title . $current_after;
-                    } elseif (x_is_product()) {
-                        echo $shop_link . $delimiter . $current_before . $page_title . $current_after;
-                    } elseif (is_page() && !$post->post_parent) {
-                        echo $current_before . $page_title . $current_after;
-                    } elseif (is_page() && $post->post_parent) {
-                        $parent_id = $post->post_parent;
-                        $breadcrumbs = array();
-                        while ($parent_id) {
-                            $page = get_page($parent_id);
-                            $breadcrumbs[] = '<a href="' . get_permalink($page->ID) . '">' . get_the_title($page->ID) . '</a>';
-                            $parent_id = $page->post_parent;
-                        }
-                        $breadcrumbs = array_reverse($breadcrumbs);
-                        for ($i = 0; $i < count($breadcrumbs); $i++) {
-                            echo $breadcrumbs[$i];
-                            if ($i != count($breadcrumbs) - 1) echo $delimiter;
-                        }
-                        echo $delimiter . $current_before . $page_title . $current_after;
-                    } elseif (is_tag()) {
-                        echo $current_before . single_tag_title('', false) . $current_after;
-                    } elseif (is_author()) {
-                        GLOBAL $author;
-                        $userdata = get_userdata($author);
-                        echo $current_before . __('Posts by ', '__x__') . '&#8220;' . $userdata->display_name . $current_after . '&#8221;';
-                    } elseif (is_404()) {
-                        echo $current_before . __('404 (Page Not Found)', '__x__') . $current_after;
-                    } elseif (is_archive()) {
-                        if (x_is_shop()) {
-                            echo $current_before . $shop_title . $current_after;
-                        } else {
-                            echo $current_before . __('Archives ', '__x__') . $current_after;
-                        }
-                    }
-                    if (get_query_var('paged')) {
-                        echo ' <span class="current" style="white-space: nowrap;">(' . __('Page', '__x__') . ' ' . get_query_var('paged') . ')</span>';
-                    }
-                    echo '</div>';
-                }
-
-            }
-
-        }
-    } // ends my geodir check
+	/**
+	 * breadcrumbs.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 */
+	function x_breadcrumbs()
+	{
+
+		if (x_get_option('x_breadcrumb_display', '1')) {
+
+			//
+			// 1. Delimiter between crumbs.
+			// 2. Output text for the "Home" link.
+			// 3. Link to the home page.
+			// 4. Tag before the current crumb.
+			// 5. Tag after the current crumb.
+			// 6. Get page title.
+			// 7. Get blog title.
+			// 8. Get shop title.
+			//
+
+			GLOBAL $post,$wp;
+
+			if (geodir_is_page('detail') || geodir_is_page('listing') || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id())) {
+				geodir_breadcrumb();
+			} else {
+
+				$stack = x_get_stack();
+				$delimiter = ' <span class="delimiter"><i class="x-icon-angle-right"></i></span> '; // 1
+				$home_text = '<span class="home"><i class="x-icon-home"></i></span>';               // 2
+				$home_link = home_url();                                                            // 3
+				$current_before = '<span class="current">';                                              // 4
+				$current_after = '</span>';                                                             // 5
+				$page_title = get_the_title();                                                       // 6
+				$blog_title = get_the_title(get_option('page_for_posts', true));                 // 7
+				$shop_title = get_theme_mod('x_' . $stack . '_shop_title');                        // 8
+
+				if (function_exists('woocommerce_get_page_id')) {
+					$shop_url = x_get_shop_link();
+					$shop_link = '<a href="' . $shop_url . '">' . $shop_title . '</a>';
+				}
+
+				if (is_front_page()) {
+					echo '<div class="x-breadcrumbs">' . $current_before . $home_text . $current_after . '</div>';
+				} elseif (is_home()) {
+					echo '<div class="x-breadcrumbs"><a href="' . $home_link . '">' . $home_text . '</a>' . $delimiter . $current_before . $blog_title . $current_after . '</div>';
+				} else {
+					echo '<div class="x-breadcrumbs"><a href="' . $home_link . '">' . $home_text . '</a>' . $delimiter;
+					if (is_category()) {
+						$the_cat = get_category(get_query_var('cat'), false);
+						if ($the_cat->parent != 0) echo get_category_parents($the_cat->parent, TRUE, $delimiter);
+						echo $current_before . single_cat_title('', false) . $current_after;
+					} elseif (x_is_product_category()) {
+						echo $shop_link . $delimiter . $current_before . single_cat_title('', false) . $current_after;
+					} elseif (x_is_product_tag()) {
+						echo $shop_link . $delimiter . $current_before . single_tag_title('', false) . $current_after;
+					} elseif (is_search()) {
+						echo $current_before . __('Search Results for ', '__x__') . '&#8220;' . get_search_query() . '&#8221;' . $current_after;
+					} elseif (is_singular('post')) {
+						if (get_option('page_for_posts') == is_front_page()) {
+							echo $current_before . $page_title . $current_after;
+						} else {
+							echo '<a href="' . get_permalink(get_option('page_for_posts')) . '" title="' . esc_attr(__('See All Posts', '__x__')) . '">' . $blog_title . '</a>' . $delimiter . $current_before . $page_title . $current_after;
+						}
+					} elseif (x_is_portfolio()) {
+						echo $current_before . get_the_title() . $current_after;
+					} elseif (x_is_portfolio_item()) {
+						$link = x_get_parent_portfolio_link();
+						$title = x_get_parent_portfolio_title();
+						echo '<a href="' . $link . '" title="' . esc_attr(__('See All Posts', '__x__')) . '">' . $title . '</a>' . $delimiter . $current_before . $page_title . $current_after;
+					} elseif (x_is_product()) {
+						echo $shop_link . $delimiter . $current_before . $page_title . $current_after;
+					} elseif (is_page() && !$post->post_parent) {
+						echo $current_before . $page_title . $current_after;
+					} elseif (is_page() && $post->post_parent) {
+						$parent_id = $post->post_parent;
+						$breadcrumbs = array();
+						while ($parent_id) {
+							$page = get_page($parent_id);
+							$breadcrumbs[] = '<a href="' . get_permalink($page->ID) . '">' . get_the_title($page->ID) . '</a>';
+							$parent_id = $page->post_parent;
+						}
+						$breadcrumbs = array_reverse($breadcrumbs);
+						for ($i = 0; $i < count($breadcrumbs); $i++) {
+							echo $breadcrumbs[$i];
+							if ($i != count($breadcrumbs) - 1) echo $delimiter;
+						}
+						echo $delimiter . $current_before . $page_title . $current_after;
+					} elseif (is_tag()) {
+						echo $current_before . single_tag_title('', false) . $current_after;
+					} elseif (is_author()) {
+						GLOBAL $author;
+						$userdata = get_userdata($author);
+						echo $current_before . __('Posts by ', '__x__') . '&#8220;' . $userdata->display_name . $current_after . '&#8221;';
+					} elseif (is_404()) {
+						echo $current_before . __('404 (Page Not Found)', '__x__') . $current_after;
+					} elseif (is_archive()) {
+						if (x_is_shop()) {
+							echo $current_before . $shop_title . $current_after;
+						} else {
+							echo $current_before . __('Archives ', '__x__') . $current_after;
+						}
+					}
+					if (get_query_var('paged')) {
+						echo ' <span class="current" style="white-space: nowrap;">(' . __('Page', '__x__') . ' ' . get_query_var('paged') . ')</span>';
+					}
+					echo '</div>';
+				}
+
+			}
+
+		}
+	} // ends my geodir check
 endif;
 
 
@@ -413,8 +413,8 @@ 
  */
 function geodir_x_location_switcher_menu_li_class($class)
 {
-    $class .= " menu-item-has-children ";
-    return $class;
+	$class .= " menu-item-has-children ";
+	return $class;
 }
 
 add_filter('geodir_sub_menu_li_class', 'geodir_x_sub_menu_li_class', 10, 1);
@@ -428,6 +428,6 @@ 
  */
 function geodir_x_sub_menu_li_class($class)
 {
-    $class .= " menu-item-has-children ";
-    return $class;
+	$class .= " menu-item-has-children ";
+	return $class;
 }
\ No newline at end of file

Braces +6 added lines, -2 removed lines

@@ -336,7 +336,9 @@ 
                     echo '<div class="x-breadcrumbs"><a href="' . $home_link . '">' . $home_text . '</a>' . $delimiter;
                     if (is_category()) {
                         $the_cat = get_category(get_query_var('cat'), false);
-                        if ($the_cat->parent != 0) echo get_category_parents($the_cat->parent, TRUE, $delimiter);
+                        if ($the_cat->parent != 0) {
+                        	echo get_category_parents($the_cat->parent, TRUE, $delimiter);
+                        }
                         echo $current_before . single_cat_title('', false) . $current_after;
                     } elseif (x_is_product_category()) {
                         echo $shop_link . $delimiter . $current_before . single_cat_title('', false) . $current_after;
@@ -371,7 +373,9 @@ 
                         $breadcrumbs = array_reverse($breadcrumbs);
                         for ($i = 0; $i < count($breadcrumbs); $i++) {
                             echo $breadcrumbs[$i];
-                            if ($i != count($breadcrumbs) - 1) echo $delimiter;
+                            if ($i != count($breadcrumbs) - 1) {
+                            	echo $delimiter;
+                            }
                         }
                         echo $delimiter . $current_before . $page_title . $current_after;
                     } elseif (is_tag()) {

Spacing +32 added lines, -32 removed lines

@@ -209,7 +209,7 @@ 
  */
 function geodir_x_action_wrapper_content_open($type = '', $id = '', $class = '')
 {
-    echo '<div class="x-main left ' . $class . '" role="main">';
+    echo '<div class="x-main left '.$class.'" role="main">';
 }
 
 /**
@@ -235,7 +235,7 @@ 
  */
 function geodir_x_action_sidebar_right_open($type = '', $id = '', $class = '', $itemtype = '')
 {
-    echo '<aside class="x-sidebar right" role="complementary" itemscope itemtype="' . $itemtype . '">';
+    echo '<aside class="x-sidebar right" role="complementary" itemscope itemtype="'.$itemtype.'">';
 }
 
 /**
@@ -307,7 +307,7 @@ 
             // 8. Get shop title.
             //
 
-            GLOBAL $post,$wp;
+            GLOBAL $post, $wp;
 
             if (geodir_is_page('detail') || geodir_is_page('listing') || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id())) {
                 geodir_breadcrumb();
@@ -315,57 +315,57 @@ 
 
                 $stack = x_get_stack();
                 $delimiter = ' <span class="delimiter"><i class="x-icon-angle-right"></i></span> '; // 1
-                $home_text = '<span class="home"><i class="x-icon-home"></i></span>';               // 2
-                $home_link = home_url();                                                            // 3
-                $current_before = '<span class="current">';                                              // 4
-                $current_after = '</span>';                                                             // 5
-                $page_title = get_the_title();                                                       // 6
-                $blog_title = get_the_title(get_option('page_for_posts', true));                 // 7
-                $shop_title = get_theme_mod('x_' . $stack . '_shop_title');                        // 8
+                $home_text = '<span class="home"><i class="x-icon-home"></i></span>'; // 2
+                $home_link = home_url(); // 3
+                $current_before = '<span class="current">'; // 4
+                $current_after = '</span>'; // 5
+                $page_title = get_the_title(); // 6
+                $blog_title = get_the_title(get_option('page_for_posts', true)); // 7
+                $shop_title = get_theme_mod('x_'.$stack.'_shop_title'); // 8
 
                 if (function_exists('woocommerce_get_page_id')) {
                     $shop_url = x_get_shop_link();
-                    $shop_link = '<a href="' . $shop_url . '">' . $shop_title . '</a>';
+                    $shop_link = '<a href="'.$shop_url.'">'.$shop_title.'</a>';
                 }
 
                 if (is_front_page()) {
-                    echo '<div class="x-breadcrumbs">' . $current_before . $home_text . $current_after . '</div>';
+                    echo '<div class="x-breadcrumbs">'.$current_before.$home_text.$current_after.'</div>';
                 } elseif (is_home()) {
-                    echo '<div class="x-breadcrumbs"><a href="' . $home_link . '">' . $home_text . '</a>' . $delimiter . $current_before . $blog_title . $current_after . '</div>';
+                    echo '<div class="x-breadcrumbs"><a href="'.$home_link.'">'.$home_text.'</a>'.$delimiter.$current_before.$blog_title.$current_after.'</div>';
                 } else {
-                    echo '<div class="x-breadcrumbs"><a href="' . $home_link . '">' . $home_text . '</a>' . $delimiter;
+                    echo '<div class="x-breadcrumbs"><a href="'.$home_link.'">'.$home_text.'</a>'.$delimiter;
                     if (is_category()) {
                         $the_cat = get_category(get_query_var('cat'), false);
                         if ($the_cat->parent != 0) echo get_category_parents($the_cat->parent, TRUE, $delimiter);
-                        echo $current_before . single_cat_title('', false) . $current_after;
+                        echo $current_before.single_cat_title('', false).$current_after;
                     } elseif (x_is_product_category()) {
-                        echo $shop_link . $delimiter . $current_before . single_cat_title('', false) . $current_after;
+                        echo $shop_link.$delimiter.$current_before.single_cat_title('', false).$current_after;
                     } elseif (x_is_product_tag()) {
-                        echo $shop_link . $delimiter . $current_before . single_tag_title('', false) . $current_after;
+                        echo $shop_link.$delimiter.$current_before.single_tag_title('', false).$current_after;
                     } elseif (is_search()) {
-                        echo $current_before . __('Search Results for ', '__x__') . '&#8220;' . get_search_query() . '&#8221;' . $current_after;
+                        echo $current_before.__('Search Results for ', '__x__').'&#8220;'.get_search_query().'&#8221;'.$current_after;
                     } elseif (is_singular('post')) {
                         if (get_option('page_for_posts') == is_front_page()) {
-                            echo $current_before . $page_title . $current_after;
+                            echo $current_before.$page_title.$current_after;
                         } else {
-                            echo '<a href="' . get_permalink(get_option('page_for_posts')) . '" title="' . esc_attr(__('See All Posts', '__x__')) . '">' . $blog_title . '</a>' . $delimiter . $current_before . $page_title . $current_after;
+                            echo '<a href="'.get_permalink(get_option('page_for_posts')).'" title="'.esc_attr(__('See All Posts', '__x__')).'">'.$blog_title.'</a>'.$delimiter.$current_before.$page_title.$current_after;
                         }
                     } elseif (x_is_portfolio()) {
-                        echo $current_before . get_the_title() . $current_after;
+                        echo $current_before.get_the_title().$current_after;
                     } elseif (x_is_portfolio_item()) {
                         $link = x_get_parent_portfolio_link();
                         $title = x_get_parent_portfolio_title();
-                        echo '<a href="' . $link . '" title="' . esc_attr(__('See All Posts', '__x__')) . '">' . $title . '</a>' . $delimiter . $current_before . $page_title . $current_after;
+                        echo '<a href="'.$link.'" title="'.esc_attr(__('See All Posts', '__x__')).'">'.$title.'</a>'.$delimiter.$current_before.$page_title.$current_after;
                     } elseif (x_is_product()) {
-                        echo $shop_link . $delimiter . $current_before . $page_title . $current_after;
+                        echo $shop_link.$delimiter.$current_before.$page_title.$current_after;
                     } elseif (is_page() && !$post->post_parent) {
-                        echo $current_before . $page_title . $current_after;
+                        echo $current_before.$page_title.$current_after;
                     } elseif (is_page() && $post->post_parent) {
                         $parent_id = $post->post_parent;
                         $breadcrumbs = array();
                         while ($parent_id) {
                             $page = get_page($parent_id);
-                            $breadcrumbs[] = '<a href="' . get_permalink($page->ID) . '">' . get_the_title($page->ID) . '</a>';
+                            $breadcrumbs[] = '<a href="'.get_permalink($page->ID).'">'.get_the_title($page->ID).'</a>';
                             $parent_id = $page->post_parent;
                         }
                         $breadcrumbs = array_reverse($breadcrumbs);
@@ -373,24 +373,24 @@ 
                             echo $breadcrumbs[$i];
                             if ($i != count($breadcrumbs) - 1) echo $delimiter;
                         }
-                        echo $delimiter . $current_before . $page_title . $current_after;
+                        echo $delimiter.$current_before.$page_title.$current_after;
                     } elseif (is_tag()) {
-                        echo $current_before . single_tag_title('', false) . $current_after;
+                        echo $current_before.single_tag_title('', false).$current_after;
                     } elseif (is_author()) {
                         GLOBAL $author;
                         $userdata = get_userdata($author);
-                        echo $current_before . __('Posts by ', '__x__') . '&#8220;' . $userdata->display_name . $current_after . '&#8221;';
+                        echo $current_before.__('Posts by ', '__x__').'&#8220;'.$userdata->display_name.$current_after.'&#8221;';
                     } elseif (is_404()) {
-                        echo $current_before . __('404 (Page Not Found)', '__x__') . $current_after;
+                        echo $current_before.__('404 (Page Not Found)', '__x__').$current_after;
                     } elseif (is_archive()) {
                         if (x_is_shop()) {
-                            echo $current_before . $shop_title . $current_after;
+                            echo $current_before.$shop_title.$current_after;
                         } else {
-                            echo $current_before . __('Archives ', '__x__') . $current_after;
+                            echo $current_before.__('Archives ', '__x__').$current_after;
                         }
                     }
                     if (get_query_var('paged')) {
-                        echo ' <span class="current" style="white-space: nowrap;">(' . __('Page', '__x__') . ' ' . get_query_var('paged') . ')</span>';
+                        echo ' <span class="current" style="white-space: nowrap;">('.__('Page', '__x__').' '.get_query_var('paged').')</span>';
                     }
                     echo '</div>';
                 }

geodirectory-functions/custom_taxonomy_hooks_actions.php

Doc Comments +3 added lines, -4 removed lines

@@ -325,7 +325,7 @@ 
  * @global wpdb $wpdb WordPress database abstraction object.

  * @deprecated 1.5.0 No longer required.

  * @param string $rules mod_rewrite Rewrite rules formatted for .htaccess.

- * @return array Rewrite rules.

+ * @return string Rewrite rules.

  */

 function geodir_htaccess_contents($rules)

 {

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

  *

  * @param array $public_query_vars The array of query variables.

- * @return array Query variables.

+ * @return string[] Query variables.

  */

 function geodir_add_location_var($public_query_vars)

 {

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

  *

  * @param array $public_query_vars The array of query variables.

- * @return array Query variables.

+ * @return string[] Query variables.

  */

 function geodir_add_geodir_page_var($public_query_vars)

 {

@@ -793,7 +793,6 @@ 
  *

  * @since 1.0.0

  *

- * @param object $wp The WordPress object.

  */

 function geodir_custom_post_status()

 {

Braces +103 added lines, -70 removed lines

@@ -106,24 +106,30 @@ 
         $listing_slug = htmlentities(trim($_REQUEST['geodir_listing_prefix']));

 

         if ($post_type == 'gd_place') {

-            if (array_key_exists('has_archive', $args))

-                $args['has_archive'] = $listing_slug;

+            if (array_key_exists('has_archive', $args)) {
+                            $args['has_archive'] = $listing_slug;
+            }
 

             if (array_key_exists('rewrite', $args)) {

-                if (array_key_exists('slug', $args['rewrite']))

-                    $args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

+                if (array_key_exists('slug', $args['rewrite'])) {
+                                    $args['rewrite']['slug'] = $listing_slug;
+                }
+                // . '/%gd_taxonomy%';

             }

 

             $geodir_post_types = get_option('geodir_post_types');

 

             if (array_key_exists($post_type, $geodir_post_types)) {

 

-                if (array_key_exists('has_archive', $geodir_post_types[$post_type]))

-                    $geodir_post_types[$post_type]['has_archive'] = $listing_slug;

+                if (array_key_exists('has_archive', $geodir_post_types[$post_type])) {
+                                    $geodir_post_types[$post_type]['has_archive'] = $listing_slug;
+                }
 

-                if (array_key_exists('rewrite', $geodir_post_types[$post_type]))

-                    if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))

-                        $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

+                if (array_key_exists('rewrite', $geodir_post_types[$post_type])) {
+                                    if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))

+                        $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;
+                }
+                // . '/%gd_taxonomy%';

 

                 update_option('geodir_post_types', $geodir_post_types);

 

@@ -138,10 +144,11 @@ 
             if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type . 'category'])) {

                 $geodir_taxonomies[$post_type . 'category']['listing_slug'] = $listing_slug;

 

-                if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category']))

-                    if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args']))

+                if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category'])) {
+                                    if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args']))

                         if (array_key_exists('slug', $geodir_taxonomies[$post_type . 'category']['args']['rewrite']))

-                            $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug;

+                            $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug;
+                }
 

                 update_option('geodir_taxonomies', $geodir_taxonomies);

 

@@ -152,10 +159,11 @@ 
             if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type . '_tags'])) {

                 $geodir_taxonomies_tag[$post_type . '_tags']['listing_slug'] = $listing_slug . '/tags';

 

-                if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags']))

-                    if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args']))

+                if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags'])) {
+                                    if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args']))

                         if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']))

-                            $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags';

+                            $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags';
+                }
 

                 update_option('geodir_taxonomies', $geodir_taxonomies_tag);

 

@@ -221,8 +229,9 @@ 
         global $wpdb;

         $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page));

     }

-    if (!isset($location_prefix))

-        $location_prefix = 'location';

+    if (!isset($location_prefix)) {
+            $location_prefix = 'location';
+    }
 

 	$location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

 	if ($location_manager) {

@@ -441,14 +450,17 @@ 
         $gd_country = '';

         $gd_region = '';

         $gd_city = '';

-        if (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '')

-            $gd_country = urldecode($wp->query_vars['gd_country']);

+        if (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') {
+                    $gd_country = urldecode($wp->query_vars['gd_country']);
+        }
 

-        if (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '')

-            $gd_region = urldecode($wp->query_vars['gd_region']);

+        if (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') {
+                    $gd_region = urldecode($wp->query_vars['gd_region']);
+        }
 

-        if (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '')

-            $gd_city = urldecode($wp->query_vars['gd_city']);

+        if (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') {
+                    $gd_city = urldecode($wp->query_vars['gd_city']);
+        }
 

         if (!($gd_country == '' && $gd_region == '' && $gd_city == '')) {

             $default_location = geodir_get_default_location();

@@ -456,17 +468,19 @@ 
             if (get_option('geodir_add_location_url')) {

                 if ($geodir_show_location_url != 'all') {

                     if ($gd_region == '') {

-                        if ($gd_ses_region = $gd_session->get('gd_region'))

-                            $gd_region = $gd_ses_region;

-                        else

-                            $gd_region = $default_location->region_slug;

+                        if ($gd_ses_region = $gd_session->get('gd_region')) {
+                                                    $gd_region = $gd_ses_region;
+                        } else {
+                                                    $gd_region = $default_location->region_slug;
+                        }
                     }

 

                     if ($gd_city == '') {

-                        if ($gd_ses_city = $gd_session->get('gd_city'))

-                            $gd_city = $gd_ses_city;

-                        else

-                            $gd_city = $default_location->city_slug;

+                        if ($gd_ses_city = $gd_session->get('gd_city')) {
+                                                    $gd_city = $gd_ses_city;
+                        } else {
+                                                    $gd_city = $default_location->city_slug;
+                        }
 

                         $base_location_link = geodir_get_location_link('base');

                         wp_redirect($base_location_link . '/' . $gd_country . '/' . $gd_region . '/' . $gd_city);

@@ -585,8 +599,9 @@ 
 

 

 				$geodir_term = str_replace('/' . $geodir_last_term, '', $geodir_term, $post_title_replace_count);

-				if (!$post_title_replace_count)

-					$geodir_term = str_replace($geodir_last_term, '', $geodir_term, $post_title_replace_count);

+				if (!$post_title_replace_count) {
+									$geodir_term = str_replace($geodir_last_term, '', $geodir_term, $post_title_replace_count);
+				}
 				$geodir_terms = explode('/', $geodir_term);

 				$geodir_last_term = end($geodir_terms);

 

@@ -622,8 +637,9 @@ 
                     if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&

                         geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) &&

                         geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)

-                    )

-                        $is_geodir_location_found = true;

+                    ) {
+                                            $is_geodir_location_found = true;
+                    }
 

                     // if location has not been found for country , region and city then search for country and region only

 

@@ -631,8 +647,9 @@ 
                         $gd_city = '';

                         if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&

                             geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region)

-                        )

-                            $is_geodir_location_found = true;

+                        ) {
+                                                    $is_geodir_location_found = true;
+                        }
 

                     }

 

@@ -640,8 +657,9 @@ 
                     if (!$is_geodir_location_found) {

                         $gd_city = '';

                         $gd_region = '';

-                        if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))

-                            $is_geodir_location_found = true;

+                        if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country)) {
+                                                    $is_geodir_location_found = true;
+                        }
                     }

                 } else if ($geodir_show_location_url == 'country_city') {

                     if (count($geodir_terms) >= 2) {

@@ -651,17 +669,19 @@ 
                         $gd_country = urldecode($geodir_terms[0]);

                     }

 

-                    if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))

-                        $is_geodir_location_found = true;

+                    if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) {
+                                            $is_geodir_location_found = true;
+                    }
 

                     // if location has not been found for country and city  then search for country only

                     if (!$is_geodir_location_found) {

                         $gd_city = '';

                         

-						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))

-                            $is_geodir_location_found = true;

+						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country)) {
+						                            $is_geodir_location_found = true;
+						}
                     }

-                }  else if ($geodir_show_location_url == 'region_city') {

+                } else if ($geodir_show_location_url == 'region_city') {

                     if (count($geodir_terms) >= 2) {

                         $gd_region = urldecode($geodir_terms[0]);

                         $gd_city = urldecode($geodir_terms[1]);

@@ -669,15 +689,17 @@ 
                         $gd_region = urldecode($geodir_terms[0]);

                     }

 

-                    if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))

-                        $is_geodir_location_found = true;

+                    if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) {
+                                            $is_geodir_location_found = true;
+                    }
 

                     // if location has not been found for region and city  then search for region only

                     if (!$is_geodir_location_found) {

                         $gd_city = '';

                         

-						if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region))

-                            $is_geodir_location_found = true;

+						if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region)) {
+						                            $is_geodir_location_found = true;
+						}
                     }

                 } else {

                     $gd_city = $geodir_terms[0];

@@ -719,14 +741,17 @@ 
 

             $wp->query_vars[$geodir_taxonomy] = $geodir_term;

             // eliminate location related terms from taxonomy term

-            if ($gd_country != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

+            if ($gd_country != '') {
+                            $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
+            }
 

-            if ($gd_region != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

+            if ($gd_region != '') {
+                            $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
+            }
 

-            if ($gd_city != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

+            if ($gd_city != '') {
+                            $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
+            }
 

 

             $wp->query_vars[$geodir_taxonomy] = str_replace('///', '', $wp->query_vars[$geodir_taxonomy]);

@@ -762,27 +787,34 @@ 
     if (get_option('geodir_add_location_url')) {        

 		if ($geodir_show_location_url == 'all') {

 		} else if ($geodir_show_location_url == 'country_city') {

-			 if (isset($wp->query_vars['gd_region']))

-                $wp->query_vars['gd_region'] = '';

+			 if (isset($wp->query_vars['gd_region'])) {
+			                 $wp->query_vars['gd_region'] = '';
+			 }
 		} else if ($geodir_show_location_url == 'region_city') {

-			if (isset($wp->query_vars['gd_country']))

-                $wp->query_vars['gd_country'] = '';

+			if (isset($wp->query_vars['gd_country'])) {
+			                $wp->query_vars['gd_country'] = '';
+			}
 		} else {

-			if (isset($wp->query_vars['gd_country']))

-                $wp->query_vars['gd_country'] = '';

+			if (isset($wp->query_vars['gd_country'])) {
+			                $wp->query_vars['gd_country'] = '';
+			}
 

-            if (isset($wp->query_vars['gd_region']))

-                $wp->query_vars['gd_region'] = '';

+            if (isset($wp->query_vars['gd_region'])) {
+                            $wp->query_vars['gd_region'] = '';
+            }
 		}

     } else {

-        if (isset($wp->query_vars['gd_country']))

-            $wp->query_vars['gd_country'] = '';

+        if (isset($wp->query_vars['gd_country'])) {
+                    $wp->query_vars['gd_country'] = '';
+        }
 

-        if (isset($wp->query_vars['gd_region']))

-            $wp->query_vars['gd_region'] = '';

+        if (isset($wp->query_vars['gd_region'])) {
+                    $wp->query_vars['gd_region'] = '';
+        }
 

-        if (isset($wp->query_vars['gd_city']))

-            $wp->query_vars['gd_city'] = '';

+        if (isset($wp->query_vars['gd_city'])) {
+                    $wp->query_vars['gd_city'] = '';
+        }
     }

 }

 

@@ -894,8 +926,9 @@ 
 function geodir_exclude_page_where($where)

 {

     global $wpdb;

-    if (is_admin())

-        $where .= " AND $wpdb->posts.post_status != 'virtual'";

+    if (is_admin()) {
+            $where .= " AND $wpdb->posts.post_status != 'virtual'";
+    }
 

     return $where;

 }

Spacing +55 added lines, -55 removed lines

@@ -70,7 +70,7 @@ 
 

             if (!empty($args['labels'])) {

                 foreach ($args['labels'] as $key => $val) {

-                    $args['labels'][$key] = __($val, 'geodirectory');// allow translation

+                    $args['labels'][$key] = __($val, 'geodirectory'); // allow translation

                 }

             }

 

@@ -111,7 +111,7 @@ 
 

             if (array_key_exists('rewrite', $args)) {

                 if (array_key_exists('slug', $args['rewrite']))

-                    $args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

+                    $args['rewrite']['slug'] = $listing_slug; // . '/%gd_taxonomy%';

             }

 

             $geodir_post_types = get_option('geodir_post_types');

@@ -123,7 +123,7 @@ 
 

                 if (array_key_exists('rewrite', $geodir_post_types[$post_type]))

                     if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))

-                        $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

+                        $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug; // . '/%gd_taxonomy%';

 

                 update_option('geodir_post_types', $geodir_post_types);

 

@@ -135,13 +135,13 @@ 
 

             $geodir_taxonomies = get_option('geodir_taxonomies');

 

-            if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type . 'category'])) {

-                $geodir_taxonomies[$post_type . 'category']['listing_slug'] = $listing_slug;

+            if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type.'category'])) {

+                $geodir_taxonomies[$post_type.'category']['listing_slug'] = $listing_slug;

 

-                if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category']))

-                    if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args']))

-                        if (array_key_exists('slug', $geodir_taxonomies[$post_type . 'category']['args']['rewrite']))

-                            $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug;

+                if (array_key_exists('args', $geodir_taxonomies[$post_type.'category']))

+                    if (array_key_exists('rewrite', $geodir_taxonomies[$post_type.'category']['args']))

+                        if (array_key_exists('slug', $geodir_taxonomies[$post_type.'category']['args']['rewrite']))

+                            $geodir_taxonomies[$post_type.'category']['args']['rewrite']['slug'] = $listing_slug;

 

                 update_option('geodir_taxonomies', $geodir_taxonomies);

 

@@ -149,13 +149,13 @@ 
 

             /* --- update taxonomies (tags) --- */

             $geodir_taxonomies_tag = get_option('geodir_taxonomies');

-            if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type . '_tags'])) {

-                $geodir_taxonomies_tag[$post_type . '_tags']['listing_slug'] = $listing_slug . '/tags';

+            if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type.'_tags'])) {

+                $geodir_taxonomies_tag[$post_type.'_tags']['listing_slug'] = $listing_slug.'/tags';

 

-                if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags']))

-                    if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args']))

-                        if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']))

-                            $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags';

+                if (array_key_exists('args', $geodir_taxonomies_tag[$post_type.'_tags']))

+                    if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type.'_tags']['args']))

+                        if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type.'_tags']['args']['rewrite']))

+                            $geodir_taxonomies_tag[$post_type.'_tags']['args']['rewrite']['slug'] = $listing_slug.'/tags';

 

                 update_option('geodir_taxonomies', $geodir_taxonomies_tag);

 

@@ -205,11 +205,11 @@ 
             $listing_slug = $args['listing_slug'];

 

             if (strpos($taxonomy, 'tags')) {

-                $newrules[$listing_slug . '/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&paged=$matches[2]';

-                $newrules[$listing_slug . '/(.+?)/?$'] = 'index.php?' . $taxonomy . '=$matches[1]';

+                $newrules[$listing_slug.'/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?'.$taxonomy.'=$matches[1]&paged=$matches[2]';

+                $newrules[$listing_slug.'/(.+?)/?$'] = 'index.php?'.$taxonomy.'=$matches[1]';

             } else {

                 // use this loop to add paging for details page comments paging

-                $newrules[str_replace("/tags","",$listing_slug) . '/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&cpage=$matches[2]';

+                $newrules[str_replace("/tags", "", $listing_slug).'/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?'.$taxonomy.'=$matches[1]&cpage=$matches[2]';

             }

         endforeach;

     endif;

@@ -217,7 +217,7 @@ 
     // create rules for location listing

     $location_page = get_option('geodir_location_page');

 	

-    if($location_page) {

+    if ($location_page) {

         global $wpdb;

         $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page));

     }

@@ -247,30 +247,30 @@ 
 		

 		if ($matches2) {

 			if ($neighbourhood_active) {

-				$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]&gd_neighbourhood=$matches[3]';

+				$newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]&gd_neighbourhood=$matches[3]';

 			}

-			$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]';

+			$newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]';

 		} else {

 			if ($neighbourhood_active) {

-				$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&gd_neighbourhood=$matches[2]';

+				$newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]&gd_neighbourhood=$matches[2]';

 			}

 		}

 		

-		$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]';

+		$newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]';

 	} else { // country/region/city

 		if ($neighbourhood_active) {

-			$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]';

+			$newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]';

 		}

-		$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]';

-		$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]&gd_region=$matches[2]';

-		$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]';

+		$newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]';

+		$newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&gd_country=$matches[1]&gd_region=$matches[2]';

+		$newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&gd_country=$matches[1]';

 	}

 

     if ($location_page && function_exists('icl_object_id')) {

-        foreach(icl_get_languages('skip_missing=N') as $lang){

+        foreach (icl_get_languages('skip_missing=N') as $lang) {

             $alt_page_id = '';

-            $alt_page_id = icl_object_id($location_page, 'page', false,$lang['language_code']);

-            if($alt_page_id){

+            $alt_page_id = icl_object_id($location_page, 'page', false, $lang['language_code']);

+            if ($alt_page_id) {

                 $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $alt_page_id));

 

 				if ($location_manager && ($hide_country_part || $hide_region_part)) {

@@ -289,29 +289,29 @@ 
 					

 					if ($matches2) {

 						if ($neighbourhood_active) {

-							$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]&gd_neighbourhood=$matches[3]';

+							$newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]&gd_neighbourhood=$matches[3]';

 						}

-						$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]';

+						$newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]';

 					} else {

 						if ($neighbourhood_active) {

-							$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&gd_neighbourhood=$matches[2]';

+							$newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]&gd_neighbourhood=$matches[2]';

 						}

 					}

 					

-					$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]';

+					$newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]';

 				} else { // country/region/city

 					if ($neighbourhood_active) {

-						$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]';

+						$newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]';

 					}

-					$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]';

-					$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]';

-					$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]';

+					$newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]';

+					$newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&gd_country=$matches[1]&gd_region=$matches[2]';

+					$newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&gd_country=$matches[1]';

 				}

             }

         }

     }

 

-    $newrules[$location_prefix . '/?$'] = 'index.php?page_id=' . $location_page;

+    $newrules[$location_prefix.'/?$'] = 'index.php?page_id='.$location_page;

 

     $rules = array_merge($newrules, $rules);

     return $rules;

@@ -340,7 +340,7 @@ 
 #Redirect 301 /location/ /$location_prefix/

 # END GeoDirectory Rules\n\n

 EOD;

-    return $my_content . $rules;

+    return $my_content.$rules;

 }

 //add_filter('mod_rewrite_rules', 'geodir_htaccess_contents');

 

@@ -416,12 +416,12 @@ 
         global $wpdb;

 

         $page_for_posts = get_option('page_for_posts');

-        $real_page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_name=%s",$wp->query_vars['pagename']));

+        $real_page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_name=%s", $wp->query_vars['pagename']));

 

         if (function_exists('icl_object_id')) {

             $real_page_id = icl_object_id($real_page_id, 'page', true, ICL_LANGUAGE_CODE);

         }

-        if ($real_page_id && $real_page_id!=$page_for_posts) {

+        if ($real_page_id && $real_page_id != $page_for_posts) {

             $wp->query_vars['page_id'] = $real_page_id;

         }

     }

@@ -469,7 +469,7 @@ 
                             $gd_city = $default_location->city_slug;

 

                         $base_location_link = geodir_get_location_link('base');

-                        wp_redirect($base_location_link . '/' . $gd_country . '/' . $gd_region . '/' . $gd_city);

+                        wp_redirect($base_location_link.'/'.$gd_country.'/'.$gd_region.'/'.$gd_city);

                         exit();

                     }

                 }

@@ -530,7 +530,7 @@ 
         $geodir_set_location_session = true;

         $geodir_taxonomis = geodir_get_taxonomies('', true);

 

-        if(!empty($geodir_taxonomis)){

+        if (!empty($geodir_taxonomis)) {

             foreach ($geodir_taxonomis as $taxonomy) {

                 if (array_key_exists($taxonomy, $wp->query_vars)) {

                     $is_geodir_taxonomy = true;

@@ -587,7 +587,7 @@ 
 				}

 

 

-				$geodir_term = str_replace('/' . $geodir_last_term, '', $geodir_term, $post_title_replace_count);

+				$geodir_term = str_replace('/'.$geodir_last_term, '', $geodir_term, $post_title_replace_count);

 				if (!$post_title_replace_count)

 					$geodir_term = str_replace($geodir_last_term, '', $geodir_term, $post_title_replace_count);

 				$geodir_terms = explode('/', $geodir_term);

@@ -664,7 +664,7 @@ 
 						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))

                             $is_geodir_location_found = true;

                     }

-                }  else if ($geodir_show_location_url == 'region_city') {

+                } else if ($geodir_show_location_url == 'region_city') {

                     if (count($geodir_terms) >= 2) {

                         $gd_region = urldecode($geodir_terms[0]);

                         $gd_city = urldecode($geodir_terms[1]);

@@ -723,13 +723,13 @@ 
             $wp->query_vars[$geodir_taxonomy] = $geodir_term;

             // eliminate location related terms from taxonomy term

             if ($gd_country != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

+                $wp->query_vars[$geodir_taxonomy] = preg_replace('/'.urlencode($gd_country).'/', '', $wp->query_vars[$geodir_taxonomy], 1);

 

             if ($gd_region != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

+                $wp->query_vars[$geodir_taxonomy] = preg_replace('/'.urlencode($gd_region).'/', '', $wp->query_vars[$geodir_taxonomy], 1);

 

             if ($gd_city != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

+                $wp->query_vars[$geodir_taxonomy] = preg_replace('/'.urlencode($gd_city).'/', '', $wp->query_vars[$geodir_taxonomy], 1);

 

 

             $wp->query_vars[$geodir_taxonomy] = str_replace('///', '', $wp->query_vars[$geodir_taxonomy]);

@@ -914,16 +914,16 @@ 
  * @param string $option Option name.

  * @return mixed The taxonomy option value.

  */

-function geodir_wpseo_taxonomy_meta( $value, $option = '' ) {

+function geodir_wpseo_taxonomy_meta($value, $option = '') {

     global $wp_query;

     

-    if ( !empty( $value ) && ( is_category() || is_tax() ) ) {

+    if (!empty($value) && (is_category() || is_tax())) {

         $term = $wp_query->get_queried_object();

         

-        if ( !empty( $term->term_id ) && !empty( $term->taxonomy ) && isset( $value[$term->taxonomy][$term->term_id] ) && in_array( str_replace( 'category', '', $term->taxonomy ), geodir_get_posttypes() ) ) {

-            $image  = geodir_get_default_catimage( $term->term_id, str_replace( 'category', '', $term->taxonomy ) );

+        if (!empty($term->term_id) && !empty($term->taxonomy) && isset($value[$term->taxonomy][$term->term_id]) && in_array(str_replace('category', '', $term->taxonomy), geodir_get_posttypes())) {

+            $image = geodir_get_default_catimage($term->term_id, str_replace('category', '', $term->taxonomy));

             

-            if ( !empty( $image['src'] ) ) {

+            if (!empty($image['src'])) {

                 $value[$term->taxonomy][$term->term_id]['wpseo_twitter-image'] = $image['src'];

                 $value[$term->taxonomy][$term->term_id]['wpseo_opengraph-image'] = $image['src'];

             }

@@ -931,4 +931,4 @@ 
     }

     return $value;

 }

-add_filter( 'option_wpseo_taxonomy_meta', 'geodir_wpseo_taxonomy_meta', 10, 2 );

+add_filter('option_wpseo_taxonomy_meta', 'geodir_wpseo_taxonomy_meta', 10, 2);

Indentation +472 added lines, -472 removed lines

@@ -13,29 +13,29 @@ 
  */

 function geodir_register_taxonomies()

 {

-    $taxonomies = array();

-    $taxonomies = get_option('geodir_taxonomies');

-    // If custom taxonomies are present, register them

-    if (is_array($taxonomies)) {

-        // Sort taxonomies

-        ksort($taxonomies);

-

-        // Register taxonomies

-        foreach ($taxonomies as $taxonomy => $args) {

-            // Allow taxonomy names to be translated

-            if (!empty($args['args']['labels'])) {

-                foreach ($args['args']['labels'] as $key => $tax_label) {

-                    $args['args']['labels'][$key] = __($tax_label, 'geodirectory');

-                }

-            }

-

-            $tax = register_taxonomy($taxonomy, $args['object_type'], $args['args']);

-

-            if (taxonomy_exists($taxonomy)) {

-                $tax = register_taxonomy_for_object_type($taxonomy, $args['object_type']);

-            }

-        }

-    }

+	$taxonomies = array();

+	$taxonomies = get_option('geodir_taxonomies');

+	// If custom taxonomies are present, register them

+	if (is_array($taxonomies)) {

+		// Sort taxonomies

+		ksort($taxonomies);

+

+		// Register taxonomies

+		foreach ($taxonomies as $taxonomy => $args) {

+			// Allow taxonomy names to be translated

+			if (!empty($args['args']['labels'])) {

+				foreach ($args['args']['labels'] as $key => $tax_label) {

+					$args['args']['labels'][$key] = __($tax_label, 'geodirectory');

+				}

+			}

+

+			$tax = register_taxonomy($taxonomy, $args['object_type'], $args['args']);

+

+			if (taxonomy_exists($taxonomy)) {

+				$tax = register_taxonomy_for_object_type($taxonomy, $args['object_type']);

+			}

+		}

+	}

 }

 

 

@@ -53,40 +53,40 @@ 
  */

 function geodir_register_post_types() 

 {

-    global $wp_post_types;

+	global $wp_post_types;

 

-    $post_types = array();

-    $post_types = get_option('geodir_post_types');

+	$post_types = array();

+	$post_types = get_option('geodir_post_types');

 

-    // Register each post type if array of data is returned

-    if (is_array($post_types)):

+	// Register each post type if array of data is returned

+	if (is_array($post_types)):

 

-        foreach ($post_types as $post_type => $args):

+		foreach ($post_types as $post_type => $args):

 

-            if (!empty($args['rewrite']['slug'])) {

-                $args['rewrite']['slug'] = _x($args['rewrite']['slug'], 'URL slug', 'geodirectory');

-            }

-            $args = stripslashes_deep($args);

+			if (!empty($args['rewrite']['slug'])) {

+				$args['rewrite']['slug'] = _x($args['rewrite']['slug'], 'URL slug', 'geodirectory');

+			}

+			$args = stripslashes_deep($args);

 

-            if (!empty($args['labels'])) {

-                foreach ($args['labels'] as $key => $val) {

-                    $args['labels'][$key] = __($val, 'geodirectory');// allow translation

-                }

-            }

+			if (!empty($args['labels'])) {

+				foreach ($args['labels'] as $key => $val) {

+					$args['labels'][$key] = __($val, 'geodirectory');// allow translation

+				}

+			}

 

-            /**

-             * Filter post type args.

-             *

-             * @since 1.0.0

-             * @param string $args Post type args.

-             * @param string $post_type The post type.

-             */

-            $args = apply_filters('geodir_post_type_args', $args, $post_type);

+			/**

+			 * Filter post type args.

+			 *

+			 * @since 1.0.0

+			 * @param string $args Post type args.

+			 * @param string $post_type The post type.

+			 */

+			$args = apply_filters('geodir_post_type_args', $args, $post_type);

 

-            $post_type = register_post_type($post_type, $args);

+			$post_type = register_post_type($post_type, $args);

 

-        endforeach;

-    endif;

+		endforeach;

+	endif;

 }

 

 /**

@@ -100,72 +100,72 @@ 
  */

 function geodir_post_type_args_modify($args, $post_type)

 {

-    $geodir_location_prefix = isset($_REQUEST['geodir_location_prefix']) ? trim($_REQUEST['geodir_location_prefix']) : get_option('geodir_location_prefix');

+	$geodir_location_prefix = isset($_REQUEST['geodir_location_prefix']) ? trim($_REQUEST['geodir_location_prefix']) : get_option('geodir_location_prefix');

 	if (isset($_REQUEST['geodir_listing_prefix']) && $_REQUEST['geodir_listing_prefix'] != '' && geodir_strtolower($_REQUEST['geodir_listing_prefix']) != geodir_strtolower($geodir_location_prefix)) {

 

-        $listing_slug = htmlentities(trim($_REQUEST['geodir_listing_prefix']));

+		$listing_slug = htmlentities(trim($_REQUEST['geodir_listing_prefix']));

 

-        if ($post_type == 'gd_place') {

-            if (array_key_exists('has_archive', $args))

-                $args['has_archive'] = $listing_slug;

+		if ($post_type == 'gd_place') {

+			if (array_key_exists('has_archive', $args))

+				$args['has_archive'] = $listing_slug;

 

-            if (array_key_exists('rewrite', $args)) {

-                if (array_key_exists('slug', $args['rewrite']))

-                    $args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

-            }

+			if (array_key_exists('rewrite', $args)) {

+				if (array_key_exists('slug', $args['rewrite']))

+					$args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

+			}

 

-            $geodir_post_types = get_option('geodir_post_types');

+			$geodir_post_types = get_option('geodir_post_types');

 

-            if (array_key_exists($post_type, $geodir_post_types)) {

+			if (array_key_exists($post_type, $geodir_post_types)) {

 

-                if (array_key_exists('has_archive', $geodir_post_types[$post_type]))

-                    $geodir_post_types[$post_type]['has_archive'] = $listing_slug;

+				if (array_key_exists('has_archive', $geodir_post_types[$post_type]))

+					$geodir_post_types[$post_type]['has_archive'] = $listing_slug;

 

-                if (array_key_exists('rewrite', $geodir_post_types[$post_type]))

-                    if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))

-                        $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

+				if (array_key_exists('rewrite', $geodir_post_types[$post_type]))

+					if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))

+						$geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

 

-                update_option('geodir_post_types', $geodir_post_types);

+				update_option('geodir_post_types', $geodir_post_types);

 

-            }

+			}

 

-            $geodir_post_types = get_option('geodir_post_types');

+			$geodir_post_types = get_option('geodir_post_types');

 

-            /* --- update taxonomies (category) --- */

+			/* --- update taxonomies (category) --- */

 

-            $geodir_taxonomies = get_option('geodir_taxonomies');

+			$geodir_taxonomies = get_option('geodir_taxonomies');

 

-            if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type . 'category'])) {

-                $geodir_taxonomies[$post_type . 'category']['listing_slug'] = $listing_slug;

+			if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type . 'category'])) {

+				$geodir_taxonomies[$post_type . 'category']['listing_slug'] = $listing_slug;

 

-                if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category']))

-                    if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args']))

-                        if (array_key_exists('slug', $geodir_taxonomies[$post_type . 'category']['args']['rewrite']))

-                            $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug;

+				if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category']))

+					if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args']))

+						if (array_key_exists('slug', $geodir_taxonomies[$post_type . 'category']['args']['rewrite']))

+							$geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug;

 

-                update_option('geodir_taxonomies', $geodir_taxonomies);

+				update_option('geodir_taxonomies', $geodir_taxonomies);

 

-            }

+			}

 

-            /* --- update taxonomies (tags) --- */

-            $geodir_taxonomies_tag = get_option('geodir_taxonomies');

-            if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type . '_tags'])) {

-                $geodir_taxonomies_tag[$post_type . '_tags']['listing_slug'] = $listing_slug . '/tags';

+			/* --- update taxonomies (tags) --- */

+			$geodir_taxonomies_tag = get_option('geodir_taxonomies');

+			if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type . '_tags'])) {

+				$geodir_taxonomies_tag[$post_type . '_tags']['listing_slug'] = $listing_slug . '/tags';

 

-                if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags']))

-                    if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args']))

-                        if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']))

-                            $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags';

+				if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags']))

+					if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args']))

+						if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']))

+							$geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags';

 

-                update_option('geodir_taxonomies', $geodir_taxonomies_tag);

+				update_option('geodir_taxonomies', $geodir_taxonomies_tag);

 

-            }

+			}

 

-        }

+		}

 

-    }

+	}

 

-    return $args;

+	return $args;

 }

 

 /**

@@ -178,8 +178,8 @@ 
  */

 function geodir_flush_rewrite_rules()

 {

-    global $wp_rewrite;

-    $wp_rewrite->flush_rules(false);

+	global $wp_rewrite;

+	$wp_rewrite->flush_rules(false);

 }

 

 /**

@@ -194,35 +194,35 @@ 
  * @return array Rewrite rules.

  */

 function geodir_listing_rewrite_rules($rules) {

-    $newrules = array();

-    $taxonomies = get_option('geodir_taxonomies');

-    $detail_url_seprator = get_option('geodir_detailurl_separator');

+	$newrules = array();

+	$taxonomies = get_option('geodir_taxonomies');

+	$detail_url_seprator = get_option('geodir_detailurl_separator');

     

 	// create rules for post listing

-    if (is_array($taxonomies)):

-        foreach ($taxonomies as $taxonomy => $args):

-            $post_type = $args['object_type'];

-            $listing_slug = $args['listing_slug'];

-

-            if (strpos($taxonomy, 'tags')) {

-                $newrules[$listing_slug . '/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&paged=$matches[2]';

-                $newrules[$listing_slug . '/(.+?)/?$'] = 'index.php?' . $taxonomy . '=$matches[1]';

-            } else {

-                // use this loop to add paging for details page comments paging

-                $newrules[str_replace("/tags","",$listing_slug) . '/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&cpage=$matches[2]';

-            }

-        endforeach;

-    endif;

-

-    // create rules for location listing

-    $location_page = get_option('geodir_location_page');

+	if (is_array($taxonomies)):

+		foreach ($taxonomies as $taxonomy => $args):

+			$post_type = $args['object_type'];

+			$listing_slug = $args['listing_slug'];

+

+			if (strpos($taxonomy, 'tags')) {

+				$newrules[$listing_slug . '/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&paged=$matches[2]';

+				$newrules[$listing_slug . '/(.+?)/?$'] = 'index.php?' . $taxonomy . '=$matches[1]';

+			} else {

+				// use this loop to add paging for details page comments paging

+				$newrules[str_replace("/tags","",$listing_slug) . '/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&cpage=$matches[2]';

+			}

+		endforeach;

+	endif;

+

+	// create rules for location listing

+	$location_page = get_option('geodir_location_page');

 	

-    if($location_page) {

-        global $wpdb;

-        $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page));

-    }

-    if (!isset($location_prefix))

-        $location_prefix = 'location';

+	if($location_page) {

+		global $wpdb;

+		$location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page));

+	}

+	if (!isset($location_prefix))

+		$location_prefix = 'location';

 

 	$location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

 	if ($location_manager) {

@@ -266,12 +266,12 @@ 
 		$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]';

 	}

 

-    if ($location_page && function_exists('icl_object_id')) {

-        foreach(icl_get_languages('skip_missing=N') as $lang){

-            $alt_page_id = '';

-            $alt_page_id = icl_object_id($location_page, 'page', false,$lang['language_code']);

-            if($alt_page_id){

-                $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $alt_page_id));

+	if ($location_page && function_exists('icl_object_id')) {

+		foreach(icl_get_languages('skip_missing=N') as $lang){

+			$alt_page_id = '';

+			$alt_page_id = icl_object_id($location_page, 'page', false,$lang['language_code']);

+			if($alt_page_id){

+				$location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $alt_page_id));

 

 				if ($location_manager && ($hide_country_part || $hide_region_part)) {

 					$matches2 = '';

@@ -307,14 +307,14 @@ 
 					$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]';

 					$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]';

 				}

-            }

-        }

-    }

+			}

+		}

+	}

 

-    $newrules[$location_prefix . '/?$'] = 'index.php?page_id=' . $location_page;

+	$newrules[$location_prefix . '/?$'] = 'index.php?page_id=' . $location_page;

 

-    $rules = array_merge($newrules, $rules);

-    return $rules;

+	$rules = array_merge($newrules, $rules);

+	return $rules;

 }

 

 /**

@@ -329,18 +329,18 @@ 
  */

 function geodir_htaccess_contents($rules)

 {

-    global $wpdb;

-    $location_prefix = get_option('geodir_location_prefix');

-    // if location page slug changed then add redirect

-    if ($location_prefix == 'location') {

-        return $rules;

-    }

-    $my_content = <<<EOD

+	global $wpdb;

+	$location_prefix = get_option('geodir_location_prefix');

+	// if location page slug changed then add redirect

+	if ($location_prefix == 'location') {

+		return $rules;

+	}

+	$my_content = <<<EOD

 \n# BEGIN GeoDirectory Rules

 #Redirect 301 /location/ /$location_prefix/

 # END GeoDirectory Rules\n\n

 EOD;

-    return $my_content . $rules;

+	return $my_content . $rules;

 }

 //add_filter('mod_rewrite_rules', 'geodir_htaccess_contents');

 

@@ -354,10 +354,10 @@ 
  */

 function geodir_add_location_var($public_query_vars)

 {

-    $public_query_vars[] = 'gd_country';

-    $public_query_vars[] = 'gd_region';

-    $public_query_vars[] = 'gd_city';

-    return $public_query_vars;

+	$public_query_vars[] = 'gd_country';

+	$public_query_vars[] = 'gd_region';

+	$public_query_vars[] = 'gd_city';

+	return $public_query_vars;

 }

 

 /**

@@ -370,8 +370,8 @@ 
  */

 function geodir_add_geodir_page_var($public_query_vars)

 {

-    $public_query_vars[] = 'gd_is_geodir_page';

-    return $public_query_vars;

+	$public_query_vars[] = 'gd_is_geodir_page';

+	return $public_query_vars;

 }

 

 /**

@@ -383,20 +383,20 @@ 
  */

 function geodir_add_page_id_in_query_var()

 {

-    global $wp_query;

+	global $wp_query;

 

-    $page_id = $wp_query->get_queried_object_id();

+	$page_id = $wp_query->get_queried_object_id();

 

-    if (!get_query_var('page_id') && !is_archive()) {

-        // fix for WP tags conflict with enfold theme

-        $theme_name = geodir_strtolower(wp_get_theme());

-        if (!geodir_is_geodir_page() && strpos($theme_name, 'enfold') !== false) {

-            return $wp_query;

-        }

-        $wp_query->set('page_id', $page_id);

-    }

+	if (!get_query_var('page_id') && !is_archive()) {

+		// fix for WP tags conflict with enfold theme

+		$theme_name = geodir_strtolower(wp_get_theme());

+		if (!geodir_is_geodir_page() && strpos($theme_name, 'enfold') !== false) {

+			return $wp_query;

+		}

+		$wp_query->set('page_id', $page_id);

+	}

 

-    return $wp_query;

+	return $wp_query;

 }

 

 /**

@@ -411,23 +411,23 @@ 
 function geodir_set_location_var_in_session_in_core($wp) {

 	global $gd_session;

 

-    // Fix for WPML removing page_id query var:

-    if (isset($wp->query_vars['page']) && !isset($wp->query_vars['page_id']) && isset($wp->query_vars['pagename']) && !is_home()) {

-        global $wpdb;

+	// Fix for WPML removing page_id query var:

+	if (isset($wp->query_vars['page']) && !isset($wp->query_vars['page_id']) && isset($wp->query_vars['pagename']) && !is_home()) {

+		global $wpdb;

 

-        $page_for_posts = get_option('page_for_posts');

-        $real_page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_name=%s",$wp->query_vars['pagename']));

+		$page_for_posts = get_option('page_for_posts');

+		$real_page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_name=%s",$wp->query_vars['pagename']));

 

-        if (function_exists('icl_object_id')) {

-            $real_page_id = icl_object_id($real_page_id, 'page', true, ICL_LANGUAGE_CODE);

-        }

-        if ($real_page_id && $real_page_id!=$page_for_posts) {

-            $wp->query_vars['page_id'] = $real_page_id;

-        }

-    }

+		if (function_exists('icl_object_id')) {

+			$real_page_id = icl_object_id($real_page_id, 'page', true, ICL_LANGUAGE_CODE);

+		}

+		if ($real_page_id && $real_page_id!=$page_for_posts) {

+			$wp->query_vars['page_id'] = $real_page_id;

+		}

+	}

 	// Query Vars will have page_id parameter

 	// check if query var has page_id and that page id is location page

-    geodir_set_is_geodir_page($wp);

+	geodir_set_is_geodir_page($wp);

 	// if is GD homepage set the page ID

 	if (geodir_is_page('home')) {

 		$wp->query_vars['page_id'] = get_option('page_on_front');

@@ -436,118 +436,118 @@ 
 	// The location url format (all or country_city or region_city or city).

 	$geodir_show_location_url = get_option('geodir_show_location_url');

 

-    if (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id()) {

-        $gd_country = '';

-        $gd_region = '';

-        $gd_city = '';

-        if (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '')

-            $gd_country = urldecode($wp->query_vars['gd_country']);

-

-        if (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '')

-            $gd_region = urldecode($wp->query_vars['gd_region']);

-

-        if (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '')

-            $gd_city = urldecode($wp->query_vars['gd_city']);

-

-        if (!($gd_country == '' && $gd_region == '' && $gd_city == '')) {

-            $default_location = geodir_get_default_location();

-

-            if (get_option('geodir_add_location_url')) {

-                if ($geodir_show_location_url != 'all') {

-                    if ($gd_region == '') {

-                        if ($gd_ses_region = $gd_session->get('gd_region'))

-                            $gd_region = $gd_ses_region;

-                        else

-                            $gd_region = $default_location->region_slug;

-                    }

-

-                    if ($gd_city == '') {

-                        if ($gd_ses_city = $gd_session->get('gd_city'))

-                            $gd_city = $gd_ses_city;

-                        else

-                            $gd_city = $default_location->city_slug;

-

-                        $base_location_link = geodir_get_location_link('base');

-                        wp_redirect($base_location_link . '/' . $gd_country . '/' . $gd_region . '/' . $gd_city);

-                        exit();

-                    }

-                }

-            }

-

-            $args = array(

-                'what' => 'city',

-                'city_val' => $gd_city,

-                'region_val' => $gd_region,

-                'country_val' => $gd_country,

-                'country_column_name' => 'country_slug',

-                'region_column_name' => 'region_slug',

-                'city_column_name' => 'city_slug',

-                'location_link_part' => false,

-                'compare_operator' => ''

-            );

-

-            $location_array = function_exists('geodir_get_location_array') ? geodir_get_location_array($args) : array();

-            if (!empty($location_array)) {

-                $gd_session->set('gd_multi_location', 1);

-                $gd_session->set('gd_country', $gd_country);

-                $gd_session->set('gd_region', $gd_region);

-                $gd_session->set('gd_city', $gd_city);

+	if (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id()) {

+		$gd_country = '';

+		$gd_region = '';

+		$gd_city = '';

+		if (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '')

+			$gd_country = urldecode($wp->query_vars['gd_country']);

+

+		if (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '')

+			$gd_region = urldecode($wp->query_vars['gd_region']);

+

+		if (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '')

+			$gd_city = urldecode($wp->query_vars['gd_city']);

+

+		if (!($gd_country == '' && $gd_region == '' && $gd_city == '')) {

+			$default_location = geodir_get_default_location();

+

+			if (get_option('geodir_add_location_url')) {

+				if ($geodir_show_location_url != 'all') {

+					if ($gd_region == '') {

+						if ($gd_ses_region = $gd_session->get('gd_region'))

+							$gd_region = $gd_ses_region;

+						else

+							$gd_region = $default_location->region_slug;

+					}

+

+					if ($gd_city == '') {

+						if ($gd_ses_city = $gd_session->get('gd_city'))

+							$gd_city = $gd_ses_city;

+						else

+							$gd_city = $default_location->city_slug;

+

+						$base_location_link = geodir_get_location_link('base');

+						wp_redirect($base_location_link . '/' . $gd_country . '/' . $gd_region . '/' . $gd_city);

+						exit();

+					}

+				}

+			}

+

+			$args = array(

+				'what' => 'city',

+				'city_val' => $gd_city,

+				'region_val' => $gd_region,

+				'country_val' => $gd_country,

+				'country_column_name' => 'country_slug',

+				'region_column_name' => 'region_slug',

+				'city_column_name' => 'city_slug',

+				'location_link_part' => false,

+				'compare_operator' => ''

+			);

+

+			$location_array = function_exists('geodir_get_location_array') ? geodir_get_location_array($args) : array();

+			if (!empty($location_array)) {

+				$gd_session->set('gd_multi_location', 1);

+				$gd_session->set('gd_country', $gd_country);

+				$gd_session->set('gd_region', $gd_region);

+				$gd_session->set('gd_city', $gd_city);

                 

 				$wp->query_vars['gd_country'] = $gd_country;

-                $wp->query_vars['gd_region'] = $gd_region;

-                $wp->query_vars['gd_city'] = $gd_city;

-            } else {

-                $gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));

-            }

-        } else {

-            $gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));

-        }

-

-    } else if (isset($wp->query_vars['post_type']) && $wp->query_vars['post_type'] != '') {

-        if (!is_admin()) {

-            $requested_post_type = $wp->query_vars['post_type'];

-            // check if this post type is geodirectory post types

-            $post_type_array = geodir_get_posttypes();

+				$wp->query_vars['gd_region'] = $gd_region;

+				$wp->query_vars['gd_city'] = $gd_city;

+			} else {

+				$gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));

+			}

+		} else {

+			$gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));

+		}

+

+	} else if (isset($wp->query_vars['post_type']) && $wp->query_vars['post_type'] != '') {

+		if (!is_admin()) {

+			$requested_post_type = $wp->query_vars['post_type'];

+			// check if this post type is geodirectory post types

+			$post_type_array = geodir_get_posttypes();

             

 			if (in_array($requested_post_type, $post_type_array)) {

-                // now u can apply geodirectory related manipulation.

-            }

-        }

-    } else {

-        // check if a geodirectory taxonomy is set

-        $gd_country = '';

-        $gd_region = '';

-        $gd_city = '';

+				// now u can apply geodirectory related manipulation.

+			}

+		}

+	} else {

+		// check if a geodirectory taxonomy is set

+		$gd_country = '';

+		$gd_region = '';

+		$gd_city = '';

         

 		$is_geodir_taxonomy = false;

-        $is_geodir_taxonomy_term = false; // the last term is real geodirectory taxonomy term or not

-        $is_geodir_location_found = false;

+		$is_geodir_taxonomy_term = false; // the last term is real geodirectory taxonomy term or not

+		$is_geodir_location_found = false;

 		

 		$geodir_taxonomy = '';

-        $geodir_post_type = '';

-        $geodir_term = '';

-        $geodir_set_location_session = true;

-        $geodir_taxonomis = geodir_get_taxonomies('', true);

-

-        if(!empty($geodir_taxonomis)){

-            foreach ($geodir_taxonomis as $taxonomy) {

-                if (array_key_exists($taxonomy, $wp->query_vars)) {

-                    $is_geodir_taxonomy = true;

-                    $geodir_taxonomy = $taxonomy;

-                    $geodir_post_type = str_replace('category', '', $taxonomy);

-                    $geodir_post_type = str_replace('_tags', '', $geodir_post_type);

-                    $geodir_term = $wp->query_vars[$geodir_taxonomy];

-                    break;

-                }

-            }

-        }

-

-        // now get an array of all terms seperated by '/'

-        $geodir_terms = explode('/', $geodir_term);

-        $geodir_last_term = end($geodir_terms);

-

-        if ($is_geodir_taxonomy) { // do all these only when it is a geodirectory taxonomy

-            $wp->query_vars['post_type'] = $geodir_post_type;

+		$geodir_post_type = '';

+		$geodir_term = '';

+		$geodir_set_location_session = true;

+		$geodir_taxonomis = geodir_get_taxonomies('', true);

+

+		if(!empty($geodir_taxonomis)){

+			foreach ($geodir_taxonomis as $taxonomy) {

+				if (array_key_exists($taxonomy, $wp->query_vars)) {

+					$is_geodir_taxonomy = true;

+					$geodir_taxonomy = $taxonomy;

+					$geodir_post_type = str_replace('category', '', $taxonomy);

+					$geodir_post_type = str_replace('_tags', '', $geodir_post_type);

+					$geodir_term = $wp->query_vars[$geodir_taxonomy];

+					break;

+				}

+			}

+		}

+

+		// now get an array of all terms seperated by '/'

+		$geodir_terms = explode('/', $geodir_term);

+		$geodir_last_term = end($geodir_terms);

+

+		if ($is_geodir_taxonomy) { // do all these only when it is a geodirectory taxonomy

+			$wp->query_vars['post_type'] = $geodir_post_type;

 

 			// now check if last term is a post of geodirectory post types

 			$geodir_post = get_posts(array(

@@ -596,196 +596,196 @@ 
 				//return ;

 			}

 

-            $geodir_location_terms = '';

-            // if last term is not a post then check if last term is a term of the specific texonomy or not

-            if (geodir_term_exists($geodir_last_term, $geodir_taxonomy)) {

-                $is_geodir_taxonomy_term = true;

+			$geodir_location_terms = '';

+			// if last term is not a post then check if last term is a term of the specific texonomy or not

+			if (geodir_term_exists($geodir_last_term, $geodir_taxonomy)) {

+				$is_geodir_taxonomy_term = true;

 

-                $geodir_set_location_session = false;

-            }

+				$geodir_set_location_session = false;

+			}

 

 

-            // now check if there is location parts in the url or not

-            if (get_option('geodir_add_location_url')) {				

+			// now check if there is location parts in the url or not

+			if (get_option('geodir_add_location_url')) {				

 				$default_location = geodir_get_default_location();

                 

 				if ($geodir_show_location_url == 'all') {

-                    if (count($geodir_terms) >= 3) {

-                        $gd_country = urldecode($geodir_terms[0]);

-                        $gd_region = urldecode($geodir_terms[1]);

-                        $gd_city = urldecode($geodir_terms[2]);

-                    } else if (count($geodir_terms) >= 2) {

-                        $gd_country = urldecode($geodir_terms[0]);

-                        $gd_region = urldecode($geodir_terms[1]);

-                    } else if (count($geodir_terms) >= 1) {

-                        $gd_country = urldecode($geodir_terms[0]);

-                    }

-

-                    if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&

-                        geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) &&

-                        geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)

-                    )

-                        $is_geodir_location_found = true;

-

-                    // if location has not been found for country , region and city then search for country and region only

-

-                    if (!$is_geodir_location_found) {

-                        $gd_city = '';

-                        if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&

-                            geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region)

-                        )

-                            $is_geodir_location_found = true;

-

-                    }

-

-                    // if location has not been found for country , region  then search for country only

-                    if (!$is_geodir_location_found) {

-                        $gd_city = '';

-                        $gd_region = '';

-                        if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))

-                            $is_geodir_location_found = true;

-                    }

-                } else if ($geodir_show_location_url == 'country_city') {

-                    if (count($geodir_terms) >= 2) {

-                        $gd_country = urldecode($geodir_terms[0]);

-                        $gd_city = urldecode($geodir_terms[1]);

-                    } else if (count($geodir_terms) >= 1) {

-                        $gd_country = urldecode($geodir_terms[0]);

-                    }

-

-                    if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))

-                        $is_geodir_location_found = true;

-

-                    // if location has not been found for country and city  then search for country only

-                    if (!$is_geodir_location_found) {

-                        $gd_city = '';

+					if (count($geodir_terms) >= 3) {

+						$gd_country = urldecode($geodir_terms[0]);

+						$gd_region = urldecode($geodir_terms[1]);

+						$gd_city = urldecode($geodir_terms[2]);

+					} else if (count($geodir_terms) >= 2) {

+						$gd_country = urldecode($geodir_terms[0]);

+						$gd_region = urldecode($geodir_terms[1]);

+					} else if (count($geodir_terms) >= 1) {

+						$gd_country = urldecode($geodir_terms[0]);

+					}

+

+					if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&

+						geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) &&

+						geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)

+					)

+						$is_geodir_location_found = true;

+

+					// if location has not been found for country , region and city then search for country and region only

+

+					if (!$is_geodir_location_found) {

+						$gd_city = '';

+						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&

+							geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region)

+						)

+							$is_geodir_location_found = true;

+

+					}

+

+					// if location has not been found for country , region  then search for country only

+					if (!$is_geodir_location_found) {

+						$gd_city = '';

+						$gd_region = '';

+						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))

+							$is_geodir_location_found = true;

+					}

+				} else if ($geodir_show_location_url == 'country_city') {

+					if (count($geodir_terms) >= 2) {

+						$gd_country = urldecode($geodir_terms[0]);

+						$gd_city = urldecode($geodir_terms[1]);

+					} else if (count($geodir_terms) >= 1) {

+						$gd_country = urldecode($geodir_terms[0]);

+					}

+

+					if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))

+						$is_geodir_location_found = true;

+

+					// if location has not been found for country and city  then search for country only

+					if (!$is_geodir_location_found) {

+						$gd_city = '';

                         

 						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))

-                            $is_geodir_location_found = true;

-                    }

-                }  else if ($geodir_show_location_url == 'region_city') {

-                    if (count($geodir_terms) >= 2) {

-                        $gd_region = urldecode($geodir_terms[0]);

-                        $gd_city = urldecode($geodir_terms[1]);

-                    } else if (count($geodir_terms) >= 1) {

-                        $gd_region = urldecode($geodir_terms[0]);

-                    }

-

-                    if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))

-                        $is_geodir_location_found = true;

-

-                    // if location has not been found for region and city  then search for region only

-                    if (!$is_geodir_location_found) {

-                        $gd_city = '';

+							$is_geodir_location_found = true;

+					}

+				}  else if ($geodir_show_location_url == 'region_city') {

+					if (count($geodir_terms) >= 2) {

+						$gd_region = urldecode($geodir_terms[0]);

+						$gd_city = urldecode($geodir_terms[1]);

+					} else if (count($geodir_terms) >= 1) {

+						$gd_region = urldecode($geodir_terms[0]);

+					}

+

+					if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))

+						$is_geodir_location_found = true;

+

+					// if location has not been found for region and city  then search for region only

+					if (!$is_geodir_location_found) {

+						$gd_city = '';

                         

 						if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region))

-                            $is_geodir_location_found = true;

-                    }

-                } else {

-                    $gd_city = $geodir_terms[0];

-

-                    if (geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) {

-                        $is_geodir_location_found = true;

-                        $gd_region = $default_location->region_slug;

-                        $gd_country = $default_location->country_slug;

-                    }

-                }

-                // if location still not found then clear location related session variables

-                if ($is_geodir_location_found && $geodir_set_location_session) {

-                    $gd_session->set('gd_multi_location', 1);

-                    $gd_session->set('gd_country', $gd_country);

-                    $gd_session->set('gd_region', $gd_region);

-                    $gd_session->set('gd_city', $gd_city);

-                }

-

-                if ($geodir_show_location_url == 'all') {

+							$is_geodir_location_found = true;

+					}

+				} else {

+					$gd_city = $geodir_terms[0];

+

+					if (geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) {

+						$is_geodir_location_found = true;

+						$gd_region = $default_location->region_slug;

+						$gd_country = $default_location->country_slug;

+					}

+				}

+				// if location still not found then clear location related session variables

+				if ($is_geodir_location_found && $geodir_set_location_session) {

+					$gd_session->set('gd_multi_location', 1);

+					$gd_session->set('gd_country', $gd_country);

+					$gd_session->set('gd_region', $gd_region);

+					$gd_session->set('gd_city', $gd_city);

+				}

+

+				if ($geodir_show_location_url == 'all') {

 				} else if ($geodir_show_location_url == 'country_city') {

 					$gd_region = '';

 				} else if ($geodir_show_location_url == 'region_city') {

 					$gd_country = '';

 				} else {

 					$gd_country = '';

-                    $gd_region = '';

+					$gd_region = '';

+				}

+

+				if ($is_geodir_location_found) {

+					$wp->query_vars['gd_country'] = $gd_country;

+					$wp->query_vars['gd_region'] = $gd_region;

+					$wp->query_vars['gd_city'] = $gd_city;

+				} else {

+					$gd_country = '';

+					$gd_region = '';

+					$gd_city = '';

 				}

+			}

+

+			$wp->query_vars[$geodir_taxonomy] = $geodir_term;

+			// eliminate location related terms from taxonomy term

+			if ($gd_country != '')

+				$wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

+

+			if ($gd_region != '')

+				$wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

 

-                if ($is_geodir_location_found) {

-                    $wp->query_vars['gd_country'] = $gd_country;

-                    $wp->query_vars['gd_region'] = $gd_region;

-                    $wp->query_vars['gd_city'] = $gd_city;

-                } else {

-                    $gd_country = '';

-                    $gd_region = '';

-                    $gd_city = '';

-                }

-            }

-

-            $wp->query_vars[$geodir_taxonomy] = $geodir_term;

-            // eliminate location related terms from taxonomy term

-            if ($gd_country != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

-

-            if ($gd_region != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

-

-            if ($gd_city != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

-

-

-            $wp->query_vars[$geodir_taxonomy] = str_replace('///', '', $wp->query_vars[$geodir_taxonomy]);

-            $wp->query_vars[$geodir_taxonomy] = str_replace('//', '', $wp->query_vars[$geodir_taxonomy]);

-

-            $wp->query_vars[$geodir_taxonomy] = trim($wp->query_vars[$geodir_taxonomy], '/');

-

-            if ($wp->query_vars[$geodir_taxonomy] == '') {

-                unset($wp->query_vars[$geodir_taxonomy]);

-            } else {

-                if (!$is_geodir_taxonomy_term) {

-                    foreach ($wp->query_vars as $key => $vars) {

-                        unset($wp->query_vars[$key]);

-                    }

-                    $wp->query_vars['error'] = '404';

-                }

-            }

-        }

-    }

+			if ($gd_city != '')

+				$wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

+

+

+			$wp->query_vars[$geodir_taxonomy] = str_replace('///', '', $wp->query_vars[$geodir_taxonomy]);

+			$wp->query_vars[$geodir_taxonomy] = str_replace('//', '', $wp->query_vars[$geodir_taxonomy]);

+

+			$wp->query_vars[$geodir_taxonomy] = trim($wp->query_vars[$geodir_taxonomy], '/');

+

+			if ($wp->query_vars[$geodir_taxonomy] == '') {

+				unset($wp->query_vars[$geodir_taxonomy]);

+			} else {

+				if (!$is_geodir_taxonomy_term) {

+					foreach ($wp->query_vars as $key => $vars) {

+						unset($wp->query_vars[$key]);

+					}

+					$wp->query_vars['error'] = '404';

+				}

+			}

+		}

+	}

 	

 	// Unset location session if gd page and location not set.

 	if (isset($wp->query_vars['gd_is_geodir_page']) && !isset($wp->query_vars['gd_country'])) {

 		$gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));

 	}

 

-    if ($gd_session->get('gd_multi_location') == 1) {

-        $wp->query_vars['gd_country'] = $gd_session->get('gd_country');

-        $wp->query_vars['gd_region'] = $gd_session->get('gd_region');

-        $wp->query_vars['gd_city'] = $gd_session->get('gd_city');

-    }

+	if ($gd_session->get('gd_multi_location') == 1) {

+		$wp->query_vars['gd_country'] = $gd_session->get('gd_country');

+		$wp->query_vars['gd_region'] = $gd_session->get('gd_region');

+		$wp->query_vars['gd_city'] = $gd_session->get('gd_city');

+	}

 

-    // now check if there is location parts in the url or not

-    if (get_option('geodir_add_location_url')) {        

+	// now check if there is location parts in the url or not

+	if (get_option('geodir_add_location_url')) {        

 		if ($geodir_show_location_url == 'all') {

 		} else if ($geodir_show_location_url == 'country_city') {

 			 if (isset($wp->query_vars['gd_region']))

-                $wp->query_vars['gd_region'] = '';

+				$wp->query_vars['gd_region'] = '';

 		} else if ($geodir_show_location_url == 'region_city') {

 			if (isset($wp->query_vars['gd_country']))

-                $wp->query_vars['gd_country'] = '';

+				$wp->query_vars['gd_country'] = '';

 		} else {

 			if (isset($wp->query_vars['gd_country']))

-                $wp->query_vars['gd_country'] = '';

+				$wp->query_vars['gd_country'] = '';

 

-            if (isset($wp->query_vars['gd_region']))

-                $wp->query_vars['gd_region'] = '';

+			if (isset($wp->query_vars['gd_region']))

+				$wp->query_vars['gd_region'] = '';

 		}

-    } else {

-        if (isset($wp->query_vars['gd_country']))

-            $wp->query_vars['gd_country'] = '';

+	} else {

+		if (isset($wp->query_vars['gd_country']))

+			$wp->query_vars['gd_country'] = '';

 

-        if (isset($wp->query_vars['gd_region']))

-            $wp->query_vars['gd_region'] = '';

+		if (isset($wp->query_vars['gd_region']))

+			$wp->query_vars['gd_region'] = '';

 

-        if (isset($wp->query_vars['gd_city']))

-            $wp->query_vars['gd_city'] = '';

-    }

+		if (isset($wp->query_vars['gd_city']))

+			$wp->query_vars['gd_city'] = '';

+	}

 }

 

 /**

@@ -799,24 +799,24 @@ 
  */

 function geodir_custom_post_status()

 {

-    // Virtual Page Status

-    register_post_status('virtual', array(

-        'label' => _x('Virtual', 'page', 'geodirectory'),

-        'public' => true,

-        'exclude_from_search' => true,

-        'show_in_admin_all_list' => true,

-        'show_in_admin_status_list' => true,

-        'label_count' => _n_noop('Virtual <span class="count">(%s)</span>', 'Virtual <span class="count">(%s)</span>', 'geodirectory'),

-    ));

-

-    /**

-     * Called after we register the custom post status 'Virtual'.

-     *

-     * Can be use to add more post statuses.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_custom_post_status');

+	// Virtual Page Status

+	register_post_status('virtual', array(

+		'label' => _x('Virtual', 'page', 'geodirectory'),

+		'public' => true,

+		'exclude_from_search' => true,

+		'show_in_admin_all_list' => true,

+		'show_in_admin_status_list' => true,

+		'label_count' => _n_noop('Virtual <span class="count">(%s)</span>', 'Virtual <span class="count">(%s)</span>', 'geodirectory'),

+	));

+

+	/**

+	 * Called after we register the custom post status 'Virtual'.

+	 *

+	 * Can be use to add more post statuses.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_custom_post_status');

 }

 

 /**

@@ -831,7 +831,7 @@ 
  */

 function geodir_get_term_link($termlink, $term, $taxonomy)

 {

-    return geodir_term_link($termlink, $term, $taxonomy); // taxonomy_functions.php

+	return geodir_term_link($termlink, $term, $taxonomy); // taxonomy_functions.php

 }

 

 /**

@@ -845,7 +845,7 @@ 
  */

 function geodir_get_posttype_link($link, $post_type)

 {

-    return geodir_posttype_link($link, $post_type); // taxonomy_functions.php

+	return geodir_posttype_link($link, $post_type); // taxonomy_functions.php

 }

 

 /**

@@ -860,13 +860,13 @@ 
  */

 function exclude_from_wp_list_pages($exclude_array)

 {

-    $pages_ids = array();

-    $pages_array = get_posts(array('post_type' => 'page', 'post_status' => 'virtual'));

-    foreach ($pages_array as $page) {

-        $pages_ids[] = $page->ID;

-    }

-    $exclude_array = $exclude_array + $pages_ids;

-    return $exclude_array;

+	$pages_ids = array();

+	$pages_array = get_posts(array('post_type' => 'page', 'post_status' => 'virtual'));

+	foreach ($pages_array as $page) {

+		$pages_ids[] = $page->ID;

+	}

+	$exclude_array = $exclude_array + $pages_ids;

+	return $exclude_array;

 }

 

 /**

@@ -879,8 +879,8 @@ 
  */

 function geodir_exclude_page($query)

 {

-    add_filter('posts_where', 'geodir_exclude_page_where', 100);

-    return $query;

+	add_filter('posts_where', 'geodir_exclude_page_where', 100);

+	return $query;

 }

 

 /**

@@ -895,11 +895,11 @@ 
  */

 function geodir_exclude_page_where($where)

 {

-    global $wpdb;

-    if (is_admin())

-        $where .= " AND $wpdb->posts.post_status != 'virtual'";

+	global $wpdb;

+	if (is_admin())

+		$where .= " AND $wpdb->posts.post_status != 'virtual'";

 

-    return $where;

+	return $where;

 }

 

 /**

@@ -914,20 +914,20 @@ 
  * @return mixed The taxonomy option value.

  */

 function geodir_wpseo_taxonomy_meta( $value, $option = '' ) {

-    global $wp_query;

+	global $wp_query;

     

-    if ( !empty( $value ) && ( is_category() || is_tax() ) ) {

-        $term = $wp_query->get_queried_object();

+	if ( !empty( $value ) && ( is_category() || is_tax() ) ) {

+		$term = $wp_query->get_queried_object();

         

-        if ( !empty( $term->term_id ) && !empty( $term->taxonomy ) && isset( $value[$term->taxonomy][$term->term_id] ) && in_array( str_replace( 'category', '', $term->taxonomy ), geodir_get_posttypes() ) ) {

-            $image  = geodir_get_default_catimage( $term->term_id, str_replace( 'category', '', $term->taxonomy ) );

+		if ( !empty( $term->term_id ) && !empty( $term->taxonomy ) && isset( $value[$term->taxonomy][$term->term_id] ) && in_array( str_replace( 'category', '', $term->taxonomy ), geodir_get_posttypes() ) ) {

+			$image  = geodir_get_default_catimage( $term->term_id, str_replace( 'category', '', $term->taxonomy ) );

             

-            if ( !empty( $image['src'] ) ) {

-                $value[$term->taxonomy][$term->term_id]['wpseo_twitter-image'] = $image['src'];

-                $value[$term->taxonomy][$term->term_id]['wpseo_opengraph-image'] = $image['src'];

-            }

-        }

-    }

-    return $value;

+			if ( !empty( $image['src'] ) ) {

+				$value[$term->taxonomy][$term->term_id]['wpseo_twitter-image'] = $image['src'];

+				$value[$term->taxonomy][$term->term_id]['wpseo_opengraph-image'] = $image['src'];

+			}

+		}

+	}

+	return $value;

 }

 add_filter( 'option_wpseo_taxonomy_meta', 'geodir_wpseo_taxonomy_meta', 10, 2 );

geodirectory-functions/geodir-class-session.php

Doc Comments +2 added lines, -4 removed lines

@@ -151,8 +151,7 @@ 
 	 * @since 1.5.7
 	 *
 	 * @param string|array $key Session key.
-	 * @param integer $value Session variable.
-	 * @return string Session variable.
+	 * @return boolean Session variable.
 	 */
 	public function un_set( $key ) {
 		if ( empty( $key ) ) {
@@ -188,8 +187,7 @@ 
 	 * @since 1.5.7
 	 *
 	 * @param string $key Session key.
-	 * @param integer $value Session variable.
-	 * @return string Session variable.
+	 * @return boolean Session variable.
 	 */
 	public function is_set( $key ) {
 		$key = sanitize_key( $key );

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 // Exit if accessed directly.
-if (!defined( 'ABSPATH' ) ) exit;
+if (!defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Geodir_Session Class.

Spacing +61 added lines, -61 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Exit if accessed directly.
-if (!defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 /**
  * Geodir_Session Class.
@@ -46,36 +46,36 @@ 
 	public function __construct() {
 		$this->use_php_sessions = $this->use_php_sessions();
 
-		if ( $this->use_php_sessions ) {
-			if ( is_multisite() ) {
-				$this->prefix = '_' . get_current_blog_id();
+		if ($this->use_php_sessions) {
+			if (is_multisite()) {
+				$this->prefix = '_'.get_current_blog_id();
 			}
 
 			// Use PHP SESSION (must be enabled via the GEODIR_USE_PHP_SESSIONS constant)
-			add_action( 'init', array( $this, 'maybe_start_session' ), -2 );
+			add_action('init', array($this, 'maybe_start_session'), -2);
 		} else {
 			// Use WP_Session (default)
-			if ( !defined( 'WP_SESSION_COOKIE' ) ) {
-				define( 'WP_SESSION_COOKIE', 'geodir_wp_session' );
+			if (!defined('WP_SESSION_COOKIE')) {
+				define('WP_SESSION_COOKIE', 'geodir_wp_session');
 			}
 
-			if ( !class_exists( 'Recursive_ArrayAccess' ) ) {
-				require_once GEODIRECTORY_PLUGIN_DIR . 'geodirectory-functions/wp-session/class-recursive-arrayaccess.php';
+			if (!class_exists('Recursive_ArrayAccess')) {
+				require_once GEODIRECTORY_PLUGIN_DIR.'geodirectory-functions/wp-session/class-recursive-arrayaccess.php';
 			}
 
-			if ( !class_exists( 'WP_Session' ) ) {
-				require_once GEODIRECTORY_PLUGIN_DIR . 'geodirectory-functions/wp-session/class-wp-session.php';
-				require_once GEODIRECTORY_PLUGIN_DIR . 'geodirectory-functions/wp-session/wp-session.php';
+			if (!class_exists('WP_Session')) {
+				require_once GEODIRECTORY_PLUGIN_DIR.'geodirectory-functions/wp-session/class-wp-session.php';
+				require_once GEODIRECTORY_PLUGIN_DIR.'geodirectory-functions/wp-session/wp-session.php';
 			}
 
-			add_filter( 'wp_session_expiration_variant', array( $this, 'set_expiration_variant_time' ), 99999 );
-			add_filter( 'wp_session_expiration', array( $this, 'set_expiration_time' ), 99999 );
+			add_filter('wp_session_expiration_variant', array($this, 'set_expiration_variant_time'), 99999);
+			add_filter('wp_session_expiration', array($this, 'set_expiration_time'), 99999);
 		}
 
-		if ( empty( $this->session ) && ! $this->use_php_sessions ) {
-			add_action( 'plugins_loaded', array( $this, 'init' ), -1 );
+		if (empty($this->session) && !$this->use_php_sessions) {
+			add_action('plugins_loaded', array($this, 'init'), -1);
 		} else {
-			add_action( 'init', array( $this, 'init' ), -1 );
+			add_action('init', array($this, 'init'), -1);
 		}
 	}
 
@@ -87,8 +87,8 @@ 
 	 * @return void
 	 */
 	public function init() {
-		if ( $this->use_php_sessions ) {
-			$this->session = isset( $_SESSION['gd' . $this->prefix ] ) && is_array( $_SESSION['gd' . $this->prefix ] ) ? $_SESSION['gd' . $this->prefix ] : array();
+		if ($this->use_php_sessions) {
+			$this->session = isset($_SESSION['gd'.$this->prefix]) && is_array($_SESSION['gd'.$this->prefix]) ? $_SESSION['gd'.$this->prefix] : array();
 		} else {
 			$this->session = WP_Session::get_instance();
 		}
@@ -115,9 +115,9 @@ 
 	 * @param string $key Session key
 	 * @return string Session variable
 	 */
-	public function get( $key ) {
-		$key = sanitize_key( $key );
-		return isset( $this->session[ $key ] ) ? maybe_unserialize( $this->session[ $key ] ) : false;
+	public function get($key) {
+		$key = sanitize_key($key);
+		return isset($this->session[$key]) ? maybe_unserialize($this->session[$key]) : false;
 	}
 
 	/**
@@ -129,20 +129,20 @@ 
 	 * @param integer $value Session variable
 	 * @return string Session variable
 	 */
-	public function set( $key, $value ) {
-		$key = sanitize_key( $key );
+	public function set($key, $value) {
+		$key = sanitize_key($key);
 
-		if ( is_array( $value ) ) {
-			$this->session[ $key ] = maybe_serialize( $value );
+		if (is_array($value)) {
+			$this->session[$key] = maybe_serialize($value);
 		} else {
-			$this->session[ $key ] = $value;
+			$this->session[$key] = $value;
 		}
 
-		if ( $this->use_php_sessions ) {
-			$_SESSION['gd' . $this->prefix ] = $this->session;
+		if ($this->use_php_sessions) {
+			$_SESSION['gd'.$this->prefix] = $this->session;
 		}
 
-		return $this->session[ $key ];
+		return $this->session[$key];
 	}
 	
 	/**
@@ -154,29 +154,29 @@ 
 	 * @param integer $value Session variable.
 	 * @return string Session variable.
 	 */
-	public function un_set( $key ) {
-		if ( empty( $key ) ) {
+	public function un_set($key) {
+		if (empty($key)) {
 			return false;
 		}
 		
-		if ( is_array( $key ) ) {
+		if (is_array($key)) {
 			foreach ($key as $index) {
-				$index = sanitize_key( $index );
+				$index = sanitize_key($index);
 			
-				if ( $index && isset( $this->session[ $index ] ) ) {
-					unset( $this->session[ $index ] );
+				if ($index && isset($this->session[$index])) {
+					unset($this->session[$index]);
 				}
 			}
 		} else {
-			$key = sanitize_key( $key );
+			$key = sanitize_key($key);
 			
-			if ( isset( $this->session[ $key ] ) ) {
-				unset( $this->session[ $key ] );
+			if (isset($this->session[$key])) {
+				unset($this->session[$key]);
 			}
 		}
 
-		if ( $this->use_php_sessions ) {
-			$_SESSION['gd' . $this->prefix ] = $this->session;
+		if ($this->use_php_sessions) {
+			$_SESSION['gd'.$this->prefix] = $this->session;
 		}
 
 		return true;
@@ -191,14 +191,14 @@ 
 	 * @param integer $value Session variable.
 	 * @return string Session variable.
 	 */
-	public function is_set( $key ) {
-		$key = sanitize_key( $key );
+	public function is_set($key) {
+		$key = sanitize_key($key);
 		
-		if ( empty( $key ) ) {
+		if (empty($key)) {
 			return false;
 		}
 
-		if ( isset( $this->session[ $key ] ) ) {
+		if (isset($this->session[$key])) {
 			return true;
 		}
 
@@ -213,8 +213,8 @@ 
 	 * @param int $exp Default expiration (1 hour)
 	 * @return int
 	 */
-	public function set_expiration_variant_time( $exp ) {
-		return ( 30 * 60 * 23 );
+	public function set_expiration_variant_time($exp) {
+		return (30 * 60 * 23);
 	}
 
 	/**
@@ -225,8 +225,8 @@ 
 	 * @param int $exp Default expiration (1 hour)
 	 * @return int
 	 */
-	public function set_expiration_time( $exp ) {
-		return ( 30 * 60 * 24 );
+	public function set_expiration_time($exp) {
+		return (30 * 60 * 24);
 	}
 
 	/**
@@ -244,18 +244,18 @@ 
 		$ret = false;
 
 		// If the database variable is already set, no need to run autodetection
-		$geodir_use_php_sessions = (bool)get_option( 'geodir_use_php_sessions' );
+		$geodir_use_php_sessions = (bool) get_option('geodir_use_php_sessions');
 
-		if (!$geodir_use_php_sessions ) {
+		if (!$geodir_use_php_sessions) {
 			// Attempt to detect if the server supports PHP sessions
-			if ( function_exists( 'session_start' ) && ! ini_get( 'safe_mode' ) ) {
-				$this->set( 'geodir_use_php_sessions', 1 );
+			if (function_exists('session_start') && !ini_get('safe_mode')) {
+				$this->set('geodir_use_php_sessions', 1);
 				
-				if ( $this->get( 'geodir_use_php_sessions' ) ) {
+				if ($this->get('geodir_use_php_sessions')) {
 					$ret = true;
 
 					// Set the database option
-					update_option( 'geodir_use_php_sessions', true );
+					update_option('geodir_use_php_sessions', true);
 				}
 			}
 		} else {
@@ -263,20 +263,20 @@ 
 		}
 
 		// Enable or disable PHP Sessions based on the GEODIR_USE_PHP_SESSIONS constant
-		if ( defined( 'GEODIR_USE_PHP_SESSIONS' ) && GEODIR_USE_PHP_SESSIONS ) {
+		if (defined('GEODIR_USE_PHP_SESSIONS') && GEODIR_USE_PHP_SESSIONS) {
 			$ret = true;
-		} else if ( defined( 'GEODIR_USE_PHP_SESSIONS' ) && ! GEODIR_USE_PHP_SESSIONS ) {
+		} else if (defined('GEODIR_USE_PHP_SESSIONS') && !GEODIR_USE_PHP_SESSIONS) {
 			$ret = false;
 		}
 
-		return (bool) apply_filters( 'geodir_use_php_sessions', $ret );
+		return (bool) apply_filters('geodir_use_php_sessions', $ret);
 	}
 
 	/**
 	 * Starts a new session if one hasn't started yet.
 	 */
 	public function maybe_start_session() {
-		if ( !session_id() && !headers_sent() ) {
+		if (!session_id() && !headers_sent()) {
 			session_start();
 		}
 	}
@@ -290,11 +290,11 @@ 
 	public function use_cart_cookie() {
 		$ret = true;
 
-		if ( defined( 'GEODIR_USE_CART_COOKIE' ) && ! GEODIR_USE_CART_COOKIE ) {
+		if (defined('GEODIR_USE_CART_COOKIE') && !GEODIR_USE_CART_COOKIE) {
 			$ret = false;
 		}
 
-		return (bool) apply_filters( 'geodir_use_cart_cookie', $ret );
+		return (bool) apply_filters('geodir_use_cart_cookie', $ret);
 	}
 }
 

geodirectory-functions/shortcode_functions.php

Doc Comments +1 added lines, -2 removed lines

@@ -46,7 +46,6 @@ 
  * @since 1.0.0
  * @since 1.5.2 Added TERRAIN map type.
  *
- * @param string $value Input value to validate measurement.
  * @return string The measurement valud in valid format.
  */
 function gdsc_validate_map_args($params)
@@ -95,7 +94,7 @@ 
  * @param mixed $in The variable to check
  * @param bool $strict If set to false, consider everything that is not false to be true.
  *
- * @return bool The boolean equivalent or null
+ * @return null|boolean The boolean equivalent or null
  */
 function gdsc_to_bool_val($in, $strict = false)
 {

Spacing +26 added lines, -26 removed lines

@@ -29,10 +29,10 @@ 
             $value = 100;
         }
         // Re-add the percent symbol
-        $value = $value . '%';
+        $value = $value.'%';
     } elseif ((strlen($value) - 2) == strpos(trim($value), 'px')) {
         // Get the absint & re-add the 'px'
-        $value = preg_replace('/\D/', '', $value) . 'px';
+        $value = preg_replace('/\D/', '', $value).'px';
     } else {
         $value = preg_replace('/\D/', '', $value);
     }
@@ -211,7 +211,7 @@ 
     }
     if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
 
-        $table = $plugin_prefix . $geodir_post_type . '_detail';
+        $table = $plugin_prefix.$geodir_post_type.'_detail';
 
         add_filter('posts_fields', 'geodir_posts_fields', 1);
         add_filter('posts_join', 'geodir_posts_join', 1);
@@ -560,10 +560,10 @@ 
 	$post_number		 = !empty($args['post_number']) ? $args['post_number'] : 10;
 	$add_location_filter = !empty($args['add_location_filter']) ? true : false;
 	$list_sort 			 = !empty($args['list_sort']) ? $args['list_sort'] : 'latest';
-	$character_count	 = isset($args['character_count']) ? $args['character_count'] : '';
-	$layout 			 = !empty($args['layout']) ? $args['layout'] : 'gridview_onehalf';
-	$with_pagination 	 = !empty($args['with_pagination']) ? true : false;
-	$event_type 	 	 = !empty($args['event_type']) ? $args['event_type'] : '';
+	$character_count = isset($args['character_count']) ? $args['character_count'] : '';
+	$layout = !empty($args['layout']) ? $args['layout'] : 'gridview_onehalf';
+	$with_pagination = !empty($args['with_pagination']) ? true : false;
+	$event_type = !empty($args['event_type']) ? $args['event_type'] : '';
     $shortcode_content   = !empty($args['shortcode_content']) ? trim($args['shortcode_content']) : '';
     $tags                = !empty($args['tags']) ? $args['tags'] : array();
     /**
@@ -577,13 +577,13 @@ 
     $shortcode_content = apply_filters('geodir_sc_gd_listings_not_found_content', $shortcode_content, $args);
 		
 	$top_pagination 	 = $with_pagination && !empty($args['top_pagination']) ? true : false;
-	$bottom_pagination 	 = $with_pagination && !empty($args['bottom_pagination']) ? true : false;
+	$bottom_pagination = $with_pagination && !empty($args['bottom_pagination']) ? true : false;
 	
 	$shortcode_atts		 = !empty($args['shortcode_atts']) ? $args['shortcode_atts'] : array();
 
 	// ajax mode
-	$geodir_ajax		 = !empty($args['geodir_ajax']) ? true : false;
-	$pageno 	 		 = $geodir_ajax && !empty($args['pageno']) ? $args['pageno'] : 1;
+	$geodir_ajax = !empty($args['geodir_ajax']) ? true : false;
+	$pageno = $geodir_ajax && !empty($args['pageno']) ? $args['pageno'] : 1;
 	
 	$query_args = array(
         'posts_per_page' => $post_number,
@@ -642,7 +642,7 @@ 
         // Clean tags
         if (!is_array($tags)) {
             $comma = _x(',', 'tag delimiter');
-            if ( ',' !== $comma ) {
+            if (',' !== $comma) {
                 $tags = str_replace($comma, ',', $tags);
             }
             $tags = explode(',', trim($tags, " \n\t\r\0\x0B,"));
@@ -651,7 +651,7 @@ 
         
         if (!empty($tags)) {
             $tag_query = array(
-                'taxonomy' => $post_type . '_tags',
+                'taxonomy' => $post_type.'_tags',
                 'field' => 'name',
                 'terms' => $tags
             );
@@ -681,7 +681,7 @@ 
 		$widget_listings = $total_posts > 0 ? geodir_get_widget_listings($query_args) : array();
 	}
 	$current_gridview_columns_widget = $gridview_columns_widget;
-    $identifier = ' gd-wgt-pagi-' . mt_rand();
+    $identifier = ' gd-wgt-pagi-'.mt_rand();
     ob_start();
 	if (!empty($widget_listings) || $with_no_results) {
 		if (!$geodir_ajax) {
@@ -692,7 +692,7 @@ 
          */
         do_action('geodir_before_sc_gd_listings');
 		?>
-        <div class="geodir_locations geodir_location_listing geodir-sc-gd-listings <?php echo $identifier;?>">
+        <div class="geodir_locations geodir_location_listing geodir-sc-gd-listings <?php echo $identifier; ?>">
             <?php if ($title != '') { ?>
             <div class="geodir_list_heading clearfix">
                 <?php echo $title; ?>
@@ -761,8 +761,8 @@ 
 			?>
             </div><p class="geodir-sclisting-loading" style="display:none;"><i class="fa fa-cog fa-spin"></i></p></div>
 <script type="text/javascript">
-jQuery(document).on('click', '.<?php echo trim($identifier);?> .gd-wgt-page', function(e) {
-    var container = jQuery( '.<?php echo trim($identifier);?>');
+jQuery(document).on('click', '.<?php echo trim($identifier); ?> .gd-wgt-page', function(e) {
+    var container = jQuery( '.<?php echo trim($identifier); ?>');
     var obj = this;
     var pid = parseInt(jQuery(this).data('page'));
     var items = jQuery(obj).closest('.gd-sc-content');
@@ -772,7 +772,7 @@ 
         return false;
     }
     
-    var scatts = "<?php echo addslashes(json_encode($shortcode_atts));?>";
+    var scatts = "<?php echo addslashes(json_encode($shortcode_atts)); ?>";
     
     var data = {
       'action': 'geodir_sclistings',
@@ -861,16 +861,16 @@ 
 	if ($max_page > 1 || $always_show) {
 		// Extra pagination info
 		$geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
-		$start_no = ( $pageno - 1 ) * $posts_per_page + 1;
+		$start_no = ($pageno - 1) * $posts_per_page + 1;
 		$end_no = min($pageno * $posts_per_page, $numposts);
 		
 		if ($geodir_pagination_more_info != '') {
-			$pagination_info = '<div class="gd-pagination-details gd-pagination-details-' . $geodir_pagination_more_info . '">' . wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts) . '</div>';
+			$pagination_info = '<div class="gd-pagination-details gd-pagination-details-'.$geodir_pagination_more_info.'">'.wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts).'</div>';
 			
 			if ($geodir_pagination_more_info == 'before') {
-				$before = $before . $pagination_info;
+				$before = $before.$pagination_info;
 			} else if ($geodir_pagination_more_info == 'after') {
-				$after = $pagination_info . $after;
+				$after = $pagination_info.$after;
 			}
 		}
 			
@@ -880,7 +880,7 @@ 
 		}
 		
 		if (($pageno - 1) > 0) {
-            echo '<a class="gd-page-sc-prev gd-wgt-page" data-page="' . (int)($pageno - 1) . '" href="javascript:void(0);">' . $prelabel . '</a>&nbsp;';
+            echo '<a class="gd-page-sc-prev gd-wgt-page" data-page="'.(int) ($pageno - 1).'" href="javascript:void(0);">'.$prelabel.'</a>&nbsp;';
 		}
 		
 		for ($i = $pageno - $half_pages_to_show; $i <= $pageno + $half_pages_to_show; $i++) {
@@ -888,17 +888,17 @@ 
 				if ($i == $pageno) {
 					echo "<strong class='on' class='gd-page-sc-act'>$i</strong>";
 				} else {
-					echo ' <a class="gd-page-sc-no gd-wgt-page" data-page="' . (int)$i . '" href="javascript:void(0);">' . $i . '</a> ';
+					echo ' <a class="gd-page-sc-no gd-wgt-page" data-page="'.(int) $i.'" href="javascript:void(0);">'.$i.'</a> ';
 				}
 			}
 		}
 		
 		if (($pageno + 1) <= $max_page) {
-			echo '&nbsp;<a class="gd-page-sc-nxt gd-wgt-page" data-page="' . (int)($pageno + 1) . '" href="javascript:void(0);">' . $nxtlabel . '</a>';
+			echo '&nbsp;<a class="gd-page-sc-nxt gd-wgt-page" data-page="'.(int) ($pageno + 1).'" href="javascript:void(0);">'.$nxtlabel.'</a>';
 		}
 		
 		if ($pageno < $max_page) {
-			echo '&nbsp;<a class="gd-page-sc-lst gd-wgt-page" data-page="' . (int)$max_page . '" href="javascript:void(0);">&raquo;</a>';
+			echo '&nbsp;<a class="gd-page-sc-lst gd-wgt-page" data-page="'.(int) $max_page.'" href="javascript:void(0);">&raquo;</a>';
 		}
 		echo "</div> $after </div>";
 	}
@@ -921,7 +921,7 @@ 
     $scatts = isset($_POST['scatts']) ? $_POST['scatts'] : NULL;
     $pageno = isset($_POST['pageno']) ? absint($_POST['pageno']) : 1;
 	
-	$shortcode_atts = !empty($scatts) ? (array)json_decode(stripslashes_deep($scatts)) : NULL;
+	$shortcode_atts = !empty($scatts) ? (array) json_decode(stripslashes_deep($scatts)) : NULL;
 	
 	if (!empty($shortcode_atts) && is_array($shortcode_atts)) {
 		$shortcode_atts['pageno'] = $pageno;

Indentation +416 added lines, -416 removed lines

@@ -9,7 +9,7 @@ 
  
 // If this file is called directly, abort.
 if (!defined('WPINC')) {
-    die;
+	die;
 }
 
 /**
@@ -22,22 +22,22 @@ 
  */
 function gdsc_validate_measurements($value)
 {
-    if ((strlen($value) - 1) == strpos(trim($value), '%')) {
-        // $value is entered as a percent, so it can't be less than 0 or more than 100
-        $value = preg_replace('/\D/', '', $value);
-        if (100 < $value) {
-            $value = 100;
-        }
-        // Re-add the percent symbol
-        $value = $value . '%';
-    } elseif ((strlen($value) - 2) == strpos(trim($value), 'px')) {
-        // Get the absint & re-add the 'px'
-        $value = preg_replace('/\D/', '', $value) . 'px';
-    } else {
-        $value = preg_replace('/\D/', '', $value);
-    }
+	if ((strlen($value) - 1) == strpos(trim($value), '%')) {
+		// $value is entered as a percent, so it can't be less than 0 or more than 100
+		$value = preg_replace('/\D/', '', $value);
+		if (100 < $value) {
+			$value = 100;
+		}
+		// Re-add the percent symbol
+		$value = $value . '%';
+	} elseif ((strlen($value) - 2) == strpos(trim($value), 'px')) {
+		// Get the absint & re-add the 'px'
+		$value = preg_replace('/\D/', '', $value) . 'px';
+	} else {
+		$value = preg_replace('/\D/', '', $value);
+	}
 
-    return $value;
+	return $value;
 }
 
 /**
@@ -52,35 +52,35 @@ 
 function gdsc_validate_map_args($params)
 {
 
-    $params['width'] = gdsc_validate_measurements($params['width']);
-    $params['height'] = gdsc_validate_measurements($params['height']);
+	$params['width'] = gdsc_validate_measurements($params['width']);
+	$params['height'] = gdsc_validate_measurements($params['height']);
 
-    // Only accept our 4 maptypes. Otherwise, revert to the default.
-    if (!(in_array(geodir_strtoupper($params['maptype']), array('HYBRID', 'SATELLITE', 'ROADMAP', 'TERRAIN')))) {
-        $params['maptype'] = 'ROADMAP';
-    } else {
-        $params['maptype'] = geodir_strtoupper($params['maptype']);
-    }
+	// Only accept our 4 maptypes. Otherwise, revert to the default.
+	if (!(in_array(geodir_strtoupper($params['maptype']), array('HYBRID', 'SATELLITE', 'ROADMAP', 'TERRAIN')))) {
+		$params['maptype'] = 'ROADMAP';
+	} else {
+		$params['maptype'] = geodir_strtoupper($params['maptype']);
+	}
 
-    // Zoom accepts a value between 1 and 19
-    $params['zoom'] = absint($params['zoom']);
-    if (19 < $params['zoom']) {
-        $params['zoom'] = '19';
-    }
-    if (0 == $params['zoom']) {
-        $params['zoom'] = '1';
-    }
+	// Zoom accepts a value between 1 and 19
+	$params['zoom'] = absint($params['zoom']);
+	if (19 < $params['zoom']) {
+		$params['zoom'] = '19';
+	}
+	if (0 == $params['zoom']) {
+		$params['zoom'] = '1';
+	}
 
-    // Child_collapse must be boolean
-    $params['child_collapse'] = gdsc_to_bool_val($params['child_collapse']);
+	// Child_collapse must be boolean
+	$params['child_collapse'] = gdsc_to_bool_val($params['child_collapse']);
 
-    // Scrollwheel must be boolean
-    $params['scrollwheel'] = gdsc_to_bool_val($params['scrollwheel']);
+	// Scrollwheel must be boolean
+	$params['scrollwheel'] = gdsc_to_bool_val($params['scrollwheel']);
 
-    // Scrollwheel must be boolean
-    $params['autozoom'] = gdsc_to_bool_val($params['autozoom']);
+	// Scrollwheel must be boolean
+	$params['autozoom'] = gdsc_to_bool_val($params['autozoom']);
 
-    return $params;
+	return $params;
 }
 
 /**
@@ -99,52 +99,52 @@ 
  */
 function gdsc_to_bool_val($in, $strict = false)
 {
-    $out = null;
-
-    // if not strict, we only have to check if something is false
-    if (in_array($in, array(
-        'false',
-        'False',
-        'FALSE',
-        'no',
-        'No',
-        'n',
-        'N',
-        '0',
-        'off',
-        'Off',
-        'OFF',
-        false,
-        0,
-        null
-    ), true)) {
-        $out = false;
-    } else if ($strict) {
-        // if strict, check the equivalent true values
-        if (in_array($in, array(
-            'true',
-            'True',
-            'TRUE',
-            'yes',
-            'Yes',
-            'y',
-            'Y',
-            '1',
-            'on',
-            'On',
-            'ON',
-            true,
-            1
-        ), true)) {
-            $out = true;
-        }
-    } else {
-        // not strict? let the regular php bool check figure it out (will
-        //     largely default to true)
-        $out = ($in ? true : false);
-    }
+	$out = null;
+
+	// if not strict, we only have to check if something is false
+	if (in_array($in, array(
+		'false',
+		'False',
+		'FALSE',
+		'no',
+		'No',
+		'n',
+		'N',
+		'0',
+		'off',
+		'Off',
+		'OFF',
+		false,
+		0,
+		null
+	), true)) {
+		$out = false;
+	} else if ($strict) {
+		// if strict, check the equivalent true values
+		if (in_array($in, array(
+			'true',
+			'True',
+			'TRUE',
+			'yes',
+			'Yes',
+			'y',
+			'Y',
+			'1',
+			'on',
+			'On',
+			'ON',
+			true,
+			1
+		), true)) {
+			$out = true;
+		}
+	} else {
+		// not strict? let the regular php bool check figure it out (will
+		//     largely default to true)
+		$out = ($in ? true : false);
+	}
 
-    return $out;
+	return $out;
 }
 
 /**
@@ -157,16 +157,16 @@ 
  */
 function gdsc_is_post_type_valid($incoming_post_type)
 {
-    $post_types = geodir_get_posttypes();
-    $post_types = array_map('geodir_strtolower', $post_types);
-    $post_type_found = false;
-    foreach ($post_types as $type) {
-        if (geodir_strtolower($incoming_post_type) == geodir_strtolower($type)) {
-            $post_type_found = true;
-        }
-    }
+	$post_types = geodir_get_posttypes();
+	$post_types = array_map('geodir_strtolower', $post_types);
+	$post_type_found = false;
+	foreach ($post_types as $type) {
+		if (geodir_strtolower($incoming_post_type) == geodir_strtolower($type)) {
+			$post_type_found = true;
+		}
+	}
 
-    return $post_type_found;
+	return $post_type_found;
 }
 
 /**
@@ -186,52 +186,52 @@ 
  */
 function gdsc_listing_loop_filter($query)
 {
-    global $wp_query, $geodir_post_type, $table, $plugin_prefix, $term;
-
-    $geodir_post_type = geodir_get_current_posttype();
-
-    if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {
-        $taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy');
-
-        if (isset($wp_query->query[$taxonomies[0]])) {
-            $request_term = explode("/", $wp_query->query[$taxonomies[0]]);
-            $request_term = end($request_term);
-            if (!term_exists($request_term)) {
-                $args = array('number' => '1',);
-                $terms_arr = get_terms($taxonomies[0], $args);
-                foreach ($terms_arr as $location_term) {
-                    $term_arr = $location_term;
-                    $term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));
-                }
-                $wp_query->queried_object_id = 1;
-                $wp_query->queried_object = $term_arr;
-            }
-        }
+	global $wp_query, $geodir_post_type, $table, $plugin_prefix, $term;
+
+	$geodir_post_type = geodir_get_current_posttype();
+
+	if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {
+		$taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy');
+
+		if (isset($wp_query->query[$taxonomies[0]])) {
+			$request_term = explode("/", $wp_query->query[$taxonomies[0]]);
+			$request_term = end($request_term);
+			if (!term_exists($request_term)) {
+				$args = array('number' => '1',);
+				$terms_arr = get_terms($taxonomies[0], $args);
+				foreach ($terms_arr as $location_term) {
+					$term_arr = $location_term;
+					$term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));
+				}
+				$wp_query->queried_object_id = 1;
+				$wp_query->queried_object = $term_arr;
+			}
+		}
 
-    }
-    if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
+	}
+	if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
 
-        $table = $plugin_prefix . $geodir_post_type . '_detail';
+		$table = $plugin_prefix . $geodir_post_type . '_detail';
 
-        add_filter('posts_fields', 'geodir_posts_fields', 1);
-        add_filter('posts_join', 'geodir_posts_join', 1);
-        geodir_post_where();
-        if (!is_admin()) {
-            add_filter('posts_orderby', 'geodir_posts_orderby', 1);
-        }
+		add_filter('posts_fields', 'geodir_posts_fields', 1);
+		add_filter('posts_join', 'geodir_posts_join', 1);
+		geodir_post_where();
+		if (!is_admin()) {
+			add_filter('posts_orderby', 'geodir_posts_orderby', 1);
+		}
 
-        // advanced filter for popular post view widget
-        global $wp_query;
-        if (!is_admin()) {
-            if (!empty($wp_query->query['with_pics_only'])) {
-                add_filter('posts_join', 'geodir_filter_widget_join', 1000);
-            }
-            add_filter('posts_where', 'geodir_filter_widget_where', 1000);
-        }
+		// advanced filter for popular post view widget
+		global $wp_query;
+		if (!is_admin()) {
+			if (!empty($wp_query->query['with_pics_only'])) {
+				add_filter('posts_join', 'geodir_filter_widget_join', 1000);
+			}
+			add_filter('posts_where', 'geodir_filter_widget_where', 1000);
+		}
 
-    }
+	}
 
-    return $query;
+	return $query;
 }
 
 /**
@@ -245,40 +245,40 @@ 
  */
 function gdsc_manage_category_choice($post_type, $category)
 {
-    if (0 == $category || '' == $category) {
-        return '';
-    }
+	if (0 == $category || '' == $category) {
+		return '';
+	}
 
-    if (!(gdsc_is_post_type_valid($post_type))) {
-        return '';
-    }
+	if (!(gdsc_is_post_type_valid($post_type))) {
+		return '';
+	}
 
-    $taxonomies = geodir_get_taxonomies($post_type);
+	$taxonomies = geodir_get_taxonomies($post_type);
 
-    $categories = get_terms(array('taxonomy' => $taxonomies[0]));
+	$categories = get_terms(array('taxonomy' => $taxonomies[0]));
 
-    $cat_id = 0;
+	$cat_id = 0;
 
-    foreach ($categories as $cat) {
-        if (is_numeric($category)) {
-            if (absint($category) == $cat->term_id) {
-                $cat_id = $cat->term_id;
-                break;
-            }
-        } else {
-            if ($category == $cat->slug) {
-                $cat_id = $cat->term_id;
-                break;
-            }
+	foreach ($categories as $cat) {
+		if (is_numeric($category)) {
+			if (absint($category) == $cat->term_id) {
+				$cat_id = $cat->term_id;
+				break;
+			}
+		} else {
+			if ($category == $cat->slug) {
+				$cat_id = $cat->term_id;
+				break;
+			}
 
-            if ($category == $cat->name) {
-                $cat_id = $cat->term_id;
-                break;
-            }
-        }
-    }
+			if ($category == $cat->name) {
+				$cat_id = $cat->term_id;
+				break;
+			}
+		}
+	}
 
-    return $cat_id;
+	return $cat_id;
 }
 
 // @todo: Extract this
@@ -288,11 +288,11 @@ 
 	 * Adds the script in the page footer for the home page google map.
 	 *
 	 * @since 1.0.0
-     * @return string Print the script in page footer.
+	 * @return string Print the script in page footer.
 	 */
 	function geodir_home_map_add_script()
-    {
-        ?>
+	{
+		?>
         <script type="text/javascript">
             jQuery(document).ready(function () {
                 geoDirMapSlide();
@@ -365,7 +365,7 @@ 
             }
         </script>
     <?php
-    }
+	}
 }
 
 /**
@@ -376,7 +376,7 @@ 
  */
 function geodir_popular_category_add_scripts()
 {
-    ?>
+	?>
     <script type="text/javascript">
         jQuery(function ($) {
             $('.geodir-showcat').click(function () {
@@ -406,56 +406,56 @@ 
  */
 function gdsc_validate_layout_choice($layout_choice)
 {
-    switch (geodir_strtolower($layout_choice)) {
-        case 'list';
-        case 'one';
-        case 'one_column';
-        case 'onecolumn';
-        case '1';
-            $layout_choice = 'list';
-            break;
-        case 'gridview_onehalf';
-        case 'two';
-        case 'two_column';
-        case 'two_columns';
-        case 'twocolumn';
-        case 'twocolumns';
-        case '2';
-            $layout_choice = 'gridview_onehalf';
-            break;
-        case 'gridview_onethird';
-        case 'three';
-        case 'three_column';
-        case 'three_columns';
-        case 'threecolumn';
-        case 'threecolumns';
-        case '3';
-            $layout_choice = 'gridview_onethird';
-            break;
-        case 'gridview_onefourth';
-        case 'four';
-        case 'four_column';
-        case 'four_columns';
-        case 'fourcolumn';
-        case 'fourcolumns';
-        case '4';
-            $layout_choice = 'gridview_onefourth';
-            break;
-        case 'gridview_onefifth';
-        case 'five';
-        case 'five_column';
-        case 'five_columns';
-        case 'fivecolumn';
-        case 'fivecolumns';
-        case '5';
-            $layout_choice = 'gridview_onefifth';
-            break;
-        default:
-            $layout_choice = 'gridview_onehalf';
-            break;
-    }
+	switch (geodir_strtolower($layout_choice)) {
+		case 'list';
+		case 'one';
+		case 'one_column';
+		case 'onecolumn';
+		case '1';
+			$layout_choice = 'list';
+			break;
+		case 'gridview_onehalf';
+		case 'two';
+		case 'two_column';
+		case 'two_columns';
+		case 'twocolumn';
+		case 'twocolumns';
+		case '2';
+			$layout_choice = 'gridview_onehalf';
+			break;
+		case 'gridview_onethird';
+		case 'three';
+		case 'three_column';
+		case 'three_columns';
+		case 'threecolumn';
+		case 'threecolumns';
+		case '3';
+			$layout_choice = 'gridview_onethird';
+			break;
+		case 'gridview_onefourth';
+		case 'four';
+		case 'four_column';
+		case 'four_columns';
+		case 'fourcolumn';
+		case 'fourcolumns';
+		case '4';
+			$layout_choice = 'gridview_onefourth';
+			break;
+		case 'gridview_onefifth';
+		case 'five';
+		case 'five_column';
+		case 'five_columns';
+		case 'fivecolumn';
+		case 'fivecolumns';
+		case '5';
+			$layout_choice = 'gridview_onefifth';
+			break;
+		default:
+			$layout_choice = 'gridview_onehalf';
+			break;
+	}
 
-    return $layout_choice;
+	return $layout_choice;
 }
 
 /**
@@ -468,20 +468,20 @@ 
  */
 function gdsc_validate_sort_choice($sort_choice)
 {
-    $sorts = array(
-        'az',
-        'latest',
-        'featured',
-        'high_review',
-        'high_rating',
-        'random',
-    );
-
-    if (!(in_array($sort_choice, $sorts))) {
-        $sort_choice = 'latest';
-    }
+	$sorts = array(
+		'az',
+		'latest',
+		'featured',
+		'high_review',
+		'high_rating',
+		'random',
+	);
+
+	if (!(in_array($sort_choice, $sorts))) {
+		$sort_choice = 'latest';
+	}
 
-    return $sort_choice;
+	return $sort_choice;
 }
 
 /**
@@ -494,22 +494,22 @@ 
  */
 function gdsc_validate_listing_width($width_choice)
 {
-    if (!(empty($width_choice))) {
-        $width_choice = absint($width_choice);
-    } else {
-        return '';
-    }
+	if (!(empty($width_choice))) {
+		$width_choice = absint($width_choice);
+	} else {
+		return '';
+	}
 
-    if (100 < $width_choice) {
-        $width_choice = 100;
-    }
+	if (100 < $width_choice) {
+		$width_choice = 100;
+	}
 
-    // If listing_width is too narrow, it won't work, arbitrarily set to 10% here
-    if (10 > $width_choice) {
-        $width_choice = 10;
-    }
+	// If listing_width is too narrow, it won't work, arbitrarily set to 10% here
+	if (10 > $width_choice) {
+		$width_choice = 10;
+	}
 
-    return $width_choice;
+	return $width_choice;
 }
 
 /**
@@ -522,18 +522,18 @@ 
  */
 function gdsc_validate_list_filter_choice($filter_choice)
 {
-    $filters = array(
-        'all',
-        'today',
-        'upcoming',
-        'past',
-    );
-
-    if (!(in_array($filter_choice, $filters))) {
-        $filter_choice = 'all';
-    }
+	$filters = array(
+		'all',
+		'today',
+		'upcoming',
+		'past',
+	);
+
+	if (!(in_array($filter_choice, $filters))) {
+		$filter_choice = 'all';
+	}
 
-    return $filter_choice;
+	return $filter_choice;
 }
 
 /**
@@ -555,7 +555,7 @@ 
  * @return string Listings HTML content.
  */
 function geodir_sc_gd_listings_output($args = array()) {
-    $title				 = !empty($args['title']) ? __($args['title'], 'geodirectory') : '';
+	$title				 = !empty($args['title']) ? __($args['title'], 'geodirectory') : '';
 	$post_type 			 = !empty($args['post_type']) ? $args['post_type'] : 'gd_place';
 	$category 			 = !empty($args['category']) ? $args['category'] : '0';
 	$post_number		 = !empty($args['post_number']) ? $args['post_number'] : 10;
@@ -565,17 +565,17 @@ 
 	$layout 			 = !empty($args['layout']) ? $args['layout'] : 'gridview_onehalf';
 	$with_pagination 	 = !empty($args['with_pagination']) ? true : false;
 	$event_type 	 	 = !empty($args['event_type']) ? $args['event_type'] : '';
-    $shortcode_content   = !empty($args['shortcode_content']) ? trim($args['shortcode_content']) : '';
-    $tags                = !empty($args['tags']) ? $args['tags'] : array();
-    /**
-     * Filter the content text displayed when no listings found.
-     *
-     * @since 1.6.0
-     *
-     * @param string $shortcode_content The shortcode content text.
-     * @param array $args Array of arguements to filter listings.
-     */
-    $shortcode_content = apply_filters('geodir_sc_gd_listings_not_found_content', $shortcode_content, $args);
+	$shortcode_content   = !empty($args['shortcode_content']) ? trim($args['shortcode_content']) : '';
+	$tags                = !empty($args['tags']) ? $args['tags'] : array();
+	/**
+	 * Filter the content text displayed when no listings found.
+	 *
+	 * @since 1.6.0
+	 *
+	 * @param string $shortcode_content The shortcode content text.
+	 * @param array $args Array of arguements to filter listings.
+	 */
+	$shortcode_content = apply_filters('geodir_sc_gd_listings_not_found_content', $shortcode_content, $args);
 		
 	$top_pagination 	 = $with_pagination && !empty($args['top_pagination']) ? true : false;
 	$bottom_pagination 	 = $with_pagination && !empty($args['bottom_pagination']) ? true : false;
@@ -587,92 +587,92 @@ 
 	$pageno 	 		 = $geodir_ajax && !empty($args['pageno']) ? $args['pageno'] : 1;
 	
 	$query_args = array(
-        'posts_per_page' => $post_number,
-        'is_geodir_loop' => true,
-        'gd_location' => $add_location_filter,
-        'post_type' => $post_type,
-        'order_by' => $list_sort,
+		'posts_per_page' => $post_number,
+		'is_geodir_loop' => true,
+		'gd_location' => $add_location_filter,
+		'post_type' => $post_type,
+		'order_by' => $list_sort,
 		'pageno' => $pageno
-    );
+	);
 
-    if ($character_count >= 0) {
-        $query_args['excerpt_length'] = $character_count;
-    }
+	if ($character_count >= 0) {
+		$query_args['excerpt_length'] = $character_count;
+	}
     
-    if (!empty($args['post_author'])) {
-        $query_args['post_author'] = $args['post_author'];
-    }
+	if (!empty($args['post_author'])) {
+		$query_args['post_author'] = $args['post_author'];
+	}
 
-    if (!empty($args['show_featured_only'])) {
-        $query_args['show_featured_only'] = 1;
-    }
+	if (!empty($args['show_featured_only'])) {
+		$query_args['show_featured_only'] = 1;
+	}
 
-    if (!empty($args['show_special_only'])) {
-        $query_args['show_special_only'] = 1;
-    }
+	if (!empty($args['show_special_only'])) {
+		$query_args['show_special_only'] = 1;
+	}
 
-    if (!empty($args['with_pics_only'])) {
-        $query_args['with_pics_only'] = 0;
-        $query_args['featured_image_only'] = 1;
-    }
+	if (!empty($args['with_pics_only'])) {
+		$query_args['with_pics_only'] = 0;
+		$query_args['featured_image_only'] = 1;
+	}
 
-    if (!empty($args['with_videos_only'])) {
-        $query_args['with_videos_only'] = 1;
-    }
+	if (!empty($args['with_videos_only'])) {
+		$query_args['with_videos_only'] = 1;
+	}
     
-    if (!empty($args['show_favorites_only'])) {
-        $query_args['show_favorites_only'] = 1;
-        $query_args['favorites_by_user'] = !empty($args['favorites_by_user']) ? $args['favorites_by_user'] : 0;
-    }
-    $with_no_results = !empty($args['without_no_results']) ? false : true;
+	if (!empty($args['show_favorites_only'])) {
+		$query_args['show_favorites_only'] = 1;
+		$query_args['favorites_by_user'] = !empty($args['favorites_by_user']) ? $args['favorites_by_user'] : 0;
+	}
+	$with_no_results = !empty($args['without_no_results']) ? false : true;
 
-    if (!empty($category) && isset($category[0]) && $category[0] != '0') {
-        $category_taxonomy = geodir_get_taxonomies($post_type);
+	if (!empty($category) && isset($category[0]) && $category[0] != '0') {
+		$category_taxonomy = geodir_get_taxonomies($post_type);
 
-        ######### WPML #########
-        if (function_exists('icl_object_id')) {
-            $category = gd_lang_object_ids($category, $category_taxonomy[0]);
-        }
-        ######### WPML #########
+		######### WPML #########
+		if (function_exists('icl_object_id')) {
+			$category = gd_lang_object_ids($category, $category_taxonomy[0]);
+		}
+		######### WPML #########
 
-        $tax_query = array(
-            'taxonomy' => $category_taxonomy[0],
-            'field' => 'id',
-            'terms' => $category
-        );
+		$tax_query = array(
+			'taxonomy' => $category_taxonomy[0],
+			'field' => 'id',
+			'terms' => $category
+		);
 
-        $query_args['tax_query'] = array($tax_query);
-    }
+		$query_args['tax_query'] = array($tax_query);
+	}
     
-    if (!empty($tags)) {
-        // Clean tags
-        if (!is_array($tags)) {
-            $comma = _x(',', 'tag delimiter');
-            if ( ',' !== $comma ) {
-                $tags = str_replace($comma, ',', $tags);
-            }
-            $tags = explode(',', trim($tags, " \n\t\r\0\x0B,"));
-            $tags = array_map('trim', $tags);
-        }
+	if (!empty($tags)) {
+		// Clean tags
+		if (!is_array($tags)) {
+			$comma = _x(',', 'tag delimiter');
+			if ( ',' !== $comma ) {
+				$tags = str_replace($comma, ',', $tags);
+			}
+			$tags = explode(',', trim($tags, " \n\t\r\0\x0B,"));
+			$tags = array_map('trim', $tags);
+		}
         
-        if (!empty($tags)) {
-            $tag_query = array(
-                'taxonomy' => $post_type . '_tags',
-                'field' => 'name',
-                'terms' => $tags
-            );
-
-            if (!empty($query_args['tax_query'])) {
-                $query_args['tax_query'][] = $tag_query;
-            } else {
-                $query_args['tax_query'] = array($tag_query);
-            }
-        }
-    }
+		if (!empty($tags)) {
+			$tag_query = array(
+				'taxonomy' => $post_type . '_tags',
+				'field' => 'name',
+				'terms' => $tags
+			);
+
+			if (!empty($query_args['tax_query'])) {
+				$query_args['tax_query'][] = $tag_query;
+			} else {
+				$query_args['tax_query'] = array($tag_query);
+			}
+		}
+	}
 
-    global $gridview_columns_widget, $geodir_is_widget_listing;
+	global $gridview_columns_widget, $geodir_is_widget_listing;
 
-    if ($post_type == 'gd_event' && function_exists('geodir_event_get_widget_events')) {
+	if ($post_type == 'gd_event' && function_exists('geodir_event_get_widget_events')) {
 		global $geodir_event_widget_listview;
 		$geodir_event_widget_listview = true;
 		
@@ -687,16 +687,16 @@ 
 		$widget_listings = $total_posts > 0 ? geodir_get_widget_listings($query_args) : array();
 	}
 	$current_gridview_columns_widget = $gridview_columns_widget;
-    $identifier = ' gd-wgt-pagi-' . mt_rand();
-    ob_start();
+	$identifier = ' gd-wgt-pagi-' . mt_rand();
+	ob_start();
 	if (!empty($widget_listings) || $with_no_results) {
 		if (!$geodir_ajax) {
-        /**
-         * Called before the shortcode [gd_listings] content is output.
-         *
-         * @since 1.0.0
-         */
-        do_action('geodir_before_sc_gd_listings');
+		/**
+		 * Called before the shortcode [gd_listings] content is output.
+		 *
+		 * @since 1.0.0
+		 */
+		do_action('geodir_before_sc_gd_listings');
 		?>
         <div class="geodir_locations geodir_location_listing geodir-sc-gd-listings <?php echo $identifier;?>">
             <?php if ($title != '') { ?>
@@ -707,63 +707,63 @@ 
             <div class="gd-sc-loader">
                 <div class="gd-sc-content">
             <?php }
-            if (!(empty($widget_listings) && !empty($shortcode_content))) {
-                if (strstr($layout, 'gridview')) {
-                    $listing_view_exp = explode('_', $layout);
-                    $gridview_columns_widget = $layout;
-                    $layout = $listing_view_exp[0];
-                } else {
-                    $gridview_columns_widget = '';
-                }
-
-                /**
-                 * Filter the widget listing listview template.
-                 *
-                 * @since 1.0.0
-                 *
-                 * @param string The template file to display listing.
-                 */
-                $template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
+			if (!(empty($widget_listings) && !empty($shortcode_content))) {
+				if (strstr($layout, 'gridview')) {
+					$listing_view_exp = explode('_', $layout);
+					$gridview_columns_widget = $layout;
+					$layout = $listing_view_exp[0];
+				} else {
+					$gridview_columns_widget = '';
+				}
+
+				/**
+				 * Filter the widget listing listview template.
+				 *
+				 * @since 1.0.0
+				 *
+				 * @param string The template file to display listing.
+				 */
+				$template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
                             
-                global $post, $map_jason, $map_canvas_arr, $gd_session;
-
-                $current_post = $post;
-                $current_map_jason = $map_jason;
-                $current_map_canvas_arr = $map_canvas_arr;
-                $geodir_is_widget_listing = true;
-                $gd_session->un_set('gd_listing_view');
-
-                if ($with_pagination && $top_pagination) {				
-                    echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
-                }
-
-                /**
-                 * Includes listing listview template.
-                 *
-                 * @since 1.0.0
-                 */
-                include($template);
+				global $post, $map_jason, $map_canvas_arr, $gd_session;
+
+				$current_post = $post;
+				$current_map_jason = $map_jason;
+				$current_map_canvas_arr = $map_canvas_arr;
+				$geodir_is_widget_listing = true;
+				$gd_session->un_set('gd_listing_view');
+
+				if ($with_pagination && $top_pagination) {				
+					echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
+				}
+
+				/**
+				 * Includes listing listview template.
+				 *
+				 * @since 1.0.0
+				 */
+				include($template);
                 
-                if ($with_pagination && $bottom_pagination) {				
-                    echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
-                }
-
-                $geodir_is_widget_listing = false;
-
-                $GLOBALS['post'] = $current_post;
-                if (!empty($current_post)) {
-                    setup_postdata($current_post);
-                }
-                $map_jason = $current_map_jason;
-                $map_canvas_arr = $current_map_canvas_arr;
-                global $gridview_columns_widget;
-                $gridview_columns_widget = $current_gridview_columns_widget;
-            } else {
-                echo $shortcode_content;
-            }
+				if ($with_pagination && $bottom_pagination) {				
+					echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
+				}
+
+				$geodir_is_widget_listing = false;
+
+				$GLOBALS['post'] = $current_post;
+				if (!empty($current_post)) {
+					setup_postdata($current_post);
+				}
+				$map_jason = $current_map_jason;
+				$map_canvas_arr = $current_map_canvas_arr;
+				global $gridview_columns_widget;
+				$gridview_columns_widget = $current_gridview_columns_widget;
+			} else {
+				echo $shortcode_content;
+			}
 			?>
 			<?php
-            if (!$geodir_ajax) { 
+			if (!$geodir_ajax) { 
 			?>
             </div><p class="geodir-sclisting-loading" style="display:none;"><i class="fa fa-cog fa-spin"></i></p></div>
 <script type="text/javascript">
@@ -801,10 +801,10 @@ 
             loading.hide();
             jQuery(items).html(response);
             <?php
-              /**
-               * if lazyload images enabled then refresh them once ajax page changed.
-               */
-              if (get_option('geodir_lazy_load', 1)) { ?>
+			  /**
+			   * if lazyload images enabled then refresh them once ajax page changed.
+			   */
+			  if (get_option('geodir_lazy_load', 1)) { ?>
               geodir_init_lazy_load();
               <?php } ?>
         }
@@ -814,11 +814,11 @@ 
 </div>
 		<?php } ?>
     <?php
-    }
+	}
 	$output = ob_get_contents();
-    ob_end_clean();
+	ob_end_clean();
 
-    return trim($output);
+	return trim($output);
 }
 
 /**
@@ -845,15 +845,15 @@ 
  * @return string Listings pagination HTML content.
  */
 function geodir_sc_listings_pagination($total_posts, $posts_per_page, $pageno, $before = '', $after = '', $prelabel = '', $nxtlabel = '', $pages_to_show = 5, $always_show = false) {
-    if (empty($prelabel)) {
-        $prelabel = '<strong>&laquo;</strong>';
-    }
+	if (empty($prelabel)) {
+		$prelabel = '<strong>&laquo;</strong>';
+	}
 
-    if (empty($nxtlabel)) {
-        $nxtlabel = '<strong>&raquo;</strong>';
-    }
+	if (empty($nxtlabel)) {
+		$nxtlabel = '<strong>&raquo;</strong>';
+	}
 
-    $half_pages_to_show = round($pages_to_show / 2);
+	$half_pages_to_show = round($pages_to_show / 2);
 
 	$numposts = $total_posts;
 
@@ -886,7 +886,7 @@ 
 		}
 		
 		if (($pageno - 1) > 0) {
-            echo '<a class="gd-page-sc-prev gd-wgt-page" data-page="' . (int)($pageno - 1) . '" href="javascript:void(0);">' . $prelabel . '</a>&nbsp;';
+			echo '<a class="gd-page-sc-prev gd-wgt-page" data-page="' . (int)($pageno - 1) . '" href="javascript:void(0);">' . $prelabel . '</a>&nbsp;';
 		}
 		
 		for ($i = $pageno - $half_pages_to_show; $i <= $pageno + $half_pages_to_show; $i++) {
@@ -909,9 +909,9 @@ 
 		echo "</div> $after </div>";
 	}
 	$output = ob_get_contents();
-    ob_end_clean();
+	ob_end_clean();
 
-    return trim($output);
+	return trim($output);
 }
 
 /**
@@ -922,10 +922,10 @@ 
  * @return string Listings HTML content.
  */
 function geodir_sclistings_callback() {
-    check_ajax_referer('geodir-sclistings-nonce', 'geodir_sclistings_nonce');
-    //set variables
-    $scatts = isset($_POST['scatts']) ? $_POST['scatts'] : NULL;
-    $pageno = isset($_POST['pageno']) ? absint($_POST['pageno']) : 1;
+	check_ajax_referer('geodir-sclistings-nonce', 'geodir_sclistings_nonce');
+	//set variables
+	$scatts = isset($_POST['scatts']) ? $_POST['scatts'] : NULL;
+	$pageno = isset($_POST['pageno']) ? absint($_POST['pageno']) : 1;
 	
 	$shortcode_atts = !empty($scatts) ? (array)json_decode(stripslashes_deep($scatts)) : NULL;
 	
@@ -937,7 +937,7 @@ 
 	} else {
 		echo 0;
 	}
-    wp_die();
+	wp_die();
 }
 add_action('wp_ajax_geodir_sclistings', 'geodir_sclistings_callback');
 add_action('wp_ajax_nopriv_geodir_sclistings', 'geodir_sclistings_callback');
\ No newline at end of file

geodirectory-functions/signup_function.php

Doc Comments +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
  * @package GeoDirectory

  * @global object $current_user Current user object.

  * @param bool $redirect Optional. Do you want to redirect to signup page, if user not logged in? Default: false.

- * @return bool

+ * @return null|boolean

  */

 function geodir_is_login($redirect = false)

 {

@@ -69,7 +69,7 @@ 
  *

  * @since 1.0.0

  * @package GeoDirectory

- * @return string|mixed|void The email ID.

+ * @return string The email ID.

  */

 function geodir_get_site_email_id()

 {

Indentation +612 added lines, -612 removed lines

@@ -17,18 +17,18 @@ 
  */

 function geodir_is_login($redirect = false)

 {

-    global $current_user;

-    if (!$current_user->ID) {

-        if ($redirect) {

-            ?>

+	global $current_user;

+	if (!$current_user->ID) {

+		if ($redirect) {

+			?>

             <script type="text/javascript">

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

             </script>

         <?php

-        } else

-            return false;

-    } else

-        return true;

+		} else

+			return false;

+	} else

+		return true;

 }

 

 /**

@@ -42,25 +42,25 @@ 
 {

 

 // Redirect to https login if forced to use SSL

-    if (force_ssl_admin() && !is_ssl()) {

-        if (0 === strpos($_SERVER['REQUEST_URI'], 'http')) {

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

-            exit();

-        } else {

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

-            exit();

-        }

-    }

-

-    /**

-     * Filter the login message.

-     *

-     * @since 1.0.0

-     *

-     * @param string $message Login message.

-     */

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

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

+	if (force_ssl_admin() && !is_ssl()) {

+		if (0 === strpos($_SERVER['REQUEST_URI'], 'http')) {

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

+			exit();

+		} else {

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

+			exit();

+		}

+	}

+

+	/**

+	 * Filter the login message.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param string $message Login message.

+	 */

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

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

 

 }

 

@@ -73,59 +73,59 @@ 
  */

 function geodir_get_site_email_id()

 {

-    if (get_option('site_email')) {

+	if (get_option('site_email')) {

 

-        return get_option('site_email');

+		return get_option('site_email');

 

-    } else {

+	} else {

 

-        return get_option('admin_email');

+		return get_option('admin_email');

 

-    }

+	}

 

 }

 

 

 if (!function_exists('get_site_emailName')) {

-    /**

-     * Get site name for sending emails.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return string Site name.

-     */

-    function get_site_emailName()

+	/**

+	 * Get site name for sending emails.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return string Site name.

+	 */

+	function get_site_emailName()

 

-    {

+	{

 

-        if (get_option('site_email_name')) {

+		if (get_option('site_email_name')) {

 

-            return stripslashes(get_option('site_email_name'));

+			return stripslashes(get_option('site_email_name'));

 

-        } else {

+		} else {

 

-            return stripslashes(get_option('blogname'));

+			return stripslashes(get_option('blogname'));

 

-        }

+		}

 

-    }

+	}

 }

 

 if (!function_exists('is_allow_user_register')) {

-    /**

-     * Checks whether the site allowing user registration or not.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return bool|string

-     */

-    function is_allow_user_register()

+	/**

+	 * Checks whether the site allowing user registration or not.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return bool|string

+	 */

+	function is_allow_user_register()

 

-    {

+	{

 

-        return get_option('users_can_register');

+		return get_option('users_can_register');

 

-    }

+	}

 }

 

 /**

@@ -138,107 +138,107 @@ 
  */

 function geodir_retrieve_password()

 {

-    global $wpdb;

-

-    $errors = new WP_Error();

-    if (empty($_POST['user_login']) && empty($_POST['user_email']))

-        $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.', 'geodirectory'));

-

-    if (strpos($_POST['user_login'], '@')) {

-        //$user_data = get_user_by_email(trim($_POST['user_login']));

-        $user_data = get_user_by('email', trim($_POST['user_login']));

-        if (empty($user_data))

-            $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.', 'geodirectory'));

-    } else {

-        $login = trim($_POST['user_login']);

-        $user_data = get_user_by('email', $login);

-    }

-

-    /**

-     * Called in the geodir_retrieve_password() function before any errors are set or any emails are sent.

-     *

-     * @since 1.0.0

-     */

-    do_action('lostpassword_post');

-

-    if ($errors->get_error_code())

-        return $errors;

-

-    if (!$user_data) {

-        $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.', 'geodirectory'));

-        return $errors;

-    }

-

-    // redefining user_login ensures we return the right case in the email

-    $user_login = $user_data->user_login;

-    $user_email = $user_data->user_email;

-

-    /**

-     * Called in the geodir_retrieve_password() function before any emails are sent.

-     *

-     * @since 1.0.0

-     * @param string $user_login The users username.

-     */

-    do_action('retrieve_password', $user_login);

-

-    ////////////////////////////////////

-    $user_email = isset($_POST['user_email']) ? $_POST['user_email'] : '';

-    $user_login = $_POST['user_login'];

-

-    $user = $wpdb->get_row(

-        $wpdb->prepare(

-            "SELECT * FROM $wpdb->users WHERE user_login like %s or user_email like %s",

-            array($user_login, $user_login)

-        )

-    );

-

-    if (empty($user))

-        return new WP_Error('invalid_key', __('Invalid key', 'geodirectory'));

-

-    $new_pass = wp_generate_password(12, false);

-

-    /**

-     * Called in the geodir_retrieve_password() function before any emails are sent.

-     *

-     * @since 1.0.0

-     * @param object $user The user object.

-     * @param string $new_pass The new pass being sent to the user.

-     */

-    do_action('password_reset', $user, $new_pass);

-

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

-    $user_name = geodir_get_client_name($user->ID);

-    $fromEmail = geodir_get_site_email_id();

-    $fromEmailName = get_site_emailName();

-    $title = sprintf(__('[%s] Your new password', 'geodirectory'), get_option('blogname'));

-    /**

-     * Filter the password reset email subject part.

-     *

-     * @since 1.0.0

-     *

-     * @param string $title Password reset email subject.

-     */

-    $title = apply_filters('password_reset_title', $title);

-    /**

-     * Filter the password reset email message part.

-     *

-     * @since 1.0.0

-     *

-     * @param string $message Password reset email message.

-     * @param string $new_pass The new password string.

-     */

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

-

-    return true;

+	global $wpdb;

+

+	$errors = new WP_Error();

+	if (empty($_POST['user_login']) && empty($_POST['user_email']))

+		$errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.', 'geodirectory'));

+

+	if (strpos($_POST['user_login'], '@')) {

+		//$user_data = get_user_by_email(trim($_POST['user_login']));

+		$user_data = get_user_by('email', trim($_POST['user_login']));

+		if (empty($user_data))

+			$errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.', 'geodirectory'));

+	} else {

+		$login = trim($_POST['user_login']);

+		$user_data = get_user_by('email', $login);

+	}

+

+	/**

+	 * Called in the geodir_retrieve_password() function before any errors are set or any emails are sent.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('lostpassword_post');

+

+	if ($errors->get_error_code())

+		return $errors;

+

+	if (!$user_data) {

+		$errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.', 'geodirectory'));

+		return $errors;

+	}

+

+	// redefining user_login ensures we return the right case in the email

+	$user_login = $user_data->user_login;

+	$user_email = $user_data->user_email;

+

+	/**

+	 * Called in the geodir_retrieve_password() function before any emails are sent.

+	 *

+	 * @since 1.0.0

+	 * @param string $user_login The users username.

+	 */

+	do_action('retrieve_password', $user_login);

+

+	////////////////////////////////////

+	$user_email = isset($_POST['user_email']) ? $_POST['user_email'] : '';

+	$user_login = $_POST['user_login'];

+

+	$user = $wpdb->get_row(

+		$wpdb->prepare(

+			"SELECT * FROM $wpdb->users WHERE user_login like %s or user_email like %s",

+			array($user_login, $user_login)

+		)

+	);

+

+	if (empty($user))

+		return new WP_Error('invalid_key', __('Invalid key', 'geodirectory'));

+

+	$new_pass = wp_generate_password(12, false);

+

+	/**

+	 * Called in the geodir_retrieve_password() function before any emails are sent.

+	 *

+	 * @since 1.0.0

+	 * @param object $user The user object.

+	 * @param string $new_pass The new pass being sent to the user.

+	 */

+	do_action('password_reset', $user, $new_pass);

+

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

+	$user_name = geodir_get_client_name($user->ID);

+	$fromEmail = geodir_get_site_email_id();

+	$fromEmailName = get_site_emailName();

+	$title = sprintf(__('[%s] Your new password', 'geodirectory'), get_option('blogname'));

+	/**

+	 * Filter the password reset email subject part.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param string $title Password reset email subject.

+	 */

+	$title = apply_filters('password_reset_title', $title);

+	/**

+	 * Filter the password reset email message part.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param string $message Password reset email message.

+	 * @param string $new_pass The new password string.

+	 */

+	$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

+

+	return true;

 }

 

 /**

@@ -253,80 +253,80 @@ 
  */

 function geodir_register_new_user($user_login, $user_email)

 {

-    global $wpdb;

-    $errors = new WP_Error();

-

-

-    $user_login = sanitize_user($user_login);

-    $user_login = str_replace(",", "", $user_login);

-    $user_email = str_replace(",", "", $user_email);

-    /**

-     * Filter the user registration email.

-     *

-     * @since 1.0.0

-     *

-     * @param string $user_email User registration email.

-     */

-    $user_email = apply_filters('user_registration_email', $user_email);

-

-

-    if (get_option('geodir_allow_cpass')) {

-        $user_pass = $_REQUEST['user_pass'];

-        $user_pass2 = $_REQUEST['user_pass2'];

-        // Check the password

-        if ($user_pass != $user_pass2) {

-            $errors->add('pass_match', __('ERROR: Passwords do not match.', 'geodirectory'));

-        } elseif (strlen($user_pass) < 7) {

-            $errors->add('pass_match', __('ERROR: Password must be 7 characters or more.', 'geodirectory'));

-        }

-    }

-

-    // Check the username

-    if ($user_login == '')

-        $errors->add('empty_username', __('ERROR: Please enter a username.', 'geodirectory'));

-    elseif (!validate_username($user_login)) {

-        $errors->add('invalid_username', __('<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.', 'geodirectory'));

-        $user_login = '';

-    } elseif (username_exists($user_login))

-        $errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered, please choose another one.', 'geodirectory'));

-

-    // Check the e-mail address

-    if ($user_email == '') {

-        $errors->add('empty_email', __('<strong>ERROR</strong>: Please type your e-mail address.', 'geodirectory'));

-    } elseif (!is_email($user_email)) {

-        $errors->add('invalid_email', __('<strong>ERROR</strong>: The email address isn&#8217;t correct.', 'geodirectory'));

-        $user_email = '';

-    } elseif (email_exists($user_email))

-        $errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.', 'geodirectory'));

-

-    /**

-     * Called when registering a new user.

-     *

-     * This is a WordPress core hook.

-     *

-     * @link https://codex.wordpress.org/Plugin_API/Action_Reference/register_post

-     * @since 1.0.0

-     */

-    do_action('register_post', $user_login, $user_email, $errors);

-    /**

-     * Filter the registration error messages.

-     *

-     * @since 1.0.0

-     *

-     * @param object $errors Registration error messages.

-     */

-    $errors = apply_filters('registration_errors', $errors,$user_login,$user_email);

-

-    if ($errors->get_error_code())

-        return $errors;

-

-

-    if (!isset($user_pass) || $user_pass == '') {

-        $user_pass = wp_generate_password(12, false);

-    }

-    $user_id = wp_create_user($user_login, $user_pass, $user_email);

-    $user_web = '';

-    /*$user_add1 = $_POST['user_add1'];

+	global $wpdb;

+	$errors = new WP_Error();

+

+

+	$user_login = sanitize_user($user_login);

+	$user_login = str_replace(",", "", $user_login);

+	$user_email = str_replace(",", "", $user_email);

+	/**

+	 * Filter the user registration email.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param string $user_email User registration email.

+	 */

+	$user_email = apply_filters('user_registration_email', $user_email);

+

+

+	if (get_option('geodir_allow_cpass')) {

+		$user_pass = $_REQUEST['user_pass'];

+		$user_pass2 = $_REQUEST['user_pass2'];

+		// Check the password

+		if ($user_pass != $user_pass2) {

+			$errors->add('pass_match', __('ERROR: Passwords do not match.', 'geodirectory'));

+		} elseif (strlen($user_pass) < 7) {

+			$errors->add('pass_match', __('ERROR: Password must be 7 characters or more.', 'geodirectory'));

+		}

+	}

+

+	// Check the username

+	if ($user_login == '')

+		$errors->add('empty_username', __('ERROR: Please enter a username.', 'geodirectory'));

+	elseif (!validate_username($user_login)) {

+		$errors->add('invalid_username', __('<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.', 'geodirectory'));

+		$user_login = '';

+	} elseif (username_exists($user_login))

+		$errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered, please choose another one.', 'geodirectory'));

+

+	// Check the e-mail address

+	if ($user_email == '') {

+		$errors->add('empty_email', __('<strong>ERROR</strong>: Please type your e-mail address.', 'geodirectory'));

+	} elseif (!is_email($user_email)) {

+		$errors->add('invalid_email', __('<strong>ERROR</strong>: The email address isn&#8217;t correct.', 'geodirectory'));

+		$user_email = '';

+	} elseif (email_exists($user_email))

+		$errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.', 'geodirectory'));

+

+	/**

+	 * Called when registering a new user.

+	 *

+	 * This is a WordPress core hook.

+	 *

+	 * @link https://codex.wordpress.org/Plugin_API/Action_Reference/register_post

+	 * @since 1.0.0

+	 */

+	do_action('register_post', $user_login, $user_email, $errors);

+	/**

+	 * Filter the registration error messages.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param object $errors Registration error messages.

+	 */

+	$errors = apply_filters('registration_errors', $errors,$user_login,$user_email);

+

+	if ($errors->get_error_code())

+		return $errors;

+

+

+	if (!isset($user_pass) || $user_pass == '') {

+		$user_pass = wp_generate_password(12, false);

+	}

+	$user_id = wp_create_user($user_login, $user_pass, $user_email);

+	$user_web = '';

+	/*$user_add1 = $_POST['user_add1'];

     $user_add2 = $_POST['user_add2'];

     $user_city = $_POST['user_city'];

     $user_state = $_POST['user_state'];

@@ -335,77 +335,77 @@ 
     $user_web = $_POST['user_web'];

     $user_phone = $_POST['user_phone'];

     $user_twitter = $_POST['user_twitter'];	*/

-    $user_fname = sanitize_user($_POST['user_fname']);

-    $user_fname = str_replace(",", "", $user_fname);

-

-    /**

-     * Filter the submitted user meta.

-     *

-     * @since 1.0.0

-     *

-     * @param int $user_id User ID.

-     */

-    $user_address_info = apply_filters('geodir_manage_user_meta', array(

-        "user_add1" => '',

-        "user_add2" => '',

-        "user_city" => '',

-        "user_state" => '',

-        "user_country" => '',

-        "user_postalcode" => '',

-        "user_phone" => '',

-        "user_twitter" => '',

-        "first_name" => $user_fname,

-        "last_name" => '',

-    ), $user_id);

-    foreach ($user_address_info as $key => $val) {

-        update_user_meta($user_id, $key, $val); // User Address Information Here

-    }

-    //update_user_meta($user_id, 'user_address_info', ($user_address_info)); // User Address Information Here

-    $userName = $user_fname;

-    update_user_meta($user_id, 'first_name', $userName); // User Address Information Here

-    //update_user_meta($user_id, 'last_name', $_POST['user_lname']); // User Address Information Here

-

-    // Changed by vikas sharma to enable all type of characters in author permalink...

-    $user_nicename = sanitize_title($userName);

-

-    $updateUsersql = $wpdb->prepare("update $wpdb->users set user_url=%s, user_nicename=%s, display_name=%s  where ID=%d", array($user_web, $user_nicename, $userName, $user_id));

-

-    $wpdb->query($updateUsersql);

-

-    if (!$user_id) {

-        $errors->add('registerfail', sprintf(__('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !', 'geodirectory'), get_option('admin_email')));

-        return $errors;

-    }

-    global $upload_folder_path;

-

-    if ($user_id) {

-

-        /**

-         * Called after registering a user and before the registration email is sent.

-         *

-         * @since 1.0.0

-         * @param int $user_id The user ID of the registered user.

-         */

-        do_action('geodir_user_register', $user_id);

-        ///////REGISTRATION EMAIL START//////

-        $fromEmail = geodir_get_site_email_id();

-        $fromEmailName = get_site_emailName();

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

+	$user_fname = sanitize_user($_POST['user_fname']);

+	$user_fname = str_replace(",", "", $user_fname);

+

+	/**

+	 * Filter the submitted user meta.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param int $user_id User ID.

+	 */

+	$user_address_info = apply_filters('geodir_manage_user_meta', array(

+		"user_add1" => '',

+		"user_add2" => '',

+		"user_city" => '',

+		"user_state" => '',

+		"user_country" => '',

+		"user_postalcode" => '',

+		"user_phone" => '',

+		"user_twitter" => '',

+		"first_name" => $user_fname,

+		"last_name" => '',

+	), $user_id);

+	foreach ($user_address_info as $key => $val) {

+		update_user_meta($user_id, $key, $val); // User Address Information Here

+	}

+	//update_user_meta($user_id, 'user_address_info', ($user_address_info)); // User Address Information Here

+	$userName = $user_fname;

+	update_user_meta($user_id, 'first_name', $userName); // User Address Information Here

+	//update_user_meta($user_id, 'last_name', $_POST['user_lname']); // User Address Information Here

+

+	// Changed by vikas sharma to enable all type of characters in author permalink...

+	$user_nicename = sanitize_title($userName);

+

+	$updateUsersql = $wpdb->prepare("update $wpdb->users set user_url=%s, user_nicename=%s, display_name=%s  where ID=%d", array($user_web, $user_nicename, $userName, $user_id));

+

+	$wpdb->query($updateUsersql);

+

+	if (!$user_id) {

+		$errors->add('registerfail', sprintf(__('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !', 'geodirectory'), get_option('admin_email')));

+		return $errors;

+	}

+	global $upload_folder_path;

+

+	if ($user_id) {

+

+		/**

+		 * Called after registering a user and before the registration email is sent.

+		 *

+		 * @since 1.0.0

+		 * @param int $user_id The user ID of the registered user.

+		 */

+		do_action('geodir_user_register', $user_id);

+		///////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>');

 

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

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

-    }

+		/////////////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

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

+	}

 

-    if (get_option('ptthemes_auto_login')) {

-        $errors->add('auto_login', __('<strong>SUCCESS</strong>: Thank you for registering, please check your email for your login details.', 'geodirectory'));

-        return $errors;

-    }

+	if (get_option('ptthemes_auto_login')) {

+		$errors->add('auto_login', __('<strong>SUCCESS</strong>: Thank you for registering, please check your email for your login details.', 'geodirectory'));

+		return $errors;

+	}

 

-    return array($user_id, $user_pass);

+	return array($user_id, $user_pass);

 }

 

 /**

@@ -418,317 +418,317 @@ 
  */

 function geodir_user_signup()

 {

-    global $errors;

-    $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'login';

-

-    $errors = new WP_Error();

-

-    if (isset($_GET['key']))

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

-        $action = 'login';

-

-    nocache_headers();

-

-    if (defined('RELOCATE')) { // Move flag is set

-        if (isset($_SERVER['PATH_INFO']) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']))

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

-    }

-

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

-    //setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN);

-    if (SITECOOKIEPATH != COOKIEPATH)

-        setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);

-

-    /**

-     * Allow plugins to override the default actions, and to add extra actions if they want on the register/signin page.

-     *

-     * Used dynamic hook login_form_$action

-     *

-     * @since 1.0.0

-     */

-    do_action('login_form_' . $action);

-

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

-

-    switch ($action):

-

-        case 'logout' :

-            //check_admin_referer('log-out');

-            wp_logout();

-

-            $redirect_to = $_SERVER['HTTP_REFERER'];

-            //$redirect_to = home_url().'/?ptype=login&loggedout=true';

-            if (isset($_REQUEST['redirect_to']))

-                $redirect_to = $_REQUEST['redirect_to'];

-            $redirect_to = home_url();

-            wp_safe_redirect($redirect_to);

-            exit();

-

-            break;

-

-        case 'lostpassword' :

-        case 'retrievepassword' :

-            if ($http_post) {

-                $errors = geodir_retrieve_password();

-                $error_message = isset($errors->errors['invalid_email'][0]) ? $errors->errors['invalid_email'][0] : '';

-                if (!is_wp_error($errors)) {

-                    wp_redirect(geodir_login_url(array('checkemail'=>'confirm')));

-                    gd_die();

-                } else {

-                    wp_redirect(geodir_login_url(array('forgot' => 1, 'emsg'=>'fw')));

-                    gd_die();

-                }

-            }

-            if (isset($_GET['error']) && 'invalidkey' == $_GET['error']) $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.', 'geodirectory'));

-        /**

-         * Called in the geodir_user_signup() function during the lostpassword case.

-         *

-         * @since 1.0.0

-         */

-        do_action('lost_password');

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

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

-

-            break;

-

-        case 'resetpass' :

-        case 'rp' :

-            $errors = reset_password($_GET['key'], $_GET['login']);

-

-            if (!is_wp_error($errors)) {

-                wp_redirect(geodir_login_url(array('checkemail'=>'newpass')));

-                exit();

-            }

-

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

-            exit();

-

-            break;

-

-        case 'register' :

-            ############################### fix by Stiofan -  HebTech.co.uk ### SECURITY FIX ##############################

-            if (!get_option('users_can_register')) {

-                wp_redirect(geodir_login_url(array('emsg'=>'regnewusr')));

-                exit();

-            }

-            ############################### fix by Stiofan -  HebTech.co.uk ### SECURITY FIX ##############################

-            global $user_email, $user_fname;

-            $user_login = '';

-            $user_email = '';

-            if ($http_post) {

-                $user_login = $_POST['user_email'];

-                $user_email = $_POST['user_email'];

-                $user_fname = $_POST['user_fname'];

-

-                $errors = geodir_register_new_user($user_login, $user_email);

-

-                /* display error in registration form */

-                if (is_wp_error($errors)) {

-                    $error_code = $errors->get_error_code();

-                    $error_message = $errors->get_error_message($error_code);

-                    if (!isset($_POST['user_login']) && ($error_code == 'empty_username' || $error_code == 'invalid_username' || $error_code == 'username_exists')) {

-                        if ($error_code == 'empty_username') {

-                            $error_code = 'empty_email';

-                        } else if ($error_code == 'invalid_username') {

-                            $error_code = 'invalid_email';

-                        } else if ($error_code == 'username_exists') {

-                            $error_code = 'email_exists';

-                        }

-

-                        $error_message = $errors->get_error_message($error_code);

-                    }

-                    global $geodir_signup_error;

-                    $geodir_signup_error = $error_message;

-                }

-

-                if (!is_wp_error($errors)) {

-                    $_POST['log'] = $user_login;

-                    $_POST['pwd'] = $errors[1];

-                    $_POST['testcookie'] = 1;

-

-                    $secure_cookie = '';

-                    // If the user wants ssl but the session is not ssl, force a secure cookie.

-                    if (!empty($_POST['log'])) {

-                        $user_name = sanitize_user($_POST['log']);

-                        if ($user = get_user_by('email', $user_name)) {

-                            if (get_user_option('use_ssl', $user->ID)) {

-                                $secure_cookie = true;

-                                force_ssl_admin(true);

-                            }

-                        }

-                    }

-

-                    $redirect_to = $_REQUEST['redirect_to'];

-

-                    if (!isset($_REQUEST['redirect_to']) || $_REQUEST['redirect_to'] == '') {

-                        if (isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], home_url())) {

-                            $redirect_to = $_SERVER['HTTP_REFERER'];

-                        } else {

-                            $redirect_to = home_url();

-                        }

-

-                    }

-

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

-

-                        $redirect_to = $_REQUEST['redirect_add_listing'];

-                    }

-

-

-                    if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

-                        $secure_cookie = false;

-

-                    $user = wp_signon('', $secure_cookie);

-

-                    $requested_redirect_to = isset($_REQUEST['redirect_add_listing']) && $_REQUEST['redirect_add_listing'] != '' ? $_REQUEST['redirect_add_listing'] : (isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '');

-                    /**

-                     * Filter the login redirect URL.

-                     *

-                     * @since 1.4.9

-                     * @param string $redirect_to The redirect destination URL.

-                     * @param string $requested_redirect_to The requested redirect destination URL passed as a parameter.

-                     * @param WP_User|WP_Error $user WP_User object if login was successful, WP_Error object otherwise.

-                     */

-                    $redirect_to = apply_filters('login_redirect', $redirect_to, $requested_redirect_to, $user);

-

-

-                    if (!is_wp_error($user)) {

-                        wp_safe_redirect($redirect_to);

-                        exit();

-                    }

-                    exit();

-                }

-            }

-

-            break;

-

-        case 'login' :

-        default:

-            $secure_cookie = '';

-

-            if (!empty($_POST['log'])) {

-                $user_name = sanitize_user($_POST['log']);

-                if ($user = get_user_by('login', $user_name)) {

-

-                    if (get_user_option('use_ssl', $user->ID)) {

-                        $secure_cookie = true;

-                        force_ssl_admin(true);

-                    }

-                } elseif ($user = get_user_by('email', $user_name)) {

-                    $_POST['log'] = $user->user_login; // If signing in by email, set the username for normal WP login

-                    if (get_user_option('use_ssl', $user->ID)) {

-                        $secure_cookie = true;

-                        force_ssl_admin(true);

-                    }

-                }

-            }

-            ///////////////////////////

-            if (isset($_REQUEST['redirect_add_listing'])) {

-                $_REQUEST['redirect_to'] = $_REQUEST['redirect_add_listing'];

-            }

-

-

-            if (!isset($_REQUEST['redirect_to']) || $_REQUEST['redirect_to'] == '') {

-                if (is_user_logged_in()) :

-                    $user_ID = isset($user->ID) ? $user->ID : '';

-                    $author_link = get_author_posts_url($user_ID);

-                    $default_author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true', 'stype' => 'gd_place'), false);

-

-                    /**

-                     * Filter the author link.

-                     *

-                     * @since 1.0.0

-                     *

-                     * @param string $default_author_link Default author link.

-                     * @param int $user_ID The user ID.

-                     */

-                    $default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_ID);

-

-                    $_REQUEST['redirect_to'] = $default_author_link;

-                else:

-                    $_REQUEST['redirect_to'] = home_url();

-                endif;

-

-            }

-            if (isset($_REQUEST['redirect_to'])) {

-                $redirect_to = $_REQUEST['redirect_to'];

-                // Redirect to https if user wants ssl

-                if ($secure_cookie && false !== strpos($redirect_to, 'wp-admin'))

-                    $redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);

-            } else {

-                $redirect_to = admin_url();

-            }

-

-            if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

-                $secure_cookie = false;

-            $user = wp_signon('', $secure_cookie);

-

-

-            /**

-             * Filter the login redirect URL.

-             *

-             * @since 1.4.9

-             * @param string $redirect_to The redirect destination URL.

-             * @param WP_User|WP_Error $user WP_User object if login was successful, WP_Error object otherwise.

-             */

-            $redirect_to = apply_filters('login_redirect', $redirect_to, isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '', $user);

-

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

-                }

-            }

-            if (!is_wp_error($user)) {

-

-                // Some servers are not logging the user in properly after wp_signon, se we set the user here.

-                //wp_set_current_user($user->ID);

-                //echo '###';exit;

-

-                if ($redirect_to) {

-                    wp_redirect($redirect_to);

-                } else {

-                    wp_redirect(home_url());

-                }

-                gd_die();

-            }

-

-            $errors = $user;

-

-            // Clear errors if loggedout is set.

-            if (!empty($_GET['loggedout']))

-                $errors = new WP_Error();

-            // If cookies are disabled we can't log in even with a valid user+pass

-            if (isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE]))

-                $errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress.", 'geodirectory'));

-

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

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

-                $successmsg = USER_REG_NOT_ALLOW_MSG;

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

-                $successmsg = EMAIL_CONFIRM_LINK_MSG;

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

-                $successmsg = NEW_PW_EMAIL_MSG;

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

-                $successmsg = REG_COMPLETE_MSG;

-            }

-

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

-                } else {

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

-                }

-                gd_die();

-            }

-            break;

-    endswitch; // end action switch

+	global $errors;

+	$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'login';

+

+	$errors = new WP_Error();

+

+	if (isset($_GET['key']))

+		$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))

+		$action = 'login';

+

+	nocache_headers();

+

+	if (defined('RELOCATE')) { // Move flag is set

+		if (isset($_SERVER['PATH_INFO']) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']))

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

+	}

+

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

+	//setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN);

+	if (SITECOOKIEPATH != COOKIEPATH)

+		setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);

+

+	/**

+	 * Allow plugins to override the default actions, and to add extra actions if they want on the register/signin page.

+	 *

+	 * Used dynamic hook login_form_$action

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('login_form_' . $action);

+

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

+

+	switch ($action):

+

+		case 'logout' :

+			//check_admin_referer('log-out');

+			wp_logout();

+

+			$redirect_to = $_SERVER['HTTP_REFERER'];

+			//$redirect_to = home_url().'/?ptype=login&loggedout=true';

+			if (isset($_REQUEST['redirect_to']))

+				$redirect_to = $_REQUEST['redirect_to'];

+			$redirect_to = home_url();

+			wp_safe_redirect($redirect_to);

+			exit();

+

+			break;

+

+		case 'lostpassword' :

+		case 'retrievepassword' :

+			if ($http_post) {

+				$errors = geodir_retrieve_password();

+				$error_message = isset($errors->errors['invalid_email'][0]) ? $errors->errors['invalid_email'][0] : '';

+				if (!is_wp_error($errors)) {

+					wp_redirect(geodir_login_url(array('checkemail'=>'confirm')));

+					gd_die();

+				} else {

+					wp_redirect(geodir_login_url(array('forgot' => 1, 'emsg'=>'fw')));

+					gd_die();

+				}

+			}

+			if (isset($_GET['error']) && 'invalidkey' == $_GET['error']) $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.', 'geodirectory'));

+		/**

+		 * Called in the geodir_user_signup() function during the lostpassword case.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('lost_password');

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

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

+

+			break;

+

+		case 'resetpass' :

+		case 'rp' :

+			$errors = reset_password($_GET['key'], $_GET['login']);

+

+			if (!is_wp_error($errors)) {

+				wp_redirect(geodir_login_url(array('checkemail'=>'newpass')));

+				exit();

+			}

+

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

+			exit();

+

+			break;

+

+		case 'register' :

+			############################### fix by Stiofan -  HebTech.co.uk ### SECURITY FIX ##############################

+			if (!get_option('users_can_register')) {

+				wp_redirect(geodir_login_url(array('emsg'=>'regnewusr')));

+				exit();

+			}

+			############################### fix by Stiofan -  HebTech.co.uk ### SECURITY FIX ##############################

+			global $user_email, $user_fname;

+			$user_login = '';

+			$user_email = '';

+			if ($http_post) {

+				$user_login = $_POST['user_email'];

+				$user_email = $_POST['user_email'];

+				$user_fname = $_POST['user_fname'];

+

+				$errors = geodir_register_new_user($user_login, $user_email);

+

+				/* display error in registration form */

+				if (is_wp_error($errors)) {

+					$error_code = $errors->get_error_code();

+					$error_message = $errors->get_error_message($error_code);

+					if (!isset($_POST['user_login']) && ($error_code == 'empty_username' || $error_code == 'invalid_username' || $error_code == 'username_exists')) {

+						if ($error_code == 'empty_username') {

+							$error_code = 'empty_email';

+						} else if ($error_code == 'invalid_username') {

+							$error_code = 'invalid_email';

+						} else if ($error_code == 'username_exists') {

+							$error_code = 'email_exists';

+						}

+

+						$error_message = $errors->get_error_message($error_code);

+					}

+					global $geodir_signup_error;

+					$geodir_signup_error = $error_message;

+				}

+

+				if (!is_wp_error($errors)) {

+					$_POST['log'] = $user_login;

+					$_POST['pwd'] = $errors[1];

+					$_POST['testcookie'] = 1;

+

+					$secure_cookie = '';

+					// If the user wants ssl but the session is not ssl, force a secure cookie.

+					if (!empty($_POST['log'])) {

+						$user_name = sanitize_user($_POST['log']);

+						if ($user = get_user_by('email', $user_name)) {

+							if (get_user_option('use_ssl', $user->ID)) {

+								$secure_cookie = true;

+								force_ssl_admin(true);

+							}

+						}

+					}

+

+					$redirect_to = $_REQUEST['redirect_to'];

+

+					if (!isset($_REQUEST['redirect_to']) || $_REQUEST['redirect_to'] == '') {

+						if (isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], home_url())) {

+							$redirect_to = $_SERVER['HTTP_REFERER'];

+						} else {

+							$redirect_to = home_url();

+						}

+

+					}

+

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

+

+						$redirect_to = $_REQUEST['redirect_add_listing'];

+					}

+

+

+					if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

+						$secure_cookie = false;

+

+					$user = wp_signon('', $secure_cookie);

+

+					$requested_redirect_to = isset($_REQUEST['redirect_add_listing']) && $_REQUEST['redirect_add_listing'] != '' ? $_REQUEST['redirect_add_listing'] : (isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '');

+					/**

+					 * Filter the login redirect URL.

+					 *

+					 * @since 1.4.9

+					 * @param string $redirect_to The redirect destination URL.

+					 * @param string $requested_redirect_to The requested redirect destination URL passed as a parameter.

+					 * @param WP_User|WP_Error $user WP_User object if login was successful, WP_Error object otherwise.

+					 */

+					$redirect_to = apply_filters('login_redirect', $redirect_to, $requested_redirect_to, $user);

+

+

+					if (!is_wp_error($user)) {

+						wp_safe_redirect($redirect_to);

+						exit();

+					}

+					exit();

+				}

+			}

+

+			break;

+

+		case 'login' :

+		default:

+			$secure_cookie = '';

+

+			if (!empty($_POST['log'])) {

+				$user_name = sanitize_user($_POST['log']);

+				if ($user = get_user_by('login', $user_name)) {

+

+					if (get_user_option('use_ssl', $user->ID)) {

+						$secure_cookie = true;

+						force_ssl_admin(true);

+					}

+				} elseif ($user = get_user_by('email', $user_name)) {

+					$_POST['log'] = $user->user_login; // If signing in by email, set the username for normal WP login

+					if (get_user_option('use_ssl', $user->ID)) {

+						$secure_cookie = true;

+						force_ssl_admin(true);

+					}

+				}

+			}

+			///////////////////////////

+			if (isset($_REQUEST['redirect_add_listing'])) {

+				$_REQUEST['redirect_to'] = $_REQUEST['redirect_add_listing'];

+			}

+

+

+			if (!isset($_REQUEST['redirect_to']) || $_REQUEST['redirect_to'] == '') {

+				if (is_user_logged_in()) :

+					$user_ID = isset($user->ID) ? $user->ID : '';

+					$author_link = get_author_posts_url($user_ID);

+					$default_author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true', 'stype' => 'gd_place'), false);

+

+					/**

+					 * Filter the author link.

+					 *

+					 * @since 1.0.0

+					 *

+					 * @param string $default_author_link Default author link.

+					 * @param int $user_ID The user ID.

+					 */

+					$default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_ID);

+

+					$_REQUEST['redirect_to'] = $default_author_link;

+				else:

+					$_REQUEST['redirect_to'] = home_url();

+				endif;

+

+			}

+			if (isset($_REQUEST['redirect_to'])) {

+				$redirect_to = $_REQUEST['redirect_to'];

+				// Redirect to https if user wants ssl

+				if ($secure_cookie && false !== strpos($redirect_to, 'wp-admin'))

+					$redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);

+			} else {

+				$redirect_to = admin_url();

+			}

+

+			if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

+				$secure_cookie = false;

+			$user = wp_signon('', $secure_cookie);

+

+

+			/**

+			 * Filter the login redirect URL.

+			 *

+			 * @since 1.4.9

+			 * @param string $redirect_to The redirect destination URL.

+			 * @param WP_User|WP_Error $user WP_User object if login was successful, WP_Error object otherwise.

+			 */

+			$redirect_to = apply_filters('login_redirect', $redirect_to, isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '', $user);

+

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

+				}

+			}

+			if (!is_wp_error($user)) {

+

+				// Some servers are not logging the user in properly after wp_signon, se we set the user here.

+				//wp_set_current_user($user->ID);

+				//echo '###';exit;

+

+				if ($redirect_to) {

+					wp_redirect($redirect_to);

+				} else {

+					wp_redirect(home_url());

+				}

+				gd_die();

+			}

+

+			$errors = $user;

+

+			// Clear errors if loggedout is set.

+			if (!empty($_GET['loggedout']))

+				$errors = new WP_Error();

+			// If cookies are disabled we can't log in even with a valid user+pass

+			if (isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE]))

+				$errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress.", 'geodirectory'));

+

+			// 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>';

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

+				$successmsg = USER_REG_NOT_ALLOW_MSG;

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

+				$successmsg = EMAIL_CONFIRM_LINK_MSG;

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

+				$successmsg = NEW_PW_EMAIL_MSG;

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

+				$successmsg = REG_COMPLETE_MSG;

+			}

+

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

+				} else {

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

+				}

+				gd_die();

+			}

+			break;

+	endswitch; // end action switch

 }
\ No newline at end of file

Spacing +22 added lines, -22 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;

 }

@@ -315,7 +315,7 @@ 
      *

      * @param object $errors Registration error messages.

      */

-    $errors = apply_filters('registration_errors', $errors,$user_login,$user_email);

+    $errors = apply_filters('registration_errors', $errors, $user_login, $user_email);

 

     if ($errors->get_error_code())

         return $errors;

@@ -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();

             }

Braces +74 added lines, -48 removed lines

@@ -25,11 +25,13 @@ 
                 window.location.href = '<?php echo geodir_login_url();?>';

             </script>

         <?php

-        } else

-            return false;

-    } else

-        return true;

-}

+        } else {
+                    return false;
+        }
+    } else {
+            return true;
+    }
+    }

 

 /**

  * Redirect to SSL url, if SSL is being used.

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

      */

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

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

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

 }

 

@@ -141,14 +145,16 @@ 
     global $wpdb;

 

     $errors = new WP_Error();

-    if (empty($_POST['user_login']) && empty($_POST['user_email']))

-        $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.', 'geodirectory'));

+    if (empty($_POST['user_login']) && empty($_POST['user_email'])) {
+            $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.', 'geodirectory'));
+    }
 

     if (strpos($_POST['user_login'], '@')) {

         //$user_data = get_user_by_email(trim($_POST['user_login']));

         $user_data = get_user_by('email', trim($_POST['user_login']));

-        if (empty($user_data))

-            $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.', 'geodirectory'));

+        if (empty($user_data)) {
+                    $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.', 'geodirectory'));
+        }
     } else {

         $login = trim($_POST['user_login']);

         $user_data = get_user_by('email', $login);

@@ -161,8 +167,9 @@ 
      */

     do_action('lostpassword_post');

 

-    if ($errors->get_error_code())

-        return $errors;

+    if ($errors->get_error_code()) {
+            return $errors;
+    }
 

     if (!$user_data) {

         $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.', 'geodirectory'));

@@ -192,8 +199,9 @@ 
         )

     );

 

-    if (empty($user))

-        return new WP_Error('invalid_key', __('Invalid key', 'geodirectory'));

+    if (empty($user)) {
+            return new WP_Error('invalid_key', __('Invalid key', 'geodirectory'));
+    }
 

     $new_pass = wp_generate_password(12, false);

 

@@ -282,13 +290,14 @@ 
     }

 

     // Check the username

-    if ($user_login == '')

-        $errors->add('empty_username', __('ERROR: Please enter a username.', 'geodirectory'));

-    elseif (!validate_username($user_login)) {

+    if ($user_login == '') {
+            $errors->add('empty_username', __('ERROR: Please enter a username.', 'geodirectory'));
+    } elseif (!validate_username($user_login)) {

         $errors->add('invalid_username', __('<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.', 'geodirectory'));

         $user_login = '';

-    } elseif (username_exists($user_login))

-        $errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered, please choose another one.', 'geodirectory'));

+    } elseif (username_exists($user_login)) {
+            $errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered, please choose another one.', 'geodirectory'));
+    }
 

     // Check the e-mail address

     if ($user_email == '') {

@@ -296,8 +305,9 @@ 
     } elseif (!is_email($user_email)) {

         $errors->add('invalid_email', __('<strong>ERROR</strong>: The email address isn&#8217;t correct.', 'geodirectory'));

         $user_email = '';

-    } elseif (email_exists($user_email))

-        $errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.', 'geodirectory'));

+    } elseif (email_exists($user_email)) {
+            $errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.', 'geodirectory'));
+    }
 

     /**

      * Called when registering a new user.

@@ -317,8 +327,9 @@ 
      */

     $errors = apply_filters('registration_errors', $errors,$user_login,$user_email);

 

-    if ($errors->get_error_code())

-        return $errors;

+    if ($errors->get_error_code()) {
+            return $errors;
+    }
 

 

     if (!isset($user_pass) || $user_pass == '') {

@@ -423,28 +434,33 @@ 
 

     $errors = new WP_Error();

 

-    if (isset($_GET['key']))

-        $action = 'resetpass';

+    if (isset($_GET['key'])) {
+            $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))

-        $action = 'login';

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

     nocache_headers();

 

     if (defined('RELOCATE')) { // Move flag is set

-        if (isset($_SERVER['PATH_INFO']) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']))

-            $_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF']);

+        if (isset($_SERVER['PATH_INFO']) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF'])) {
+                    $_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.

     //setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN);

-    if (SITECOOKIEPATH != COOKIEPATH)

-        setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);

+    if (SITECOOKIEPATH != COOKIEPATH) {
+            setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);
+    }
 

     /**

      * Allow plugins to override the default actions, and to add extra actions if they want on the register/signin page.

@@ -465,8 +481,9 @@ 
 

             $redirect_to = $_SERVER['HTTP_REFERER'];

             //$redirect_to = home_url().'/?ptype=login&loggedout=true';

-            if (isset($_REQUEST['redirect_to']))

-                $redirect_to = $_REQUEST['redirect_to'];

+            if (isset($_REQUEST['redirect_to'])) {
+                            $redirect_to = $_REQUEST['redirect_to'];
+            }
             $redirect_to = home_url();

             wp_safe_redirect($redirect_to);

             exit();

@@ -486,7 +503,9 @@ 
                     gd_die();

                 }

             }

-            if (isset($_GET['error']) && 'invalidkey' == $_GET['error']) $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.', 'geodirectory'));

+            if (isset($_GET['error']) && 'invalidkey' == $_GET['error']) {
+            	$errors->add('invalidkey', __('Sorry, that key does not appear to be valid.', 'geodirectory'));
+            }
         /**

          * Called in the geodir_user_signup() function during the lostpassword case.

          *

@@ -582,8 +601,9 @@ 
                     }

 

 

-                    if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

-                        $secure_cookie = false;

+                    if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http'))) {
+                                            $secure_cookie = false;
+                    }
 

                     $user = wp_signon('', $secure_cookie);

 

@@ -652,22 +672,26 @@ 
                     $default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_ID);

 

                     $_REQUEST['redirect_to'] = $default_author_link;

-                else:

-                    $_REQUEST['redirect_to'] = home_url();

+                else {
+                	:

+                    $_REQUEST['redirect_to'] = home_url();
+                }
                 endif;

 

             }

             if (isset($_REQUEST['redirect_to'])) {

                 $redirect_to = $_REQUEST['redirect_to'];

                 // Redirect to https if user wants ssl

-                if ($secure_cookie && false !== strpos($redirect_to, 'wp-admin'))

-                    $redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);

+                if ($secure_cookie && false !== strpos($redirect_to, 'wp-admin')) {
+                                    $redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);
+                }
             } else {

                 $redirect_to = admin_url();

             }

 

-            if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

-                $secure_cookie = false;

+            if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http'))) {
+                            $secure_cookie = false;
+            }
             $user = wp_signon('', $secure_cookie);

 

 

@@ -702,11 +726,13 @@ 
             $errors = $user;

 

             // Clear errors if loggedout is set.

-            if (!empty($_GET['loggedout']))

-                $errors = new WP_Error();

+            if (!empty($_GET['loggedout'])) {
+                            $errors = new WP_Error();
+            }
             // If cookies are disabled we can't log in even with a valid user+pass

-            if (isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE]))

-                $errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress.", 'geodirectory'));

+            if (isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE])) {
+                            $errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress.", 'geodirectory'));
+            }
 

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

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

geodirectory-functions/template_functions.php

Doc Comments +1 added lines, -1 removed lines

@@ -393,7 +393,7 @@
  * @global object $post The current post object.

  * @global object $geodirectory Not yet implemented.

  * @param string $slug The template slug.

- * @param null $name The template name.

+ * @param string $name The template name.

  */

 function geodir_get_template_part($slug = '', $name = NULL)

 {

Braces +58 added lines, -26 removed lines

@@ -47,16 +47,19 @@ 
 

             if ($listing_page_id != '' && (is_page($listing_page_id) || ($is_wpml && !empty($wp->query_vars['page_id']))) && isset($_REQUEST['listing_type'])

                 && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

-            )

-                $post_type = sanitize_text_field($_REQUEST['listing_type']);

+            ) {
+                            $post_type = sanitize_text_field($_REQUEST['listing_type']);
+            }
             if (empty($post_type) && !isset($_REQUEST['pid'])) {

                 $pagename = $wp->query_vars['pagename'];

                 $post_types = geodir_get_posttypes();

-                if (!empty($post_types))

-                    $post_type = $post_types[0];

+                if (!empty($post_types)) {
+                                    $post_type = $post_types[0];
+                }
 					

-				if($sc_post_type != '' )

-					$post_type = $sc_post_type;

+				if($sc_post_type != '' ) {
+									$post_type = $sc_post_type;
+				}
 				

                 if ($is_wpml && !empty($wp->query_vars['page_id'])) {

 					wp_redirect(geodir_getlink(get_permalink($wp->query_vars['page_id']), array('listing_type' => $post_type)));

@@ -71,14 +74,16 @@ 
             $success_page_id = geodir_success_page_id();

             if ($success_page_id != '' && is_page($success_page_id) && isset($_REQUEST['listing_type'])

                 && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

-            )

-                $post_type = sanitize_text_field($_REQUEST['listing_type']);

+            ) {
+                            $post_type = sanitize_text_field($_REQUEST['listing_type']);
+            }
             return $template = locate_template(array("geodirectory/{$post_type}-success.php", "geodirectory/listing-success.php"));

             break;

         case 'detail':

         case 'preview':

-            if (in_array(get_post_type(), geodir_get_posttypes()))

-                $post_type = get_post_type();

+            if (in_array(get_post_type(), geodir_get_posttypes())) {
+                            $post_type = get_post_type();
+            }
             return $template = locate_template(array("geodirectory/single-{$post_type}.php", "geodirectory/listing-detail.php"));

             break;

         case 'listing':

@@ -184,7 +189,9 @@ 
 

         $template = geodir_locate_template('signup');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';
+        }
 

         /**

          * Filter the signup template path.

@@ -202,7 +209,9 @@ 
 

             $template = geodir_locate_template('information');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+            if (!$template) {
+            	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';
+            }
             /**

              * Filter the information template path.

              *

@@ -219,7 +228,9 @@ 
             if (!$is_current_user_owner) {

                 $template = geodir_locate_template('information');

 

-                if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+                if (!$template) {
+                	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';
+                }
                 /**

                  * Filter the information template path.

                  *

@@ -241,7 +252,9 @@ 
 

         $template = geodir_locate_template('add-listing');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';
+        }
         /**

          * Filter the add listing template path.

          *

@@ -258,7 +271,9 @@ 
 

         $template = geodir_locate_template('preview');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';
+        }
         /**

          * Filter the preview template path.

          *

@@ -274,7 +289,9 @@ 
 

         $template = geodir_locate_template('success');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';
+        }
         /**

          * Filter the success template path.

          *

@@ -289,7 +306,9 @@ 
 

         $template = geodir_locate_template('detail');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';
+        }
         /**

          * Filter the detail template path.

          *

@@ -304,7 +323,9 @@ 
 

         $template = geodir_locate_template('listing');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';
+        }
         /**

          * Filter the listing template path.

          *

@@ -319,7 +340,9 @@ 
 

         $template = geodir_locate_template('search');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';
+        }
         /**

          * Filter the search template path.

          *

@@ -334,7 +357,9 @@ 
 

         $template = geodir_locate_template('author');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';
+        }
         /**

          * Filter the author template path.

          *

@@ -355,7 +380,9 @@ 
 

             $template = geodir_locate_template('geodir-home');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';

+            if (!$template) {
+            	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';
+            }
             /**

              * Filter the home page template path.

              *

@@ -368,7 +395,9 @@ 
 

             $template = geodir_locate_template('location');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';

+            if (!$template) {
+            	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';
+            }
             /**

              * Filter the location template path.

              *

@@ -377,8 +406,9 @@ 
              */

             return $template = apply_filters('geodir_template_location', $template);

 

-        } else

-            return $template;

+        } else {
+                    return $template;
+        }
 

     }

 

@@ -432,8 +462,10 @@ 
          * @since 1.0.0

          */

         include($template);

-    else:

-        locate_template(array("geodirectory/" . $template_name), true, false);

+    else {
+    	:

+        locate_template(array("geodirectory/" . $template_name), true, false);
+    }
     endif;

 

 }

Indentation +349 added lines, -349 removed lines

@@ -19,18 +19,18 @@ 
  */

 function geodir_locate_template($template = '')

 {

-    global $post_type, $wp, $post;

-    $fields = array();

+	global $post_type, $wp, $post;

+	$fields = array();

 

-    switch ($template):

-        case 'signup':

-            return $template = locate_template(array("geodirectory/geodir-signup.php"));

-            break;

-        case 'add-listing':

+	switch ($template):

+		case 'signup':

+			return $template = locate_template(array("geodirectory/geodir-signup.php"));

+			break;

+		case 'add-listing':

 

-            $sc_post_type = '';

+			$sc_post_type = '';

 			if (is_page() && isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {

-                $listing_page_id = $post->ID;

+				$listing_page_id = $post->ID;

 				

 				$regex_pattern = get_shortcode_regex();

 				preg_match('/'.$regex_pattern.'/s', $post->post_content, $regex_matches);

@@ -39,100 +39,100 @@ 
 					$shortcode_atts = shortcode_parse_atts($regex_matches[3]);

 					$sc_post_type = !empty($shortcode_atts) && isset($shortcode_atts['listing_type']) && !empty($shortcode_atts['listing_type']) ? $shortcode_atts['listing_type'] : '';

 				}

-            } else {

-                $listing_page_id = geodir_add_listing_page_id();

-            }

+			} else {

+				$listing_page_id = geodir_add_listing_page_id();

+			}

 			

 			$is_wpml = function_exists('icl_object_id') ? true : false;

 

-            if ($listing_page_id != '' && (is_page($listing_page_id) || ($is_wpml && !empty($wp->query_vars['page_id']))) && isset($_REQUEST['listing_type'])

-                && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

-            )

-                $post_type = sanitize_text_field($_REQUEST['listing_type']);

-            if (empty($post_type) && !isset($_REQUEST['pid'])) {

-                $pagename = $wp->query_vars['pagename'];

-                $post_types = geodir_get_posttypes();

-                if (!empty($post_types))

-                    $post_type = $post_types[0];

+			if ($listing_page_id != '' && (is_page($listing_page_id) || ($is_wpml && !empty($wp->query_vars['page_id']))) && isset($_REQUEST['listing_type'])

+				&& in_array($_REQUEST['listing_type'], geodir_get_posttypes())

+			)

+				$post_type = sanitize_text_field($_REQUEST['listing_type']);

+			if (empty($post_type) && !isset($_REQUEST['pid'])) {

+				$pagename = $wp->query_vars['pagename'];

+				$post_types = geodir_get_posttypes();

+				if (!empty($post_types))

+					$post_type = $post_types[0];

 					

 				if($sc_post_type != '' )

 					$post_type = $sc_post_type;

 				

-                if ($is_wpml && !empty($wp->query_vars['page_id'])) {

+				if ($is_wpml && !empty($wp->query_vars['page_id'])) {

 					wp_redirect(geodir_getlink(get_permalink($wp->query_vars['page_id']), array('listing_type' => $post_type)));

 				} else {

 					wp_redirect(trailingslashit(get_site_url()) . $pagename . '/?listing_type=' . $post_type);

 				}

-                gd_die();

-            }

-            return $template = locate_template(array("geodirectory/add-{$post_type}.php", "geodirectory/add-listing.php"));

-            break;

-        case 'success':

-            $success_page_id = geodir_success_page_id();

-            if ($success_page_id != '' && is_page($success_page_id) && isset($_REQUEST['listing_type'])

-                && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

-            )

-                $post_type = sanitize_text_field($_REQUEST['listing_type']);

-            return $template = locate_template(array("geodirectory/{$post_type}-success.php", "geodirectory/listing-success.php"));

-            break;

-        case 'detail':

-        case 'preview':

-            if (in_array(get_post_type(), geodir_get_posttypes()))

-                $post_type = get_post_type();

-            return $template = locate_template(array("geodirectory/single-{$post_type}.php", "geodirectory/listing-detail.php"));

-            break;

-        case 'listing':

-            $templates = array();

-            if (is_post_type_archive() && in_array(get_post_type(), geodir_get_posttypes())) {

-                $post_type = get_post_type();

-                $templates[] = "geodirectory/archive-$post_type.php";

-            }

-

-

-            if (is_tax() && geodir_get_taxonomy_posttype()) {

-                $query_obj = get_queried_object();

-                $curr_taxonomy = isset($query_obj->taxonomy) ? $query_obj->taxonomy : '';

-                $curr_term = isset($query_obj->slug) ? $query_obj->slug : '';

-                $templates[] = "geodirectory/taxonomy-$curr_taxonomy-$curr_term.php";

-                $templates[] = "geodirectory/taxonomy-$curr_taxonomy.php";

-            }

-

-            $templates[] = "geodirectory/geodir-listing.php";

-

-            return $template = locate_template($templates);

-            break;

-        case 'information':

-            return $template = locate_template(array("geodirectory/geodir-information.php"));

-            break;

-        case 'author':

-            return $template = locate_template(array("geodirectory/geodir-author.php"));

-            break;

-        case 'search':

-            return $template = locate_template(array("geodirectory/geodir-search.php"));

-            break;

-        case 'location':

-            return $template = locate_template(array("geodirectory/geodir-location.php"));

-            break;

-        case 'geodir-home':

-            return $template = locate_template(array("geodirectory/geodir-home.php"));

-            break;

-        case 'listing-listview':

-            $template = locate_template(array("geodirectory/listing-listview.php"));

-            if (!$template) {

-                $template = geodir_plugin_path() . '/geodirectory-templates/listing-listview.php';

-            }

-            return $template;

-            break;

-        case 'widget-listing-listview':

-            $template = locate_template(array("geodirectory/widget-listing-listview.php"));

-            if (!$template) {

-                $template = geodir_plugin_path() . '/geodirectory-templates/widget-listing-listview.php';

-            }

-            return $template;

-            break;

-    endswitch;

-

-    return false;

+				gd_die();

+			}

+			return $template = locate_template(array("geodirectory/add-{$post_type}.php", "geodirectory/add-listing.php"));

+			break;

+		case 'success':

+			$success_page_id = geodir_success_page_id();

+			if ($success_page_id != '' && is_page($success_page_id) && isset($_REQUEST['listing_type'])

+				&& in_array($_REQUEST['listing_type'], geodir_get_posttypes())

+			)

+				$post_type = sanitize_text_field($_REQUEST['listing_type']);

+			return $template = locate_template(array("geodirectory/{$post_type}-success.php", "geodirectory/listing-success.php"));

+			break;

+		case 'detail':

+		case 'preview':

+			if (in_array(get_post_type(), geodir_get_posttypes()))

+				$post_type = get_post_type();

+			return $template = locate_template(array("geodirectory/single-{$post_type}.php", "geodirectory/listing-detail.php"));

+			break;

+		case 'listing':

+			$templates = array();

+			if (is_post_type_archive() && in_array(get_post_type(), geodir_get_posttypes())) {

+				$post_type = get_post_type();

+				$templates[] = "geodirectory/archive-$post_type.php";

+			}

+

+

+			if (is_tax() && geodir_get_taxonomy_posttype()) {

+				$query_obj = get_queried_object();

+				$curr_taxonomy = isset($query_obj->taxonomy) ? $query_obj->taxonomy : '';

+				$curr_term = isset($query_obj->slug) ? $query_obj->slug : '';

+				$templates[] = "geodirectory/taxonomy-$curr_taxonomy-$curr_term.php";

+				$templates[] = "geodirectory/taxonomy-$curr_taxonomy.php";

+			}

+

+			$templates[] = "geodirectory/geodir-listing.php";

+

+			return $template = locate_template($templates);

+			break;

+		case 'information':

+			return $template = locate_template(array("geodirectory/geodir-information.php"));

+			break;

+		case 'author':

+			return $template = locate_template(array("geodirectory/geodir-author.php"));

+			break;

+		case 'search':

+			return $template = locate_template(array("geodirectory/geodir-search.php"));

+			break;

+		case 'location':

+			return $template = locate_template(array("geodirectory/geodir-location.php"));

+			break;

+		case 'geodir-home':

+			return $template = locate_template(array("geodirectory/geodir-home.php"));

+			break;

+		case 'listing-listview':

+			$template = locate_template(array("geodirectory/listing-listview.php"));

+			if (!$template) {

+				$template = geodir_plugin_path() . '/geodirectory-templates/listing-listview.php';

+			}

+			return $template;

+			break;

+		case 'widget-listing-listview':

+			$template = locate_template(array("geodirectory/widget-listing-listview.php"));

+			if (!$template) {

+				$template = geodir_plugin_path() . '/geodirectory-templates/widget-listing-listview.php';

+			}

+			return $template;

+			break;

+	endswitch;

+

+	return false;

 

 }

 

@@ -151,255 +151,255 @@ 
 function geodir_template_loader($template)

 {

 

-    global $wp_query;

-

-    /**

-     * Filter the custom page list.

-     *

-     * @since 1.0.0

-     */

-    $geodir_custom_page_list = apply_filters('geodir_set_custom_pages', array(

-        'geodir_signup_page' =>

-            apply_filters('geodir_set_custom_signup_page', false),

-        'geodir_add_listing_page' =>

-            apply_filters('geodir_set_custom_add_listing_page', false),

-        'geodir_preview_page' =>

-            apply_filters('geodir_set_custom_preview_page', false),

-        'geodir_listing_success_page' =>

-            apply_filters('geodir_set_custom_listing_success_page', false),

-        'geodir_listing_detail_page' =>

-            apply_filters('geodir_set_custom_listing_detail_page', false),

-        'geodir_listing_page' =>

-            apply_filters('geodir_set_custom_listing_page', false),

-        'geodir_search_page' =>

-            apply_filters('geodir_set_custom_search_page', false),

-        'geodir_author_page' =>

-            apply_filters('geodir_set_custom_author_page', false),

-        'geodir_home_map_page' =>

-            apply_filters('geodir_set_custom_home_map_page', false)

-    ));

-

-

-    if (geodir_is_page('login') || $geodir_custom_page_list['geodir_signup_page']) {

-

-        $template = geodir_locate_template('signup');

-

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';

-

-        /**

-         * Filter the signup template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_signup', $template);

-    }

-

-    if (geodir_is_page('add-listing') || $geodir_custom_page_list['geodir_add_listing_page']) {

-        if (!geodir_is_default_location_set()) {

-            global $information;

-            $information = sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>');

-

-            $template = geodir_locate_template('information');

-

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

-            /**

-             * Filter the information template path.

-             *

-             * @since 1.0.0

-             * @param string $template The template path.

-             */

-            return $template = apply_filters('geodir_template_information', $template);

-        }

-        // check if pid exists in the record if yes then check if this post belongs to the user who is logged in.

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

-            /// WPML

-            if (geodir_is_wpml() && $duplicate_of = wpml_get_master_post_from_duplicate((int)$_GET['pid'])) {

-                global $sitepress;

+	global $wp_query;

+

+	/**

+	 * Filter the custom page list.

+	 *

+	 * @since 1.0.0

+	 */

+	$geodir_custom_page_list = apply_filters('geodir_set_custom_pages', array(

+		'geodir_signup_page' =>

+			apply_filters('geodir_set_custom_signup_page', false),

+		'geodir_add_listing_page' =>

+			apply_filters('geodir_set_custom_add_listing_page', false),

+		'geodir_preview_page' =>

+			apply_filters('geodir_set_custom_preview_page', false),

+		'geodir_listing_success_page' =>

+			apply_filters('geodir_set_custom_listing_success_page', false),

+		'geodir_listing_detail_page' =>

+			apply_filters('geodir_set_custom_listing_detail_page', false),

+		'geodir_listing_page' =>

+			apply_filters('geodir_set_custom_listing_page', false),

+		'geodir_search_page' =>

+			apply_filters('geodir_set_custom_search_page', false),

+		'geodir_author_page' =>

+			apply_filters('geodir_set_custom_author_page', false),

+		'geodir_home_map_page' =>

+			apply_filters('geodir_set_custom_home_map_page', false)

+	));

+

+

+	if (geodir_is_page('login') || $geodir_custom_page_list['geodir_signup_page']) {

+

+		$template = geodir_locate_template('signup');

+

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';

+

+		/**

+		 * Filter the signup template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_signup', $template);

+	}

+

+	if (geodir_is_page('add-listing') || $geodir_custom_page_list['geodir_add_listing_page']) {

+		if (!geodir_is_default_location_set()) {

+			global $information;

+			$information = sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>');

+

+			$template = geodir_locate_template('information');

+

+			if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+			/**

+			 * Filter the information template path.

+			 *

+			 * @since 1.0.0

+			 * @param string $template The template path.

+			 */

+			return $template = apply_filters('geodir_template_information', $template);

+		}

+		// check if pid exists in the record if yes then check if this post belongs to the user who is logged in.

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

+			/// WPML

+			if (geodir_is_wpml() && $duplicate_of = wpml_get_master_post_from_duplicate((int)$_GET['pid'])) {

+				global $sitepress;

                 

-                $lang_of_duplicate = geodir_get_language_for_element($duplicate_of, 'post_' . get_post_type($duplicate_of));

-                $sitepress->switch_lang($lang_of_duplicate, true);

+				$lang_of_duplicate = geodir_get_language_for_element($duplicate_of, 'post_' . get_post_type($duplicate_of));

+				$sitepress->switch_lang($lang_of_duplicate, true);

         

-                $redirect_to = get_permalink(geodir_add_listing_page_id());

-                $_GET['pid'] = $duplicate_of;

-                if (!empty($_GET)) {

-                    $redirect_to = add_query_arg($_GET, $redirect_to);

-                }

-                wp_redirect($redirect_to);

-                exit;

-            }

-            /// WPML

+				$redirect_to = get_permalink(geodir_add_listing_page_id());

+				$_GET['pid'] = $duplicate_of;

+				if (!empty($_GET)) {

+					$redirect_to = add_query_arg($_GET, $redirect_to);

+				}

+				wp_redirect($redirect_to);

+				exit;

+			}

+			/// WPML

             

-            global $information;

-            $information = __('This listing does not belong to your account, please check the listing id carefully.', 'geodirectory');

-            $is_current_user_owner = geodir_listing_belong_to_current_user();

-            if (!$is_current_user_owner) {

-                $template = geodir_locate_template('information');

-

-                if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

-                /**

-                 * Filter the information template path.

-                 *

-                 * @since 1.0.0

-                 * @param string $template The template path.

-                 */

-                return $template = apply_filters('geodir_template_information', $template);

-            }

+			global $information;

+			$information = __('This listing does not belong to your account, please check the listing id carefully.', 'geodirectory');

+			$is_current_user_owner = geodir_listing_belong_to_current_user();

+			if (!$is_current_user_owner) {

+				$template = geodir_locate_template('information');

+

+				if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+				/**

+				 * Filter the information template path.

+				 *

+				 * @since 1.0.0

+				 * @param string $template The template path.

+				 */

+				return $template = apply_filters('geodir_template_information', $template);

+			}

+

 

+		}

 

-        }

+		//geodir_is_login(true);

+		global $current_user;

+		if (!$current_user->ID) {

+			wp_redirect(geodir_login_url(array('redirect_add_listing'=>urlencode(geodir_curPageURL()))), 302);

+			exit;

+		}

 

-        //geodir_is_login(true);

-        global $current_user;

-        if (!$current_user->ID) {

-            wp_redirect(geodir_login_url(array('redirect_add_listing'=>urlencode(geodir_curPageURL()))), 302);

-            exit;

-        }

+		$template = geodir_locate_template('add-listing');

 

-        $template = geodir_locate_template('add-listing');

-

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';

-        /**

-         * Filter the add listing template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_add_listing', $template);

-    }

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';

+		/**

+		 * Filter the add listing template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_add_listing', $template);

+	}

 

 

-    if (geodir_is_page('preview') || $geodir_custom_page_list['geodir_preview_page']) {

-        global $preview;

-        $preview = true;

+	if (geodir_is_page('preview') || $geodir_custom_page_list['geodir_preview_page']) {

+		global $preview;

+		$preview = true;

 

-        $template = geodir_locate_template('preview');

+		$template = geodir_locate_template('preview');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

-        /**

-         * Filter the preview template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_preview', $template);

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+		/**

+		 * Filter the preview template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_preview', $template);

 

-    }

+	}

 

 

-    if (geodir_is_page('listing-success') || $geodir_custom_page_list['geodir_listing_success_page']) {

+	if (geodir_is_page('listing-success') || $geodir_custom_page_list['geodir_listing_success_page']) {

 

-        $template = geodir_locate_template('success');

+		$template = geodir_locate_template('success');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';

-        /**

-         * Filter the success template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_success', $template);

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';

+		/**

+		 * Filter the success template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_success', $template);

 

-    }

+	}

 

-    if (geodir_is_page('detail') || $geodir_custom_page_list['geodir_listing_detail_page']) {

+	if (geodir_is_page('detail') || $geodir_custom_page_list['geodir_listing_detail_page']) {

 

-        $template = geodir_locate_template('detail');

+		$template = geodir_locate_template('detail');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

-        /**

-         * Filter the detail template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_detail', $template);

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+		/**

+		 * Filter the detail template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_detail', $template);

 

-    }

+	}

 

-    if (geodir_is_page('listing') || $geodir_custom_page_list['geodir_listing_page']) {

+	if (geodir_is_page('listing') || $geodir_custom_page_list['geodir_listing_page']) {

 

-        $template = geodir_locate_template('listing');

+		$template = geodir_locate_template('listing');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';

-        /**

-         * Filter the listing template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_listing', $template);

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';

+		/**

+		 * Filter the listing template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_listing', $template);

 

-    }

+	}

 

-    if (geodir_is_page('search') || $geodir_custom_page_list['geodir_search_page']) {

+	if (geodir_is_page('search') || $geodir_custom_page_list['geodir_search_page']) {

 

-        $template = geodir_locate_template('search');

+		$template = geodir_locate_template('search');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';

-        /**

-         * Filter the search template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_search', $template);

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';

+		/**

+		 * Filter the search template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_search', $template);

 

-    }

+	}

 

-    if (geodir_is_page('author') || $geodir_custom_page_list['geodir_author_page']) {

+	if (geodir_is_page('author') || $geodir_custom_page_list['geodir_author_page']) {

 

-        $template = geodir_locate_template('author');

+		$template = geodir_locate_template('author');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';

-        /**

-         * Filter the author template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_author', $template);

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';

+		/**

+		 * Filter the author template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_author', $template);

 

-    }

+	}

 

-    if ( geodir_is_page('home') || geodir_is_page('location')) {

+	if ( geodir_is_page('home') || geodir_is_page('location')) {

 

-        global $post, $wp_query;

+		global $post, $wp_query;

 

-        if (geodir_is_page('home') || ('page' == get_option('show_on_front') && isset($post->ID) && $post->ID == get_option('page_on_front'))

-            || (is_home() && !$wp_query->is_posts_page)

-        ) {

+		if (geodir_is_page('home') || ('page' == get_option('show_on_front') && isset($post->ID) && $post->ID == get_option('page_on_front'))

+			|| (is_home() && !$wp_query->is_posts_page)

+		) {

 

-            $template = geodir_locate_template('geodir-home');

+			$template = geodir_locate_template('geodir-home');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';

-            /**

-             * Filter the home page template path.

-             *

-             * @since 1.0.0

-             * @param string $template The template path.

-             */

-            return $template = apply_filters('geodir_template_homepage', $template);

+			if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';

+			/**

+			 * Filter the home page template path.

+			 *

+			 * @since 1.0.0

+			 * @param string $template The template path.

+			 */

+			return $template = apply_filters('geodir_template_homepage', $template);

 

-        } elseif (geodir_is_page('location')) {

+		} elseif (geodir_is_page('location')) {

 

-            $template = geodir_locate_template('location');

+			$template = geodir_locate_template('location');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';

-            /**

-             * Filter the location template path.

-             *

-             * @since 1.0.0

-             * @param string $template The template path.

-             */

-            return $template = apply_filters('geodir_template_location', $template);

+			if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';

+			/**

+			 * Filter the location template path.

+			 *

+			 * @since 1.0.0

+			 * @param string $template The template path.

+			 */

+			return $template = apply_filters('geodir_template_location', $template);

 

-        } else

-            return $template;

+		} else

+			return $template;

 

-    }

+	}

 

-    return $template;

+	return $template;

 }

 

 /**

@@ -414,44 +414,44 @@ 
  */

 function geodir_get_template_part($slug = '', $name = NULL)

 {

-    global $geodirectory, $post;

-    /**

-     * Called at the start for the geodir_get_template_part() function.

-     *

-     * Used dynamic hook name: geodir_get_template_part_{$slug}

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $slug The template slug.

-     * @param string $name The template name.

-     */

-    do_action("geodir_get_template_part_{$slug}", $slug, $name);

-    $templates = array();

-    $name = (string)$name;

-    if ('' !== $name) {

-        $template_name = "{$slug}-{$name}.php";

-

-    } else {

-        $template_name = "{$slug}.php";

-    }

-

-    if (!locate_template(array("geodirectory/" . $template_name))) :

-        /**

-         * Filter the template part with slug and name.

-         *

-         * @since 1.0.0

-         * @param string $template_name The template name.

-         */

-        $template = apply_filters("geodir_template_part-{$slug}-{$name}", geodir_plugin_path() . '/geodirectory-templates/' . $template_name);

-        /**

-         * Includes the template part with slug and name.

-         *

-         * @since 1.0.0

-         */

-        include($template);

-    else:

-        locate_template(array("geodirectory/" . $template_name), true, false);

-    endif;

+	global $geodirectory, $post;

+	/**

+	 * Called at the start for the geodir_get_template_part() function.

+	 *

+	 * Used dynamic hook name: geodir_get_template_part_{$slug}

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $slug The template slug.

+	 * @param string $name The template name.

+	 */

+	do_action("geodir_get_template_part_{$slug}", $slug, $name);

+	$templates = array();

+	$name = (string)$name;

+	if ('' !== $name) {

+		$template_name = "{$slug}-{$name}.php";

+

+	} else {

+		$template_name = "{$slug}.php";

+	}

+

+	if (!locate_template(array("geodirectory/" . $template_name))) :

+		/**

+		 * Filter the template part with slug and name.

+		 *

+		 * @since 1.0.0

+		 * @param string $template_name The template name.

+		 */

+		$template = apply_filters("geodir_template_part-{$slug}-{$name}", geodir_plugin_path() . '/geodirectory-templates/' . $template_name);

+		/**

+		 * Includes the template part with slug and name.

+		 *

+		 * @since 1.0.0

+		 */

+		include($template);

+	else:

+		locate_template(array("geodirectory/" . $template_name), true, false);

+	endif;

 

 }

 

@@ -467,23 +467,23 @@ 
  */

 function geodir_core_post_view_extra_class($class, $all_postypes = '')

 {

-    global $post;

+	global $post;

 

-    if (!$all_postypes) {

-        $all_postypes = geodir_get_posttypes();

-    }

+	if (!$all_postypes) {

+		$all_postypes = geodir_get_posttypes();

+	}

 

-    $gdp_post_id = !empty($post) && isset($post->ID) ? $post->ID : NULL;

-    $gdp_post_type = $gdp_post_id > 0 && isset($post->post_type) ? $post->post_type : NULL;

-    $gdp_post_type = $gdp_post_type != '' && !empty($all_postypes) && in_array($gdp_post_type, $all_postypes) ? $gdp_post_type : NULL;

+	$gdp_post_id = !empty($post) && isset($post->ID) ? $post->ID : NULL;

+	$gdp_post_type = $gdp_post_id > 0 && isset($post->post_type) ? $post->post_type : NULL;

+	$gdp_post_type = $gdp_post_type != '' && !empty($all_postypes) && in_array($gdp_post_type, $all_postypes) ? $gdp_post_type : NULL;

 

-    if ($gdp_post_id && $gdp_post_type) {

-        $append_class = 'gd-post-' . $gdp_post_type;

-        $append_class .= isset($post->is_featured) && $post->is_featured > 0 ? ' gd-post-featured' : '';

-        $class = $class != '' ? $class . ' ' . $append_class : $append_class;

-    }

+	if ($gdp_post_id && $gdp_post_type) {

+		$append_class = 'gd-post-' . $gdp_post_type;

+		$append_class .= isset($post->is_featured) && $post->is_featured > 0 ? ' gd-post-featured' : '';

+		$class = $class != '' ? $class . ' ' . $append_class : $append_class;

+	}

 

-    return $class;

+	return $class;

 }

 

 /**

@@ -497,7 +497,7 @@ 
  * @param bool $favorite Listing Optional. Are favorite listings results? Default: false.

  */

 function geodir_display_message_not_found_on_listing($template_listview = 'listing-listview', $favorite = false) {

-    if ($favorite) {

+	if ($favorite) {

 		$message = __('No favorite listings found which match your selection.', 'geodirectory');

 	} else {

 		$message = __('No listings found which match your selection.', 'geodirectory');

Spacing +35 added lines, -35 removed lines

@@ -55,13 +55,13 @@ 
                 if (!empty($post_types))

                     $post_type = $post_types[0];

 					

-				if($sc_post_type != '' )

+				if ($sc_post_type != '')

 					$post_type = $sc_post_type;

 				

                 if ($is_wpml && !empty($wp->query_vars['page_id'])) {

 					wp_redirect(geodir_getlink(get_permalink($wp->query_vars['page_id']), array('listing_type' => $post_type)));

 				} else {

-					wp_redirect(trailingslashit(get_site_url()) . $pagename . '/?listing_type=' . $post_type);

+					wp_redirect(trailingslashit(get_site_url()).$pagename.'/?listing_type='.$post_type);

 				}

                 gd_die();

             }

@@ -119,14 +119,14 @@ 
         case 'listing-listview':

             $template = locate_template(array("geodirectory/listing-listview.php"));

             if (!$template) {

-                $template = geodir_plugin_path() . '/geodirectory-templates/listing-listview.php';

+                $template = geodir_plugin_path().'/geodirectory-templates/listing-listview.php';

             }

             return $template;

             break;

         case 'widget-listing-listview':

             $template = locate_template(array("geodirectory/widget-listing-listview.php"));

             if (!$template) {

-                $template = geodir_plugin_path() . '/geodirectory-templates/widget-listing-listview.php';

+                $template = geodir_plugin_path().'/geodirectory-templates/widget-listing-listview.php';

             }

             return $template;

             break;

@@ -184,7 +184,7 @@ 
 

         $template = geodir_locate_template('signup');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-signup.php';

 

         /**

          * Filter the signup template path.

@@ -198,11 +198,11 @@ 
     if (geodir_is_page('add-listing') || $geodir_custom_page_list['geodir_add_listing_page']) {

         if (!geodir_is_default_location_set()) {

             global $information;

-            $information = sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>');

+            $information = sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=default_location_settings').'\'>', '</a>');

 

             $template = geodir_locate_template('information');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+            if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-information.php';

             /**

              * Filter the information template path.

              *

@@ -214,10 +214,10 @@ 
         // check if pid exists in the record if yes then check if this post belongs to the user who is logged in.

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

             /// WPML

-            if (geodir_is_wpml() && $duplicate_of = wpml_get_master_post_from_duplicate((int)$_GET['pid'])) {

+            if (geodir_is_wpml() && $duplicate_of = wpml_get_master_post_from_duplicate((int) $_GET['pid'])) {

                 global $sitepress;

                 

-                $lang_of_duplicate = geodir_get_language_for_element($duplicate_of, 'post_' . get_post_type($duplicate_of));

+                $lang_of_duplicate = geodir_get_language_for_element($duplicate_of, 'post_'.get_post_type($duplicate_of));

                 $sitepress->switch_lang($lang_of_duplicate, true);

         

                 $redirect_to = get_permalink(geodir_add_listing_page_id());

@@ -236,7 +236,7 @@ 
             if (!$is_current_user_owner) {

                 $template = geodir_locate_template('information');

 

-                if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+                if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-information.php';

                 /**

                  * Filter the information template path.

                  *

@@ -258,7 +258,7 @@ 
 

         $template = geodir_locate_template('add-listing');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/add-listing.php';

         /**

          * Filter the add listing template path.

          *

@@ -275,7 +275,7 @@ 
 

         $template = geodir_locate_template('preview');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/listing-detail.php';

         /**

          * Filter the preview template path.

          *

@@ -291,7 +291,7 @@ 
 

         $template = geodir_locate_template('success');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/listing-success.php';

         /**

          * Filter the success template path.

          *

@@ -306,7 +306,7 @@ 
 

         $template = geodir_locate_template('detail');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/listing-detail.php';

         /**

          * Filter the detail template path.

          *

@@ -321,7 +321,7 @@ 
 

         $template = geodir_locate_template('listing');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-listing.php';

         /**

          * Filter the listing template path.

          *

@@ -336,7 +336,7 @@ 
 

         $template = geodir_locate_template('search');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-search.php';

         /**

          * Filter the search template path.

          *

@@ -351,7 +351,7 @@ 
 

         $template = geodir_locate_template('author');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-author.php';

         /**

          * Filter the author template path.

          *

@@ -362,7 +362,7 @@ 
 

     }

 

-    if ( geodir_is_page('home') || geodir_is_page('location')) {

+    if (geodir_is_page('home') || geodir_is_page('location')) {

 

         global $post, $wp_query;

 

@@ -372,7 +372,7 @@ 
 

             $template = geodir_locate_template('geodir-home');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';

+            if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-home.php';

             /**

              * Filter the home page template path.

              *

@@ -385,7 +385,7 @@ 
 

             $template = geodir_locate_template('location');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';

+            if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-location.php';

             /**

              * Filter the location template path.

              *

@@ -427,7 +427,7 @@ 
      */

     do_action("geodir_get_template_part_{$slug}", $slug, $name);

     $templates = array();

-    $name = (string)$name;

+    $name = (string) $name;

     if ('' !== $name) {

         $template_name = "{$slug}-{$name}.php";

 

@@ -435,14 +435,14 @@ 
         $template_name = "{$slug}.php";

     }

 

-    if (!locate_template(array("geodirectory/" . $template_name))) :

+    if (!locate_template(array("geodirectory/".$template_name))) :

         /**

          * Filter the template part with slug and name.

          *

          * @since 1.0.0

          * @param string $template_name The template name.

          */

-        $template = apply_filters("geodir_template_part-{$slug}-{$name}", geodir_plugin_path() . '/geodirectory-templates/' . $template_name);

+        $template = apply_filters("geodir_template_part-{$slug}-{$name}", geodir_plugin_path().'/geodirectory-templates/'.$template_name);

         /**

          * Includes the template part with slug and name.

          *

@@ -450,7 +450,7 @@ 
          */

         include($template);

     else:

-        locate_template(array("geodirectory/" . $template_name), true, false);

+        locate_template(array("geodirectory/".$template_name), true, false);

     endif;

 

 }

@@ -478,9 +478,9 @@ 
     $gdp_post_type = $gdp_post_type != '' && !empty($all_postypes) && in_array($gdp_post_type, $all_postypes) ? $gdp_post_type : NULL;

 

     if ($gdp_post_id && $gdp_post_type) {

-        $append_class = 'gd-post-' . $gdp_post_type;

+        $append_class = 'gd-post-'.$gdp_post_type;

         $append_class .= isset($post->is_featured) && $post->is_featured > 0 ? ' gd-post-featured' : '';

-        $class = $class != '' ? $class . ' ' . $append_class : $append_class;

+        $class = $class != '' ? $class.' '.$append_class : $append_class;

     }

 

     return $class;

@@ -512,7 +512,7 @@ 
 	 */

 	$message = apply_filters('geodir_message_listing_not_found', $message, $template_listview, $favorite);

 	

-	echo '<li class="no-listing">' . $message . '</li>';

+	echo '<li class="no-listing">'.$message.'</li>';

 }

 

 /**

@@ -541,7 +541,7 @@ 
 function geodir_convert_listing_view_class($columns = '') {

 	$class = '';

 	

-	switch ((int)$columns) {

+	switch ((int) $columns) {

 		case 1:

 			$class = '';

 		break;

@@ -606,7 +606,7 @@ 
 		$html .= '<option value=""></option>';

 		if (!empty($star_texts) && is_array($star_texts)) {

 			foreach ($star_texts as $i => $text) {

-				$html .= '<option ' . selected((int)($i + 1), (int)$default, false) . ' value="' . (int)($i + 1) . '">' . $text . '</option>';

+				$html .= '<option '.selected((int) ($i + 1), (int) $default, false).' value="'.(int) ($i + 1).'">'.$text.'</option>';

 			}

 		} else {

 			$html .= '<option value="1">1</option>';

@@ -635,14 +635,14 @@ 
 function geodir_font_awesome_rating_stars_html($html, $rating, $star_count = 5) {

 	if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

 		$rating = min($rating, $star_count);

-		$full_stars = floor( $rating );

-		$half_stars = ceil( $rating - $full_stars );

+		$full_stars = floor($rating);

+		$half_stars = ceil($rating - $full_stars);

 		$empty_stars = $star_count - $full_stars - $half_stars;

 		

 		$html = '<div class="gd-star-rating gd-fa-star-rating">';

-		$html .= str_repeat( '<i class="fa fa-star gd-full-star"></i>', $full_stars );

-		$html .= str_repeat( '<i class="fa fa-star-o fa-star-half-full gd-half-star"></i>', $half_stars );

-		$html .= str_repeat( '<i class="fa fa-star-o gd-empty-star"></i>', $empty_stars);

+		$html .= str_repeat('<i class="fa fa-star gd-full-star"></i>', $full_stars);

+		$html .= str_repeat('<i class="fa fa-star-o fa-star-half-full gd-half-star"></i>', $half_stars);

+		$html .= str_repeat('<i class="fa fa-star-o gd-empty-star"></i>', $empty_stars);

 		$html .= '</div>';

 	}

 

@@ -661,7 +661,7 @@ 
 		$full_color = get_option('geodir_reviewrating_fa_full_rating_color', '#757575');

 		if ($full_color != '#757575') {

 			echo '<style type="text/css">.br-theme-fontawesome-stars .br-widget a.br-active:after,.br-theme-fontawesome-stars .br-widget a.br-selected:after,

-			.gd-star-rating i.fa {color:' . stripslashes($full_color) . '!important;}</style>';

+			.gd-star-rating i.fa {color:' . stripslashes($full_color).'!important;}</style>';

 		}

 	}

 }
\ No newline at end of file