GeoDirectory / geodirectory

geodirectory-admin/option-pages/permalink_settings_array.php

Indentation +178 added lines, -178 removed lines

@@ -16,184 +16,184 @@
  */
 $geodir_settings['permalink_settings'] = apply_filters('geodir_permalink_settings', array(
 
-    /* Listing Permalink Settings start */
-    array('name' => __('Permalink', 'geodirectory'), 'type' => 'no_tabs', 'desc' => 'Settings to set permalink', 'id' => 'geodir_permalink_settings '),
-
-
-    array('name' => __('Listing Detail Permalink Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_permalink'),
-
-    array(
-        'name' => __('Add location in urls', 'geodirectory'),
-        'desc' => __('Add location slug in listing urls', 'geodirectory'),
-        'id' => 'geodir_add_location_url',
-        'type' => 'checkbox',
-        'std' => '1',
-        'checkboxgroup' => 'start'
-    ),
-
-    array(
-        'name' => __('Add full location in listing urls', 'geodirectory'),
-        'desc' => __('Add full location info with country, region and city slug in listing urls', 'geodirectory'),
-        'id' => 'geodir_show_location_url',
-        'type' => 'radio',
-        'value' => 'all',
-        'std' => 'all',
-        'radiogroup' => ''
-    ),
-
-	array(
-        'name' => __('Add country and city slug in listing urls', 'geodirectory'),
-        'desc' => __('Add country and city slug in listing urls (/country/city/)', 'geodirectory'),
-        'id' => 'geodir_show_location_url',
-        'type' => 'radio',
-        'std' => 'all',
-        'value' => 'country_city',
-        'radiogroup' => ''
-    ),
-	array(
-        'name' => __('Add region and city slug in listing urls', 'geodirectory'),
-        'desc' => __('Add region and city slug in listing urls (/region/city/)', 'geodirectory'),
-        'id' => 'geodir_show_location_url',
-        'type' => 'radio',
-        'std' => 'all',
-        'value' => 'region_city',
-        'radiogroup' => ''
-    ),
-    array(
-        'name' => __('Add only city in listing urls', 'geodirectory'),
-        'desc' => __('Add city slug in listing urls', 'geodirectory'),
-        'id' => 'geodir_show_location_url',
-        'type' => 'radio',
-        'std' => 'all',
-        'value' => 'city',
-        'radiogroup' => 'end'
-    ),
-
-
-
-    array(
-        'name' => __('Add category in listing urls', 'geodirectory'),
-        'desc' => __('Add requested category slugs in listing urls', 'geodirectory'),
-        'id' => 'geodir_add_categories_url',
-        'type' => 'checkbox',
-        'std' => '1',
-    ),
-
-    array(
-        'name' => __('Listing url prefix', 'geodirectory'),
-        'desc' => __('Listing prefix to show in url', 'geodirectory'),
-        'id' => 'geodir_listing_prefix',
-        'type' => 'text',
-        'css' => 'min-width:300px;',
-        'std' => 'places'
-    ),
-
-    array(
-        'name' => __('Location url prefix', 'geodirectory'),
-        'desc' => __('Depreciated, now uses the location page slug', 'geodirectory'),
-        'id' => 'geodir_location_prefix',
-        'type' => 'text',
-        'css' => 'min-width:300px;',
-        'std' => 'location' // Default value to show home top section
-    ),
-
-    array(
-        'name' => __('Location and category url separator', 'geodirectory'),
-        'desc' => __('Separator to show between location and category url slugs in listing urls', 'geodirectory'),
-        'id' => 'geodir_listingurl_separator',
-        'type' => 'text',
-        'css' => 'min-width:300px;',
-        'std' => 'C' // Default value to show home top section
-    ),
-
-    array(
-        'name' => __('Listing detail url separator', 'geodirectory'),
-        'desc' => __('Separator to show before listing slug in listing detail urls', 'geodirectory'),
-        'id' => 'geodir_detailurl_separator',
-        'type' => 'text',
-        'css' => 'min-width:300px;',
-        'std' => 'info' // Default value to show home top section
-    ),
-
-
-    array('type' => 'sectionend', 'id' => 'geodir_permalink'),
-
-    array('name' => __('GeoDirectory Pages', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_pages'),
-
-    array(
-        'name' => __('GD Home page', 'geodirectory'),
-        'desc' => __('Select the page to use for the GD homepage (you must also set this page in Settings>Reading>Front page for it to work)', 'geodirectory'),
-        'id' => 'geodir_home_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-    array(
-        'name' => __('Add listing page', 'geodirectory'),
-        'desc' => __('Select the page to use for adding listings', 'geodirectory'),
-        'id' => 'geodir_add_listing_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-    array(
-        'name' => __('Listing preview page', 'geodirectory'),
-        'desc' => __('Select the page to use for listing preview', 'geodirectory'),
-        'id' => 'geodir_preview_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-    array(
-        'name' => __('Listing success page', 'geodirectory'),
-        'desc' => __('Select the page to use for listing success', 'geodirectory'),
-        'id' => 'geodir_success_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-    array(
-        'name' => __('Location page', 'geodirectory'),
-        'desc' => __('Select the page to use for locations', 'geodirectory'),
-        'id' => 'geodir_location_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-    array(
-        'name' => __('Terms and Conditions page', 'geodirectory'),
-        'desc' => __('Select the page to use for Terms and Conditions (if enabled)', 'geodirectory'),
-        'id' => 'geodir_term_condition_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-    array(
-        'name' => __('Info page', 'geodirectory'),
-        'desc' => __('Select the page to use for Gd general Info', 'geodirectory'),
-        'id' => 'geodir_info_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-    array(
-        'name' => __('Login page', 'geodirectory'),
-        'desc' => __('Select the page to use for Login / Register', 'geodirectory'),
-        'id' => 'geodir_login_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-
-    array('type' => 'sectionend', 'id' => 'geodir_pages'),
-
-    /* Listing Detail Permalink Settings End */
+	/* Listing Permalink Settings start */
+	array('name' => __('Permalink', 'geodirectory'), 'type' => 'no_tabs', 'desc' => 'Settings to set permalink', 'id' => 'geodir_permalink_settings '),
+
+
+	array('name' => __('Listing Detail Permalink Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_permalink'),
+
+	array(
+		'name' => __('Add location in urls', 'geodirectory'),
+		'desc' => __('Add location slug in listing urls', 'geodirectory'),
+		'id' => 'geodir_add_location_url',
+		'type' => 'checkbox',
+		'std' => '1',
+		'checkboxgroup' => 'start'
+	),
+
+	array(
+		'name' => __('Add full location in listing urls', 'geodirectory'),
+		'desc' => __('Add full location info with country, region and city slug in listing urls', 'geodirectory'),
+		'id' => 'geodir_show_location_url',
+		'type' => 'radio',
+		'value' => 'all',
+		'std' => 'all',
+		'radiogroup' => ''
+	),
+
+	array(
+		'name' => __('Add country and city slug in listing urls', 'geodirectory'),
+		'desc' => __('Add country and city slug in listing urls (/country/city/)', 'geodirectory'),
+		'id' => 'geodir_show_location_url',
+		'type' => 'radio',
+		'std' => 'all',
+		'value' => 'country_city',
+		'radiogroup' => ''
+	),
+	array(
+		'name' => __('Add region and city slug in listing urls', 'geodirectory'),
+		'desc' => __('Add region and city slug in listing urls (/region/city/)', 'geodirectory'),
+		'id' => 'geodir_show_location_url',
+		'type' => 'radio',
+		'std' => 'all',
+		'value' => 'region_city',
+		'radiogroup' => ''
+	),
+	array(
+		'name' => __('Add only city in listing urls', 'geodirectory'),
+		'desc' => __('Add city slug in listing urls', 'geodirectory'),
+		'id' => 'geodir_show_location_url',
+		'type' => 'radio',
+		'std' => 'all',
+		'value' => 'city',
+		'radiogroup' => 'end'
+	),
+
+
+
+	array(
+		'name' => __('Add category in listing urls', 'geodirectory'),
+		'desc' => __('Add requested category slugs in listing urls', 'geodirectory'),
+		'id' => 'geodir_add_categories_url',
+		'type' => 'checkbox',
+		'std' => '1',
+	),
+
+	array(
+		'name' => __('Listing url prefix', 'geodirectory'),
+		'desc' => __('Listing prefix to show in url', 'geodirectory'),
+		'id' => 'geodir_listing_prefix',
+		'type' => 'text',
+		'css' => 'min-width:300px;',
+		'std' => 'places'
+	),
+
+	array(
+		'name' => __('Location url prefix', 'geodirectory'),
+		'desc' => __('Depreciated, now uses the location page slug', 'geodirectory'),
+		'id' => 'geodir_location_prefix',
+		'type' => 'text',
+		'css' => 'min-width:300px;',
+		'std' => 'location' // Default value to show home top section
+	),
+
+	array(
+		'name' => __('Location and category url separator', 'geodirectory'),
+		'desc' => __('Separator to show between location and category url slugs in listing urls', 'geodirectory'),
+		'id' => 'geodir_listingurl_separator',
+		'type' => 'text',
+		'css' => 'min-width:300px;',
+		'std' => 'C' // Default value to show home top section
+	),
+
+	array(
+		'name' => __('Listing detail url separator', 'geodirectory'),
+		'desc' => __('Separator to show before listing slug in listing detail urls', 'geodirectory'),
+		'id' => 'geodir_detailurl_separator',
+		'type' => 'text',
+		'css' => 'min-width:300px;',
+		'std' => 'info' // Default value to show home top section
+	),
+
+
+	array('type' => 'sectionend', 'id' => 'geodir_permalink'),
+
+	array('name' => __('GeoDirectory Pages', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_pages'),
+
+	array(
+		'name' => __('GD Home page', 'geodirectory'),
+		'desc' => __('Select the page to use for the GD homepage (you must also set this page in Settings>Reading>Front page for it to work)', 'geodirectory'),
+		'id' => 'geodir_home_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+	array(
+		'name' => __('Add listing page', 'geodirectory'),
+		'desc' => __('Select the page to use for adding listings', 'geodirectory'),
+		'id' => 'geodir_add_listing_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+	array(
+		'name' => __('Listing preview page', 'geodirectory'),
+		'desc' => __('Select the page to use for listing preview', 'geodirectory'),
+		'id' => 'geodir_preview_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+	array(
+		'name' => __('Listing success page', 'geodirectory'),
+		'desc' => __('Select the page to use for listing success', 'geodirectory'),
+		'id' => 'geodir_success_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+	array(
+		'name' => __('Location page', 'geodirectory'),
+		'desc' => __('Select the page to use for locations', 'geodirectory'),
+		'id' => 'geodir_location_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+	array(
+		'name' => __('Terms and Conditions page', 'geodirectory'),
+		'desc' => __('Select the page to use for Terms and Conditions (if enabled)', 'geodirectory'),
+		'id' => 'geodir_term_condition_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+	array(
+		'name' => __('Info page', 'geodirectory'),
+		'desc' => __('Select the page to use for Gd general Info', 'geodirectory'),
+		'id' => 'geodir_info_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+	array(
+		'name' => __('Login page', 'geodirectory'),
+		'desc' => __('Select the page to use for Login / Register', 'geodirectory'),
+		'id' => 'geodir_login_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+
+	array('type' => 'sectionend', 'id' => 'geodir_pages'),
+
+	/* Listing Detail Permalink Settings End */
 
 
 )); // End Design settings

geodirectory-templates/preview-success.php

Indentation +31 added lines, -31 removed lines

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

 

 

-    global $wpdb;

+	global $wpdb;

 

-    $post_id = $_REQUEST['pid'];

-    $post_info = get_post($post_id);

+	$post_id = $_REQUEST['pid'];

+	$post_info = get_post($post_id);

 

-    $posted_date = $post_info->post_date;

-    $productlink = get_permalink($post_id);

-    $siteName = get_bloginfo('name');

-    $siteurl = home_url();

-    $siteurl_link = '<a href="' . $siteurl . '">' . $siteurl . '</a>';

+	$posted_date = $post_info->post_date;

+	$productlink = get_permalink($post_id);

+	$siteName = get_bloginfo('name');

+	$siteurl = home_url();

+	$siteurl_link = '<a href="' . $siteurl . '">' . $siteurl . '</a>';

 

-    $loginurl = geodir_login_url();

-    $loginurl_link = '<a href="' . $loginurl . '">login</a>';

+	$loginurl = geodir_login_url();

+	$loginurl_link = '<a href="' . $loginurl . '">login</a>';

 

-    $post_author = $post_info->post_author;

+	$post_author = $post_info->post_author;

 

-    $user_info = get_userdata($post_author);

-    $username = $user_info->user_login;

-    $user_email = $user_info->user_email;

+	$user_info = get_userdata($post_author);

+	$username = $user_info->user_login;

+	$user_email = $user_info->user_email;

 

-    $message = wpautop(__(stripslashes_deep(get_option('geodir_post_added_success_msg_content')),'geodirectory'));

+	$message = wpautop(__(stripslashes_deep(get_option('geodir_post_added_success_msg_content')),'geodirectory'));

 

-    /*

+	/*

      * Filter the success page message before variable replacements.

      *

      * @since 1.5.7

@@ -45,13 +45,13 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    $message = apply_filters('geodir_success_page_msg_before_var_replace', $message,$post_info, $user_info);

+	$message = apply_filters('geodir_success_page_msg_before_var_replace', $message,$post_info, $user_info);

 

-    $search_array = array('[#submited_information_link#]', '[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#user_email#]', '[#username#]', '[#login_url#]', '[#posted_date#]');

-    $replace_array = array($productlink, $productlink, $siteurl_link, $post_id, $siteName, $user_email, $username, $loginurl_link, $posted_date);

-    $message = str_replace($search_array, $replace_array, $message);

+	$search_array = array('[#submited_information_link#]', '[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#user_email#]', '[#username#]', '[#login_url#]', '[#posted_date#]');

+	$replace_array = array($productlink, $productlink, $siteurl_link, $post_id, $siteName, $user_email, $username, $loginurl_link, $posted_date);

+	$message = str_replace($search_array, $replace_array, $message);

 

-    /*

+	/*

      * Filter the success page message after variable replacements.

      *

      * @since 1.5.7

@@ -59,15 +59,15 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    $message = apply_filters('geodir_success_page_msg_after_var_replace', $message,$post_info, $user_info);

+	$message = apply_filters('geodir_success_page_msg_after_var_replace', $message,$post_info, $user_info);

 

 

 

-    ?>

+	?>

 

     <?php

 

-    /*

+	/*

      * Action called before the success page message wrapper.

      *

      * @since 1.5.7

@@ -75,11 +75,11 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    do_action('geodir_before_success_page_msg_wrapper', $message,$post_info, $user_info);

-    echo '<h5 class="geodir_information">';

-    echo $message;

-    echo '</h5>';

-    /*

+	do_action('geodir_before_success_page_msg_wrapper', $message,$post_info, $user_info);

+	echo '<h5 class="geodir_information">';

+	echo $message;

+	echo '</h5>';

+	/*

      * Action called after the success page message wrapper.

      *

      * @since 1.5.7

@@ -87,8 +87,8 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    do_action('geodir_after_success_page_msg_wrapper', $message,$post_info, $user_info);

+	do_action('geodir_after_success_page_msg_wrapper', $message,$post_info, $user_info);

 

-    ?>

+	?>

 

 </div>
\ No newline at end of file

geodirectory-widgets/geodirectory_reviews_widget.php

Indentation +49 added lines, -49 removed lines

@@ -14,37 +14,37 @@ 
  */

 class geodir_recent_reviews_widget extends WP_Widget

 {

-    /**

+	/**

 	 * Register the recent reviews widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

+	 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

 	 */

-    public function __construct() {

-        $widget_ops = array('classname' => 'geodir_recent_reviews', 'description' => __('GD > Recent Reviews', 'geodirectory'));

-        parent::__construct(

-            'geodir_recent_reviews', // Base ID

-            __('GD > Recent Reviews', 'geodirectory'), // Name

-            $widget_ops// Args

-        );

-    }

+	public function __construct() {

+		$widget_ops = array('classname' => 'geodir_recent_reviews', 'description' => __('GD > Recent Reviews', 'geodirectory'));

+		parent::__construct(

+			'geodir_recent_reviews', // Base ID

+			__('GD > Recent Reviews', 'geodirectory'), // Name

+			$widget_ops// Args

+		);

+	}

 

 	/**

 	 * Front-end display content for recent reviews widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $args     Widget arguments.

 	 * @param array $instance Saved values from database.

 	 */

 	public function widget($args, $instance)

-    {

-        // prints the widget

-        extract($args, EXTR_SKIP);

+	{

+		// prints the widget

+		extract($args, EXTR_SKIP);

 

-        /** This filter is documented in geodirectory_widgets.php */

-        $title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

+		/** This filter is documented in geodirectory_widgets.php */

+		$title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

 		

 		/**

 		 * Filter the number of reviews to display.

@@ -63,35 +63,35 @@ 
 		 * @param int $g_size Height and width of the avatar image in pixels. Default 30.

 		 */

 		$g_size = apply_filters('geodir_recent_reviews_g_size', 30);

-        /**

-         * Filter the excerpt length

-         *

-         * @since 1.0.0

-         *

-         * @param int $excerpt_length Excerpt length. Default 100.

-         */

-        $excerpt_length = apply_filters('geodir_recent_reviews_excerpt_length', 100);

-        $comments_li = geodir_get_recent_reviews($g_size, $count, $excerpt_length, false);

+		/**

+		 * Filter the excerpt length

+		 *

+		 * @since 1.0.0

+		 *

+		 * @param int $excerpt_length Excerpt length. Default 100.

+		 */

+		$excerpt_length = apply_filters('geodir_recent_reviews_excerpt_length', 100);

+		$comments_li = geodir_get_recent_reviews($g_size, $count, $excerpt_length, false);

 

-        if ($comments_li) {

-            echo $before_widget;

-            ?>

+		if ($comments_li) {

+			echo $before_widget;

+			?>

             <div class="widget geodir_recent_reviews_section">

                 <?php if ($title) {

-                    echo $before_title . $title . $after_title;

-                } ?>

+					echo $before_title . $title . $after_title;

+				} ?>

                 <ul class="geodir_recent_reviews"><?php echo $comments_li; ?></ul>

             </div>

             <?php

-            echo $after_widget;

-        }

-    }

+			echo $after_widget;

+		}

+	}

 

 	/**

 	 * Sanitize recent reviews widget form values as they are saved.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $new_instance Values just sent to be saved.

 	 * @param array $old_instance Previously saved values from database.

@@ -99,29 +99,29 @@ 
 	 * @return array Updated safe values to be saved.

 	 */

 	public function update($new_instance, $old_instance)

-    {

-        //save the widget

-        $instance = $old_instance;

-        $instance['title'] = strip_tags($new_instance['title']);

-        $instance['count'] = strip_tags($new_instance['count']);

-        return $instance;

-    }

+	{

+		//save the widget

+		$instance = $old_instance;

+		$instance['title'] = strip_tags($new_instance['title']);

+		$instance['count'] = strip_tags($new_instance['count']);

+		return $instance;

+	}

     

 	/**

 	 * Back-end recent reviews widget settings form.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $instance Previously saved values from database.

 	 */

 	public function form($instance)

-    {

-        //widgetform in backend

-        $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'count' => ''));

-        $title = strip_tags($instance['title']);

-        $count = strip_tags($instance['count']);

-        ?>

+	{

+		//widgetform in backend

+		$instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'count' => ''));

+		$title = strip_tags($instance['title']);

+		$count = strip_tags($instance['count']);

+		?>

         <p><label for="<?php echo $this->get_field_id('title'); ?>">Widget Title: <input class="widefat"

                                                                                          id="<?php echo $this->get_field_id('title'); ?>"

                                                                                          name="<?php echo $this->get_field_name('title'); ?>"

@@ -135,7 +135,7 @@ 
                                                                                              value="<?php echo esc_attr($count); ?>"/></label>

         </p>

     <?php

-    }

+	}

 } // class geodir_recent_reviews_widget

 

 register_widget('geodir_recent_reviews_widget');
\ No newline at end of file

geodirectory-admin/admin_install.php

Indentation +160 added lines, -160 removed lines

@@ -24,8 +24,8 @@ 
 function geodir_activation()

 {

 

-    geodir_install();

-    add_action('wp_loaded', 'geodir_flush_activation');

+	geodir_install();

+	add_action('wp_loaded', 'geodir_flush_activation');

 }

 

 /**

@@ -36,9 +36,9 @@ 
  */

 function geodir_flush_activation()

 {

-    // Remove rewrite rules and then recreate rewrite rules.

-    // flush late so everything is loaded

-    flush_rewrite_rules();

+	// Remove rewrite rules and then recreate rewrite rules.

+	// flush late so everything is loaded

+	flush_rewrite_rules();

 }

 

 /**

@@ -50,44 +50,44 @@ 
  */

 function geodir_install()

 {

-    global $geodir_settings;

-

-    /**

-     * Called before the GD installation scripts have run.

-     *

-     * @since 1.0.0

-     * @see 'geodir_installation_end'

-     */

-    do_action('geodir_installation_start');

-

-    // Do install

-    if (!get_option('geodir_default_data_installed')) {

-        geodir_create_tables(); // in admin db install.php

-        geodir_register_defaults(); // geodir_functions/ taxonomy_functions.php

-        geodir_create_default_fields();

-        //geodir_default_taxonomies();

-        geodir_set_default_options();

-        geodir_create_pages();

-        geodir_set_default_widgets();

-        gd_install_theme_compat();

-

-        update_option('geodir_default_data_installed', 1);

-

-    }

-

-    if (!get_option('geodir_default_data_installed_1.2.8')) {

-        //geodir_create_tables(); // in admin db install.php

-        update_option('geodir_default_data_installed_1.2.8', 1);

-    }

-

-    geodir_installation_end();

-    /**

-     * Called after the GD installation scripts have run.

-     *

-     * @since 1.0.0

-     * @see 'geodir_installation_start'

-     */

-    do_action('geodir_installation_end');

+	global $geodir_settings;

+

+	/**

+	 * Called before the GD installation scripts have run.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_installation_end'

+	 */

+	do_action('geodir_installation_start');

+

+	// Do install

+	if (!get_option('geodir_default_data_installed')) {

+		geodir_create_tables(); // in admin db install.php

+		geodir_register_defaults(); // geodir_functions/ taxonomy_functions.php

+		geodir_create_default_fields();

+		//geodir_default_taxonomies();

+		geodir_set_default_options();

+		geodir_create_pages();

+		geodir_set_default_widgets();

+		gd_install_theme_compat();

+

+		update_option('geodir_default_data_installed', 1);

+

+	}

+

+	if (!get_option('geodir_default_data_installed_1.2.8')) {

+		//geodir_create_tables(); // in admin db install.php

+		update_option('geodir_default_data_installed_1.2.8', 1);

+	}

+

+	geodir_installation_end();

+	/**

+	 * Called after the GD installation scripts have run.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_installation_start'

+	 */

+	do_action('geodir_installation_end');

 

 

 }

@@ -104,16 +104,16 @@ 
 function geodir_create_pages()

 {

 

-    //geodir_create_page( esc_sql( _x('home-map', 'page_slug', 'geodirectory') ), 'geodir_home_map_page', __('Home Map', 'geodirectory'), '',0,'publish' );

-    geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('add-listing', 'page_slug', 'geodirectory')), 'geodir_add_listing_page', __('Add Listing', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('listing-preview', 'page_slug', 'geodirectory')), 'geodir_preview_page', __('Listing Preview', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('listing-success', 'page_slug', 'geodirectory')), 'geodir_success_page', __('Listing Success', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('location', 'page_slug', 'geodirectory')), 'geodir_location_page', __('Location', 'geodirectory'), '');

+	//geodir_create_page( esc_sql( _x('home-map', 'page_slug', 'geodirectory') ), 'geodir_home_map_page', __('Home Map', 'geodirectory'), '',0,'publish' );

+	geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('add-listing', 'page_slug', 'geodirectory')), 'geodir_add_listing_page', __('Add Listing', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('listing-preview', 'page_slug', 'geodirectory')), 'geodir_preview_page', __('Listing Preview', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('listing-success', 'page_slug', 'geodirectory')), 'geodir_success_page', __('Listing Success', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('location', 'page_slug', 'geodirectory')), 'geodir_location_page', __('Location', 'geodirectory'), '');

 

-    //New since 1.5.3

-    geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');

+	//New since 1.5.3

+	geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');

 

 

 }

@@ -129,11 +129,11 @@ 
  */

 function geodir_installation_end()

 {

-    //update_option( "geodir_db_version", GEODIRECTORY_VERSION );

+	//update_option( "geodir_db_version", GEODIRECTORY_VERSION );

 

-    update_option("geodir_installed", 1);

-    update_option("geodir_installation_redirect", 1);

-    update_option('skip_install_geodir_pages', 0);

+	update_option("geodir_installed", 1);

+	update_option("geodir_installation_redirect", 1);

+	update_option('skip_install_geodir_pages', 0);

 }

 

 /**

@@ -147,45 +147,45 @@ 
  */

 function geodir_set_default_options()

 {

-    global $geodir_settings;

-    /**

-     * Contains settings array for general tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once("option-pages/general_settings_array.php");

-    /**

-     * Contains settings array for design tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once("option-pages/design_settings_array.php");

-    /**

-     * Contains settings array for notifications tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once("option-pages/notifications_settings_array.php");

-    /**

-     * Contains settings array for permalink tab.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once("option-pages/permalink_settings_array.php");

-    /**

-     * Contains settings array for title / meta tab.

-     *

-     * @since 1.5.4

-     * @package GeoDirectory

-     */

-    include_once("option-pages/title_meta_settings_array.php");

-    foreach ($geodir_settings as $value) {

-        geodir_update_options($value, true);

-    }

+	global $geodir_settings;

+	/**

+	 * Contains settings array for general tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/general_settings_array.php");

+	/**

+	 * Contains settings array for design tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/design_settings_array.php");

+	/**

+	 * Contains settings array for notifications tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/notifications_settings_array.php");

+	/**

+	 * Contains settings array for permalink tab.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/permalink_settings_array.php");

+	/**

+	 * Contains settings array for title / meta tab.

+	 *

+	 * @since 1.5.4

+	 * @package GeoDirectory

+	 */

+	include_once("option-pages/title_meta_settings_array.php");

+	foreach ($geodir_settings as $value) {

+		geodir_update_options($value, true);

+	}

 

 }

 

@@ -199,103 +199,103 @@ 
 function geodir_set_default_widgets()

 {

 

-    $widget_option_list = array();

-    $widgetinfo = array();

-    $sidebarvalue_array = array();

-    $sidebars_widgets = array();

+	$widget_option_list = array();

+	$widgetinfo = array();

+	$sidebarvalue_array = array();

+	$sidebars_widgets = array();

 

-    /*===========================*/

-    /*  Widgets ON HOME PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON HOME PAGE     */

+	/*===========================*/

 

-    $widget_option_list['geodir_home_top'] =

-        array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

-            'geodir_map_v3_home_map' => array("autozoom" => 1, "width" => '100%', "heigh" => '425'),

-            'geodir_advance_search' => array());

+	$widget_option_list['geodir_home_top'] =

+		array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

+			'geodir_map_v3_home_map' => array("autozoom" => 1, "width" => '100%', "heigh" => '425'),

+			'geodir_advance_search' => array());

 

-    $widget_option_list['geodir_home_content'] =

-        array('popular_post_view' => array("title" => __('Popular Places', 'geodirectory'), "layout" => 'list', "add_location_filter" => '1'));

+	$widget_option_list['geodir_home_content'] =

+		array('popular_post_view' => array("title" => __('Popular Places', 'geodirectory'), "layout" => 'list', "add_location_filter" => '1'));

 

-    $widget_option_list['geodir_home_right'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

-            'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

+	$widget_option_list['geodir_home_right'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

+			'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

 

-    /*===========================*/

-    /*  Widgets ON LISTING PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON LISTING PAGE     */

+	/*===========================*/

 

-    $widget_option_list['geodir_listing_top'] =

-        array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

-            'geodir_advance_search' => array());

+	$widget_option_list['geodir_listing_top'] =

+		array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

+			'geodir_advance_search' => array());

 

-    $widget_option_list['geodir_listing_right_sidebar'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

-            'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

-            'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

+	$widget_option_list['geodir_listing_right_sidebar'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

+			'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

+			'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

 

 

-    /*===========================*/

-    /*  Widgets ON SEARCH PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON SEARCH PAGE     */

+	/*===========================*/

 

-    $widget_option_list['geodir_search_top'] =

-        array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

-            'geodir_advance_search' => array());

+	$widget_option_list['geodir_search_top'] =

+		array('popular_post_category' => array("title" => __('Popular Categories', 'geodirectory')),

+			'geodir_advance_search' => array());

 

-    $widget_option_list['geodir_search_right_sidebar'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

-            'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

-            'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

+	$widget_option_list['geodir_search_right_sidebar'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

+			'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

+			'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

 

-    /*===========================*/

-    /*  Widgets ON DETAIL/SINGLE PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON DETAIL/SINGLE PAGE     */

+	/*===========================*/

 

-    $widget_option_list['geodir_detail_sidebar'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

-            'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

-            'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

+	$widget_option_list['geodir_detail_sidebar'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')),

+			'geodir_map_v3_listing_map' => array("autozoom" => 1, "sticky" => 1),

+			'popular_post_view' => array("title" => __('Latest Places', 'geodirectory'), "add_location_filter" => '1'));

 

 

-    /*===========================*/

-    /*  Widgets ON AUTHOR PAGE     */

-    /*===========================*/

+	/*===========================*/

+	/*  Widgets ON AUTHOR PAGE     */

+	/*===========================*/

 

 

-    $widget_option_list['geodir_author_right_sidebar'] =

-        array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')));

+	$widget_option_list['geodir_author_right_sidebar'] =

+		array('geodir_loginbox' => array("title" => __('My Dashboard', 'geodirectory')));

 

 

-    $sidebars_widgets = get_option('sidebars_widgets');

+	$sidebars_widgets = get_option('sidebars_widgets');

 

-    foreach ($widget_option_list as $key => $widget_options) {

+	foreach ($widget_option_list as $key => $widget_options) {

 

-        foreach ($widget_options as $key2 => $widget_options_obj) {

-            $widgetid = 'widget_' . $key2;

+		foreach ($widget_options as $key2 => $widget_options_obj) {

+			$widgetid = 'widget_' . $key2;

 

-            $widgetinfo[$widgetid][] = $widget_options_obj;

+			$widgetinfo[$widgetid][] = $widget_options_obj;

 

-            $sidebarvalue_array[$key][] = $key2 . "-" . (count($widgetinfo[$widgetid]));

+			$sidebarvalue_array[$key][] = $key2 . "-" . (count($widgetinfo[$widgetid]));

 

-            $widget_update[$widgetid][count($widgetinfo[$widgetid])] = $widget_options_obj;

+			$widget_update[$widgetid][count($widgetinfo[$widgetid])] = $widget_options_obj;

 

-        }

+		}

 

-        if (!empty($sidebarvalue_array[$key])) {

+		if (!empty($sidebarvalue_array[$key])) {

 

-            $sidebars_widgets = get_option('sidebars_widgets');

-            $sidebars_widgets[$key] = $sidebarvalue_array[$key];

-            update_option('sidebars_widgets', $sidebars_widgets);

+			$sidebars_widgets = get_option('sidebars_widgets');

+			$sidebars_widgets[$key] = $sidebarvalue_array[$key];

+			update_option('sidebars_widgets', $sidebars_widgets);

 

-            foreach ($widget_update as $key => $value) {

+			foreach ($widget_update as $key => $value) {

 

-                update_option($key, $value);

+				update_option($key, $value);

 

-            }

+			}

 

-        }

+		}

 

-    }

+	}

 

 

 }

geodirectory-functions/compatibility/Jupiter.php

Indentation +141 added lines, -141 removed lines

@@ -16,28 +16,28 @@ 
  */
 function jupiter_action_calls()
 {
-    // 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);
-
-
-    // CAHNGE PAGE TITLES
-    remove_action('page_title', 'mk_page_title');
-    add_action('page_title', 'gd_mk_page_title');
-    // CHANGE BREADCRUMS FOR GD PAGES
-    remove_action('theme_breadcrumbs', 'mk_theme_breadcrumbs');
-    add_action('theme_breadcrumbs', 'gd_mk_theme_breadcrumbs');
+	// 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);
+
+
+	// CAHNGE PAGE TITLES
+	remove_action('page_title', 'mk_page_title');
+	add_action('page_title', 'gd_mk_page_title');
+	// CHANGE BREADCRUMS FOR GD PAGES
+	remove_action('theme_breadcrumbs', 'mk_theme_breadcrumbs');
+	add_action('theme_breadcrumbs', 'gd_mk_theme_breadcrumbs');
 
 
 }
@@ -52,19 +52,19 @@ 
 function gd_mk_theme_breadcrumbs()
 {
 
-    if (is_page_geodir_home() || geodir_is_page('location')) {
-        jupiter_geodir_breadcrumb();
-    } elseif (geodir_is_page('listing')) {
-        jupiter_geodir_breadcrumb();
-    } elseif (geodir_is_page('detail')) {
-        jupiter_geodir_breadcrumb();
-    } elseif (geodir_is_page('search')) {
-        jupiter_geodir_breadcrumb();
-    } elseif (geodir_is_page('author')) {
-        jupiter_geodir_breadcrumb();
-    } else {
-        mk_theme_breadcrumbs();
-    }
+	if (is_page_geodir_home() || geodir_is_page('location')) {
+		jupiter_geodir_breadcrumb();
+	} elseif (geodir_is_page('listing')) {
+		jupiter_geodir_breadcrumb();
+	} elseif (geodir_is_page('detail')) {
+		jupiter_geodir_breadcrumb();
+	} elseif (geodir_is_page('search')) {
+		jupiter_geodir_breadcrumb();
+	} elseif (geodir_is_page('author')) {
+		jupiter_geodir_breadcrumb();
+	} else {
+		mk_theme_breadcrumbs();
+	}
 }
 
 /**
@@ -76,35 +76,35 @@ 
  */
 function gd_mk_page_title()
 {
-    global $wp;
-
-
-    if (is_page_geodir_home() || geodir_is_page('location')) {
-        jupiter_geodir_page_title();
-    } elseif (geodir_is_page('listing')) {
-        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]);
-        jupiter_geodir_page_title($title);
-    } elseif (geodir_is_page('search')) {
-        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]);
-        jupiter_geodir_page_title($title);
-    } elseif (geodir_is_page('author')) {
-        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);
-        jupiter_geodir_page_title($gd_title);
-    } else {
-        mk_page_title();
-    }
+	global $wp;
+
+
+	if (is_page_geodir_home() || geodir_is_page('location')) {
+		jupiter_geodir_page_title();
+	} elseif (geodir_is_page('listing')) {
+		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]);
+		jupiter_geodir_page_title($title);
+	} elseif (geodir_is_page('search')) {
+		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]);
+		jupiter_geodir_page_title($title);
+	} elseif (geodir_is_page('author')) {
+		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);
+		jupiter_geodir_page_title($gd_title);
+	} else {
+		mk_page_title();
+	}
 
 
 }
@@ -119,48 +119,48 @@ 
  */
 function jupiter_geodir_breadcrumb()
 {
-    $item = '';
-    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);exit;
-        //print_r($trail);
-        $item = $gd_crums;
-
-    }
-    if (!$item) {
-        return;
-    }
-    global $mk_options, $post;
-    $post_id = global_get_post_id();
-
-    if ($post_id) {
-        $local_skining = get_post_meta($post_id, '_enable_local_backgrounds', true);
-        $breadcrumb_skin = get_post_meta($post_id, '_breadcrumb_skin', true);
-        if ($local_skining == 'true' && !empty($breadcrumb_skin)) {
-            $breadcrumb_skin_class = $breadcrumb_skin;
-        } else {
-            $breadcrumb_skin_class = $mk_options['breadcrumb_skin'];
-        }
-    } else {
-        $breadcrumb_skin_class = $mk_options['breadcrumb_skin'];
-    }
-
-
-    $delimiter = ' &#47; ';
-
-    echo '<div id="mk-breadcrumbs"><div class="mk-breadcrumbs-inner ' . $breadcrumb_skin_class . '-skin">';
-
-    echo implode($delimiter, $item);
-    echo "</div></div>";
+	$item = '';
+	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);exit;
+		//print_r($trail);
+		$item = $gd_crums;
+
+	}
+	if (!$item) {
+		return;
+	}
+	global $mk_options, $post;
+	$post_id = global_get_post_id();
+
+	if ($post_id) {
+		$local_skining = get_post_meta($post_id, '_enable_local_backgrounds', true);
+		$breadcrumb_skin = get_post_meta($post_id, '_breadcrumb_skin', true);
+		if ($local_skining == 'true' && !empty($breadcrumb_skin)) {
+			$breadcrumb_skin_class = $breadcrumb_skin;
+		} else {
+			$breadcrumb_skin_class = $mk_options['breadcrumb_skin'];
+		}
+	} else {
+		$breadcrumb_skin_class = $mk_options['breadcrumb_skin'];
+	}
+
+
+	$delimiter = ' &#47; ';
+
+	echo '<div id="mk-breadcrumbs"><div class="mk-breadcrumbs-inner ' . $breadcrumb_skin_class . '-skin">';
+
+	echo implode($delimiter, $item);
+	echo "</div></div>";
 
 }
 
@@ -174,41 +174,41 @@ 
  */
 function jupiter_geodir_page_title($title = '', $subtitle = '')
 {
-    global $mk_options;
-
-    $post_id = global_get_post_id();
-    $shadow_css = '';
-    if ($mk_options['page_title_shadow'] == 'true') {
-        $shadow_css = 'mk-drop-shadow';
-    }
-
-    $align = !empty($align) ? $align : 'left';
-
-    //$title = 'xxxx';
-    echo '<section id="mk-page-introduce" class="intro-' . $align . '">';
-    echo '<div class="mk-grid">';
-    if (!empty($title)) {
-        echo '<h1 class="page-introduce-title ' . $shadow_css . '">' . $title . '</h1>';
-
-    }
-
-    if (!empty($subtitle)) {
-        echo '<div class="page-introduce-subtitle">';
-        echo $subtitle;
-        echo '</div>';
-    }
-    if ($mk_options['disable_breadcrumb'] == 'true') {
-        if (get_post_meta($post_id, '_disable_breadcrumb', true) != 'false') {
-            /**
-             * Calls the theme breadcrumbs for Jupiter theme.
-             *
-             * @since 1.4.0
-             */
-            do_action('theme_breadcrumbs', $post_id);
-        }
-    }
-
-    echo '<div class="clearboth"></div></div></section>';
+	global $mk_options;
+
+	$post_id = global_get_post_id();
+	$shadow_css = '';
+	if ($mk_options['page_title_shadow'] == 'true') {
+		$shadow_css = 'mk-drop-shadow';
+	}
+
+	$align = !empty($align) ? $align : 'left';
+
+	//$title = 'xxxx';
+	echo '<section id="mk-page-introduce" class="intro-' . $align . '">';
+	echo '<div class="mk-grid">';
+	if (!empty($title)) {
+		echo '<h1 class="page-introduce-title ' . $shadow_css . '">' . $title . '</h1>';
+
+	}
+
+	if (!empty($subtitle)) {
+		echo '<div class="page-introduce-subtitle">';
+		echo $subtitle;
+		echo '</div>';
+	}
+	if ($mk_options['disable_breadcrumb'] == 'true') {
+		if (get_post_meta($post_id, '_disable_breadcrumb', true) != 'false') {
+			/**
+			 * Calls the theme breadcrumbs for Jupiter theme.
+			 *
+			 * @since 1.4.0
+			 */
+			do_action('theme_breadcrumbs', $post_id);
+		}
+	}
+
+	echo '<div class="clearboth"></div></div></section>';
 
 
 }

geodirectory-functions/compatibility/Enfold.php

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

geodirectory-templates/add-listing.php

Indentation +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 global $gd_session;
 
 if (!isset($_REQUEST['backandedit'])) {
-    $gd_session->un_set('listing');
+	$gd_session->un_set('listing');
 }
 // call header
 get_header();

geodirectory-functions/compatibility/Multi_News.php

Indentation +87 added lines, -87 removed lines

@@ -16,36 +16,36 @@ 
  */
 function multi_news_action_calls()
 {
-    // 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);
-
-    //ADD BREADCRUMS
-    add_action('geodir_detail_before_main_content', 'gd_mn_replace_breadcrums', 20);
-    add_action('geodir_listings_before_main_content', 'gd_mn_replace_breadcrums', 20);
-    add_action('geodir_author_before_main_content', 'gd_mn_replace_breadcrums', 20);
-    add_action('geodir_search_before_main_content', 'gd_mn_replace_breadcrums', 20);
-    //add_action('geodir_home_before_main_content', 'gd_mn_replace_breadcrums', 20);
-    add_action('geodir_location_before_main_content', 'gd_mn_replace_breadcrums', 20);
-
-
-    // fix breadcrums
-    add_filter('breadcrumbs_plus_items', 'gd_breadcrumbs_plus_items', 1);
-
-    // 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);
-
-
-    add_action('geodir_wrapper_content_open', 'gd_mn_extra_wrap', 30, 1);
-    add_action('geodir_wrapper_content_close', 'gd_mn_extra_wrap_end', 3, 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);
+
+	//ADD BREADCRUMS
+	add_action('geodir_detail_before_main_content', 'gd_mn_replace_breadcrums', 20);
+	add_action('geodir_listings_before_main_content', 'gd_mn_replace_breadcrums', 20);
+	add_action('geodir_author_before_main_content', 'gd_mn_replace_breadcrums', 20);
+	add_action('geodir_search_before_main_content', 'gd_mn_replace_breadcrums', 20);
+	//add_action('geodir_home_before_main_content', 'gd_mn_replace_breadcrums', 20);
+	add_action('geodir_location_before_main_content', 'gd_mn_replace_breadcrums', 20);
+
+
+	// fix breadcrums
+	add_filter('breadcrumbs_plus_items', 'gd_breadcrumbs_plus_items', 1);
+
+	// 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);
+
+
+	add_action('geodir_wrapper_content_open', 'gd_mn_extra_wrap', 30, 1);
+	add_action('geodir_wrapper_content_close', 'gd_mn_extra_wrap_end', 3, 1);
 }
 
 /**
@@ -57,11 +57,11 @@ 
  */
 function gd_mn_extra_wrap($page)
 {
-    if ($page == 'add-listing-page') {
-        echo '<div class="site-content page-wrap">';
-    } elseif ($page == 'signup-page') {
-        echo '</div><div class="section full-width-section" style="float: left;width:100%;">';
-    }
+	if ($page == 'add-listing-page') {
+		echo '<div class="site-content page-wrap">';
+	} elseif ($page == 'signup-page') {
+		echo '</div><div class="section full-width-section" style="float: left;width:100%;">';
+	}
 
 }
 
@@ -75,9 +75,9 @@ 
  */
 function gd_mn_extra_wrap_end($page)
 {
-    if ($page == 'add-listing-page') {
-        echo '</div>';
-    }
+	if ($page == 'add-listing-page') {
+		echo '</div>';
+	}
 
 }
 
@@ -91,13 +91,13 @@ 
 function gd_mn_replace_breadcrums()
 {
 
-    if (mom_option('breadcrumb') != 0) { ?>
+	if (mom_option('breadcrumb') != 0) { ?>
         <?php if (mom_option('cats_bread')) {
-            $cclass = '';
-            if (mom_option('cat_slider') == false) {
-                $cclass = 'post-crumbs ';
-            }
-            ?>
+			$cclass = '';
+			if (mom_option('cat_slider') == false) {
+				$cclass = 'post-crumbs ';
+			}
+			?>
             <div class="<?php echo $cclass; ?>entry-crumbs" xmlns:v="http://rdf.data-vocabulary.org/#">
 
                 <?php mom_breadcrumb(); ?>
@@ -119,14 +119,14 @@ 
  */
 function gd_get_breadcrum_links()
 {
-    ob_start();
-    geodir_breadcrumb();
-    $crums = ob_get_contents();
-    ob_get_clean();
-    $regexp = "<a\s[^>]*href=(\"??)([^\" >]*?)\\1[^>]*>(.*)<\/a>";
-    if (preg_match_all("/$regexp/siU", $crums, $matches)) {
-        return $matches[0];
-    } else return '';
+	ob_start();
+	geodir_breadcrumb();
+	$crums = ob_get_contents();
+	ob_get_clean();
+	$regexp = "<a\s[^>]*href=(\"??)([^\" >]*?)\\1[^>]*>(.*)<\/a>";
+	if (preg_match_all("/$regexp/siU", $crums, $matches)) {
+		return $matches[0];
+	} else return '';
 }
 
 
@@ -140,30 +140,30 @@ 
  */
 function gd_breadcrumbs_plus_items($items)
 {   //print_r($items);exit;
-    $bits = array();
-    $pieces = gd_get_breadcrum_links();
-    //unset($pieces[0]);
-    $bits = $pieces;
+	$bits = array();
+	$pieces = gd_get_breadcrum_links();
+	//unset($pieces[0]);
+	$bits = $pieces;
 
-    $title = $items['last'];
-    if (is_page_geodir_home() || geodir_is_page('location')) {
+	$title = $items['last'];
+	if (is_page_geodir_home() || geodir_is_page('location')) {
 
-    } elseif (geodir_is_page('listing')) {
+	} elseif (geodir_is_page('listing')) {
 
-    } elseif (geodir_is_page('detail')) {
-        ob_start();
-        geodir_action_page_title();
-        $title = ob_get_contents();
-        ob_end_clean();
-    } elseif (geodir_is_page('search')) {
-    } elseif (geodir_is_page('author')) {
-    }
+	} elseif (geodir_is_page('detail')) {
+		ob_start();
+		geodir_action_page_title();
+		$title = ob_get_contents();
+		ob_end_clean();
+	} elseif (geodir_is_page('search')) {
+	} elseif (geodir_is_page('author')) {
+	}
 
-    $title = strip_tags($title);
-    $items = gd_breadcrumbs_plus_items_add($items, $bits, $title);
+	$title = strip_tags($title);
+	$items = gd_breadcrumbs_plus_items_add($items, $bits, $title);
 
 
-    return $items;
+	return $items;
 }
 
 
@@ -179,28 +179,28 @@ 
  */
 function gd_breadcrumbs_plus_items_add($items, $bits, $last)
 {
-    //$pieces = explode("</div>", $items[0]);
-    if (is_array($bits)) {
-        $items = array();
-        $pieces = '';
-        foreach ($bits as $bit) {
-            $pieces .= $bit;
-        }
-        $items[0] = '<div class="vbreadcrumb" typeof="v:Breadcrumb">' . $pieces . "</div>";
-        if (isset($last) && $last) {
-            $items['last'] = $last;
-        }
-    }
-
-    //print_r($items);
-    return $items;
+	//$pieces = explode("</div>", $items[0]);
+	if (is_array($bits)) {
+		$items = array();
+		$pieces = '';
+		foreach ($bits as $bit) {
+			$pieces .= $bit;
+		}
+		$items[0] = '<div class="vbreadcrumb" typeof="v:Breadcrumb">' . $pieces . "</div>";
+		if (isset($last) && $last) {
+			$items['last'] = $last;
+		}
+	}
+
+	//print_r($items);
+	return $items;
 
 }
 
 add_filter('geodir_menu_after_sub_ul','gd_multinews_mobile_menu_caret',10,1);
 add_filter('geodir_location_switcher_menu_after_sub_ul','gd_multinews_mobile_menu_caret',10,1);
 function gd_multinews_mobile_menu_caret($html){
-    $html .= '<i class="responsive-caret"></i>';
-    return $html;
+	$html .= '<i class="responsive-caret"></i>';
+	return $html;
 
 }

tests/test-Check_Maps.php

Indentation +55 added lines, -55 removed lines

@@ -1,69 +1,69 @@
 <?php
 class CheckMaps extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+	}
 
-    public function testCheckHomeMap()
-    {
-        $output = do_shortcode('[gd_homepage_map width=100% height=300 scrollwheel=false]');
-        $this->assertContains( 'geodir-map-home-page', $output );
-    }
+	public function testCheckHomeMap()
+	{
+		$output = do_shortcode('[gd_homepage_map width=100% height=300 scrollwheel=false]');
+		$this->assertContains( 'geodir-map-home-page', $output );
+	}
 
-    public function testListingsPageMap()
-    {
-        $output = do_shortcode('[gd_listing_map width=100% height=300 scrollwheel=false sticky=true]');
-        $this->assertContains( 'geodir-map-listing-page', $output );
-    }
+	public function testListingsPageMap()
+	{
+		$output = do_shortcode('[gd_listing_map width=100% height=300 scrollwheel=false sticky=true]');
+		$this->assertContains( 'geodir-map-listing-page', $output );
+	}
 
-    public function testDetailPageMap()
-    {
+	public function testDetailPageMap()
+	{
 
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
 
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-            global $post;
-            $post =  geodir_get_post_info($post_id);
-            setup_postdata($post);
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+			global $post;
+			$post =  geodir_get_post_info($post_id);
+			setup_postdata($post);
 
-            $map_args = array();
-            $map_args['map_canvas_name'] = 'detail_page_map_canvas';
-            $map_args['width'] = '600';
-            $map_args['height'] = '300';
-            if ($post->post_mapzoom) {
-                $map_args['zoom'] = '' . $post->post_mapzoom . '';
-            }
-            $map_args['autozoom'] = false;
-            $map_args['child_collapse'] = '0';
-            $map_args['enable_cat_filters'] = false;
-            $map_args['enable_text_search'] = false;
-            $map_args['enable_post_type_filters'] = false;
-            $map_args['enable_location_filters'] = false;
-            $map_args['enable_jason_on_load'] = true;
-            $map_args['enable_map_direction'] = true;
-            $map_args['map_class_name'] = 'geodir-map-detail-page';
-            $map_args['maptype'] = (!empty($post->post_mapview)) ? $post->post_mapview : 'ROADMAP';
-            ob_start();
-            geodir_draw_map($map_args);
-            $output = ob_get_clean();
-            $this->assertContains( 'geodir-map-detail-page', $output );
-        endwhile;
+			$map_args = array();
+			$map_args['map_canvas_name'] = 'detail_page_map_canvas';
+			$map_args['width'] = '600';
+			$map_args['height'] = '300';
+			if ($post->post_mapzoom) {
+				$map_args['zoom'] = '' . $post->post_mapzoom . '';
+			}
+			$map_args['autozoom'] = false;
+			$map_args['child_collapse'] = '0';
+			$map_args['enable_cat_filters'] = false;
+			$map_args['enable_text_search'] = false;
+			$map_args['enable_post_type_filters'] = false;
+			$map_args['enable_location_filters'] = false;
+			$map_args['enable_jason_on_load'] = true;
+			$map_args['enable_map_direction'] = true;
+			$map_args['map_class_name'] = 'geodir-map-detail-page';
+			$map_args['maptype'] = (!empty($post->post_mapview)) ? $post->post_mapview : 'ROADMAP';
+			ob_start();
+			geodir_draw_map($map_args);
+			$output = ob_get_clean();
+			$this->assertContains( 'geodir-map-detail-page', $output );
+		endwhile;
 
 
-    }
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file