View GitHub Repository geodirectory

Schedule Inspection
Subscribe
Test Failed
Pull Request — master (#300)
by Kiran
21:43
created
Status
Category
Toggle Patches
geodirectory_template_tags.php 3 patches
Indentation   +333 added lines, -333 removed lines patch added patch discarded remove patch 
@@ -22,7 +22,7 @@  discard block
 
 block discarded – undo
22 22 
  */
23 23 
 function geodir_core_dequeue_script()
24 24 
 {
25 
-    wp_dequeue_script('flexslider');
25 
+	wp_dequeue_script('flexslider');
26 26 
 }
27 27
28 28 
 add_action('wp_print_scripts', 'geodir_core_dequeue_script', 100);

@@ -35,168 +35,168 @@  discard block
 
 block discarded – undo
35 35 
  */
36 36 
 function geodir_templates_scripts()
37 37 
 {
38 
-    $is_detail_page = false;
39 
-    $geodir_map_name = geodir_map_name();
38 
+	$is_detail_page = false;
39 
+	$geodir_map_name = geodir_map_name();
40 40
41 
-    if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {
42 
-        $is_detail_page = true;
43 
-    }
44 
-
45 
-    wp_enqueue_script('jquery');
46 
-
47 
-    wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);
48 
-    wp_enqueue_script('geodirectory-script');
41 
+	if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {
42 
+		$is_detail_page = true;
43 
+	}
49 44
50 
-    $geodir_vars_data = array(
51 
-        'siteurl' => get_option('siteurl'),
52 
-        'geodir_plugin_url' => geodir_plugin_url(),
53 
-        'geodir_lazy_load' => get_option('geodir_lazy_load',1),
54 
-        'geodir_ajax_url' => geodir_get_ajax_url(),
55 
-        'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),
56 
-        'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue
57 
-    );
45 
+	wp_enqueue_script('jquery');
46 
+
47 
+	wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);
48 
+	wp_enqueue_script('geodirectory-script');
49 
+
50 
+	$geodir_vars_data = array(
51 
+		'siteurl' => get_option('siteurl'),
52 
+		'geodir_plugin_url' => geodir_plugin_url(),
53 
+		'geodir_lazy_load' => get_option('geodir_lazy_load',1),
54 
+		'geodir_ajax_url' => geodir_get_ajax_url(),
55 
+		'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),
56 
+		'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue
57 
+	);
58 
+
59 
+	/**
60 
+	 * Filter the `geodir_var` data array that outputs the  wp_localize_script() translations and variables.
61 
+	 *
62 
+	 * This is used by addons to add JS translatable variables.
63 
+	 *
64 
+	 * @since 1.4.4
65 
+	 * @param array $geodir_vars_data {
66 
+	 *    geodir var data used by addons to add JS translatable variables.
67 
+	 *
68 
+	 *    @type string $siteurl Site url.
69 
+	 *    @type string $geodir_plugin_url Geodirectory core plugin url.
70 
+	 *    @type string $geodir_ajax_url Geodirectory plugin ajax url.
71 
+	 *    @type int $geodir_gd_modal Disable GD modal that displays slideshow images in popup?.
72 
+	 *    @type int $is_rtl Checks if current locale is RTL.
73 
+	 *
74 
+	 * }
75 
+	 */
76 
+	$geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);
77 
+
78 
+	wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);
79 
+
80 
+	wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);
81 
+	if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}
82 
+
83 
+	wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);
84 
+	wp_enqueue_script('geodirectory-lightbox-jquery');
85 
+
86 
+	wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);
87 
+	if ($is_detail_page) {
88 
+		wp_enqueue_script('geodirectory-jquery-simplemodal');
89 
+	}
58 90
59 
-    /**
60 
-     * Filter the `geodir_var` data array that outputs the  wp_localize_script() translations and variables.
61 
-     *
62 
-     * This is used by addons to add JS translatable variables.
63 
-     *
64 
-     * @since 1.4.4
65 
-     * @param array $geodir_vars_data {
66 
-     *    geodir var data used by addons to add JS translatable variables.
67 
-     *
68 
-     *    @type string $siteurl Site url.
69 
-     *    @type string $geodir_plugin_url Geodirectory core plugin url.
70 
-     *    @type string $geodir_ajax_url Geodirectory plugin ajax url.
71 
-     *    @type int $geodir_gd_modal Disable GD modal that displays slideshow images in popup?.
72 
-     *    @type int $is_rtl Checks if current locale is RTL.
73 
-     *
74 
-     * }
75 
-     */
76 
-    $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);
77 
-
78 
-    wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);
79 
-
80 
-    wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);
81 
-    if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}
82 
-
83 
-    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);
84 
-    wp_enqueue_script('geodirectory-lightbox-jquery');
85 
-
86 
-    wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);
87 
-    if ($is_detail_page) {
88 
-        wp_enqueue_script('geodirectory-jquery-simplemodal');
89 
-    }
90 
-
91 
-    if (in_array($geodir_map_name, array('auto', 'google'))) {
92 
-        $map_lang = "&language=" . geodir_get_map_default_language();
93 
-        $map_key = "&key=" . geodir_get_map_api_key();
94 
-        /**
95 
-         * Filter the variables that are added to the end of the google maps script call.
96 
-         *
97 
-         * This i used to change things like google maps language etc.
98 
-         *
99 
-         * @since 1.0.0
100 
-         * @param string $var The string to filter, default is empty string.
101 
-         */
102 
-        $map_extra = apply_filters('geodir_googlemap_script_extra', '');
103 
-        wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);
104 
-    }
91 
+	if (in_array($geodir_map_name, array('auto', 'google'))) {
92 
+		$map_lang = "&language=" . geodir_get_map_default_language();
93 
+		$map_key = "&key=" . geodir_get_map_api_key();
94 
+		/**
95 
+		 * Filter the variables that are added to the end of the google maps script call.
96 
+		 *
97 
+		 * This i used to change things like google maps language etc.
98 
+		 *
99 
+		 * @since 1.0.0
100 
+		 * @param string $var The string to filter, default is empty string.
101 
+		 */
102 
+		$map_extra = apply_filters('geodir_googlemap_script_extra', '');
103 
+		wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);
104 
+	}
105 105
106 
-    if ($geodir_map_name == 'osm') {
107 
-        // Leaflet OpenStreetMap
108 
-        wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
109 
-        wp_enqueue_style('geodirectory-leaflet-style');
106 
+	if ($geodir_map_name == 'osm') {
107 
+		// Leaflet OpenStreetMap
108 
+		wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
109 
+		wp_enqueue_style('geodirectory-leaflet-style');
110 110
111 
-        wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
112 
-        wp_enqueue_script('geodirectory-leaflet-script');
111 
+		wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
112 
+		wp_enqueue_script('geodirectory-leaflet-script');
113 113
114 
-        wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array(), GEODIRECTORY_VERSION);
115 
-        wp_enqueue_script('geodirectory-leaflet-geo-script');
114 
+		wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array(), GEODIRECTORY_VERSION);
115 
+		wp_enqueue_script('geodirectory-leaflet-geo-script');
116 116
117 
-        if ($is_detail_page) {
118 
-            wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);
119 
-            wp_enqueue_style('geodirectory-leaflet-routing-style');
117 
+		if ($is_detail_page) {
118 
+			wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);
119 
+			wp_enqueue_style('geodirectory-leaflet-routing-style');
120 120
121 
-            wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.js', array(), GEODIRECTORY_VERSION);
122 
-            wp_enqueue_script('geodirectory-leaflet-routing-script');
123 
-        }
124 
-    }
125 
-    wp_enqueue_script( 'jquery-ui-autocomplete' );
121 
+			wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.js', array(), GEODIRECTORY_VERSION);
122 
+			wp_enqueue_script('geodirectory-leaflet-routing-script');
123 
+		}
124 
+	}
125 
+	wp_enqueue_script( 'jquery-ui-autocomplete' );
126 126
127 
-    wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
128 
-    wp_enqueue_script('geodirectory-goMap-script');
129 
-
130 
-
131 
-    wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);
132 
-    wp_enqueue_script('chosen');
133 
-
134 
-    wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);
135 
-    wp_enqueue_script('geodirectory-choose-ajax');
136 
-
137 
-    wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);
138 
-
139 
-    if (is_page() && geodir_is_page('add-listing')) {
140 
-        // SCRIPT FOR UPLOAD
141 
-        wp_enqueue_script('plupload-all');
142 
-        wp_enqueue_script('jquery-ui-sortable');
143 
-
144 
-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);
145 
-        wp_enqueue_script('geodirectory-plupload-script');
146 
-        // SCRIPT FOR UPLOAD END
147 
-
148 
-        // check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls
149 
-        if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
150 
-            $ajax_url = admin_url('admin-ajax.php');
151 
-        } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
152 
-            $ajax_url = admin_url('admin-ajax.php');
153 
-        } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
154 
-            $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
155 
-        } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
156 
-            $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
157 
-        } else {
158 
-            $ajax_url = admin_url('admin-ajax.php');
159 
-        }
127 
+	wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
128 
+	wp_enqueue_script('geodirectory-goMap-script');
129 
+
130 
+
131 
+	wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);
132 
+	wp_enqueue_script('chosen');
133 
+
134 
+	wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);
135 
+	wp_enqueue_script('geodirectory-choose-ajax');
136 
+
137 
+	wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);
138 
+
139 
+	if (is_page() && geodir_is_page('add-listing')) {
140 
+		// SCRIPT FOR UPLOAD
141 
+		wp_enqueue_script('plupload-all');
142 
+		wp_enqueue_script('jquery-ui-sortable');
143 
+
144 
+		wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);
145 
+		wp_enqueue_script('geodirectory-plupload-script');
146 
+		// SCRIPT FOR UPLOAD END
147 
+
148 
+		// check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls
149 
+		if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
150 
+			$ajax_url = admin_url('admin-ajax.php');
151 
+		} elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
152 
+			$ajax_url = admin_url('admin-ajax.php');
153 
+		} elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
154 
+			$ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
155 
+		} elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
156 
+			$ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
157 
+		} else {
158 
+			$ajax_url = admin_url('admin-ajax.php');
159 
+		}
160 160
161 
-        // place js config array for plupload
162 
-        $plupload_init = array(
163 
-            'runtimes' => 'html5,silverlight,flash,browserplus,gears,html4',
164 
-            'browse_button' => 'plupload-browse-button', // will be adjusted per uploader
165 
-            'container' => 'plupload-upload-ui', // will be adjusted per uploader
166 
-            'drop_element' => 'dropbox', // will be adjusted per uploader
167 
-            'file_data_name' => 'async-upload', // will be adjusted per uploader
168 
-            'multiple_queues' => true,
169 
-            'max_file_size' => geodir_max_upload_size(),
170 
-            'url' => $ajax_url,
171 
-            'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
172 
-            'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
173 
-            'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
174 
-            'multipart' => true,
175 
-            'urlstream_upload' => true,
176 
-            'multi_selection' => false, // will be added per uploader
177 
-            // additional post data to send to our ajax hook
178 
-            'multipart_params' => array(
179 
-                '_ajax_nonce' => "", // will be added per uploader
180 
-                'action' => 'plupload_action', // the ajax action name
181 
-                'imgid' => 0 // will be added per uploader
182 
-            )
183 
-        );
184 
-        $base_plupload_config = json_encode($plupload_init);
185 
-
186 
-        $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
187 
-            'upload_img_size' => geodir_max_upload_size());
188 
-
189 
-        wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
190 
-
191 
-        wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');
192 
-    } // End if for add place page
193 
-
194 
-    wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
195 
-    if ($is_detail_page) {
161 
+		// place js config array for plupload
162 
+		$plupload_init = array(
163 
+			'runtimes' => 'html5,silverlight,flash,browserplus,gears,html4',
164 
+			'browse_button' => 'plupload-browse-button', // will be adjusted per uploader
165 
+			'container' => 'plupload-upload-ui', // will be adjusted per uploader
166 
+			'drop_element' => 'dropbox', // will be adjusted per uploader
167 
+			'file_data_name' => 'async-upload', // will be adjusted per uploader
168 
+			'multiple_queues' => true,
169 
+			'max_file_size' => geodir_max_upload_size(),
170 
+			'url' => $ajax_url,
171 
+			'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
172 
+			'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
173 
+			'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
174 
+			'multipart' => true,
175 
+			'urlstream_upload' => true,
176 
+			'multi_selection' => false, // will be added per uploader
177 
+			// additional post data to send to our ajax hook
178 
+			'multipart_params' => array(
179 
+				'_ajax_nonce' => "", // will be added per uploader
180 
+				'action' => 'plupload_action', // the ajax action name
181 
+				'imgid' => 0 // will be added per uploader
182 
+			)
183 
+		);
184 
+		$base_plupload_config = json_encode($plupload_init);
185 
+
186 
+		$gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
187 
+			'upload_img_size' => geodir_max_upload_size());
188 
+
189 
+		wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
190 
+
191 
+		wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');
192 
+	} // End if for add place page
193 
+
194 
+	wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
195 
+	if ($is_detail_page) {
196 196 
 		wp_enqueue_script('geodirectory-post-custom-js');
197 197 
 	}
198 198
199 
-    // font awesome rating script
199 
+	// font awesome rating script
200 200 
 	if (get_option('geodir_reviewrating_enable_font_awesome')) {
201 201 
 		wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);
202 202 
 		wp_enqueue_script('geodir-barrating-js');

@@ -205,11 +205,11 @@  discard block
 
 block discarded – undo
205 205 
 		wp_enqueue_script('geodir-jRating-js');
206 206 
 	}
207 207
208 
-    wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
209 
-    wp_enqueue_script('geodir-on-document-load');
208 
+	wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
209 
+	wp_enqueue_script('geodir-on-document-load');
210 210
211 
-    wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
212 
-    wp_enqueue_script('google-geometa');
211 
+	wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
212 
+	wp_enqueue_script('google-geometa');
213 213 
 }
214 214
215 215 
 /**

@@ -223,8 +223,8 @@  discard block
 
 block discarded – undo
223 223 
  */
224 224 
 function geodir_header_scripts()
225 225 
 {
226 
-    echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';
227 
-    echo stripslashes(get_option('geodir_header_scripts'));
226 
+	echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';
227 
+	echo stripslashes(get_option('geodir_header_scripts'));
228 228 
 }
229 229
230 230 
 

@@ -240,7 +240,7 @@  discard block
 
 block discarded – undo
240 240 
 function geodir_footer_scripts()
241 241 
 {
242 242
243 
-    if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>
243 
+	if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>
244 244
245 245 
         <script>
246 246 
             (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

@@ -254,20 +254,20 @@  discard block
 
 block discarded – undo
254 254 
         </script>
255 255
256 256 
 <?php
257 
-    }elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
258 
-        echo stripslashes(get_option('geodir_ga_tracking_code'));
259 
-    }
257 
+	}elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
258 
+		echo stripslashes(get_option('geodir_ga_tracking_code'));
259 
+	}
260 260
261 
-    echo stripslashes(get_option('geodir_footer_scripts'));
261 
+	echo stripslashes(get_option('geodir_footer_scripts'));
262 262
263 
-    /*
263 
+	/*
264 264 
      * Apple suck and can't/won't fix bugs: https://bugs.webkit.org/show_bug.cgi?id=136041
265 265 
      *
266 266 
      * Flexbox wont wrap on ios for search form items
267 267 
      */
268 
-    if (preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {
269 
-        echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";
270 
-    }
268 
+	if (preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {
269 
+		echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";
270 
+	}
271 271 
 }
272 272
273 273 
 

@@ -281,12 +281,12 @@  discard block
 
 block discarded – undo
281 281 
  */
282 282 
 function geodir_add_async_forscript($url)
283 283 
 {
284 
-    if (strpos($url, '#asyncload')===false)
285 
-        return $url;
286 
-    else if (is_admin())
287 
-        return str_replace('#asyncload', '', $url);
288 
-    else
289 
-        return str_replace('#asyncload', '', $url)."' async='async";
284 
+	if (strpos($url, '#asyncload')===false)
285 
+		return $url;
286 
+	else if (is_admin())
287 
+		return str_replace('#asyncload', '', $url);
288 
+	else
289 
+		return str_replace('#asyncload', '', $url)."' async='async";
290 290 
 }
291 291 
 add_filter('clean_url', 'geodir_add_async_forscript', 11, 1);
292 292 
 

@@ -299,17 +299,17 @@  discard block
 
 block discarded – undo
299 299 
 function geodir_templates_styles()
300 300 
 {
301 301
302 
-    wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);
303 
-    wp_enqueue_style('geodir-core-scss');
304 
-    wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);
302 
+	wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);
303 
+	wp_enqueue_style('geodir-core-scss');
304 
+	wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);
305 305
306 
-    if(is_rtl()){
307 
-    wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);
308 
-    wp_enqueue_style('geodirectory-frontend-rtl-style');
309 
-    }
306 
+	if(is_rtl()){
307 
+	wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);
308 
+	wp_enqueue_style('geodirectory-frontend-rtl-style');
309 
+	}
310 310
311 
-    wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
312 
-    wp_enqueue_style('font-awesome');
311 
+	wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
312 
+	wp_enqueue_style('font-awesome');
313 313
314 314
315 315 
 }

@@ -323,7 +323,7 @@  discard block
 
 block discarded – undo
323 323 
  */
324 324 
 function geodir_get_sidebar()
325 325 
 {
326 
-    get_sidebar('geodirectory');
326 
+	get_sidebar('geodirectory');
327 327 
 }
328 328
329 329 
 /**

@@ -342,122 +342,122 @@  discard block
 
 block discarded – undo
342 342 
  * @param bool $always_show Do you want to show the pagination always? Default: false.
343 343 
  */
344 344 
 function geodir_pagination($before = '', $after = '', $prelabel = '', $nxtlabel = '', $pages_to_show = 5, $always_show = false) {
345 
-    global $wp_query, $posts_per_page, $wpdb, $paged, $blog_id;
345 
+	global $wp_query, $posts_per_page, $wpdb, $paged, $blog_id;
346 346
347 
-    if (empty($prelabel)) {
348 
-        $prelabel = '<strong>&laquo;</strong>';
349 
-    }
347 
+	if (empty($prelabel)) {
348 
+		$prelabel = '<strong>&laquo;</strong>';
349 
+	}
350 350
351 
-    if (empty($nxtlabel)) {
352 
-        $nxtlabel = '<strong>&raquo;</strong>';
353 
-    }
351 
+	if (empty($nxtlabel)) {
352 
+		$nxtlabel = '<strong>&raquo;</strong>';
353 
+	}
354 354
355 
-    $half_pages_to_show = round($pages_to_show / 2);
355 
+	$half_pages_to_show = round($pages_to_show / 2);
356 356
357 
-    if (geodir_is_page('home')) // dont apply default  pagination for geodirectory home page.
358 
-        return;
357 
+	if (geodir_is_page('home')) // dont apply default  pagination for geodirectory home page.
358 
+		return;
359 359
360 
-    if (!is_single()) {
361 
-        if (function_exists('geodir_location_geo_home_link')) {
362 
-            remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
363 
-        }
364 
-        $numposts = $wp_query->found_posts;
360 
+	if (!is_single()) {
361 
+		if (function_exists('geodir_location_geo_home_link')) {
362 
+			remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
363 
+		}
364 
+		$numposts = $wp_query->found_posts;
365 365
366 
-        $max_page = ceil($numposts / $posts_per_page);
366 
+		$max_page = ceil($numposts / $posts_per_page);
367 367
368 
-        if (empty($paged)) {
369 
-            $paged = 1;
370 
-        }
368 
+		if (empty($paged)) {
369 
+			$paged = 1;
370 
+		}
371 371
372 
-        $post_type = geodir_get_current_posttype();
373 
-        $listing_type_name = get_post_type_plural_label($post_type);
374 
-        if (geodir_is_page('listing') || geodir_is_page('search')) {
375 
-            $term = array();
372 
+		$post_type = geodir_get_current_posttype();
373 
+		$listing_type_name = get_post_type_plural_label($post_type);
374 
+		if (geodir_is_page('listing') || geodir_is_page('search')) {
375 
+			$term = array();
376 376
377 
-            if (is_tax()) {
378 
-                $term_id = get_queried_object_id();
379 
-                $taxonomy = get_query_var('taxonomy');
377 
+			if (is_tax()) {
378 
+				$term_id = get_queried_object_id();
379 
+				$taxonomy = get_query_var('taxonomy');
380 380
381 
-                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {
382 
-                    $term = get_term($term_id, $post_type . 'category');
383 
-                }
384 
-            }
381 
+				if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {
382 
+					$term = get_term($term_id, $post_type . 'category');
383 
+				}
384 
+			}
385 385
386 
-            if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {
387 
-                $taxonomy_search = $_REQUEST['s' . $post_type . 'category'];
386 
+			if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {
387 
+				$taxonomy_search = $_REQUEST['s' . $post_type . 'category'];
388 388
389 
-                if (!is_array($taxonomy_search)) {
390 
-                    $term = get_term((int)$taxonomy_search, $post_type . 'category');
391 
-                } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
392 
-                    $term = get_term((int)$taxonomy_search[0], $post_type . 'category');
393 
-                }
394 
-            }
389 
+				if (!is_array($taxonomy_search)) {
390 
+					$term = get_term((int)$taxonomy_search, $post_type . 'category');
391 
+				} else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
392 
+					$term = get_term((int)$taxonomy_search[0], $post_type . 'category');
393 
+				}
394 
+			}
395 395
396 
-            if (!empty($term) && !is_wp_error($term)) {
397 
-                $listing_type_name = $term->name;
398 
-            }
399 
-        }
396 
+			if (!empty($term) && !is_wp_error($term)) {
397 
+				$listing_type_name = $term->name;
398 
+			}
399 
+		}
400 400
401 
-        if ($max_page > 1 || $always_show) {
402 
-            // Extra pagination info
403 
-            $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
404 
-            $start_no = ( $paged - 1 ) * $posts_per_page + 1;
405 
-            $end_no = min($paged * $posts_per_page, $numposts);
401 
+		if ($max_page > 1 || $always_show) {
402 
+			// Extra pagination info
403 
+			$geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
404 
+			$start_no = ( $paged - 1 ) * $posts_per_page + 1;
405 
+			$end_no = min($paged * $posts_per_page, $numposts);
406 406
407 
-            if ($geodir_pagination_more_info != '') {
408 
-                if ($listing_type_name) {
409 
-                    $listing_type_name = __($listing_type_name, 'geodirectory');
410 
-                    $pegination_desc = wp_sprintf(__('Showing %s %d-%d of %d', 'geodirectory'), $listing_type_name, $start_no, $end_no, $numposts);
411 
-                } else {
412 
-                    $pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);
413 
-                }
414 
-                $pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>';
415 
-                /**
416 
-                 * Adds an extra pagination info above/under pagination.
417 
-                 *
418 
-                 * @since 1.5.9
419 
-                 *
420 
-                 * @param string $pagination_info Extra pagination info content.
421 
-                 * @param string $listing_type_name Listing results type.
422 
-                 * @param string $start_no First result number.
423 
-                 * @param string $end_no Last result number.
424 
-                 * @param string $numposts Total number of listings.
425 
-                 * @param string $post_type The post type.
426 
-                 */
427 
-                $pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);
407 
+			if ($geodir_pagination_more_info != '') {
408 
+				if ($listing_type_name) {
409 
+					$listing_type_name = __($listing_type_name, 'geodirectory');
410 
+					$pegination_desc = wp_sprintf(__('Showing %s %d-%d of %d', 'geodirectory'), $listing_type_name, $start_no, $end_no, $numposts);
411 
+				} else {
412 
+					$pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);
413 
+				}
414 
+				$pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>';
415 
+				/**
416 
+				 * Adds an extra pagination info above/under pagination.
417 
+				 *
418 
+				 * @since 1.5.9
419 
+				 *
420 
+				 * @param string $pagination_info Extra pagination info content.
421 
+				 * @param string $listing_type_name Listing results type.
422 
+				 * @param string $start_no First result number.
423 
+				 * @param string $end_no Last result number.
424 
+				 * @param string $numposts Total number of listings.
425 
+				 * @param string $post_type The post type.
426 
+				 */
427 
+				$pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);
428 428
429 
-                if ($geodir_pagination_more_info == 'before') {
430 
-                    $before = $before . $pagination_info;
431 
-                } else if ($geodir_pagination_more_info == 'after') {
432 
-                    $after = $pagination_info . $after;
433 
-                }
434 
-            }
429 
+				if ($geodir_pagination_more_info == 'before') {
430 
+					$before = $before . $pagination_info;
431 
+				} else if ($geodir_pagination_more_info == 'after') {
432 
+					$after = $pagination_info . $after;
433 
+				}
434 
+			}
435 435
436 
-            echo "$before <div class='Navi gd-navi'>";
437 
-            if ($paged >= ($pages_to_show - 1)) {
438 
-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';
439 
-            }
440 
-            previous_posts_link($prelabel);
441 
-            for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {
442 
-                if ($i >= 1 && $i <= $max_page) {
443 
-                    if ($i == $paged) {
444 
-                        echo "<strong class='on'>$i</strong>";
445 
-                    } else {
446 
-                        echo ' <a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($i)) . '">' . $i . '</a> ';
447 
-                    }
448 
-                }
449 
-            }
450 
-            next_posts_link($nxtlabel, $max_page);
451 
-            if (($paged + $half_pages_to_show) < ($max_page)) {
452 
-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)) . '">&raquo;</a>';
453 
-            }
454 
-            echo "</div> $after";
455 
-        }
436 
+			echo "$before <div class='Navi gd-navi'>";
437 
+			if ($paged >= ($pages_to_show - 1)) {
438 
+				echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';
439 
+			}
440 
+			previous_posts_link($prelabel);
441 
+			for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {
442 
+				if ($i >= 1 && $i <= $max_page) {
443 
+					if ($i == $paged) {
444 
+						echo "<strong class='on'>$i</strong>";
445 
+					} else {
446 
+						echo ' <a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($i)) . '">' . $i . '</a> ';
447 
+					}
448 
+				}
449 
+			}
450 
+			next_posts_link($nxtlabel, $max_page);
451 
+			if (($paged + $half_pages_to_show) < ($max_page)) {
452 
+				echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)) . '">&raquo;</a>';
453 
+			}
454 
+			echo "</div> $after";
455 
+		}
456 456
457 
-        if (function_exists('geodir_location_geo_home_link')) {
458 
-            add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
459 
-        }
460 
-    }
457 
+		if (function_exists('geodir_location_geo_home_link')) {
458 
+			add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
459 
+		}
460 
+	}
461 461 
 }
462 462
463 463 
 /**

@@ -468,20 +468,20 @@  discard block
 
 block discarded – undo
468 468 
  */
469 469 
 function geodir_listingsearch_scripts()
470 470 
 {
471 
-    if (get_option('gd_search_dist') != '') {
472 
-        $dist = get_option('gd_search_dist');
473 
-    } else {
474 
-        $dist = 500;
475 
-    }
476 
-    $dist_dif = 1000;
477 
-
478 
-    if ($dist <= 5000) $dist_dif = 500;
479 
-    if ($dist <= 1000) $dist_dif = 100;
480 
-    if ($dist <= 500) $dist_dif = 50;
481 
-    if ($dist <= 100) $dist_dif = 10;
482 
-    if ($dist <= 50) $dist_dif = 5;
483 
-
484 
-    ?>
471 
+	if (get_option('gd_search_dist') != '') {
472 
+		$dist = get_option('gd_search_dist');
473 
+	} else {
474 
+		$dist = 500;
475 
+	}
476 
+	$dist_dif = 1000;
477 
+
478 
+	if ($dist <= 5000) $dist_dif = 500;
479 
+	if ($dist <= 1000) $dist_dif = 100;
480 
+	if ($dist <= 500) $dist_dif = 50;
481 
+	if ($dist <= 100) $dist_dif = 10;
482 
+	if ($dist <= 50) $dist_dif = 5;
483 
+
484 
+	?>
485 485 
     <script type="text/javascript">
486 486
487 487 
         jQuery(function ($) {

@@ -540,15 +540,15 @@  discard block
 
 block discarded – undo
540 540 
 function geodir_add_sharelocation_scripts()
541 541 
 {
542 542
543 
-    $default_search_for_text = SEARCH_FOR_TEXT;
544 
-    if (get_option('geodir_search_field_default_text'))
545 
-        $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
543 
+	$default_search_for_text = SEARCH_FOR_TEXT;
544 
+	if (get_option('geodir_search_field_default_text'))
545 
+		$default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
546 546
547 
-    $default_near_text = NEAR_TEXT;
548 
-    if (get_option('geodir_near_field_default_text'))
549 
-        $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
547 
+	$default_near_text = NEAR_TEXT;
548 
+	if (get_option('geodir_near_field_default_text'))
549 
+		$default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
550 550
551 
-    ?>
551 
+	?>
552 552
553 553
554 554 
     <script type="text/javascript">

@@ -631,14 +631,14 @@  discard block
 
 block discarded – undo
631 631 
                     initialise2();
632 632 
                 } else {
633 633 
                     <?php
634 
-                    $near_add = get_option('geodir_search_near_addition');
635 
-                    /**
636 
-                     * Adds any extra info to the near search box query when trying to geolocate it via google api.
637 
-                     *
638 
-                     * @since 1.0.0
639 
-                     */
640 
-                    $near_add2 = apply_filters('geodir_search_near_addition', '');
641 
-                    ?>
634 
+					$near_add = get_option('geodir_search_near_addition');
635 
+					/**
636 
+					 * Adds any extra info to the near search box query when trying to geolocate it via google api.
637 
+					 *
638 
+					 * @since 1.0.0
639 
+					 */
640 
+					$near_add2 = apply_filters('geodir_search_near_addition', '');
641 
+					?>
642 642 
                     if (window.gdMaps === 'google') {
643 643 
                         Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", ' . $near_add . '"' : '') . $near_add2;?>},
644 644 
                             function (results, status) {

@@ -741,30 +741,30 @@  discard block
 
 block discarded – undo
741 741 
  */
742 742 
 function geodir_show_badges_on_image($which, $post, $link)
743 743 
 {
744 
-    $return = '';
745 
-    switch ($which) {
746 
-        case 'featured':
747 
-            /**
748 
-             * Filter the featured image badge html that appears in the listings pages over the thumbnail.
749 
-             *
750 
-             * @since 1.0.0
751 
-             * @param object $post The post object.
752 
-             * @param string $link The link to the post.
753 
-             */
754 
-            $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>',$post,$link);
755 
-            break;
756 
-        case 'new' :
757 
-            /**
758 
-             * Filter the new image badge html that appears in the listings pages over the thumbnail.
759 
-             *
760 
-             * @since 1.0.0
761 
-             * @param object $post The post object.
762 
-             * @param string $link The link to the post.
763 
-             */
764 
-            $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>',$post,$link);
765 
-            break;
766 
-
767 
-    }
744 
+	$return = '';
745 
+	switch ($which) {
746 
+		case 'featured':
747 
+			/**
748 
+			 * Filter the featured image badge html that appears in the listings pages over the thumbnail.
749 
+			 *
750 
+			 * @since 1.0.0
751 
+			 * @param object $post The post object.
752 
+			 * @param string $link The link to the post.
753 
+			 */
754 
+			$return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>',$post,$link);
755 
+			break;
756 
+		case 'new' :
757 
+			/**
758 
+			 * Filter the new image badge html that appears in the listings pages over the thumbnail.
759 
+			 *
760 
+			 * @since 1.0.0
761 
+			 * @param object $post The post object.
762 
+			 * @param string $link The link to the post.
763 
+			 */
764 
+			$return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>',$post,$link);
765 
+			break;
766 
+
767 
+	}
768 768
769 
-    return $return;
769 
+	return $return;
770 770 
 }
Please login to merge, or discard this patch.
Spacing   +71 added lines, -71 removed lines patch added patch discarded remove patch 
@@ -38,21 +38,21 @@  discard block
 
 block discarded – undo
38 38 
     $is_detail_page = false;
39 39 
     $geodir_map_name = geodir_map_name();
40 40
41 
-    if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {
41 
+    if ((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview'))) {
42 42 
         $is_detail_page = true;
43 43 
     }
44 44
45 45 
     wp_enqueue_script('jquery');
46 46
47 
-    wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);
47 
+    wp_register_script('geodirectory-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);
48 48 
     wp_enqueue_script('geodirectory-script');
49 49
50 50 
     $geodir_vars_data = array(
51 51 
         'siteurl' => get_option('siteurl'),
52 52 
         'geodir_plugin_url' => geodir_plugin_url(),
53 
-        'geodir_lazy_load' => get_option('geodir_lazy_load',1),
53 
+        'geodir_lazy_load' => get_option('geodir_lazy_load', 1),
54 54 
         'geodir_ajax_url' => geodir_get_ajax_url(),
55 
-        'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),
55 
+        'geodir_gd_modal' => (int) get_option('geodir_disable_gb_modal'),
56 56 
         'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue
57 57 
     );
58 58 
 

@@ -73,24 +73,24 @@  discard block
 
 block discarded – undo
73 73 
      *
74 74 
      * }
75 75 
      */
76 
-    $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);
76 
+    $geodir_vars_data = apply_filters('geodir_vars_data', $geodir_vars_data);
77 77
78 78 
     wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);
79 79
80 
-    wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);
81 
-    if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}
80 
+    wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION, true);
81 
+    if ($is_detail_page) {wp_enqueue_script('geodirectory-jquery-flexslider-js'); }
82 82
83 
-    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);
83 
+    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url().'/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION, true);
84 84 
     wp_enqueue_script('geodirectory-lightbox-jquery');
85 85
86 
-    wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);
86 
+    wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url().'/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION, true);
87 87 
     if ($is_detail_page) {
88 88 
         wp_enqueue_script('geodirectory-jquery-simplemodal');
89 89 
     }
90 90
91 91 
     if (in_array($geodir_map_name, array('auto', 'google'))) {
92 
-        $map_lang = "&language=" . geodir_get_map_default_language();
93 
-        $map_key = "&key=" . geodir_get_map_api_key();
92 
+        $map_lang = "&language=".geodir_get_map_default_language();
93 
+        $map_key = "&key=".geodir_get_map_api_key();
94 94 
         /**
95 95 
          * Filter the variables that are added to the end of the google maps script call.
96 96 
          *

@@ -100,48 +100,48 @@  discard block
 
 block discarded – undo
100 100 
          * @param string $var The string to filter, default is empty string.
101 101 
          */
102 102 
         $map_extra = apply_filters('geodir_googlemap_script_extra', '');
103 
-        wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);
103 
+        wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?'.$map_lang.$map_key.$map_extra, '', NULL);
104 104 
     }
105 105
106 106 
     if ($geodir_map_name == 'osm') {
107 107 
         // Leaflet OpenStreetMap
108 
-        wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
108 
+        wp_register_style('geodirectory-leaflet-style', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
109 109 
         wp_enqueue_style('geodirectory-leaflet-style');
110 110
111 
-        wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
111 
+        wp_register_script('geodirectory-leaflet-script', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
112 112 
         wp_enqueue_script('geodirectory-leaflet-script');
113 113
114 
-        wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array(), GEODIRECTORY_VERSION);
114 
+        wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url().'/geodirectory-assets/leaflet/osm.geocode.js', array(), GEODIRECTORY_VERSION);
115 115 
         wp_enqueue_script('geodirectory-leaflet-geo-script');
116 116
117 117 
         if ($is_detail_page) {
118 
-            wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);
118 
+            wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url().'/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);
119 119 
             wp_enqueue_style('geodirectory-leaflet-routing-style');
120 120
121 
-            wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.js', array(), GEODIRECTORY_VERSION);
121 
+            wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url().'/geodirectory-assets/leaflet/routing/leaflet-routing-machine.js', array(), GEODIRECTORY_VERSION);
122 122 
             wp_enqueue_script('geodirectory-leaflet-routing-script');
123 123 
         }
124 124 
     }
125 
-    wp_enqueue_script( 'jquery-ui-autocomplete' );
125 
+    wp_enqueue_script('jquery-ui-autocomplete');
126 126
127 
-    wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
127 
+    wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);
128 128 
     wp_enqueue_script('geodirectory-goMap-script');
129 129
130 130
131 
-    wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);
131 
+    wp_register_script('chosen', geodir_plugin_url().'/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);
132 132 
     wp_enqueue_script('chosen');
133 133
134 
-    wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);
134 
+    wp_register_script('geodirectory-choose-ajax', geodir_plugin_url().'/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);
135 135 
     wp_enqueue_script('geodirectory-choose-ajax');
136 136
137 
-    wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);
137 
+    wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);
138 138
139 139 
     if (is_page() && geodir_is_page('add-listing')) {
140 140 
         // SCRIPT FOR UPLOAD
141 141 
         wp_enqueue_script('plupload-all');
142 142 
         wp_enqueue_script('jquery-ui-sortable');
143 143
144 
-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);
144 
+        wp_register_script('geodirectory-plupload-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
145 145 
         wp_enqueue_script('geodirectory-plupload-script');
146 146 
         // SCRIPT FOR UPLOAD END
147 147 
 

@@ -188,27 +188,27 @@  discard block
 
 block discarded – undo
188 188
189 189 
         wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
190 190
191 
-        wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');
191 
+        wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url().'/geodirectory-assets/js/listing_validation.min.js#asyncload');
192 192 
     } // End if for add place page
193 193
194 
-    wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
194 
+    wp_register_script('geodirectory-post-custom-js', geodir_plugin_url().'/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
195 195 
     if ($is_detail_page) {
196 196 
 		wp_enqueue_script('geodirectory-post-custom-js');
197 197 
 	}
198 198
199 199 
     // font awesome rating script
200 200 
 	if (get_option('geodir_reviewrating_enable_font_awesome')) {
201 
-		wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);
201 
+		wp_register_script('geodir-barrating-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);
202 202 
 		wp_enqueue_script('geodir-barrating-js');
203 203 
 	} else { // default rating script
204 
-		wp_register_script('geodir-jRating-js', geodir_plugin_url() . '/geodirectory-assets/js/jRating.jquery.min.js', array(), GEODIRECTORY_VERSION, true);
204 
+		wp_register_script('geodir-jRating-js', geodir_plugin_url().'/geodirectory-assets/js/jRating.jquery.min.js', array(), GEODIRECTORY_VERSION, true);
205 205 
 		wp_enqueue_script('geodir-jRating-js');
206 206 
 	}
207 207
208 
-    wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
208 
+    wp_register_script('geodir-on-document-load', geodir_plugin_url().'/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
209 209 
     wp_enqueue_script('geodir-on-document-load');
210 210
211 
-    wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
211 
+    wp_register_script('google-geometa', geodir_plugin_url().'/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
212 212 
     wp_enqueue_script('google-geometa');
213 213 
 }
214 214 
 

@@ -223,7 +223,7 @@  discard block
 
 block discarded – undo
223 223 
  */
224 224 
 function geodir_header_scripts()
225 225 
 {
226 
-    echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';
226 
+    echo '<style>'.stripslashes(get_option('geodir_coustem_css')).'</style>';
227 227 
     echo stripslashes(get_option('geodir_header_scripts'));
228 228 
 }
229 229 
 

@@ -240,7 +240,7 @@  discard block
 
 block discarded – undo
240 240 
 function geodir_footer_scripts()
241 241 
 {
242 242
243 
-    if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>
243 
+    if (get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')) {?>
244 244
245 245 
         <script>
246 246 
             (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

@@ -248,13 +248,13 @@  discard block
 
 block discarded – undo
248 248 
                 m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
249 249 
             })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
250 250
251 
-            ga('create', '<?php echo esc_attr(get_option('geodir_ga_account_id'));?>', 'auto');
251 
+            ga('create', '<?php echo esc_attr(get_option('geodir_ga_account_id')); ?>', 'auto');
252 252 
             ga('send', 'pageview');
253 253
254 254 
         </script>
255 255
256 256 
 <?php
257 
-    }elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
257 
+    }elseif (get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')) {
258 258 
         echo stripslashes(get_option('geodir_ga_tracking_code'));
259 259 
     }
260 260 
 

@@ -265,7 +265,7 @@  discard block
 
 block discarded – undo
265 265 
      *
266 266 
      * Flexbox wont wrap on ios for search form items
267 267 
      */
268 
-    if (preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {
268 
+    if (preg_match('/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'])) {
269 269 
         echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";
270 270 
     }
271 271 
 }

@@ -281,7 +281,7 @@  discard block
 
 block discarded – undo
281 281 
  */
282 282 
 function geodir_add_async_forscript($url)
283 283 
 {
284 
-    if (strpos($url, '#asyncload')===false)
284 
+    if (strpos($url, '#asyncload') === false)
285 285 
         return $url;
286 286 
     else if (is_admin())
287 287 
         return str_replace('#asyncload', '', $url);

@@ -299,12 +299,12 @@  discard block
 
 block discarded – undo
299 299 
 function geodir_templates_styles()
300 300 
 {
301 301
302 
-    wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);
302 
+    wp_register_style('geodir-core-scss', geodir_plugin_url().'/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);
303 303 
     wp_enqueue_style('geodir-core-scss');
304 
-    wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);
304 
+    wp_register_style('geodir-core-scss-footer', geodir_plugin_url().'/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);
305 305
306 
-    if(is_rtl()){
307 
-    wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);
306 
+    if (is_rtl()) {
307 
+    wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url().'/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);
308 308 
     wp_enqueue_style('geodirectory-frontend-rtl-style');
309 309 
     }
310 310 
 

@@ -378,18 +378,18 @@  discard block
 
 block discarded – undo
378 378 
                 $term_id = get_queried_object_id();
379 379 
                 $taxonomy = get_query_var('taxonomy');
380 380
381 
-                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {
382 
-                    $term = get_term($term_id, $post_type . 'category');
381 
+                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type.'category') {
382 
+                    $term = get_term($term_id, $post_type.'category');
383 383 
                 }
384 384 
             }
385 385
386 
-            if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {
387 
-                $taxonomy_search = $_REQUEST['s' . $post_type . 'category'];
386 
+            if (geodir_is_page('search') && !empty($_REQUEST['s'.$post_type.'category'])) {
387 
+                $taxonomy_search = $_REQUEST['s'.$post_type.'category'];
388 388
389 389 
                 if (!is_array($taxonomy_search)) {
390 
-                    $term = get_term((int)$taxonomy_search, $post_type . 'category');
391 
-                } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
392 
-                    $term = get_term((int)$taxonomy_search[0], $post_type . 'category');
390 
+                    $term = get_term((int) $taxonomy_search, $post_type.'category');
391 
+                } else if (is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
392 
+                    $term = get_term((int) $taxonomy_search[0], $post_type.'category');
393 393 
                 }
394 394 
             }
395 395 
             

@@ -401,7 +401,7 @@  discard block
 
 block discarded – undo
401 401 
         if ($max_page > 1 || $always_show) {
402 402 
             // Extra pagination info
403 403 
             $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
404 
-            $start_no = ( $paged - 1 ) * $posts_per_page + 1;
404 
+            $start_no = ($paged - 1) * $posts_per_page + 1;
405 405 
             $end_no = min($paged * $posts_per_page, $numposts);
406 406
407 407 
             if ($geodir_pagination_more_info != '') {

@@ -411,7 +411,7 @@  discard block
 
 block discarded – undo
411 411 
                 } else {
412 412 
                     $pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);
413 413 
                 }
414 
-                $pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>';
414 
+                $pagination_info = '<div class="gd-pagination-details">'.$pegination_desc.'</div>';
415 415 
                 /**
416 416 
                  * Adds an extra pagination info above/under pagination.
417 417 
                  *

@@ -427,15 +427,15 @@  discard block
 
 block discarded – undo
427 427 
                 $pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);
428 428
429 429 
                 if ($geodir_pagination_more_info == 'before') {
430 
-                    $before = $before . $pagination_info;
430 
+                    $before = $before.$pagination_info;
431 431 
                 } else if ($geodir_pagination_more_info == 'after') {
432 
-                    $after = $pagination_info . $after;
432 
+                    $after = $pagination_info.$after;
433 433 
                 }
434 434 
             }
435 435
436 436 
             echo "$before <div class='Navi gd-navi'>";
437 437 
             if ($paged >= ($pages_to_show - 1)) {
438 
-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';
438 
+                echo '<a href="'.str_replace('&paged', '&amp;paged', get_pagenum_link()).'">&laquo;</a>';
439 439 
             }
440 440 
             previous_posts_link($prelabel);
441 441 
             for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {

@@ -443,13 +443,13 @@  discard block
 
 block discarded – undo
443 443 
                     if ($i == $paged) {
444 444 
                         echo "<strong class='on'>$i</strong>";
445 445 
                     } else {
446 
-                        echo ' <a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($i)) . '">' . $i . '</a> ';
446 
+                        echo ' <a href="'.str_replace('&paged', '&amp;paged', get_pagenum_link($i)).'">'.$i.'</a> ';
447 447 
                     }
448 448 
                 }
449 449 
             }
450 450 
             next_posts_link($nxtlabel, $max_page);
451 451 
             if (($paged + $half_pages_to_show) < ($max_page)) {
452 
-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)) . '">&raquo;</a>';
452 
+                echo '<a href="'.str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)).'">&raquo;</a>';
453 453 
             }
454 454 
             echo "</div> $after";
455 455 
         }

@@ -487,7 +487,7 @@  discard block
 
 block discarded – undo
487 487 
         jQuery(function ($) {
488 488 
             $("#distance_slider").slider({
489 489 
                 range: true,
490 
-                values: [0, <?php echo ($_REQUEST['sdist']!='') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>],
490 
+                values: [0, <?php echo ($_REQUEST['sdist'] != '') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>],
491 491 
                 min: 0,
492 492 
                 max: <?php echo $dist; ?>,
493 493 
                 step: <?php echo $dist_dif; ?>,

@@ -552,7 +552,7 @@  discard block
 
 block discarded – undo
552 552
553 553
554 554 
     <script type="text/javascript">
555 
-        var default_location = '<?php if($search_location = geodir_get_default_location())  echo $search_location->city ;?>';
555 
+        var default_location = '<?php if ($search_location = geodir_get_default_location())  echo $search_location->city; ?>';
556 556 
         var latlng;
557 557 
         var address;
558 558 
         var dist = 0;

@@ -568,7 +568,7 @@  discard block
 
 block discarded – undo
568 568 
 				var $form = jQuery(this).closest('form');
569 569
570 570 
 				if (jQuery("#sdist input[type='radio']:checked").length != 0) dist = jQuery("#sdist input[type='radio']:checked").val();
571 
-				if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text;?>') jQuery('.search_text', $form).val(s);
571 
+				if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text; ?>') jQuery('.search_text', $form).val(s);
572 572
573 573 
 				// Disable location based search for disabled location post type.
574 574 
 				if (jQuery('.search_by_post', $form).val() != '' && typeof gd_cpt_no_location == 'function') {

@@ -582,7 +582,7 @@  discard block
 
 block discarded – undo
582 582 
 					}
583 583 
 				}
584 584
585 
-				if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text;?>')) {
585 
+				if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text; ?>')) {
586 586 
 					geodir_setsearch($form);
587 587 
 				} else {
588 588 
 					jQuery(".snear", $form).val('');

@@ -600,7 +600,7 @@  discard block
 
 block discarded – undo
600 600 
         });
601 601
602 602 
 		function geodir_setsearch($form) {
603 
-			if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text;?>')) jQuery(".snear", $form).val(default_location);
603 
+			if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text; ?>')) jQuery(".snear", $form).val(default_location);
604 604 
 			geocodeAddress($form);
605 605 
 		}
606 606 
 

@@ -619,15 +619,15 @@  discard block
 
 block discarded – undo
619 619 
             // Call the geocode function
620 620 
             Sgeocoder = window.gdMaps == 'google' ? new google.maps.Geocoder() : null;
621 621
622 
-            if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != ''  ) || jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {
623 
-                if (jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {
622 
+            if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != ''  ) || jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {
623 
+                if (jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {
624 624 
                     jQuery(".snear", $form).val('');
625 625 
                 }
626 626 
                 jQuery($form).submit();
627 627 
             } else {
628 628 
                 var address = jQuery(".snear", $form).val();
629 629
630 
-                if (jQuery('.snear', $form).val() == '<?php echo $default_near_text;?>') {
630 
+                if (jQuery('.snear', $form).val() == '<?php echo $default_near_text; ?>') {
631 631 
                     initialise2();
632 632 
                 } else {
633 633 
                     <?php

@@ -640,12 +640,12 @@  discard block
 
 block discarded – undo
640 640 
                     $near_add2 = apply_filters('geodir_search_near_addition', '');
641 641 
                     ?>
642 642 
                     if (window.gdMaps === 'google') {
643 
-                        Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", ' . $near_add . '"' : '') . $near_add2;?>},
643 
+                        Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", '.$near_add.'"' : '').$near_add2; ?>},
644 644 
                             function (results, status) {
645 645 
                                 if (status == google.maps.GeocoderStatus.OK) {
646 646 
                                     updateSearchPosition(results[0].geometry.location, $form);
647 647 
                                 } else {
648 
-                                    alert("<?php esc_attr_e('Search was not successful for the following reason :', 'geodirectory');?>" + status);
648 
+                                    alert("<?php esc_attr_e('Search was not successful for the following reason :', 'geodirectory'); ?>" + status);
649 649 
                                 }
650 650 
                             });
651 651 
                     } else if (window.gdMaps === 'osm') {

@@ -654,7 +654,7 @@  discard block
 
 block discarded – undo
654 654 
                                 if (typeof geo !== 'undefined' && geo.lat && geo.lon) {
655 655 
                                     updateSearchPosition(geo, $form);
656 656 
                                 } else {
657 
-                                    alert("<?php esc_attr_e('Search was not successful for the requested address.', 'geodirectory');?>");
657 
+                                    alert("<?php esc_attr_e('Search was not successful for the requested address.', 'geodirectory'); ?>");
658 658 
                                 }
659 659 
                             });
660 660 
                     } else {

@@ -700,19 +700,19 @@  discard block
 
 block discarded – undo
700 700 
             var msg;
701 701 
             switch (err.code) {
702 702 
                 case err.UNKNOWN_ERROR:
703 
-                    msg = "<?php _e('Unable to find your location','geodirectory');?>";
703 
+                    msg = "<?php _e('Unable to find your location', 'geodirectory'); ?>";
704 704 
                     break;
705 705 
                 case err.PERMISSION_DENINED:
706 
-                    msg = "<?php _e('Permission denied in finding your location','geodirectory');?>";
706 
+                    msg = "<?php _e('Permission denied in finding your location', 'geodirectory'); ?>";
707 707 
                     break;
708 708 
                 case err.POSITION_UNAVAILABLE:
709 
-                    msg = "<?php _e('Your location is currently unknown','geodirectory');?>";
709 
+                    msg = "<?php _e('Your location is currently unknown', 'geodirectory'); ?>";
710 710 
                     break;
711 711 
                 case err.BREAK:
712 
-                    msg = "<?php _e('Attempt to find location took too long','geodirectory');?>";
712 
+                    msg = "<?php _e('Attempt to find location took too long', 'geodirectory'); ?>";
713 713 
                     break;
714 714 
                 default:
715 
-                    msg = "<?php _e('Location detection not supported in browser','geodirectory');?>";
715 
+                    msg = "<?php _e('Location detection not supported in browser', 'geodirectory'); ?>";
716 716 
             }
717 717 
             jQuery('#info').html(msg);
718 718 
         }

@@ -751,7 +751,7 @@  discard block
 
 block discarded – undo
751 751 
              * @param object $post The post object.
752 752 
              * @param string $link The link to the post.
753 753 
              */
754 
-            $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>',$post,$link);
754 
+            $return = apply_filters('geodir_featured_badge_on_image', '<a href="'.$link.'"><span class="geodir_featured_img">&nbsp;</span></a>', $post, $link);
755 755 
             break;
756 756 
         case 'new' :
757 757 
             /**

@@ -761,7 +761,7 @@  discard block
 
 block discarded – undo
761 761 
              * @param object $post The post object.
762 762 
              * @param string $link The link to the post.
763 763 
              */
764 
-            $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>',$post,$link);
764 
+            $return = apply_filters('geodir_new_badge_on_image', '<a href="'.$link.'"><span class="geodir_new_listing">&nbsp;</span></a>', $post, $link);
765 765 
             break;
766 766
767 767 
     }
Please login to merge, or discard this patch.
Braces   +38 added lines, -20 removed lines patch added patch discarded remove patch 
@@ -254,7 +254,7 @@  discard block
 
 block discarded – undo
254 254 
         </script>
255 255
256 256 
 <?php
257 
-    }elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
257 
+    } elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
258 258 
         echo stripslashes(get_option('geodir_ga_tracking_code'));
259 259 
     }
260 260 
 

@@ -281,13 +281,14 @@  discard block
 
 block discarded – undo
281 281 
  */
282 282 
 function geodir_add_async_forscript($url)
283 283 
 {
284 
-    if (strpos($url, '#asyncload')===false)
285 
-        return $url;
286 
-    else if (is_admin())
287 
-        return str_replace('#asyncload', '', $url);
288 
-    else
289 
-        return str_replace('#asyncload', '', $url)."' async='async";
290 
-}
284 
+    if (strpos($url, '#asyncload')===false) {
285 
+            return $url;
286 
+    } else if (is_admin()) {
287 
+            return str_replace('#asyncload', '', $url);
288 
+    } else {
289 
+            return str_replace('#asyncload', '', $url)."' async='async";
290 
+    }
291 
+    }
291 292 
 add_filter('clean_url', 'geodir_add_async_forscript', 11, 1);
292 293
293 294 
 /**

@@ -354,8 +355,10 @@  discard block
 
 block discarded – undo
354 355
355 356 
     $half_pages_to_show = round($pages_to_show / 2);
356 357
357 
-    if (geodir_is_page('home')) // dont apply default  pagination for geodirectory home page.
358 
-        return;
358 
+    if (geodir_is_page('home')) {
359 
+    	// dont apply default  pagination for geodirectory home page.
360 
+        return;
361 
+    }
359 362
360 363 
     if (!is_single()) {
361 364 
         if (function_exists('geodir_location_geo_home_link')) {

@@ -475,11 +478,21 @@  discard block
 
 block discarded – undo
475 478 
     }
476 479 
     $dist_dif = 1000;
477 480
478 
-    if ($dist <= 5000) $dist_dif = 500;
479 
-    if ($dist <= 1000) $dist_dif = 100;
480 
-    if ($dist <= 500) $dist_dif = 50;
481 
-    if ($dist <= 100) $dist_dif = 10;
482 
-    if ($dist <= 50) $dist_dif = 5;
481 
+    if ($dist <= 5000) {
482 
+    	$dist_dif = 500;
483 
+    }
484 
+    if ($dist <= 1000) {
485 
+    	$dist_dif = 100;
486 
+    }
487 
+    if ($dist <= 500) {
488 
+    	$dist_dif = 50;
489 
+    }
490 
+    if ($dist <= 100) {
491 
+    	$dist_dif = 10;
492 
+    }
493 
+    if ($dist <= 50) {
494 
+    	$dist_dif = 5;
495 
+    }
483 496
484 497 
     ?>
485 498 
     <script type="text/javascript">

@@ -541,18 +554,23 @@  discard block
 
 block discarded – undo
541 554 
 {
542 555
543 556 
     $default_search_for_text = SEARCH_FOR_TEXT;
544 
-    if (get_option('geodir_search_field_default_text'))
545 
-        $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
557 
+    if (get_option('geodir_search_field_default_text')) {
558 
+            $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
559 
+    }
546 560
547 561 
     $default_near_text = NEAR_TEXT;
548 
-    if (get_option('geodir_near_field_default_text'))
549 
-        $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
562 
+    if (get_option('geodir_near_field_default_text')) {
563 
+            $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
564 
+    }
550 565
551 566 
     ?>
552 567
553 568
554 569 
     <script type="text/javascript">
555 
-        var default_location = '<?php if($search_location = geodir_get_default_location())  echo $search_location->city ;?>';
570 
+        var default_location = '<?php if($search_location = geodir_get_default_location()) {
571 
+	echo $search_location->city ;
572 
+}
573 
+?>';
556 574 
         var latlng;
557 575 
         var address;
558 576 
         var dist = 0;
Please login to merge, or discard this patch.
geodirectory-admin/dummy-data/recruitment_jobs.php 3 patches
Indentation   +646 added lines, -646 removed lines patch added patch discarded remove patch 
@@ -7,232 +7,232 @@  discard block
 
 block discarded – undo
7 7 
  */
8 8
9 9 
 function geodir_property_sale_custom_fields($post_type='gd_place',$package_id=''){
10 
-    $fields = array();
11 
-    $package = ($package_id=='') ? '' : array($package_id);
12 
-
13 
-    // Salary
14 
-    $fields[] = array('listing_type' => $post_type,
15 
-                      'field_type'          =>  'text',
16 
-                      'data_type'           =>  'FLOAT',
17 
-                      'decimal_point'       =>  '2',
18 
-                      'admin_title'         =>  __('Salary', 'geodirectory'),
19 
-                      'site_title'          =>  __('Salary', 'geodirectory'),
20 
-                      'admin_desc'          =>  __('Enter the Salary in $ (no currency symbol) ie: 25000', 'geodirectory'),
21 
-                      'htmlvar_name'        =>  'salary',
22 
-                      'is_active'           =>  true,
23 
-                      'for_admin_use'       =>  false,
24 
-                      'default_value'       =>  '',
25 
-                      'show_in' 	        =>  '[detail],[listing]',
26 
-                      'is_required'         =>  false,
27 
-                      'validation_pattern'  =>  '\d+(\.\d{2})?',
28 
-                      'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
29 
-                      'required_msg'        =>  '',
30 
-                      'field_icon'          =>  'fa fa-usd',
31 
-                      'css_class'           =>  '',
32 
-                      'cat_sort'            =>  true,
33 
-                      'cat_filter'	        =>  true,
34 
-                      'extra'        =>  array(
35 
-                          'is_price'                  =>  1,
36 
-                          'thousand_separator'        =>  'comma',
37 
-                          'decimal_separator'         =>  'period',
38 
-                          'decimal_display'           =>  'if',
39 
-                          'currency_symbol'           =>  '$',
40 
-                          'currency_symbol_placement' =>  'left'
41 
-                      )
42 
-    );
43 
-
44 
-
45 
-
46 
-    // Job Type
47 
-    $fields[] = array('listing_type' => $post_type,
48 
-                      'field_type'          =>  'select',
49 
-                      'data_type'           =>  'VARCHAR',
50 
-                      'admin_title'         =>  __('Job Type', 'geodirectory'),
51 
-                      'site_title'          =>  __('Job Type','geodirectory'),
52 
-                      'admin_desc'          =>  __('Select the type of job.','geodirectory'),
53 
-                      'htmlvar_name'        =>  'job_type',
54 
-                      'is_active'           =>  true,
55 
-                      'for_admin_use'       =>  false,
56 
-                      'default_value'       =>  '',
57 
-                      'show_in' 	        =>  '[detail],[listing]',
58 
-                      'is_required'         =>  true,
59 
-                      'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
60 
-                      'validation_pattern'  =>  '',
61 
-                      'validation_msg'      =>  '',
62 
-                      'required_msg'        =>  '',
63 
-                      'field_icon'          =>  'fa fa-briefcase',
64 
-                      'css_class'           =>  '',
65 
-                      'cat_sort'            =>  true,
66 
-                      'cat_filter'	        =>  true
67 
-    );
68 
-
69 
-    // Job Sector
70 
-    $fields[] = array('listing_type' => $post_type,
71 
-                      'field_type'          =>  'select',
72 
-                      'data_type'           =>  'VARCHAR',
73 
-                      'admin_title'         =>  __('Job Sector','geodirectory'),
74 
-                      'site_title'          =>  __('Job Sector','geodirectory'),
75 
-                      'admin_desc'          =>  __('Select the job sector.','geodirectory'),
76 
-                      'htmlvar_name'        =>  'job_sector',
77 
-                      'is_active'           =>  true,
78 
-                      'for_admin_use'       =>  false,
79 
-                      'default_value'       =>  '',
80 
-                      'show_in' 	          =>  '[detail]',
81 
-                      'is_required'         =>  true,
82 
-                      'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
83 
-                      'validation_pattern'  =>  '',
84 
-                      'validation_msg'      =>  '',
85 
-                      'required_msg'        =>  '',
86 
-                      'field_icon'          =>  'fa fa-briefcase',
87 
-                      'css_class'           =>  '',
88 
-                      'cat_sort'            =>  true,
89 
-                      'cat_filter'	      =>  true
90 
-    );
91 
-
92 
-    // Required Experience
93 
-    $fields[] = array('listing_type' => $post_type,
94 
-                      'field_type'          =>  'select',
95 
-                      'data_type'           =>  'VARCHAR',
96 
-                      'admin_title'         =>  __('Required Experience', 'geodirectory'),
97 
-                      'site_title'          =>  __('Required Experience', 'geodirectory'),
98 
-                      'admin_desc'          =>  __('Select the number of years required experience', 'geodirectory'),
99 
-                      'htmlvar_name'        =>  'job_experience',
100 
-                      'is_active'           =>  true,
101 
-                      'for_admin_use'       =>  false,
102 
-                      'default_value'       =>  '',
103 
-                      'show_in' 	        =>  '[detail],[listing]',
104 
-                      'is_required'         =>  true,
105 
-                      'option_values'       =>  __('Select Experience/,No Experience Required,1 Year,2 Years,3 Years,4 Years,5 Years,6 Years,7 Years,8 Years,9 Years,10+ Years','geodirectory'),
106 
-                      'validation_pattern'  =>  '',
107 
-                      'validation_msg'      =>  '',
108 
-                      'required_msg'        =>  '',
109 
-                      'field_icon'          =>  'fa fa-life-ring',
110 
-                      'css_class'           =>  '',
111 
-                      'cat_sort'            =>  true,
112 
-                      'cat_filter'	        =>  true
113 
-    );
114 
-
115 
-    // Required Skills
116 
-    $fields[] = array('listing_type' => $post_type,
117 
-                      'field_type'          =>  'textarea',
118 
-                      'data_type'           =>  'TEXT',
119 
-                      'admin_title'         =>  __('Required Skills', 'geodirectory'),
120 
-                      'site_title'          =>  __('Required Skills', 'geodirectory'),
121 
-                      'admin_desc'          =>  __('Enter the required skills for the job', 'geodirectory'),
122 
-                      'htmlvar_name'        =>  'property_area',
123 
-                      'is_active'           =>  true,
124 
-                      'for_admin_use'       =>  false,
125 
-                      'default_value'       =>  '',
126 
-                      'show_in' 	        =>  '[detail],[listing]',
127 
-                      'is_required'         =>  false,
128 
-                      'validation_pattern'  =>  '',
129 
-                      'validation_msg'      =>  '',
130 
-                      'required_msg'        =>  '',
131 
-                      'field_icon'          =>  'fa fa-area-chart',
132 
-                      'css_class'           =>  '',
133 
-                      'cat_sort'            =>  true,
134 
-                      'cat_filter'	        =>  true
135 
-    );
136 
-
137 
-
138 
-
139 
-    // Company details fieldset
140 
-    $fields[] = array('listing_type' => $post_type,
141 
-                      'field_type'          =>  'fieldset',
142 
-                      'data_type'           =>  '',
143 
-                      'admin_title'         =>  __('Company Details', 'geodirectory'),
144 
-                      'site_title'          =>  __('Company Details', 'geodirectory'),
145 
-                      'admin_desc'          =>  __('Enter your company details here', 'geodirectory'),
146 
-                      'htmlvar_name'        =>  'job_company_details',
147 
-                      'is_active'           =>  true,
148 
-                      'for_admin_use'       =>  false,
149 
-                      'show_in' 	        =>  '[owntab]'
150 
-
151 
-    );
152 
-
153 
-    // Company Name
154 
-    $fields[] = array('listing_type' => $post_type,
155 
-                      'field_type'          =>  'text',
156 
-                      'data_type'           =>  'VARCHAR',
157 
-                      'admin_title'         =>  __('Company Name', 'geodirectory'),
158 
-                      'site_title'          =>  __('Company Name', 'geodirectory'),
159 
-                      'admin_desc'          =>  __('Enter your company name', 'geodirectory'),
160 
-                      'htmlvar_name'        =>  'job_company_name',
161 
-                      'is_active'           =>  true,
162 
-                      'for_admin_use'       =>  false,
163 
-                      'default_value'       =>  '',
164 
-                      'show_in' 	        =>  '[owntab]',
165 
-                      'is_required'         =>  false,
166 
-                      'validation_pattern'  =>  '',
167 
-                      'validation_msg'      =>  '',
168 
-                      'required_msg'        =>  '',
169 
-                      'field_icon'          =>  'fa fa-arrow-circle-right',
170 
-                      'css_class'           =>  '',
171 
-                      'cat_sort'            =>  false,
172 
-                      'cat_filter'	        =>  false
173 
-    );
174 
-
175 
-    // Company Logo
176 
-    $fields[] = array('listing_type' => $post_type,
177 
-                      'field_type'          =>  'file',
178 
-                      'data_type'           =>  '',
179 
-                      'admin_title'         =>  __('Company Logo', 'geodirectory'),
180 
-                      'site_title'          =>  __('Company Logo', 'geodirectory'),
181 
-                      'admin_desc'          =>  __('Enter your company Logo', 'geodirectory'),
182 
-                      'htmlvar_name'        =>  'job_company_logo',
183 
-                      'is_active'           =>  true,
184 
-                      'for_admin_use'       =>  false,
185 
-                      'default_value'       =>  '',
186 
-                      'show_in' 	        =>  '[owntab]',
187 
-                      'is_required'         =>  false,
188 
-                      'validation_pattern'  =>  '',
189 
-                      'validation_msg'      =>  '',
190 
-                      'required_msg'        =>  '',
191 
-                      'field_icon'          =>  'fa fa-arrow-circle-right',
192 
-                      'css_class'           =>  '',
193 
-                      'cat_sort'            =>  false,
194 
-                      'cat_filter'	        =>  false,
195 
-                      'extra'               =>  array(
196 
-                          'gd_file_types'   =>  'jpg',
197 
-                          'gd_file_types'   =>  'jpeg',
198 
-                          'gd_file_types'   =>  'gif',
199 
-                          'gd_file_types'   =>  'png',
200 
-                      )
201 
-    );
202 
-
203 
-    // Company Url
204 
-    $fields[] = array('listing_type' => $post_type,
205 
-                      'field_type'          =>  'url',
206 
-                      'data_type'           =>  'VARCHAR',
207 
-                      'admin_title'         =>  __('Company Url', 'geodirectory'),
208 
-                      'site_title'          =>  __('Company Url', 'geodirectory'),
209 
-                      'admin_desc'          =>  __('Enter your company Url', 'geodirectory'),
210 
-                      'htmlvar_name'        =>  'job_company_url',
211 
-                      'is_active'           =>  true,
212 
-                      'for_admin_use'       =>  false,
213 
-                      'default_value'       =>  '',
214 
-                      'show_in' 	        =>  '[owntab]',
215 
-                      'is_required'         =>  false,
216 
-                      'validation_pattern'  =>  '',
217 
-                      'validation_msg'      =>  '',
218 
-                      'required_msg'        =>  '',
219 
-                      'field_icon'          =>  'fa fa-arrow-circle-right',
220 
-                      'css_class'           =>  '',
221 
-                      'cat_sort'            =>  false,
222 
-                      'cat_filter'	        =>  false
223 
-    );
224 
-
225 
-
226 
-
227 
-    /**
228 
-     * Filter the array of default custom fields DB table data.
229 
-     *
230 
-     * @since 1.6.6
231 
-     * @param string $fields The default custom fields as an array.
232 
-     */
233 
-    $fields = apply_filters('geodir_property_sale_custom_fields', $fields);
234 
-
235 
-    return  $fields;
10 
+	$fields = array();
11 
+	$package = ($package_id=='') ? '' : array($package_id);
12 
+
13 
+	// Salary
14 
+	$fields[] = array('listing_type' => $post_type,
15 
+					  'field_type'          =>  'text',
16 
+					  'data_type'           =>  'FLOAT',
17 
+					  'decimal_point'       =>  '2',
18 
+					  'admin_title'         =>  __('Salary', 'geodirectory'),
19 
+					  'site_title'          =>  __('Salary', 'geodirectory'),
20 
+					  'admin_desc'          =>  __('Enter the Salary in $ (no currency symbol) ie: 25000', 'geodirectory'),
21 
+					  'htmlvar_name'        =>  'salary',
22 
+					  'is_active'           =>  true,
23 
+					  'for_admin_use'       =>  false,
24 
+					  'default_value'       =>  '',
25 
+					  'show_in' 	        =>  '[detail],[listing]',
26 
+					  'is_required'         =>  false,
27 
+					  'validation_pattern'  =>  '\d+(\.\d{2})?',
28 
+					  'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
29 
+					  'required_msg'        =>  '',
30 
+					  'field_icon'          =>  'fa fa-usd',
31 
+					  'css_class'           =>  '',
32 
+					  'cat_sort'            =>  true,
33 
+					  'cat_filter'	        =>  true,
34 
+					  'extra'        =>  array(
35 
+						  'is_price'                  =>  1,
36 
+						  'thousand_separator'        =>  'comma',
37 
+						  'decimal_separator'         =>  'period',
38 
+						  'decimal_display'           =>  'if',
39 
+						  'currency_symbol'           =>  '$',
40 
+						  'currency_symbol_placement' =>  'left'
41 
+					  )
42 
+	);
43 
+
44 
+
45 
+
46 
+	// Job Type
47 
+	$fields[] = array('listing_type' => $post_type,
48 
+					  'field_type'          =>  'select',
49 
+					  'data_type'           =>  'VARCHAR',
50 
+					  'admin_title'         =>  __('Job Type', 'geodirectory'),
51 
+					  'site_title'          =>  __('Job Type','geodirectory'),
52 
+					  'admin_desc'          =>  __('Select the type of job.','geodirectory'),
53 
+					  'htmlvar_name'        =>  'job_type',
54 
+					  'is_active'           =>  true,
55 
+					  'for_admin_use'       =>  false,
56 
+					  'default_value'       =>  '',
57 
+					  'show_in' 	        =>  '[detail],[listing]',
58 
+					  'is_required'         =>  true,
59 
+					  'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
60 
+					  'validation_pattern'  =>  '',
61 
+					  'validation_msg'      =>  '',
62 
+					  'required_msg'        =>  '',
63 
+					  'field_icon'          =>  'fa fa-briefcase',
64 
+					  'css_class'           =>  '',
65 
+					  'cat_sort'            =>  true,
66 
+					  'cat_filter'	        =>  true
67 
+	);
68 
+
69 
+	// Job Sector
70 
+	$fields[] = array('listing_type' => $post_type,
71 
+					  'field_type'          =>  'select',
72 
+					  'data_type'           =>  'VARCHAR',
73 
+					  'admin_title'         =>  __('Job Sector','geodirectory'),
74 
+					  'site_title'          =>  __('Job Sector','geodirectory'),
75 
+					  'admin_desc'          =>  __('Select the job sector.','geodirectory'),
76 
+					  'htmlvar_name'        =>  'job_sector',
77 
+					  'is_active'           =>  true,
78 
+					  'for_admin_use'       =>  false,
79 
+					  'default_value'       =>  '',
80 
+					  'show_in' 	          =>  '[detail]',
81 
+					  'is_required'         =>  true,
82 
+					  'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
83 
+					  'validation_pattern'  =>  '',
84 
+					  'validation_msg'      =>  '',
85 
+					  'required_msg'        =>  '',
86 
+					  'field_icon'          =>  'fa fa-briefcase',
87 
+					  'css_class'           =>  '',
88 
+					  'cat_sort'            =>  true,
89 
+					  'cat_filter'	      =>  true
90 
+	);
91 
+
92 
+	// Required Experience
93 
+	$fields[] = array('listing_type' => $post_type,
94 
+					  'field_type'          =>  'select',
95 
+					  'data_type'           =>  'VARCHAR',
96 
+					  'admin_title'         =>  __('Required Experience', 'geodirectory'),
97 
+					  'site_title'          =>  __('Required Experience', 'geodirectory'),
98 
+					  'admin_desc'          =>  __('Select the number of years required experience', 'geodirectory'),
99 
+					  'htmlvar_name'        =>  'job_experience',
100 
+					  'is_active'           =>  true,
101 
+					  'for_admin_use'       =>  false,
102 
+					  'default_value'       =>  '',
103 
+					  'show_in' 	        =>  '[detail],[listing]',
104 
+					  'is_required'         =>  true,
105 
+					  'option_values'       =>  __('Select Experience/,No Experience Required,1 Year,2 Years,3 Years,4 Years,5 Years,6 Years,7 Years,8 Years,9 Years,10+ Years','geodirectory'),
106 
+					  'validation_pattern'  =>  '',
107 
+					  'validation_msg'      =>  '',
108 
+					  'required_msg'        =>  '',
109 
+					  'field_icon'          =>  'fa fa-life-ring',
110 
+					  'css_class'           =>  '',
111 
+					  'cat_sort'            =>  true,
112 
+					  'cat_filter'	        =>  true
113 
+	);
114 
+
115 
+	// Required Skills
116 
+	$fields[] = array('listing_type' => $post_type,
117 
+					  'field_type'          =>  'textarea',
118 
+					  'data_type'           =>  'TEXT',
119 
+					  'admin_title'         =>  __('Required Skills', 'geodirectory'),
120 
+					  'site_title'          =>  __('Required Skills', 'geodirectory'),
121 
+					  'admin_desc'          =>  __('Enter the required skills for the job', 'geodirectory'),
122 
+					  'htmlvar_name'        =>  'property_area',
123 
+					  'is_active'           =>  true,
124 
+					  'for_admin_use'       =>  false,
125 
+					  'default_value'       =>  '',
126 
+					  'show_in' 	        =>  '[detail],[listing]',
127 
+					  'is_required'         =>  false,
128 
+					  'validation_pattern'  =>  '',
129 
+					  'validation_msg'      =>  '',
130 
+					  'required_msg'        =>  '',
131 
+					  'field_icon'          =>  'fa fa-area-chart',
132 
+					  'css_class'           =>  '',
133 
+					  'cat_sort'            =>  true,
134 
+					  'cat_filter'	        =>  true
135 
+	);
136 
+
137 
+
138 
+
139 
+	// Company details fieldset
140 
+	$fields[] = array('listing_type' => $post_type,
141 
+					  'field_type'          =>  'fieldset',
142 
+					  'data_type'           =>  '',
143 
+					  'admin_title'         =>  __('Company Details', 'geodirectory'),
144 
+					  'site_title'          =>  __('Company Details', 'geodirectory'),
145 
+					  'admin_desc'          =>  __('Enter your company details here', 'geodirectory'),
146 
+					  'htmlvar_name'        =>  'job_company_details',
147 
+					  'is_active'           =>  true,
148 
+					  'for_admin_use'       =>  false,
149 
+					  'show_in' 	        =>  '[owntab]'
150 
+
151 
+	);
152 
+
153 
+	// Company Name
154 
+	$fields[] = array('listing_type' => $post_type,
155 
+					  'field_type'          =>  'text',
156 
+					  'data_type'           =>  'VARCHAR',
157 
+					  'admin_title'         =>  __('Company Name', 'geodirectory'),
158 
+					  'site_title'          =>  __('Company Name', 'geodirectory'),
159 
+					  'admin_desc'          =>  __('Enter your company name', 'geodirectory'),
160 
+					  'htmlvar_name'        =>  'job_company_name',
161 
+					  'is_active'           =>  true,
162 
+					  'for_admin_use'       =>  false,
163 
+					  'default_value'       =>  '',
164 
+					  'show_in' 	        =>  '[owntab]',
165 
+					  'is_required'         =>  false,
166 
+					  'validation_pattern'  =>  '',
167 
+					  'validation_msg'      =>  '',
168 
+					  'required_msg'        =>  '',
169 
+					  'field_icon'          =>  'fa fa-arrow-circle-right',
170 
+					  'css_class'           =>  '',
171 
+					  'cat_sort'            =>  false,
172 
+					  'cat_filter'	        =>  false
173 
+	);
174 
+
175 
+	// Company Logo
176 
+	$fields[] = array('listing_type' => $post_type,
177 
+					  'field_type'          =>  'file',
178 
+					  'data_type'           =>  '',
179 
+					  'admin_title'         =>  __('Company Logo', 'geodirectory'),
180 
+					  'site_title'          =>  __('Company Logo', 'geodirectory'),
181 
+					  'admin_desc'          =>  __('Enter your company Logo', 'geodirectory'),
182 
+					  'htmlvar_name'        =>  'job_company_logo',
183 
+					  'is_active'           =>  true,
184 
+					  'for_admin_use'       =>  false,
185 
+					  'default_value'       =>  '',
186 
+					  'show_in' 	        =>  '[owntab]',
187 
+					  'is_required'         =>  false,
188 
+					  'validation_pattern'  =>  '',
189 
+					  'validation_msg'      =>  '',
190 
+					  'required_msg'        =>  '',
191 
+					  'field_icon'          =>  'fa fa-arrow-circle-right',
192 
+					  'css_class'           =>  '',
193 
+					  'cat_sort'            =>  false,
194 
+					  'cat_filter'	        =>  false,
195 
+					  'extra'               =>  array(
196 
+						  'gd_file_types'   =>  'jpg',
197 
+						  'gd_file_types'   =>  'jpeg',
198 
+						  'gd_file_types'   =>  'gif',
199 
+						  'gd_file_types'   =>  'png',
200 
+					  )
201 
+	);
202 
+
203 
+	// Company Url
204 
+	$fields[] = array('listing_type' => $post_type,
205 
+					  'field_type'          =>  'url',
206 
+					  'data_type'           =>  'VARCHAR',
207 
+					  'admin_title'         =>  __('Company Url', 'geodirectory'),
208 
+					  'site_title'          =>  __('Company Url', 'geodirectory'),
209 
+					  'admin_desc'          =>  __('Enter your company Url', 'geodirectory'),
210 
+					  'htmlvar_name'        =>  'job_company_url',
211 
+					  'is_active'           =>  true,
212 
+					  'for_admin_use'       =>  false,
213 
+					  'default_value'       =>  '',
214 
+					  'show_in' 	        =>  '[owntab]',
215 
+					  'is_required'         =>  false,
216 
+					  'validation_pattern'  =>  '',
217 
+					  'validation_msg'      =>  '',
218 
+					  'required_msg'        =>  '',
219 
+					  'field_icon'          =>  'fa fa-arrow-circle-right',
220 
+					  'css_class'           =>  '',
221 
+					  'cat_sort'            =>  false,
222 
+					  'cat_filter'	        =>  false
223 
+	);
224 
+
225 
+
226 
+
227 
+	/**
228 
+	 * Filter the array of default custom fields DB table data.
229 
+	 *
230 
+	 * @since 1.6.6
231 
+	 * @param string $fields The default custom fields as an array.
232 
+	 */
233 
+	$fields = apply_filters('geodir_property_sale_custom_fields', $fields);
234 
+
235 
+	return  $fields;
236 236 
 }
237 237
238 238 
 global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2,$wpdb, $current_user,$dummy_post_index;
 
@@ -242,36 +242,36 @@  discard block
 
 block discarded – undo
242 242 
 $category_array = array('Apartments', 'Houses', 'Commercial', 'Land');
243 243
244 244 
 if($dummy_post_index==1){
245 
-    // add the dummy categories
246 
-    geodir_dummy_data_taxonomies($post_type,$category_array );
245 
+	// add the dummy categories
246 
+	geodir_dummy_data_taxonomies($post_type,$category_array );
247 247
248 
-    // add the dummy custom fields
249 
-    $fields = geodir_property_sale_custom_fields($post_type);
250 
-    geodir_create_dummy_fields($fields);
251 
-    update_option($post_type.'_dummy_data_type','property_sale');
248 
+	// add the dummy custom fields
249 
+	$fields = geodir_property_sale_custom_fields($post_type);
250 
+	geodir_create_dummy_fields($fields);
251 
+	update_option($post_type.'_dummy_data_type','property_sale');
252 252 
 }
253 253
254 254 
 if (geodir_dummy_folder_exists())
255 
-    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
255 
+	$dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
256 256 
 else
257 
-    $dummy_image_url = 'http://www.wpgeodirectory.com/dummy';
257 
+	$dummy_image_url = 'http://www.wpgeodirectory.com/dummy';
258 258
259 259 
 $dummy_image_url = apply_filters('place_dummy_image_url', $dummy_image_url);
260 260
261 261 
 switch ($dummy_post_index) {
262 262
263 
-    case(1):
264 
-        $image_array[] = "$dummy_image_url/ps/psf1.jpg";
265 
-        $image_array[] = "$dummy_image_url/ps/psl1.jpg";
266 
-        $image_array[] = "$dummy_image_url/ps/psb1.jpg";
267 
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
268 
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
263 
+	case(1):
264 
+		$image_array[] = "$dummy_image_url/ps/psf1.jpg";
265 
+		$image_array[] = "$dummy_image_url/ps/psl1.jpg";
266 
+		$image_array[] = "$dummy_image_url/ps/psb1.jpg";
267 
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
268 
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
269 269
270 270
271 
-        $post_info[] = array(
272 
-            "listing_type" => $post_type,
273 
-            "post_title" => 'Eastern Lodge',
274 
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec non augue ultrices, vulputate nulla at, consectetur ante. Quisque neque mi, vulputate quis nulla a, sollicitudin fringilla leo. Nam dictum id neque eu imperdiet. Curabitur ligula turpis, malesuada at lobortis commodo, vulputate volutpat arcu. Duis bibendum blandit aliquam. In ipsum diam, tristique ut bibendum vel, lobortis non tellus. Nulla ultricies, ante vitae placerat auctor, nisi quam blandit enim, sit amet aliquam est diam id urna. Suspendisse eget nibh volutpat, malesuada enim sed, egestas massa.
271 
+		$post_info[] = array(
272 
+			"listing_type" => $post_type,
273 
+			"post_title" => 'Eastern Lodge',
274 
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec non augue ultrices, vulputate nulla at, consectetur ante. Quisque neque mi, vulputate quis nulla a, sollicitudin fringilla leo. Nam dictum id neque eu imperdiet. Curabitur ligula turpis, malesuada at lobortis commodo, vulputate volutpat arcu. Duis bibendum blandit aliquam. In ipsum diam, tristique ut bibendum vel, lobortis non tellus. Nulla ultricies, ante vitae placerat auctor, nisi quam blandit enim, sit amet aliquam est diam id urna. Suspendisse eget nibh volutpat, malesuada enim sed, egestas massa.
275 275
276 276 
 Aliquam ut odio ullamcorper, posuere enim sed, venenatis tortor. Donec justo elit, aliquam sed cursus sed, semper eget libero. Mauris consequat lorem sed fringilla tincidunt. Phasellus suscipit velit et elit tristique, ac commodo metus scelerisque. Vivamus finibus ipsum placerat pulvinar aliquet. Maecenas augue orci, blandit at nibh pharetra, condimentum congue ligula. Duis non ante sagittis odio convallis lacinia in quis sapien.
277 277 
 
@@ -280,42 +280,42 @@  discard block
 
 block discarded – undo
280 280 
 Vestibulum tristique quam eget bibendum pulvinar. Mauris sit amet magna ut arcu rutrum pellentesque feugiat et ipsum. Proin porta quam sed risus accumsan pharetra. Nulla quis semper nisl. Nulla facilisi. Nulla facilisi. Pellentesque euismod sollicitudin lacus vel ultricies. Vestibulum ut sem ut nulla ultricies convallis in at mi. Nunc vitae nibh arcu. Maecenas nunc enim, tempus a rhoncus eget, pellentesque ut erat.
281 281
282 282 
 Suspendisse interdum accumsan magna et tempor. Suspendisse scelerisque at lorem sit amet faucibus. Aenean quis consectetur enim. Duis aliquet tristique tempus. Suspendisse id ullamcorper mauris. Aliquam in libero eu justo porttitor pulvinar. Nulla semper placerat lectus. Nulla mollis suscipit lacus, a blandit purus cursus non. Maecenas id tellus mi. Pellentesque sollicitudin nibh eget magna scelerisque consequat. Aliquam convallis orci arcu, et euismod dui cursus et. Donec nec pellentesque nulla, ac pretium massa. In gravida bibendum ornare.',
283 
-            "post_images" => $image_array,
284 
-            "post_category" => array($post_type.'category' => array($category_array[1])),
285 
-            "post_tags" => array('Tags', 'Sample Tags'),
286 
-            "geodir_video" => '',
287 
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
288 
-            "geodir_contact" => '(111) 677-4444',
289 
-            "geodir_email" => '[email protected]',
290 
-            "geodir_website" => 'http://example.com/',
291 
-            "geodir_twitter" => 'http://example.com/',
292 
-            "geodir_facebook" => 'http://example.com/',
293 
-            "geodir_price" => '350000',
294 
-            "geodir_property_status" => 'For Sale',
295 
-            'geodir_property_furnishing' => 'Furnished',
296 
-            'geodir_property_type' => 'Detached house',
297 
-            'geodir_property_bedrooms' => '3',
298 
-            'geodir_property_bathrooms' => '2',
299 
-            'geodir_property_area' => '1850',
300 
-            'geodir_property_features' => 'Gas Central Heating,Triple Glazing,Front Garden,Private driveway,Fireplace',
301 
-            "post_dummy" => '1'
302 
-        );
303 
-
304 
-
305 
-        break;
306 
-    case 2:
307 
-        $image_array = array();
308 
-        $post_meta = array();
309 
-        $image_array[] = "$dummy_image_url/ps/psf2.jpg";
310 
-        $image_array[] = "$dummy_image_url/ps/psl2.jpg";
311 
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
312 
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
313 
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
314 
-
315 
-        $post_info[] = array(
316 
-            "listing_type" => $post_type,
317 
-            "post_title" => 'Daisy Street',
318 
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
283 
+			"post_images" => $image_array,
284 
+			"post_category" => array($post_type.'category' => array($category_array[1])),
285 
+			"post_tags" => array('Tags', 'Sample Tags'),
286 
+			"geodir_video" => '',
287 
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
288 
+			"geodir_contact" => '(111) 677-4444',
289 
+			"geodir_email" => '[email protected]',
290 
+			"geodir_website" => 'http://example.com/',
291 
+			"geodir_twitter" => 'http://example.com/',
292 
+			"geodir_facebook" => 'http://example.com/',
293 
+			"geodir_price" => '350000',
294 
+			"geodir_property_status" => 'For Sale',
295 
+			'geodir_property_furnishing' => 'Furnished',
296 
+			'geodir_property_type' => 'Detached house',
297 
+			'geodir_property_bedrooms' => '3',
298 
+			'geodir_property_bathrooms' => '2',
299 
+			'geodir_property_area' => '1850',
300 
+			'geodir_property_features' => 'Gas Central Heating,Triple Glazing,Front Garden,Private driveway,Fireplace',
301 
+			"post_dummy" => '1'
302 
+		);
303 
+
304 
+
305 
+		break;
306 
+	case 2:
307 
+		$image_array = array();
308 
+		$post_meta = array();
309 
+		$image_array[] = "$dummy_image_url/ps/psf2.jpg";
310 
+		$image_array[] = "$dummy_image_url/ps/psl2.jpg";
311 
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
312 
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
313 
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
314 
+
315 
+		$post_info[] = array(
316 
+			"listing_type" => $post_type,
317 
+			"post_title" => 'Daisy Street',
318 
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
319 319
320 320 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
321 321 
 
@@ -325,42 +325,42 @@  discard block
 
 block discarded – undo
325 325
326 326 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
327 327
328 
-            "post_images" => $image_array,
329 
-            "post_category" => array($post_type.'category' => array($category_array[1])),
330 
-            "post_tags" => array('Garage'),
331 
-            "geodir_video" => '',
332 
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
333 
-            "geodir_contact" => '(222) 777-1111',
334 
-            "geodir_email" => '[email protected]',
335 
-            "geodir_website" => 'http://example.com/',
336 
-            "geodir_twitter" => 'http://example.com/',
337 
-            "geodir_facebook" => 'http://example.com/',
338 
-            "geodir_price" => '230000',
339 
-            "geodir_property_status" => 'Sold',
340 
-            'geodir_property_furnishing' => 'Unfurnished',
341 
-            'geodir_property_type' => 'Detached house',
342 
-            'geodir_property_bedrooms' => '5',
343 
-            'geodir_property_bathrooms' => '3',
344 
-            'geodir_property_area' => '2650',
345 
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Front Garden,Garage,Private driveway,Fireplace',
346 
-            "post_dummy" => '1'
347 
-        );
348 
-
349 
-        break;
350 
-
351 
-    case 3:
352 
-        $image_array = array();
353 
-        $post_meta = array();
354 
-        $image_array[] = "$dummy_image_url/ps/psf3.jpg";
355 
-        $image_array[] = "$dummy_image_url/ps/psl3.jpg";
356 
-        $image_array[] = "$dummy_image_url/ps/psb3.jpg";
357 
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
358 
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
359 
-
360 
-        $post_info[] = array(
361 
-            "listing_type" => $post_type,
362 
-            "post_title" => 'Northbay House',
363 
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
328 
+			"post_images" => $image_array,
329 
+			"post_category" => array($post_type.'category' => array($category_array[1])),
330 
+			"post_tags" => array('Garage'),
331 
+			"geodir_video" => '',
332 
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
333 
+			"geodir_contact" => '(222) 777-1111',
334 
+			"geodir_email" => '[email protected]',
335 
+			"geodir_website" => 'http://example.com/',
336 
+			"geodir_twitter" => 'http://example.com/',
337 
+			"geodir_facebook" => 'http://example.com/',
338 
+			"geodir_price" => '230000',
339 
+			"geodir_property_status" => 'Sold',
340 
+			'geodir_property_furnishing' => 'Unfurnished',
341 
+			'geodir_property_type' => 'Detached house',
342 
+			'geodir_property_bedrooms' => '5',
343 
+			'geodir_property_bathrooms' => '3',
344 
+			'geodir_property_area' => '2650',
345 
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Front Garden,Garage,Private driveway,Fireplace',
346 
+			"post_dummy" => '1'
347 
+		);
348 
+
349 
+		break;
350 
+
351 
+	case 3:
352 
+		$image_array = array();
353 
+		$post_meta = array();
354 
+		$image_array[] = "$dummy_image_url/ps/psf3.jpg";
355 
+		$image_array[] = "$dummy_image_url/ps/psl3.jpg";
356 
+		$image_array[] = "$dummy_image_url/ps/psb3.jpg";
357 
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
358 
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
359 
+
360 
+		$post_info[] = array(
361 
+			"listing_type" => $post_type,
362 
+			"post_title" => 'Northbay House',
363 
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
364 364
365 365 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
366 366 
 
@@ -370,43 +370,43 @@  discard block
 
 block discarded – undo
370 370
371 371 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
372 372
373 
-            "post_images" => $image_array,
374 
-            "post_category" => array($post_type.'category' => array($category_array[1])),
375 
-            "post_tags" => array('Tags', 'Sample Tags'),
376 
-            "geodir_video" => '',
377 
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
378 
-            "geodir_contact" => '(222) 777-1111',
379 
-            "geodir_email" => '[email protected]',
380 
-            "geodir_website" => 'http://example.com/',
381 
-            "geodir_twitter" => 'http://example.com/',
382 
-            "geodir_facebook" => 'http://example.com/',
383 
-            "geodir_price" => '260000',
384 
-            "geodir_property_status" => 'Under Offer',
385 
-            'geodir_property_furnishing' => 'Unfurnished',
386 
-            'geodir_property_type' => 'Detached house',
387 
-            'geodir_property_bedrooms' => '6',
388 
-            'geodir_property_bathrooms' => '6',
389 
-            'geodir_property_area' => '1650',
390 
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Triple Glazing,Off Road Parking,Fireplace',
391 
-            "post_dummy" => '1'
392 
-        );
393 
-
394 
-        break;
395 
-
396 
-
397 
-    case 4:
398 
-        $image_array = array();
399 
-        $post_meta = array();
400 
-        $image_array[] = "$dummy_image_url/ps/psf4.jpg";
401 
-        $image_array[] = "$dummy_image_url/ps/psl4.jpg";
402 
-        $image_array[] = "$dummy_image_url/ps/psb4.jpg";
403 
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
404 
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
405 
-
406 
-        $post_info[] = array(
407 
-            "listing_type" => $post_type,
408 
-            "post_title" => 'Jesmond Mansion',
409 
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
373 
+			"post_images" => $image_array,
374 
+			"post_category" => array($post_type.'category' => array($category_array[1])),
375 
+			"post_tags" => array('Tags', 'Sample Tags'),
376 
+			"geodir_video" => '',
377 
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
378 
+			"geodir_contact" => '(222) 777-1111',
379 
+			"geodir_email" => '[email protected]',
380 
+			"geodir_website" => 'http://example.com/',
381 
+			"geodir_twitter" => 'http://example.com/',
382 
+			"geodir_facebook" => 'http://example.com/',
383 
+			"geodir_price" => '260000',
384 
+			"geodir_property_status" => 'Under Offer',
385 
+			'geodir_property_furnishing' => 'Unfurnished',
386 
+			'geodir_property_type' => 'Detached house',
387 
+			'geodir_property_bedrooms' => '6',
388 
+			'geodir_property_bathrooms' => '6',
389 
+			'geodir_property_area' => '1650',
390 
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Triple Glazing,Off Road Parking,Fireplace',
391 
+			"post_dummy" => '1'
392 
+		);
393 
+
394 
+		break;
395 
+
396 
+
397 
+	case 4:
398 
+		$image_array = array();
399 
+		$post_meta = array();
400 
+		$image_array[] = "$dummy_image_url/ps/psf4.jpg";
401 
+		$image_array[] = "$dummy_image_url/ps/psl4.jpg";
402 
+		$image_array[] = "$dummy_image_url/ps/psb4.jpg";
403 
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
404 
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
405 
+
406 
+		$post_info[] = array(
407 
+			"listing_type" => $post_type,
408 
+			"post_title" => 'Jesmond Mansion',
409 
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
410 410
411 411 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
412 412 
 
@@ -416,42 +416,42 @@  discard block
 
 block discarded – undo
416 416
417 417 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
418 418
419 
-            "post_images" => $image_array,
420 
-            "post_category" => array($post_type.'category' => array($category_array[1])),
421 
-            "post_tags" => array('Tags', 'Sample Tags'),
422 
-            "geodir_video" => '',
423 
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
424 
-            "geodir_contact" => '(222) 777-1111',
425 
-            "geodir_email" => '[email protected]',
426 
-            "geodir_website" => 'http://example.com/',
427 
-            "geodir_twitter" => 'http://example.com/',
428 
-            "geodir_facebook" => 'http://example.com/',
429 
-            "geodir_price" => '2300000',
430 
-            "geodir_property_status" => 'Under Offer',
431 
-            'geodir_property_furnishing' => 'Partially furnished',
432 
-            'geodir_property_type' => 'Detached house',
433 
-            'geodir_property_bedrooms' => '10',
434 
-            'geodir_property_bathrooms' => '7',
435 
-            'geodir_property_area' => '6600',
436 
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden,Garage,Private driveway,Fireplace',
437 
-            "post_dummy" => '1'
438 
-        );
439 
-
440 
-        break;
441 
-
442 
-    case 5:
443 
-        $image_array = array();
444 
-        $post_meta = array();
445 
-        $image_array[] = "$dummy_image_url/ps/psf5.jpg";
446 
-        $image_array[] = "$dummy_image_url/ps/psl5.jpg";
447 
-        $image_array[] = "$dummy_image_url/ps/psb5.jpg";
448 
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
449 
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
450 
-
451 
-        $post_info[] = array(
452 
-            "listing_type" => $post_type,
453 
-            "post_title" => 'Springfield Lodge',
454 
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
419 
+			"post_images" => $image_array,
420 
+			"post_category" => array($post_type.'category' => array($category_array[1])),
421 
+			"post_tags" => array('Tags', 'Sample Tags'),
422 
+			"geodir_video" => '',
423 
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
424 
+			"geodir_contact" => '(222) 777-1111',
425 
+			"geodir_email" => '[email protected]',
426 
+			"geodir_website" => 'http://example.com/',
427 
+			"geodir_twitter" => 'http://example.com/',
428 
+			"geodir_facebook" => 'http://example.com/',
429 
+			"geodir_price" => '2300000',
430 
+			"geodir_property_status" => 'Under Offer',
431 
+			'geodir_property_furnishing' => 'Partially furnished',
432 
+			'geodir_property_type' => 'Detached house',
433 
+			'geodir_property_bedrooms' => '10',
434 
+			'geodir_property_bathrooms' => '7',
435 
+			'geodir_property_area' => '6600',
436 
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden,Garage,Private driveway,Fireplace',
437 
+			"post_dummy" => '1'
438 
+		);
439 
+
440 
+		break;
441 
+
442 
+	case 5:
443 
+		$image_array = array();
444 
+		$post_meta = array();
445 
+		$image_array[] = "$dummy_image_url/ps/psf5.jpg";
446 
+		$image_array[] = "$dummy_image_url/ps/psl5.jpg";
447 
+		$image_array[] = "$dummy_image_url/ps/psb5.jpg";
448 
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
449 
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
450 
+
451 
+		$post_info[] = array(
452 
+			"listing_type" => $post_type,
453 
+			"post_title" => 'Springfield Lodge',
454 
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
455 455
456 456 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
457 457 
 
@@ -461,42 +461,42 @@  discard block
 
 block discarded – undo
461 461
462 462 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
463 463
464 
-            "post_images" => $image_array,
465 
-            "post_category" => array($post_type.'category' => array($category_array[1])),
466 
-            "post_tags" => array('Tags', 'Sample Tags'),
467 
-            "geodir_video" => '',
468 
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
469 
-            "geodir_contact" => '(222) 777-1111',
470 
-            "geodir_email" => '[email protected]',
471 
-            "geodir_website" => 'http://example.com/',
472 
-            "geodir_twitter" => 'http://example.com/',
473 
-            "geodir_facebook" => 'http://example.com/',
474 
-            "geodir_price" => '330000',
475 
-            "geodir_property_status" => 'For Sale',
476 
-            'geodir_property_furnishing' => 'Optional',
477 
-            'geodir_property_type' => 'Detached house',
478 
-            'geodir_property_bedrooms' => '4',
479 
-            'geodir_property_bathrooms' => '3',
480 
-            'geodir_property_area' => '3700',
481 
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden',
482 
-            "post_dummy" => '1'
483 
-        );
484 
-
485 
-        break;
486 
-
487 
-    case 6:
488 
-        $image_array = array();
489 
-        $post_meta = array();
490 
-        $image_array[] = "$dummy_image_url/ps/psf6.jpg";
491 
-        $image_array[] = "$dummy_image_url/ps/psl6.jpg";
492 
-        $image_array[] = "$dummy_image_url/ps/psb5.jpg";
493 
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
494 
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
495 
-
496 
-        $post_info[] = array(
497 
-            "listing_type" => $post_type,
498 
-            "post_title" => 'Forrest Park',
499 
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
464 
+			"post_images" => $image_array,
465 
+			"post_category" => array($post_type.'category' => array($category_array[1])),
466 
+			"post_tags" => array('Tags', 'Sample Tags'),
467 
+			"geodir_video" => '',
468 
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
469 
+			"geodir_contact" => '(222) 777-1111',
470 
+			"geodir_email" => '[email protected]',
471 
+			"geodir_website" => 'http://example.com/',
472 
+			"geodir_twitter" => 'http://example.com/',
473 
+			"geodir_facebook" => 'http://example.com/',
474 
+			"geodir_price" => '330000',
475 
+			"geodir_property_status" => 'For Sale',
476 
+			'geodir_property_furnishing' => 'Optional',
477 
+			'geodir_property_type' => 'Detached house',
478 
+			'geodir_property_bedrooms' => '4',
479 
+			'geodir_property_bathrooms' => '3',
480 
+			'geodir_property_area' => '3700',
481 
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden',
482 
+			"post_dummy" => '1'
483 
+		);
484 
+
485 
+		break;
486 
+
487 
+	case 6:
488 
+		$image_array = array();
489 
+		$post_meta = array();
490 
+		$image_array[] = "$dummy_image_url/ps/psf6.jpg";
491 
+		$image_array[] = "$dummy_image_url/ps/psl6.jpg";
492 
+		$image_array[] = "$dummy_image_url/ps/psb5.jpg";
493 
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
494 
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
495 
+
496 
+		$post_info[] = array(
497 
+			"listing_type" => $post_type,
498 
+			"post_title" => 'Forrest Park',
499 
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
500 500
501 501 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
502 502 
 
@@ -506,42 +506,42 @@  discard block
 
 block discarded – undo
506 506
507 507 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
508 508
509 
-            "post_images" => $image_array,
510 
-            "post_category" => array($post_type.'category' => array($category_array[1])),
511 
-            "post_tags" => array('Tags', 'Sample Tags'),
512 
-            "geodir_video" => '',
513 
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
514 
-            "geodir_contact" => '(222) 777-1111',
515 
-            "geodir_email" => '[email protected]',
516 
-            "geodir_website" => 'http://example.com/',
517 
-            "geodir_twitter" => 'http://example.com/',
518 
-            "geodir_facebook" => 'http://example.com/',
519 
-            "geodir_price" => '530000',
520 
-            "geodir_property_status" => 'For Sale',
521 
-            'geodir_property_furnishing' => 'Unfurnished',
522 
-            'geodir_property_type' => 'Detached house',
523 
-            'geodir_property_bedrooms' => '5',
524 
-            'geodir_property_bathrooms' => '4',
525 
-            'geodir_property_area' => '2250',
526 
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Front Garden,Private driveway',
527 
-            "post_dummy" => '1'
528 
-        );
529 
-
530 
-        break;
531 
-
532 
-    case 7:
533 
-        $image_array = array();
534 
-        $post_meta = array();
535 
-        $image_array[] = "$dummy_image_url/ps/psf7.jpg";
536 
-        $image_array[] = "$dummy_image_url/ps/psl4.jpg";
537 
-        $image_array[] = "$dummy_image_url/ps/psb4.jpg";
538 
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
539 
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
540 
-
541 
-        $post_info[] = array(
542 
-            "listing_type" => $post_type,
543 
-            "post_title" => 'Fraser Suites',
544 
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
509 
+			"post_images" => $image_array,
510 
+			"post_category" => array($post_type.'category' => array($category_array[1])),
511 
+			"post_tags" => array('Tags', 'Sample Tags'),
512 
+			"geodir_video" => '',
513 
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
514 
+			"geodir_contact" => '(222) 777-1111',
515 
+			"geodir_email" => '[email protected]',
516 
+			"geodir_website" => 'http://example.com/',
517 
+			"geodir_twitter" => 'http://example.com/',
518 
+			"geodir_facebook" => 'http://example.com/',
519 
+			"geodir_price" => '530000',
520 
+			"geodir_property_status" => 'For Sale',
521 
+			'geodir_property_furnishing' => 'Unfurnished',
522 
+			'geodir_property_type' => 'Detached house',
523 
+			'geodir_property_bedrooms' => '5',
524 
+			'geodir_property_bathrooms' => '4',
525 
+			'geodir_property_area' => '2250',
526 
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Front Garden,Private driveway',
527 
+			"post_dummy" => '1'
528 
+		);
529 
+
530 
+		break;
531 
+
532 
+	case 7:
533 
+		$image_array = array();
534 
+		$post_meta = array();
535 
+		$image_array[] = "$dummy_image_url/ps/psf7.jpg";
536 
+		$image_array[] = "$dummy_image_url/ps/psl4.jpg";
537 
+		$image_array[] = "$dummy_image_url/ps/psb4.jpg";
538 
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
539 
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
540 
+
541 
+		$post_info[] = array(
542 
+			"listing_type" => $post_type,
543 
+			"post_title" => 'Fraser Suites',
544 
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
545 545
546 546 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
547 547 
 
@@ -551,42 +551,42 @@  discard block
 
 block discarded – undo
551 551
552 552 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
553 553
554 
-            "post_images" => $image_array,
555 
-            "post_category" => array($post_type.'category' => array($category_array[0])),
556 
-            "post_tags" => array('Tags', 'Sample Tags'),
557 
-            "geodir_video" => '',
558 
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
559 
-            "geodir_contact" => '(222) 777-1111',
560 
-            "geodir_email" => '[email protected]',
561 
-            "geodir_website" => 'http://example.com/',
562 
-            "geodir_twitter" => 'http://example.com/',
563 
-            "geodir_facebook" => 'http://example.com/',
564 
-            "geodir_price" => '245000',
565 
-            "geodir_property_status" => 'For Sale',
566 
-            'geodir_property_furnishing' => 'Unfurnished',
567 
-            'geodir_property_type' => 'Apartment',
568 
-            'geodir_property_bedrooms' => '3',
569 
-            'geodir_property_bathrooms' => '2',
570 
-            'geodir_property_area' => '1250',
571 
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing',
572 
-            "post_dummy" => '1'
573 
-        );
574 
-
575 
-        break;
576 
-
577 
-    case 8:
578 
-        $image_array = array();
579 
-        $post_meta = array();
580 
-        $image_array[] = "$dummy_image_url/ps/psf8.jpg";
581 
-        $image_array[] = "$dummy_image_url/ps/psl2.jpg";
582 
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
583 
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
584 
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
585 
-
586 
-        $post_info[] = array(
587 
-            "listing_type" => $post_type,
588 
-            "post_title" => 'Richmore Apartments',
589 
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
554 
+			"post_images" => $image_array,
555 
+			"post_category" => array($post_type.'category' => array($category_array[0])),
556 
+			"post_tags" => array('Tags', 'Sample Tags'),
557 
+			"geodir_video" => '',
558 
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
559 
+			"geodir_contact" => '(222) 777-1111',
560 
+			"geodir_email" => '[email protected]',
561 
+			"geodir_website" => 'http://example.com/',
562 
+			"geodir_twitter" => 'http://example.com/',
563 
+			"geodir_facebook" => 'http://example.com/',
564 
+			"geodir_price" => '245000',
565 
+			"geodir_property_status" => 'For Sale',
566 
+			'geodir_property_furnishing' => 'Unfurnished',
567 
+			'geodir_property_type' => 'Apartment',
568 
+			'geodir_property_bedrooms' => '3',
569 
+			'geodir_property_bathrooms' => '2',
570 
+			'geodir_property_area' => '1250',
571 
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing',
572 
+			"post_dummy" => '1'
573 
+		);
574 
+
575 
+		break;
576 
+
577 
+	case 8:
578 
+		$image_array = array();
579 
+		$post_meta = array();
580 
+		$image_array[] = "$dummy_image_url/ps/psf8.jpg";
581 
+		$image_array[] = "$dummy_image_url/ps/psl2.jpg";
582 
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
583 
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
584 
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
585 
+
586 
+		$post_info[] = array(
587 
+			"listing_type" => $post_type,
588 
+			"post_title" => 'Richmore Apartments',
589 
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
590 590
591 591 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
592 592 
 
@@ -596,43 +596,43 @@  discard block
 
 block discarded – undo
596 596
597 597 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
598 598
599 
-            "post_images" => $image_array,
600 
-            "post_category" => array($post_type.'category' => array($category_array[0])),
601 
-            "post_tags" => array('Tags', 'Sample Tags'),
602 
-            "geodir_video" => '',
603 
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
604 
-            "geodir_contact" => '(222) 777-1111',
605 
-            "geodir_email" => '[email protected]',
606 
-            "geodir_website" => 'http://example.com/',
607 
-            "geodir_twitter" => 'http://example.com/',
608 
-            "geodir_facebook" => 'http://example.com/',
609 
-            "geodir_price" => '395000',
610 
-            "geodir_property_status" => 'For Sale',
611 
-            'geodir_property_furnishing' => 'Unfurnished',
612 
-            'geodir_property_type' => 'Apartment',
613 
-            'geodir_property_bedrooms' => '2',
614 
-            'geodir_property_bathrooms' => '2',
615 
-            'geodir_property_area' => '1750',
616 
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
617 
-            "post_dummy" => '1'
618 
-        );
619 
-
620 
-        break;
621 
-
622 
-
623 
-    case 9:
624 
-        $image_array = array();
625 
-        $post_meta = array();
626 
-        $image_array[] = "$dummy_image_url/ps/psf9.jpg";
627 
-        $image_array[] = "$dummy_image_url/ps/psc9.jpg";
628 
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
629 
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
630 
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
631 
-
632 
-        $post_info[] = array(
633 
-            "listing_type" => $post_type,
634 
-            "post_title" => 'Hotel Alpina',
635 
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
599 
+			"post_images" => $image_array,
600 
+			"post_category" => array($post_type.'category' => array($category_array[0])),
601 
+			"post_tags" => array('Tags', 'Sample Tags'),
602 
+			"geodir_video" => '',
603 
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
604 
+			"geodir_contact" => '(222) 777-1111',
605 
+			"geodir_email" => '[email protected]',
606 
+			"geodir_website" => 'http://example.com/',
607 
+			"geodir_twitter" => 'http://example.com/',
608 
+			"geodir_facebook" => 'http://example.com/',
609 
+			"geodir_price" => '395000',
610 
+			"geodir_property_status" => 'For Sale',
611 
+			'geodir_property_furnishing' => 'Unfurnished',
612 
+			'geodir_property_type' => 'Apartment',
613 
+			'geodir_property_bedrooms' => '2',
614 
+			'geodir_property_bathrooms' => '2',
615 
+			'geodir_property_area' => '1750',
616 
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
617 
+			"post_dummy" => '1'
618 
+		);
619 
+
620 
+		break;
621 
+
622 
+
623 
+	case 9:
624 
+		$image_array = array();
625 
+		$post_meta = array();
626 
+		$image_array[] = "$dummy_image_url/ps/psf9.jpg";
627 
+		$image_array[] = "$dummy_image_url/ps/psc9.jpg";
628 
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
629 
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
630 
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
631 
+
632 
+		$post_info[] = array(
633 
+			"listing_type" => $post_type,
634 
+			"post_title" => 'Hotel Alpina',
635 
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
636 636
637 637 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
638 638 
 
@@ -642,39 +642,39 @@  discard block
 
 block discarded – undo
642 642
643 643 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
644 644
645 
-            "post_images" => $image_array,
646 
-            "post_category" => array($post_type.'category' => array($category_array[2])),
647 
-            "post_tags" => array('Tags', 'Sample Tags'),
648 
-            "geodir_video" => '',
649 
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
650 
-            "geodir_contact" => '(222) 777-1111',
651 
-            "geodir_email" => '[email protected]',
652 
-            "geodir_website" => 'http://example.com/',
653 
-            "geodir_twitter" => 'http://example.com/',
654 
-            "geodir_facebook" => 'http://example.com/',
655 
-            "geodir_price" => '12500000',
656 
-            "geodir_property_status" => 'For Sale',
657 
-            'geodir_property_furnishing' => 'Furnished',
658 
-            'geodir_property_type' => 'Hotel',
659 
-            'geodir_property_bedrooms' => '120',
660 
-            'geodir_property_bathrooms' => '133',
661 
-            'geodir_property_area' => '35000',
662 
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
663 
-            "post_dummy" => '1'
664 
-        );
665 
-
666 
-        break;
667 
-
668 
-    case 10:
669 
-        $image_array = array();
670 
-        $post_meta = array();
671 
-        $image_array[] = "$dummy_image_url/ps/psf10.jpg";
672 
-        $image_array[] = "$dummy_image_url/ps/psf102.jpg";
673 
-
674 
-        $post_info[] = array(
675 
-            "listing_type" => $post_type,
676 
-            "post_title" => 'Development Land',
677 
-            "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
645 
+			"post_images" => $image_array,
646 
+			"post_category" => array($post_type.'category' => array($category_array[2])),
647 
+			"post_tags" => array('Tags', 'Sample Tags'),
648 
+			"geodir_video" => '',
649 
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
650 
+			"geodir_contact" => '(222) 777-1111',
651 
+			"geodir_email" => '[email protected]',
652 
+			"geodir_website" => 'http://example.com/',
653 
+			"geodir_twitter" => 'http://example.com/',
654 
+			"geodir_facebook" => 'http://example.com/',
655 
+			"geodir_price" => '12500000',
656 
+			"geodir_property_status" => 'For Sale',
657 
+			'geodir_property_furnishing' => 'Furnished',
658 
+			'geodir_property_type' => 'Hotel',
659 
+			'geodir_property_bedrooms' => '120',
660 
+			'geodir_property_bathrooms' => '133',
661 
+			'geodir_property_area' => '35000',
662 
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
663 
+			"post_dummy" => '1'
664 
+		);
665 
+
666 
+		break;
667 
+
668 
+	case 10:
669 
+		$image_array = array();
670 
+		$post_meta = array();
671 
+		$image_array[] = "$dummy_image_url/ps/psf10.jpg";
672 
+		$image_array[] = "$dummy_image_url/ps/psf102.jpg";
673 
+
674 
+		$post_info[] = array(
675 
+			"listing_type" => $post_type,
676 
+			"post_title" => 'Development Land',
677 
+			"post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna.
678 678
679 679 
 Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel.
680 680 
 
@@ -684,93 +684,93 @@  discard block
 
 block discarded – undo
684 684
685 685 
 Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.',
686 686
687 
-            "post_images" => $image_array,
688 
-            "post_category" => array($post_type.'category' => array($category_array[3])),
689 
-            "post_tags" => array('Tags', 'Sample Tags'),
690 
-            "geodir_video" => '',
691 
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
692 
-            "geodir_contact" => '(222) 777-1111',
693 
-            "geodir_email" => '[email protected]',
694 
-            "geodir_website" => 'http://example.com/',
695 
-            "geodir_twitter" => 'http://example.com/',
696 
-            "geodir_facebook" => 'http://example.com/',
697 
-            "geodir_price" => '80000',
698 
-            "geodir_property_status" => 'For Sale',
699 
-            'geodir_property_furnishing' => '',
700 
-            'geodir_property_type' => 'Land',
701 
-            'geodir_property_bedrooms' => '',
702 
-            'geodir_property_bathrooms' => '',
703 
-            'geodir_property_area' => '250000',
704 
-            'geodir_property_features' => '',
705 
-            "post_dummy" => '1'
706 
-        );
707 
-
708 
-        break;
687 
+			"post_images" => $image_array,
688 
+			"post_category" => array($post_type.'category' => array($category_array[3])),
689 
+			"post_tags" => array('Tags', 'Sample Tags'),
690 
+			"geodir_video" => '',
691 
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
692 
+			"geodir_contact" => '(222) 777-1111',
693 
+			"geodir_email" => '[email protected]',
694 
+			"geodir_website" => 'http://example.com/',
695 
+			"geodir_twitter" => 'http://example.com/',
696 
+			"geodir_facebook" => 'http://example.com/',
697 
+			"geodir_price" => '80000',
698 
+			"geodir_property_status" => 'For Sale',
699 
+			'geodir_property_furnishing' => '',
700 
+			'geodir_property_type' => 'Land',
701 
+			'geodir_property_bedrooms' => '',
702 
+			'geodir_property_bathrooms' => '',
703 
+			'geodir_property_area' => '250000',
704 
+			'geodir_property_features' => '',
705 
+			"post_dummy" => '1'
706 
+		);
707 
+
708 
+		break;
709 709
710 710 
 } // end of switch
711 711
712 712 
 foreach ($post_info as $post_info) {
713 
-    $default_location = geodir_get_default_location();
714 
-    if ($city_bound_lat1 > $city_bound_lat2)
715 
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
716 
-    else
717 
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
713 
+	$default_location = geodir_get_default_location();
714 
+	if ($city_bound_lat1 > $city_bound_lat2)
715 
+		$dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
716 
+	else
717 
+		$dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
718 718
719 719
720 
-    if ($city_bound_lng1 > $city_bound_lng2)
721 
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
722 
-    else
723 
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
720 
+	if ($city_bound_lng1 > $city_bound_lng2)
721 
+		$dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
722 
+	else
723 
+		$dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
724 724
725 
-    $load_map = get_option('geodir_load_map');
725 
+	$load_map = get_option('geodir_load_map');
726 726
727 
-    if ($load_map == 'osm') {
728 
-        $post_address = geodir_get_osm_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
729 
-    } else {
730 
-        $post_address = geodir_get_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
731 
-    }
732 
-
733 
-    $postal_code = '';
734 
-    if (!empty($post_address)) {
735 
-        if ($load_map == 'osm') {
736 
-            $address = !empty($post_address->formatted_address) ? $post_address->formatted_address : '';
737 
-            $postal_code = !empty($post_address->address->postcode) ? $post_address->address->postcode : '';
738 
-        } else {
739 
-            $addresses = array();
740 
-            $addresses_default = array();
727 
+	if ($load_map == 'osm') {
728 
+		$post_address = geodir_get_osm_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
729 
+	} else {
730 
+		$post_address = geodir_get_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
731 
+	}
732 
+
733 
+	$postal_code = '';
734 
+	if (!empty($post_address)) {
735 
+		if ($load_map == 'osm') {
736 
+			$address = !empty($post_address->formatted_address) ? $post_address->formatted_address : '';
737 
+			$postal_code = !empty($post_address->address->postcode) ? $post_address->address->postcode : '';
738 
+		} else {
739 
+			$addresses = array();
740 
+			$addresses_default = array();
741 741
742 
-            foreach ($post_address as $add_key => $add_value) {
743 
-                if ($add_key < 2 && !empty($add_value->long_name)) {
744 
-                    $addresses_default[] = $add_value->long_name;
745 
-                }
746 
-                if ($add_value->types[0] == 'postal_code') {
747 
-                    $postal_code = $add_value->long_name;
748 
-                }
749 
-                if ($add_value->types[0] == 'street_number') {
750 
-                    $addresses[] = $add_value->long_name;
751 
-                }
752 
-                if ($add_value->types[0] == 'route') {
753 
-                    $addresses[] = $add_value->long_name;
754 
-                }
755 
-                if ($add_value->types[0] == 'neighborhood') {
756 
-                    $addresses[] = $add_value->long_name;
757 
-                }
758 
-                if ($add_value->types[0] == 'sublocality') {
759 
-                    $addresses[] = $add_value->long_name;
760 
-                }
761 
-            }
762 
-            $address = !empty($addresses) ? implode(', ', $addresses) : (!empty($addresses_default) ? implode(', ', $addresses_default) : '');
763 
-        }
764 
-
765 
-        $post_info['post_address'] = !empty($address) ? $address : $default_location->city;
766 
-        $post_info['post_city'] = $default_location->city;
767 
-        $post_info['post_region'] = $default_location->region;
768 
-        $post_info['post_country'] = $default_location->country;
769 
-        $post_info['post_zip'] = $postal_code;
770 
-        $post_info['post_latitude'] = $dummy_post_latitude;
771 
-        $post_info['post_longitude'] = $dummy_post_longitude;
772 
-    }
742 
+			foreach ($post_address as $add_key => $add_value) {
743 
+				if ($add_key < 2 && !empty($add_value->long_name)) {
744 
+					$addresses_default[] = $add_value->long_name;
745 
+				}
746 
+				if ($add_value->types[0] == 'postal_code') {
747 
+					$postal_code = $add_value->long_name;
748 
+				}
749 
+				if ($add_value->types[0] == 'street_number') {
750 
+					$addresses[] = $add_value->long_name;
751 
+				}
752 
+				if ($add_value->types[0] == 'route') {
753 
+					$addresses[] = $add_value->long_name;
754 
+				}
755 
+				if ($add_value->types[0] == 'neighborhood') {
756 
+					$addresses[] = $add_value->long_name;
757 
+				}
758 
+				if ($add_value->types[0] == 'sublocality') {
759 
+					$addresses[] = $add_value->long_name;
760 
+				}
761 
+			}
762 
+			$address = !empty($addresses) ? implode(', ', $addresses) : (!empty($addresses_default) ? implode(', ', $addresses_default) : '');
763 
+		}
764 
+
765 
+		$post_info['post_address'] = !empty($address) ? $address : $default_location->city;
766 
+		$post_info['post_city'] = $default_location->city;
767 
+		$post_info['post_region'] = $default_location->region;
768 
+		$post_info['post_country'] = $default_location->country;
769 
+		$post_info['post_zip'] = $postal_code;
770 
+		$post_info['post_latitude'] = $dummy_post_latitude;
771 
+		$post_info['post_longitude'] = $dummy_post_longitude;
772 
+	}
773 773
774 
-    geodir_save_listing($post_info, true);
775 
-    echo 1;
774 
+	geodir_save_listing($post_info, true);
775 
+	echo 1;
776 776 
 }
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch 
@@ -6,9 +6,9 @@  discard block
 
 block discarded – undo
6 6 
  * @package GeoDirectory
7 7 
  */
8 8
9 
-function geodir_property_sale_custom_fields($post_type='gd_place',$package_id=''){
9 
+function geodir_property_sale_custom_fields($post_type = 'gd_place', $package_id = '') {
10 10 
     $fields = array();
11 
-    $package = ($package_id=='') ? '' : array($package_id);
11 
+    $package = ($package_id == '') ? '' : array($package_id);
12 12
13 13 
     // Salary
14 14 
     $fields[] = array('listing_type' => $post_type,
 
@@ -48,15 +48,15 @@  discard block
 
 block discarded – undo
48 48 
                       'field_type'          =>  'select',
49 49 
                       'data_type'           =>  'VARCHAR',
50 50 
                       'admin_title'         =>  __('Job Type', 'geodirectory'),
51 
-                      'site_title'          =>  __('Job Type','geodirectory'),
52 
-                      'admin_desc'          =>  __('Select the type of job.','geodirectory'),
51 
+                      'site_title'          =>  __('Job Type', 'geodirectory'),
52 
+                      'admin_desc'          =>  __('Select the type of job.', 'geodirectory'),
53 53 
                       'htmlvar_name'        =>  'job_type',
54 54 
                       'is_active'           =>  true,
55 55 
                       'for_admin_use'       =>  false,
56 56 
                       'default_value'       =>  '',
57 57 
                       'show_in' 	        =>  '[detail],[listing]',
58 58 
                       'is_required'         =>  true,
59 
-                      'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
59 
+                      'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other', 'geodirectory'),
60 60 
                       'validation_pattern'  =>  '',
61 61 
                       'validation_msg'      =>  '',
62 62 
                       'required_msg'        =>  '',
 
@@ -70,16 +70,16 @@  discard block
 
 block discarded – undo
70 70 
     $fields[] = array('listing_type' => $post_type,
71 71 
                       'field_type'          =>  'select',
72 72 
                       'data_type'           =>  'VARCHAR',
73 
-                      'admin_title'         =>  __('Job Sector','geodirectory'),
74 
-                      'site_title'          =>  __('Job Sector','geodirectory'),
75 
-                      'admin_desc'          =>  __('Select the job sector.','geodirectory'),
73 
+                      'admin_title'         =>  __('Job Sector', 'geodirectory'),
74 
+                      'site_title'          =>  __('Job Sector', 'geodirectory'),
75 
+                      'admin_desc'          =>  __('Select the job sector.', 'geodirectory'),
76 76 
                       'htmlvar_name'        =>  'job_sector',
77 77 
                       'is_active'           =>  true,
78 78 
                       'for_admin_use'       =>  false,
79 79 
                       'default_value'       =>  '',
80 80 
                       'show_in' 	          =>  '[detail]',
81 81 
                       'is_required'         =>  true,
82 
-                      'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
82 
+                      'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies', 'geodirectory'),
83 83 
                       'validation_pattern'  =>  '',
84 84 
                       'validation_msg'      =>  '',
85 85 
                       'required_msg'        =>  '',
 
@@ -102,7 +102,7 @@  discard block
 
 block discarded – undo
102 102 
                       'default_value'       =>  '',
103 103 
                       'show_in' 	        =>  '[detail],[listing]',
104 104 
                       'is_required'         =>  true,
105 
-                      'option_values'       =>  __('Select Experience/,No Experience Required,1 Year,2 Years,3 Years,4 Years,5 Years,6 Years,7 Years,8 Years,9 Years,10+ Years','geodirectory'),
105 
+                      'option_values'       =>  __('Select Experience/,No Experience Required,1 Year,2 Years,3 Years,4 Years,5 Years,6 Years,7 Years,8 Years,9 Years,10+ Years', 'geodirectory'),
106 106 
                       'validation_pattern'  =>  '',
107 107 
                       'validation_msg'      =>  '',
108 108 
                       'required_msg'        =>  '',
 
@@ -235,24 +235,24 @@  discard block
 
 block discarded – undo
235 235 
     return  $fields;
236 236 
 }
237 237
238 
-global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2,$wpdb, $current_user,$dummy_post_index;
238 
+global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2, $wpdb, $current_user, $dummy_post_index;
239 239 
 $post_info = array();
240 240 
 $image_array = array();
241 241 
 $post_meta = array();
242 242 
 $category_array = array('Apartments', 'Houses', 'Commercial', 'Land');
243 243
244 
-if($dummy_post_index==1){
244 
+if ($dummy_post_index == 1) {
245 245 
     // add the dummy categories
246 
-    geodir_dummy_data_taxonomies($post_type,$category_array );
246 
+    geodir_dummy_data_taxonomies($post_type, $category_array);
247 247
248 248 
     // add the dummy custom fields
249 249 
     $fields = geodir_property_sale_custom_fields($post_type);
250 250 
     geodir_create_dummy_fields($fields);
251 
-    update_option($post_type.'_dummy_data_type','property_sale');
251 
+    update_option($post_type.'_dummy_data_type', 'property_sale');
252 252 
 }
253 253
254 254 
 if (geodir_dummy_folder_exists())
255 
-    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
255 
+    $dummy_image_url = geodir_plugin_url()."/geodirectory-admin/dummy";
256 256 
 else
257 257 
     $dummy_image_url = 'http://www.wpgeodirectory.com/dummy';
258 258
Please login to merge, or discard this patch.
Braces   +13 added lines, -10 removed lines patch added patch discarded remove patch 
@@ -17,10 +17,11 @@  discard block
 
 block discarded – undo
17 17 
     update_option($post_type.'_dummy_data_type','standard_places');
18 18 
 }
19 19
20 
-if (geodir_dummy_folder_exists())
20 
+if (geodir_dummy_folder_exists()) {
21 21 
     $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
22 
-else
22 
+} else {
23 23 
     $dummy_image_url = 'http://www.wpgeodirectory.com/dummy';
24 
+}
24 25
25 26 
 $dummy_image_url = apply_filters('place_dummy_image_url', $dummy_image_url);
26 27 
 
@@ -1815,16 +1816,18 @@  discard block
 
 block discarded – undo
1815 1816 
 echo '###4.1';
1816 1817 
 foreach ($post_info as $post_info) {echo '###5';
1817 1818 
     $default_location = geodir_get_default_location();
1818 
-    if ($city_bound_lat1 > $city_bound_lat2)
1819 
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
1820 
-    else
1821 
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
1819 
+    if ($city_bound_lat1 > $city_bound_lat2) {
1820 
+            $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
1821 
+    } else {
1822 
+            $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
1823 
+    }
1822 1824
1823 1825
1824 
-    if ($city_bound_lng1 > $city_bound_lng2)
1825 
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
1826 
-    else
1827 
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
1826 
+    if ($city_bound_lng1 > $city_bound_lng2) {
1827 
+            $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
1828 
+    } else {
1829 
+            $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
1830 
+    }
1828 1831
1829 1832 
     $load_map = get_option('geodir_load_map');
1830 1833
Please login to merge, or discard this patch.
geodirectory-functions/ajax_handler_functions.php 3 patches
Indentation   +306 added lines, -306 removed lines patch added patch discarded remove patch 
@@ -16,22 +16,22 @@  discard block
 
 block discarded – undo
16 16 
  */
17 17 
 function geodir_on_wp_loaded()
18 18 
 {
19 
-    /**
20 
-     * Called on the wp_loaded WP hook and used to send the send inquiry and send to friend forms.
21 
-     *
22 
-     * @since 1.0.0
23 
-     */
24 
-    do_action('giodir_handle_request_plugins_loaded');
25 
-    global $wpdb;
19 
+	/**
20 
+	 * Called on the wp_loaded WP hook and used to send the send inquiry and send to friend forms.
21 
+	 *
22 
+	 * @since 1.0.0
23 
+	 */
24 
+	do_action('giodir_handle_request_plugins_loaded');
25 
+	global $wpdb;
26 26
27 27
28 
-    if (isset($_POST['sendact']) && $_POST['sendact'] == 'send_inqury') {
29 
-        geodir_send_inquiry($_REQUEST); // function in custom_functions.php
28 
+	if (isset($_POST['sendact']) && $_POST['sendact'] == 'send_inqury') {
29 
+		geodir_send_inquiry($_REQUEST); // function in custom_functions.php
30 30
31 
-    } elseif (isset($_POST['sendact']) && $_POST['sendact'] == 'email_frnd') {
32 
-        geodir_send_friend($_REQUEST); // function in custom_functions.php
31 
+	} elseif (isset($_POST['sendact']) && $_POST['sendact'] == 'email_frnd') {
32 
+		geodir_send_friend($_REQUEST); // function in custom_functions.php
33 33
34 
-    }
34 
+	}
35 35
36 36 
 }
37 37 
 

@@ -44,9 +44,9 @@  discard block
 
 block discarded – undo
44 44 
  */
45 45 
 function geodir_on_wp()
46 46 
 {
47 
-    if(geodir_is_page('login')) {
48 
-        geodir_user_signup();
49 
-    }
47 
+	if(geodir_is_page('login')) {
48 
+		geodir_user_signup();
49 
+	}
50 50
51 51 
 }
52 52 
 

@@ -59,32 +59,32 @@  discard block
 
 block discarded – undo
59 59 
  */
60 60 
 function geodir_on_init()
61 61 
 {
62 
-    /**
63 
-     * Called on the wp_init WP hook at the start of the geodir_on_init() function.
64 
-     *
65 
-     * @since 1.0.0
66 
-     */
67 
-    do_action('giodir_handle_request');
68 
-    global $wpdb;
62 
+	/**
63 
+	 * Called on the wp_init WP hook at the start of the geodir_on_init() function.
64 
+	 *
65 
+	 * @since 1.0.0
66 
+	 */
67 
+	do_action('giodir_handle_request');
68 
+	global $wpdb;
69 69
70 70
71 71
72 72
73 
-    if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && !current_user_can('manage_options') && !class_exists('BuddyPress')) {
74 
-        show_admin_bar(false);
75 
-    }
73 
+	if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && !current_user_can('manage_options') && !class_exists('BuddyPress')) {
74 
+		show_admin_bar(false);
75 
+	}
76 76
77 77
78 
-    if (isset($_REQUEST['ptype']) && $_REQUEST['ptype'] == 'get_markers') {
79 
-        /**
80 
-         * Contains map marker functions.
81 
-         *
82 
-         * @since 1.0.0
83 
-         * @package GeoDirectory
84 
-         */
85 
-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');
86 
-        die;
87 
-    }
78 
+	if (isset($_REQUEST['ptype']) && $_REQUEST['ptype'] == 'get_markers') {
79 
+		/**
80 
+		 * Contains map marker functions.
81 
+		 *
82 
+		 * @since 1.0.0
83 
+		 * @package GeoDirectory
84 
+		 */
85 
+		include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');
86 
+		die;
87 
+	}
88 88
89 89
90 90 
 

@@ -104,290 +104,290 @@  discard block
 
 block discarded – undo
104 104 
  * @todo check if nonce is required here and if so add one.
105 105 
  */
106 106 
 function geodir_ajax_handler() {
107 
-    global $wpdb, $gd_session,$post;
107 
+	global $wpdb, $gd_session,$post;
108 108
109 
-    if (isset($_REQUEST['gd_listing_view']) && $_REQUEST['gd_listing_view'] != '') {
109 
+	if (isset($_REQUEST['gd_listing_view']) && $_REQUEST['gd_listing_view'] != '') {
110 110 
 		$gd_session->set('gd_listing_view', $_REQUEST['gd_listing_view']);
111 
-        echo '1';
112 
-    }
113 
-
114 
-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {
115 
-        if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude']))
116 
-            geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);
117 
-        else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax']))
118 
-            geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);
119 
-    }
120 
-
121 
-    if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') || isset($_REQUEST['create_field']) || isset($_REQUEST['sort_create_field'])) {
122 
-        if (current_user_can('manage_options')) {
123 
-            /**
124 
-             * Contains admin ajax handling functions.
125 
-             *
126 
-             * @since 1.0.0
127 
-             * @package GeoDirectory
128 
-             */
129 
-            include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php');
130 
-        } else {
131 
-            wp_redirect(geodir_login_url());
132 
-            gd_die();
133 
-        }
134 
-    }
135 
-
136 
-    if (isset($_REQUEST['geodir_autofill']) && $_REQUEST['geodir_autofill'] != '' && isset($_REQUEST['_wpnonce'])) {
137 
-        if (current_user_can('manage_options')) {
138 
-            switch ($_REQUEST['geodir_autofill']):
139 
-                case "geodir_dummy_delete" :
140 
-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
141 
-                        return;
142 
-
143 
-                    $datatype = isset($_REQUEST['datatype']) ? sanitize_key($_REQUEST['datatype']) : '';
144 
-                    if (isset($_REQUEST['posttype']))
145 
-                        /**
146 
-                         * Used to delete the dummy post data per post type.
147 
-                         *
148 
-                         * Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype'].
149 
-                         *
150 
-                         * @since 1.6.11
151 
-                         * @param string $posttype The post type to insert.
152 
-                         * @param string $datatype The type of dummy data to insert.
153 
-                         */
154 
-                        do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);
155 
-                    break;
156 
-                case "geodir_dummy_insert" :
157 
-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
158 
-                        return;
159 
-
160 
-                    global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;
161 
-                    $city_bound_lat1 = $_REQUEST['city_bound_lat1'];
162 
-                    $city_bound_lng1 = $_REQUEST['city_bound_lng1'];
163 
-                    $city_bound_lat2 = $_REQUEST['city_bound_lat2'];
164 
-                    $city_bound_lng2 = $_REQUEST['city_bound_lng2'];
165 
-
166 
-                    if (isset($_REQUEST['posttype'])){
167 
-                        /**
168 
-                         * Used to insert the dummy post data per post type.
169 
-                         *
170 
-                         * Uses dynamic hook, geodir_insert_dummy_posts_$_REQUEST['posttype'].
171 
-                         *
172 
-                         * @since 1.6.11
173 
-                         * @param string $posttype The post type to insert.
174 
-                         * @param string $datatype The type of dummy data to insert.
175 
-                         * @param int $post_index The item number to insert.
176 
-                         */
177 
-                        do_action('geodir_insert_dummy_posts',sanitize_key($_REQUEST['posttype']),sanitize_key($_REQUEST['datatype']),absint($_REQUEST['insert_dummy_post_index']));
178 
-                    }
179 
-
180 
-
181 
-                    break;
182 
-            endswitch;
183 
-        } else {
184 
-            wp_redirect(geodir_login_url());
185 
-            exit();
186 
-        }
187 
-    }
188 
-
189 
-    if (isset($_REQUEST['popuptype']) && $_REQUEST['popuptype'] != '' && isset($_REQUEST['post_id']) && $_REQUEST['post_id'] != '') {
190 
-
191 
-        if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend') {
192 
-            $template = locate_template(array("geodirectory/popup-forms.php"));
193 
-            if (!$template) {
194 
-                $template = geodir_plugin_path() . '/geodirectory-templates/popup-forms.php';
195 
-            }
196 
-            require_once($template);
197 
-        }
198 
-
199 
-        gd_die();
200 
-    }
201 
-
202 
-    /*if(isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'filter_ajax'){
111 
+		echo '1';
112 
+	}
113 
+
114 
+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {
115 
+		if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude']))
116 
+			geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);
117 
+		else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax']))
118 
+			geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);
119 
+	}
120 
+
121 
+	if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') || isset($_REQUEST['create_field']) || isset($_REQUEST['sort_create_field'])) {
122 
+		if (current_user_can('manage_options')) {
123 
+			/**
124 
+			 * Contains admin ajax handling functions.
125 
+			 *
126 
+			 * @since 1.0.0
127 
+			 * @package GeoDirectory
128 
+			 */
129 
+			include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php');
130 
+		} else {
131 
+			wp_redirect(geodir_login_url());
132 
+			gd_die();
133 
+		}
134 
+	}
135 
+
136 
+	if (isset($_REQUEST['geodir_autofill']) && $_REQUEST['geodir_autofill'] != '' && isset($_REQUEST['_wpnonce'])) {
137 
+		if (current_user_can('manage_options')) {
138 
+			switch ($_REQUEST['geodir_autofill']):
139 
+				case "geodir_dummy_delete" :
140 
+					if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
141 
+						return;
142 
+
143 
+					$datatype = isset($_REQUEST['datatype']) ? sanitize_key($_REQUEST['datatype']) : '';
144 
+					if (isset($_REQUEST['posttype']))
145 
+						/**
146 
+						 * Used to delete the dummy post data per post type.
147 
+						 *
148 
+						 * Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype'].
149 
+						 *
150 
+						 * @since 1.6.11
151 
+						 * @param string $posttype The post type to insert.
152 
+						 * @param string $datatype The type of dummy data to insert.
153 
+						 */
154 
+						do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);
155 
+					break;
156 
+				case "geodir_dummy_insert" :
157 
+					if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
158 
+						return;
159 
+
160 
+					global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;
161 
+					$city_bound_lat1 = $_REQUEST['city_bound_lat1'];
162 
+					$city_bound_lng1 = $_REQUEST['city_bound_lng1'];
163 
+					$city_bound_lat2 = $_REQUEST['city_bound_lat2'];
164 
+					$city_bound_lng2 = $_REQUEST['city_bound_lng2'];
165 
+
166 
+					if (isset($_REQUEST['posttype'])){
167 
+						/**
168 
+						 * Used to insert the dummy post data per post type.
169 
+						 *
170 
+						 * Uses dynamic hook, geodir_insert_dummy_posts_$_REQUEST['posttype'].
171 
+						 *
172 
+						 * @since 1.6.11
173 
+						 * @param string $posttype The post type to insert.
174 
+						 * @param string $datatype The type of dummy data to insert.
175 
+						 * @param int $post_index The item number to insert.
176 
+						 */
177 
+						do_action('geodir_insert_dummy_posts',sanitize_key($_REQUEST['posttype']),sanitize_key($_REQUEST['datatype']),absint($_REQUEST['insert_dummy_post_index']));
178 
+					}
179 
+
180 
+
181 
+					break;
182 
+			endswitch;
183 
+		} else {
184 
+			wp_redirect(geodir_login_url());
185 
+			exit();
186 
+		}
187 
+	}
188 
+
189 
+	if (isset($_REQUEST['popuptype']) && $_REQUEST['popuptype'] != '' && isset($_REQUEST['post_id']) && $_REQUEST['post_id'] != '') {
190 
+
191 
+		if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend') {
192 
+			$template = locate_template(array("geodirectory/popup-forms.php"));
193 
+			if (!$template) {
194 
+				$template = geodir_plugin_path() . '/geodirectory-templates/popup-forms.php';
195 
+			}
196 
+			require_once($template);
197 
+		}
198 
+
199 
+		gd_die();
200 
+	}
201 
+
202 
+	/*if(isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'filter_ajax'){
203 203 
         include_once ( geodir_plugin_path() . '/geodirectory-templates/advance-search-form.php');
204 204 
     }*/
205 205
206 
-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'map_ajax') {
207 
-        /**
208 
-         * Contains map marker functions.
209 
-         *
210 
-         * @since 1.0.0
211 
-         * @package GeoDirectory
212 
-         */
213 
-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');
214 
-    }
215 
-
216 
-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {
217 
-        if (is_user_logged_in()) {
218 
-            switch ($_REQUEST['ajax_action']):
219 
-                case "add" :
220 
-                    geodir_add_to_favorite((int)$_REQUEST['pid']);
221 
-                    break;
222 
-                case "remove" :
223 
-                    geodir_remove_from_favorite((int)$_REQUEST['pid']);
224 
-                    break;
225 
-            endswitch;
226 
-        } else {
227 
-            wp_redirect(geodir_login_url());
228 
-            exit();
229 
-        }
230 
-    }
231 
-
232 
-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'add_listing') {
233 
-
234 
-        $is_current_user_owner = true;
235 
-        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
236 
-            $is_current_user_owner = geodir_listing_belong_to_current_user((int)$_REQUEST['pid']);
237 
-        }
238 
-
239 
-        $request = $gd_session->get('listing');
240 
-
241 
-        if (is_user_logged_in() && $is_current_user_owner) {
242 
-
243 
-            switch ($_REQUEST['ajax_action']):
244 
-                case "add":
245 
-                case "update":
246 
-
247 
-                    if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {
248 
-                        $last_id = geodir_save_listing();
249 
-
250 
-                        if ($last_id) {
251 
-                            //$redirect_to = get_permalink( $last_id );
252 
-                            $redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));
253 
-
254 
-                        } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
255 
-                            $redirect_to = get_permalink(geodir_add_listing_page_id());
256 
-                            $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
257 
-                        } else
258 
-                            $redirect_to = get_permalink(geodir_add_listing_page_id());
259 
-
260 
-                        wp_redirect($redirect_to);
261 
-                    } else {
262 
-                        $gd_session->un_set('listing');
263 
-                        wp_redirect(home_url());
264 
-                    }
265 
-
266 
-                    break;
267 
-                case "cancel" :
268 
-
269 
-                    $gd_session->un_set('listing');
270 
-
271 
-                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid']))
272 
-                        wp_redirect(get_permalink($_REQUEST['pid']));
273 
-                    else {
274 
-                        geodir_remove_temp_images();
275 
-                        wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));
276 
-                    }
277 
-
278 
-                    break;
279 
-
280 
-                case "publish" :
281 
-
282 
-                    if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {
283 
-
284 
-                        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
285 
-                            $new_post = array();
286 
-                            $new_post['ID'] = $_REQUEST['pid'];
287 
-
288 
-                            $lastid = wp_update_post($new_post);
289 
-
290 
-                            $gd_session->un_set('listing');
291 
-                            wp_redirect(get_permalink($lastid));
292 
-                        } else {
293 
-                            $last_id = geodir_save_listing();
294 
-
295 
-                            if ($last_id) {
296 
-                                //$redirect_to = get_permalink( $last_id );
297 
-                                $redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));
298 
-                            } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
299 
-                                $redirect_to = get_permalink(geodir_add_listing_page_id());
300 
-                                $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
301 
-                            } else
302 
-                                $redirect_to = get_permalink(geodir_add_listing_page_id());
303 
-
304 
-                            $gd_session->un_set('listing');
305 
-                            wp_redirect($redirect_to);
306 
-                        }
307 
-                    } else {
308 
-                        $gd_session->un_set('listing');
309 
-                        wp_redirect(home_url());
310 
-                    }
311 
-
312 
-                    break;
313 
-                case "delete" :
314 
-                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
315 
-                        global $current_user;
316 
-
317 
-                        if (get_option('geodir_disable_perm_delete')) {
318 
-                            $lastid = wp_trash_post($_REQUEST['pid']);
319 
-                        } else {
320 
-                            $lastid = wp_delete_post($_REQUEST['pid']);
321 
-                        }
322 
-
323 
-                        if ($lastid && !is_wp_error($lastid))
324 
-                            wp_redirect($_SERVER['HTTP_REFERER']);
325 
-
326 
-                        //wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );
327 
-                    }
328 
-                    break;
329 
-            endswitch;
330 
-
331 
-            $gd_session->un_set('listing');
332 
-        } else {
333 
-            $gd_session->un_set('listing');
334 
-            wp_redirect(geodir_login_url());
335 
-            exit();
336 
-        }
337 
-    }
338 
-
339 
-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'user_login') {
340 
-        /**
341 
-         * Contains registration and login functions.
342 
-         * @todo Fix the file path.
343 
-         *
344 
-         * @since 1.0.0
345 
-         * @package GeoDirectory
346 
-         */
347 
-        include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php');
348 
-    }
349 
-
350 
-    if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'geodir_get_term_list') {
351 
-        $args = array('taxonomy' => sanitize_text_field($_REQUEST['term']));
352 
-        if (!empty($_REQUEST['parent_only'])) {
353 
-            $args['parent'] = 0;
354 
-        }
355 
-        $terms_o = get_terms($args);
206 
+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'map_ajax') {
207 
+		/**
208 
+		 * Contains map marker functions.
209 
+		 *
210 
+		 * @since 1.0.0
211 
+		 * @package GeoDirectory
212 
+		 */
213 
+		include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');
214 
+	}
215 
+
216 
+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {
217 
+		if (is_user_logged_in()) {
218 
+			switch ($_REQUEST['ajax_action']):
219 
+				case "add" :
220 
+					geodir_add_to_favorite((int)$_REQUEST['pid']);
221 
+					break;
222 
+				case "remove" :
223 
+					geodir_remove_from_favorite((int)$_REQUEST['pid']);
224 
+					break;
225 
+			endswitch;
226 
+		} else {
227 
+			wp_redirect(geodir_login_url());
228 
+			exit();
229 
+		}
230 
+	}
231 
+
232 
+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'add_listing') {
233 
+
234 
+		$is_current_user_owner = true;
235 
+		if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
236 
+			$is_current_user_owner = geodir_listing_belong_to_current_user((int)$_REQUEST['pid']);
237 
+		}
238 
+
239 
+		$request = $gd_session->get('listing');
240 
+
241 
+		if (is_user_logged_in() && $is_current_user_owner) {
242 
+
243 
+			switch ($_REQUEST['ajax_action']):
244 
+				case "add":
245 
+				case "update":
246 
+
247 
+					if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {
248 
+						$last_id = geodir_save_listing();
249 
+
250 
+						if ($last_id) {
251 
+							//$redirect_to = get_permalink( $last_id );
252 
+							$redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));
253 
+
254 
+						} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
255 
+							$redirect_to = get_permalink(geodir_add_listing_page_id());
256 
+							$redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
257 
+						} else
258 
+							$redirect_to = get_permalink(geodir_add_listing_page_id());
259 
+
260 
+						wp_redirect($redirect_to);
261 
+					} else {
262 
+						$gd_session->un_set('listing');
263 
+						wp_redirect(home_url());
264 
+					}
265 
+
266 
+					break;
267 
+				case "cancel" :
268 
+
269 
+					$gd_session->un_set('listing');
270 
+
271 
+					if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid']))
272 
+						wp_redirect(get_permalink($_REQUEST['pid']));
273 
+					else {
274 
+						geodir_remove_temp_images();
275 
+						wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));
276 
+					}
277 
+
278 
+					break;
279 
+
280 
+				case "publish" :
281 
+
282 
+					if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {
283 
+
284 
+						if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
285 
+							$new_post = array();
286 
+							$new_post['ID'] = $_REQUEST['pid'];
287 
+
288 
+							$lastid = wp_update_post($new_post);
289 
+
290 
+							$gd_session->un_set('listing');
291 
+							wp_redirect(get_permalink($lastid));
292 
+						} else {
293 
+							$last_id = geodir_save_listing();
294 
+
295 
+							if ($last_id) {
296 
+								//$redirect_to = get_permalink( $last_id );
297 
+								$redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));
298 
+							} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
299 
+								$redirect_to = get_permalink(geodir_add_listing_page_id());
300 
+								$redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
301 
+							} else
302 
+								$redirect_to = get_permalink(geodir_add_listing_page_id());
303 
+
304 
+							$gd_session->un_set('listing');
305 
+							wp_redirect($redirect_to);
306 
+						}
307 
+					} else {
308 
+						$gd_session->un_set('listing');
309 
+						wp_redirect(home_url());
310 
+					}
311 
+
312 
+					break;
313 
+				case "delete" :
314 
+					if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
315 
+						global $current_user;
316 
+
317 
+						if (get_option('geodir_disable_perm_delete')) {
318 
+							$lastid = wp_trash_post($_REQUEST['pid']);
319 
+						} else {
320 
+							$lastid = wp_delete_post($_REQUEST['pid']);
321 
+						}
322 
+
323 
+						if ($lastid && !is_wp_error($lastid))
324 
+							wp_redirect($_SERVER['HTTP_REFERER']);
325 
+
326 
+						//wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );
327 
+					}
328 
+					break;
329 
+			endswitch;
330 
+
331 
+			$gd_session->un_set('listing');
332 
+		} else {
333 
+			$gd_session->un_set('listing');
334 
+			wp_redirect(geodir_login_url());
335 
+			exit();
336 
+		}
337 
+	}
338 
+
339 
+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'user_login') {
340 
+		/**
341 
+		 * Contains registration and login functions.
342 
+		 * @todo Fix the file path.
343 
+		 *
344 
+		 * @since 1.0.0
345 
+		 * @package GeoDirectory
346 
+		 */
347 
+		include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php');
348 
+	}
349 
+
350 
+	if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'geodir_get_term_list') {
351 
+		$args = array('taxonomy' => sanitize_text_field($_REQUEST['term']));
352 
+		if (!empty($_REQUEST['parent_only'])) {
353 
+			$args['parent'] = 0;
354 
+		}
355 
+		$terms_o = get_terms($args);
356 356
357 
-        // Skip terms which has no listing
358 
-        if (!empty($terms_o)) {
359 
-            $filter_terms = array();
357 
+		// Skip terms which has no listing
358 
+		if (!empty($terms_o)) {
359 
+			$filter_terms = array();
360 360
361 
-            foreach ($terms_o as $term) {
362 
-                if (isset($term->count) && $term->count > 0) {
363 
-                    $filter_terms[] = $term;
364 
-                }
365 
-            }
366 
-            $terms_o = $filter_terms;
367 
-        }
361 
+			foreach ($terms_o as $term) {
362 
+				if (isset($term->count) && $term->count > 0) {
363 
+					$filter_terms[] = $term;
364 
+				}
365 
+			}
366 
+			$terms_o = $filter_terms;
367 
+		}
368 368
369 
-        $terms = geodir_sort_terms($terms_o, 'count');
370 
-        geodir_helper_cat_list_output($terms, intval($_REQUEST['limit']));
371 
-        exit();
372 
-    }
369 
+		$terms = geodir_sort_terms($terms_o, 'count');
370 
+		geodir_helper_cat_list_output($terms, intval($_REQUEST['limit']));
371 
+		exit();
372 
+	}
373 373
374 
-    gd_die();
374 
+	gd_die();
375 375 
 }
376 376
377 377
378 378 
 function geodir_show_ga_stats(){
379 
-    if (isset($_REQUEST['ga_start'])) {
380 
-        $ga_start = $_REQUEST['ga_start'];
381 
-    } else {
382 
-        $ga_start = '';
383 
-    }
384 
-    if (isset($_REQUEST['ga_end'])) {
385 
-        $ga_end = $_REQUEST['ga_end'];
386 
-    } else {
387 
-        $ga_end = '';
388 
-    }
389 
-    geodir_getGoogleAnalytics($_REQUEST['ga_page'], $ga_start, $ga_end);
390 
-    die;
379 
+	if (isset($_REQUEST['ga_start'])) {
380 
+		$ga_start = $_REQUEST['ga_start'];
381 
+	} else {
382 
+		$ga_start = '';
383 
+	}
384 
+	if (isset($_REQUEST['ga_end'])) {
385 
+		$ga_end = $_REQUEST['ga_end'];
386 
+	} else {
387 
+		$ga_end = '';
388 
+	}
389 
+	geodir_getGoogleAnalytics($_REQUEST['ga_page'], $ga_start, $ga_end);
390 
+	die;
391 391 
 }
392 392 
 add_action( 'wp_ajax_gdga', 'geodir_show_ga_stats' );
393 393 
 add_action( 'wp_ajax_nopriv_gdga', 'geodir_show_ga_stats' );
394 394 
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch 
@@ -44,7 +44,7 @@  discard block
 
 block discarded – undo
44 44 
  */
45 45 
 function geodir_on_wp()
46 46 
 {
47 
-    if(geodir_is_page('login')) {
47 
+    if (geodir_is_page('login')) {
48 48 
         geodir_user_signup();
49 49 
     }
50 50 
 

@@ -82,7 +82,7 @@  discard block
 
 block discarded – undo
82 82 
          * @since 1.0.0
83 83 
          * @package GeoDirectory
84 84 
          */
85 
-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');
85 
+        include_once(geodir_plugin_path().'/geodirectory-functions/map-functions/get_markers.php');
86 86 
         die;
87 87 
     }
88 88 
 

@@ -104,7 +104,7 @@  discard block
 
 block discarded – undo
104 104 
  * @todo check if nonce is required here and if so add one.
105 105 
  */
106 106 
 function geodir_ajax_handler() {
107 
-    global $wpdb, $gd_session,$post;
107 
+    global $wpdb, $gd_session, $post;
108 108
109 109 
     if (isset($_REQUEST['gd_listing_view']) && $_REQUEST['gd_listing_view'] != '') {
110 110 
 		$gd_session->set('gd_listing_view', $_REQUEST['gd_listing_view']);

@@ -126,7 +126,7 @@  discard block
 
 block discarded – undo
126 126 
              * @since 1.0.0
127 127 
              * @package GeoDirectory
128 128 
              */
129 
-            include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php');
129 
+            include_once(geodir_plugin_path().'/geodirectory-admin/geodir_admin_ajax.php');
130 130 
         } else {
131 131 
             wp_redirect(geodir_login_url());
132 132 
             gd_die();

@@ -151,7 +151,7 @@  discard block
 
 block discarded – undo
151 151 
                          * @param string $posttype The post type to insert.
152 152 
                          * @param string $datatype The type of dummy data to insert.
153 153 
                          */
154 
-                        do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);
154 
+                        do_action('geodir_delete_dummy_posts', sanitize_key($_REQUEST['posttype']), $datatype);
155 155 
                     break;
156 156 
                 case "geodir_dummy_insert" :
157 157 
                     if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))

@@ -163,7 +163,7 @@  discard block
 
 block discarded – undo
163 163 
                     $city_bound_lat2 = $_REQUEST['city_bound_lat2'];
164 164 
                     $city_bound_lng2 = $_REQUEST['city_bound_lng2'];
165 165
166 
-                    if (isset($_REQUEST['posttype'])){
166 
+                    if (isset($_REQUEST['posttype'])) {
167 167 
                         /**
168 168 
                          * Used to insert the dummy post data per post type.
169 169 
                          *

@@ -174,7 +174,7 @@  discard block
 
 block discarded – undo
174 174 
                          * @param string $datatype The type of dummy data to insert.
175 175 
                          * @param int $post_index The item number to insert.
176 176 
                          */
177 
-                        do_action('geodir_insert_dummy_posts',sanitize_key($_REQUEST['posttype']),sanitize_key($_REQUEST['datatype']),absint($_REQUEST['insert_dummy_post_index']));
177 
+                        do_action('geodir_insert_dummy_posts', sanitize_key($_REQUEST['posttype']), sanitize_key($_REQUEST['datatype']), absint($_REQUEST['insert_dummy_post_index']));
178 178 
                     }
179 179
180 180 
 

@@ -191,7 +191,7 @@  discard block
 
 block discarded – undo
191 191 
         if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend') {
192 192 
             $template = locate_template(array("geodirectory/popup-forms.php"));
193 193 
             if (!$template) {
194 
-                $template = geodir_plugin_path() . '/geodirectory-templates/popup-forms.php';
194 
+                $template = geodir_plugin_path().'/geodirectory-templates/popup-forms.php';
195 195 
             }
196 196 
             require_once($template);
197 197 
         }

@@ -210,17 +210,17 @@  discard block
 
 block discarded – undo
210 210 
          * @since 1.0.0
211 211 
          * @package GeoDirectory
212 212 
          */
213 
-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');
213 
+        include_once(geodir_plugin_path().'/geodirectory-functions/map-functions/get_markers.php');
214 214 
     }
215 215
216 216 
     if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {
217 217 
         if (is_user_logged_in()) {
218 218 
             switch ($_REQUEST['ajax_action']):
219 219 
                 case "add" :
220 
-                    geodir_add_to_favorite((int)$_REQUEST['pid']);
220 
+                    geodir_add_to_favorite((int) $_REQUEST['pid']);
221 221 
                     break;
222 222 
                 case "remove" :
223 
-                    geodir_remove_from_favorite((int)$_REQUEST['pid']);
223 
+                    geodir_remove_from_favorite((int) $_REQUEST['pid']);
224 224 
                     break;
225 225 
             endswitch;
226 226 
         } else {

@@ -233,7 +233,7 @@  discard block
 
 block discarded – undo
233 233
234 234 
         $is_current_user_owner = true;
235 235 
         if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
236 
-            $is_current_user_owner = geodir_listing_belong_to_current_user((int)$_REQUEST['pid']);
236 
+            $is_current_user_owner = geodir_listing_belong_to_current_user((int) $_REQUEST['pid']);
237 237 
         }
238 238
239 239 
         $request = $gd_session->get('listing');

@@ -344,7 +344,7 @@  discard block
 
 block discarded – undo
344 344 
          * @since 1.0.0
345 345 
          * @package GeoDirectory
346 346 
          */
347 
-        include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php');
347 
+        include_once(geodir_plugin_path().'/geodirectory-functions/geodirectory_reg.php');
348 348 
     }
349 349
350 350 
     if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'geodir_get_term_list') {

@@ -375,7 +375,7 @@  discard block
 
 block discarded – undo
375 375 
 }
376 376
377 377
378 
-function geodir_show_ga_stats(){
378 
+function geodir_show_ga_stats() {
379 379 
     if (isset($_REQUEST['ga_start'])) {
380 380 
         $ga_start = $_REQUEST['ga_start'];
381 381 
     } else {

@@ -389,5 +389,5 @@  discard block
 
 block discarded – undo
389 389 
     geodir_getGoogleAnalytics($_REQUEST['ga_page'], $ga_start, $ga_end);
390 390 
     die;
391 391 
 }
392 
-add_action( 'wp_ajax_gdga', 'geodir_show_ga_stats' );
393 
-add_action( 'wp_ajax_nopriv_gdga', 'geodir_show_ga_stats' );
394 392 
\ No newline at end of file
393 
+add_action('wp_ajax_gdga', 'geodir_show_ga_stats');
394 
+add_action('wp_ajax_nopriv_gdga', 'geodir_show_ga_stats');
395 395 
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +27 added lines, -20 removed lines patch added patch discarded remove patch 
@@ -112,10 +112,11 @@  discard block
 
 block discarded – undo
112 112 
     }
113 113
114 114 
     if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {
115 
-        if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude']))
116 
-            geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);
117 
-        else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax']))
118 
-            geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);
115 
+        if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude'])) {
116 
+                    geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);
117 
+        } else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax'])) {
118 
+                    geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);
119 
+        }
119 120 
     }
120 121
121 122 
     if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') || isset($_REQUEST['create_field']) || isset($_REQUEST['sort_create_field'])) {

@@ -137,12 +138,13 @@  discard block
 
 block discarded – undo
137 138 
         if (current_user_can('manage_options')) {
138 139 
             switch ($_REQUEST['geodir_autofill']):
139 140 
                 case "geodir_dummy_delete" :
140 
-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
141 
-                        return;
141 
+                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename')) {
142 
+                                            return;
143 
+                    }
142 144
143 145 
                     $datatype = isset($_REQUEST['datatype']) ? sanitize_key($_REQUEST['datatype']) : '';
144 
-                    if (isset($_REQUEST['posttype']))
145 
-                        /**
146 
+                    if (isset($_REQUEST['posttype'])) {
147 
+                                            /**
146 148 
                          * Used to delete the dummy post data per post type.
147 149 
                          *
148 150 
                          * Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype'].

@@ -151,11 +153,13 @@  discard block
 
 block discarded – undo
151 153 
                          * @param string $posttype The post type to insert.
152 154 
                          * @param string $datatype The type of dummy data to insert.
153 155 
                          */
154 
-                        do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);
156 
+                        do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);
157 
+                    }
155 158 
                     break;
156 159 
                 case "geodir_dummy_insert" :
157 
-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
158 
-                        return;
160 
+                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename')) {
161 
+                                            return;
162 
+                    }
159 163
160 164 
                     global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;
161 165 
                     $city_bound_lat1 = $_REQUEST['city_bound_lat1'];

@@ -254,8 +258,9 @@  discard block
 
 block discarded – undo
254 258 
                         } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
255 259 
                             $redirect_to = get_permalink(geodir_add_listing_page_id());
256 260 
                             $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
257 
-                        } else
258 
-                            $redirect_to = get_permalink(geodir_add_listing_page_id());
261 
+                        } else {
262 
+                                                    $redirect_to = get_permalink(geodir_add_listing_page_id());
263 
+                        }
259 264
260 265 
                         wp_redirect($redirect_to);
261 266 
                     } else {

@@ -268,9 +273,9 @@  discard block
 
 block discarded – undo
268 273
269 274 
                     $gd_session->un_set('listing');
270 275
271 
-                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid']))
272 
-                        wp_redirect(get_permalink($_REQUEST['pid']));
273 
-                    else {
276 
+                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid'])) {
277 
+                                            wp_redirect(get_permalink($_REQUEST['pid']));
278 
+                    } else {
274 279 
                         geodir_remove_temp_images();
275 280 
                         wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));
276 281 
                     }

@@ -298,8 +303,9 @@  discard block
 
 block discarded – undo
298 303 
                             } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
299 304 
                                 $redirect_to = get_permalink(geodir_add_listing_page_id());
300 305 
                                 $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
301 
-                            } else
302 
-                                $redirect_to = get_permalink(geodir_add_listing_page_id());
306 
+                            } else {
307 
+                                                            $redirect_to = get_permalink(geodir_add_listing_page_id());
308 
+                            }
303 309
304 310 
                             $gd_session->un_set('listing');
305 311 
                             wp_redirect($redirect_to);

@@ -320,8 +326,9 @@  discard block
 
 block discarded – undo
320 326 
                             $lastid = wp_delete_post($_REQUEST['pid']);
321 327 
                         }
322 328
323 
-                        if ($lastid && !is_wp_error($lastid))
324 
-                            wp_redirect($_SERVER['HTTP_REFERER']);
329 
+                        if ($lastid && !is_wp_error($lastid)) {
330 
+                                                    wp_redirect($_SERVER['HTTP_REFERER']);
331 
+                        }
325 332
326 333 
                         //wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );
327 334 
                     }
Please login to merge, or discard this patch.
geodirectory-admin/google-api-php-client/src/Google/Auth/OAuth2.php 3 patches
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -500,7 +500,7 @@  discard block
 
 block discarded – undo
500 500 
    * @param [$issuer] the expected issues, defaults to Google
501 501 
    * @param [$max_expiry] the max lifetime of a token, defaults to MAX_TOKEN_LIFETIME_SECS
502 502 
    * @throws Google_Auth_Exception
503 
-   * @return mixed token information if valid, false if not
503 
+   * @return Google_Auth_LoginTicket token information if valid, false if not
504 504 
    */
505 505 
   public function verifySignedJwtWithCerts(
506 506 
       $jwt,
 
@@ -626,6 +626,7 @@  discard block
 
 block discarded – undo
626 626
627 627 
   /**
628 628 
    * Add a parameter to the auth params if not empty string.
629 
+   * @param string $name
629 630 
    */
630 631 
   private function maybeAddParam($params, $name)
631 632 
   {
Please login to merge, or discard this patch.
Indentation   +411 added lines, -411 removed lines patch added patch discarded remove patch 
@@ -57,7 +57,7 @@  discard block
 
 block discarded – undo
57 57 
    */
58 58 
   public function __construct(Google_Client $client)
59 59 
   {
60 
-    $this->client = $client;
60 
+	$this->client = $client;
61 61 
   }
62 62
63 63 
   /**
 
@@ -72,8 +72,8 @@  discard block
 
 block discarded – undo
72 72 
    */
73 73 
   public function authenticatedRequest(Google_Http_Request $request)
74 74 
   {
75 
-    $request = $this->sign($request);
76 
-    return $this->client->getIo()->makeRequest($request);
75 
+	$request = $this->sign($request);
76 
+	return $this->client->getIo()->makeRequest($request);
77 77 
   }
78 78
79 79 
   /**
 
@@ -84,52 +84,52 @@  discard block
 
 block discarded – undo
84 84 
    */
85 85 
   public function authenticate($code, $crossClient = false)
86 86 
   {
87 
-    if (strlen($code) == 0) {
88 
-      throw new Google_Auth_Exception("Invalid code");
89 
-    }
90 
-
91 
-    $arguments = array(
92 
-          'code' => $code,
93 
-          'grant_type' => 'authorization_code',
94 
-          'client_id' => $this->client->getClassConfig($this, 'client_id'),
95 
-          'client_secret' => $this->client->getClassConfig($this, 'client_secret')
96 
-    );
97 
-
98 
-    if ($crossClient !== true) {
99 
-        $arguments['redirect_uri'] = $this->client->getClassConfig($this, 'redirect_uri');
100 
-    }
101 
-
102 
-    // We got here from the redirect from a successful authorization grant,
103 
-    // fetch the access token
104 
-    $request = new Google_Http_Request(
105 
-        self::OAUTH2_TOKEN_URI,
106 
-        'POST',
107 
-        array(),
108 
-        $arguments
109 
-    );
110 
-    $request->disableGzip();
111 
-    $response = $this->client->getIo()->makeRequest($request);
112 
-
113 
-    if ($response->getResponseHttpCode() == 200) {
114 
-      $this->setAccessToken($response->getResponseBody());
115 
-      $this->token['created'] = time();
116 
-      return $this->getAccessToken();
117 
-    } else {
118 
-      $decodedResponse = json_decode($response->getResponseBody(), true);
119 
-      if ($decodedResponse != null && $decodedResponse['error']) {
120 
-        $errorText = $decodedResponse['error'];
121 
-        if (isset($decodedResponse['error_description'])) {
122 
-          $errorText .= ": " . $decodedResponse['error_description'];
123 
-        }
124 
-      }
125 
-      throw new Google_Auth_Exception(
126 
-          sprintf(
127 
-              "Error fetching OAuth2 access token, message: '%s'",
128 
-              $errorText
129 
-          ),
130 
-          $response->getResponseHttpCode()
131 
-      );
132 
-    }
87 
+	if (strlen($code) == 0) {
88 
+	  throw new Google_Auth_Exception("Invalid code");
89 
+	}
90 
+
91 
+	$arguments = array(
92 
+		  'code' => $code,
93 
+		  'grant_type' => 'authorization_code',
94 
+		  'client_id' => $this->client->getClassConfig($this, 'client_id'),
95 
+		  'client_secret' => $this->client->getClassConfig($this, 'client_secret')
96 
+	);
97 
+
98 
+	if ($crossClient !== true) {
99 
+		$arguments['redirect_uri'] = $this->client->getClassConfig($this, 'redirect_uri');
100 
+	}
101 
+
102 
+	// We got here from the redirect from a successful authorization grant,
103 
+	// fetch the access token
104 
+	$request = new Google_Http_Request(
105 
+		self::OAUTH2_TOKEN_URI,
106 
+		'POST',
107 
+		array(),
108 
+		$arguments
109 
+	);
110 
+	$request->disableGzip();
111 
+	$response = $this->client->getIo()->makeRequest($request);
112 
+
113 
+	if ($response->getResponseHttpCode() == 200) {
114 
+	  $this->setAccessToken($response->getResponseBody());
115 
+	  $this->token['created'] = time();
116 
+	  return $this->getAccessToken();
117 
+	} else {
118 
+	  $decodedResponse = json_decode($response->getResponseBody(), true);
119 
+	  if ($decodedResponse != null && $decodedResponse['error']) {
120 
+		$errorText = $decodedResponse['error'];
121 
+		if (isset($decodedResponse['error_description'])) {
122 
+		  $errorText .= ": " . $decodedResponse['error_description'];
123 
+		}
124 
+	  }
125 
+	  throw new Google_Auth_Exception(
126 
+		  sprintf(
127 
+			  "Error fetching OAuth2 access token, message: '%s'",
128 
+			  $errorText
129 
+		  ),
130 
+		  $response->getResponseHttpCode()
131 
+	  );
132 
+	}
133 133 
   }
134 134
135 135 
   /**
 
@@ -141,37 +141,37 @@  discard block
 
 block discarded – undo
141 141 
    */
142 142 
   public function createAuthUrl($scope)
143 143 
   {
144 
-    $params = array(
145 
-        'response_type' => 'code',
146 
-        'redirect_uri' => $this->client->getClassConfig($this, 'redirect_uri'),
147 
-        'client_id' => $this->client->getClassConfig($this, 'client_id'),
148 
-        'scope' => $scope,
149 
-        'access_type' => $this->client->getClassConfig($this, 'access_type'),
150 
-    );
151 
-
152 
-    // Prefer prompt to approval prompt.
153 
-    if ($this->client->getClassConfig($this, 'prompt')) {
154 
-      $params = $this->maybeAddParam($params, 'prompt');
155 
-    } else {
156 
-      $params = $this->maybeAddParam($params, 'approval_prompt');
157 
-    }
158 
-    $params = $this->maybeAddParam($params, 'login_hint');
159 
-    $params = $this->maybeAddParam($params, 'hd');
160 
-    $params = $this->maybeAddParam($params, 'openid.realm');
161 
-    $params = $this->maybeAddParam($params, 'include_granted_scopes');
162 
-
163 
-    // If the list of scopes contains plus.login, add request_visible_actions
164 
-    // to auth URL.
165 
-    $rva = $this->client->getClassConfig($this, 'request_visible_actions');
166 
-    if (strpos($scope, 'plus.login') && strlen($rva) > 0) {
167 
-        $params['request_visible_actions'] = $rva;
168 
-    }
169 
-
170 
-    if (isset($this->state)) {
171 
-      $params['state'] = $this->state;
172 
-    }
173 
-
174 
-    return self::OAUTH2_AUTH_URL . "?" . http_build_query($params, '', '&');
144 
+	$params = array(
145 
+		'response_type' => 'code',
146 
+		'redirect_uri' => $this->client->getClassConfig($this, 'redirect_uri'),
147 
+		'client_id' => $this->client->getClassConfig($this, 'client_id'),
148 
+		'scope' => $scope,
149 
+		'access_type' => $this->client->getClassConfig($this, 'access_type'),
150 
+	);
151 
+
152 
+	// Prefer prompt to approval prompt.
153 
+	if ($this->client->getClassConfig($this, 'prompt')) {
154 
+	  $params = $this->maybeAddParam($params, 'prompt');
155 
+	} else {
156 
+	  $params = $this->maybeAddParam($params, 'approval_prompt');
157 
+	}
158 
+	$params = $this->maybeAddParam($params, 'login_hint');
159 
+	$params = $this->maybeAddParam($params, 'hd');
160 
+	$params = $this->maybeAddParam($params, 'openid.realm');
161 
+	$params = $this->maybeAddParam($params, 'include_granted_scopes');
162 
+
163 
+	// If the list of scopes contains plus.login, add request_visible_actions
164 
+	// to auth URL.
165 
+	$rva = $this->client->getClassConfig($this, 'request_visible_actions');
166 
+	if (strpos($scope, 'plus.login') && strlen($rva) > 0) {
167 
+		$params['request_visible_actions'] = $rva;
168 
+	}
169 
+
170 
+	if (isset($this->state)) {
171 
+	  $params['state'] = $this->state;
172 
+	}
173 
+
174 
+	return self::OAUTH2_AUTH_URL . "?" . http_build_query($params, '', '&');
175 175 
   }
176 176
177 177 
   /**
 
@@ -180,38 +180,38 @@  discard block
 
 block discarded – undo
180 180 
    */
181 181 
   public function setAccessToken($token)
182 182 
   {
183 
-    $token = json_decode($token, true);
184 
-    if ($token == null) {
185 
-      throw new Google_Auth_Exception('Could not json decode the token');
186 
-    }
187 
-    if (! isset($token['access_token'])) {
188 
-      throw new Google_Auth_Exception("Invalid token format");
189 
-    }
190 
-    $this->token = $token;
183 
+	$token = json_decode($token, true);
184 
+	if ($token == null) {
185 
+	  throw new Google_Auth_Exception('Could not json decode the token');
186 
+	}
187 
+	if (! isset($token['access_token'])) {
188 
+	  throw new Google_Auth_Exception("Invalid token format");
189 
+	}
190 
+	$this->token = $token;
191 191 
   }
192 192
193 193 
   public function getAccessToken()
194 194 
   {
195 
-    return json_encode($this->token);
195 
+	return json_encode($this->token);
196 196 
   }
197 197
198 198 
   public function getRefreshToken()
199 199 
   {
200 
-    if (array_key_exists('refresh_token', $this->token)) {
201 
-      return $this->token['refresh_token'];
202 
-    } else {
203 
-      return null;
204 
-    }
200 
+	if (array_key_exists('refresh_token', $this->token)) {
201 
+	  return $this->token['refresh_token'];
202 
+	} else {
203 
+	  return null;
204 
+	}
205 205 
   }
206 206
207 207 
   public function setState($state)
208 208 
   {
209 
-    $this->state = $state;
209 
+	$this->state = $state;
210 210 
   }
211 211
212 212 
   public function setAssertionCredentials(Google_Auth_AssertionCredentials $creds)
213 213 
   {
214 
-    $this->assertionCredentials = $creds;
214 
+	$this->assertionCredentials = $creds;
215 215 
   }
216 216
217 217 
   /**
 
@@ -222,43 +222,43 @@  discard block
 
 block discarded – undo
222 222 
    */
223 223 
   public function sign(Google_Http_Request $request)
224 224 
   {
225 
-    // add the developer key to the request before signing it
226 
-    if ($this->client->getClassConfig($this, 'developer_key')) {
227 
-      $request->setQueryParam('key', $this->client->getClassConfig($this, 'developer_key'));
228 
-    }
229 
-
230 
-    // Cannot sign the request without an OAuth access token.
231 
-    if (null == $this->token && null == $this->assertionCredentials) {
232 
-      return $request;
233 
-    }
234 
-
235 
-    // Check if the token is set to expire in the next 30 seconds
236 
-    // (or has already expired).
237 
-    if ($this->isAccessTokenExpired()) {
238 
-      if ($this->assertionCredentials) {
239 
-        $this->refreshTokenWithAssertion();
240 
-      } else {
241 
-        $this->client->getLogger()->debug('OAuth2 access token expired');
242 
-        if (! array_key_exists('refresh_token', $this->token)) {
243 
-          $error = "The OAuth 2.0 access token has expired,"
244 
-                  ." and a refresh token is not available. Refresh tokens"
245 
-                  ." are not returned for responses that were auto-approved.";
246 
-
247 
-          $this->client->getLogger()->error($error);
248 
-          throw new Google_Auth_Exception($error);
249 
-        }
250 
-        $this->refreshToken($this->token['refresh_token']);
251 
-      }
252 
-    }
253 
-
254 
-    $this->client->getLogger()->debug('OAuth2 authentication');
255 
-
256 
-    // Add the OAuth2 header to the request
257 
-    $request->setRequestHeaders(
258 
-        array('Authorization' => 'Bearer ' . $this->token['access_token'])
259 
-    );
260 
-
261 
-    return $request;
225 
+	// add the developer key to the request before signing it
226 
+	if ($this->client->getClassConfig($this, 'developer_key')) {
227 
+	  $request->setQueryParam('key', $this->client->getClassConfig($this, 'developer_key'));
228 
+	}
229 
+
230 
+	// Cannot sign the request without an OAuth access token.
231 
+	if (null == $this->token && null == $this->assertionCredentials) {
232 
+	  return $request;
233 
+	}
234 
+
235 
+	// Check if the token is set to expire in the next 30 seconds
236 
+	// (or has already expired).
237 
+	if ($this->isAccessTokenExpired()) {
238 
+	  if ($this->assertionCredentials) {
239 
+		$this->refreshTokenWithAssertion();
240 
+	  } else {
241 
+		$this->client->getLogger()->debug('OAuth2 access token expired');
242 
+		if (! array_key_exists('refresh_token', $this->token)) {
243 
+		  $error = "The OAuth 2.0 access token has expired,"
244 
+				  ." and a refresh token is not available. Refresh tokens"
245 
+				  ." are not returned for responses that were auto-approved.";
246 
+
247 
+		  $this->client->getLogger()->error($error);
248 
+		  throw new Google_Auth_Exception($error);
249 
+		}
250 
+		$this->refreshToken($this->token['refresh_token']);
251 
+	  }
252 
+	}
253 
+
254 
+	$this->client->getLogger()->debug('OAuth2 authentication');
255 
+
256 
+	// Add the OAuth2 header to the request
257 
+	$request->setRequestHeaders(
258 
+		array('Authorization' => 'Bearer ' . $this->token['access_token'])
259 
+	);
260 
+
261 
+	return $request;
262 262 
   }
263 263
264 264 
   /**
 
@@ -268,14 +268,14 @@  discard block
 
 block discarded – undo
268 268 
    */
269 269 
   public function refreshToken($refreshToken)
270 270 
   {
271 
-    $this->refreshTokenRequest(
272 
-        array(
273 
-          'client_id' => $this->client->getClassConfig($this, 'client_id'),
274 
-          'client_secret' => $this->client->getClassConfig($this, 'client_secret'),
275 
-          'refresh_token' => $refreshToken,
276 
-          'grant_type' => 'refresh_token'
277 
-        )
278 
-    );
271 
+	$this->refreshTokenRequest(
272 
+		array(
273 
+		  'client_id' => $this->client->getClassConfig($this, 'client_id'),
274 
+		  'client_secret' => $this->client->getClassConfig($this, 'client_secret'),
275 
+		  'refresh_token' => $refreshToken,
276 
+		  'grant_type' => 'refresh_token'
277 
+		)
278 
+	);
279 279 
   }
280 280
281 281 
   /**
 
@@ -285,83 +285,83 @@  discard block
 
 block discarded – undo
285 285 
    */
286 286 
   public function refreshTokenWithAssertion($assertionCredentials = null)
287 287 
   {
288 
-    if (!$assertionCredentials) {
289 
-      $assertionCredentials = $this->assertionCredentials;
290 
-    }
291 
-
292 
-    $cacheKey = $assertionCredentials->getCacheKey();
293 
-
294 
-    if ($cacheKey) {
295 
-      // We can check whether we have a token available in the
296 
-      // cache. If it is expired, we can retrieve a new one from
297 
-      // the assertion.
298 
-      $token = $this->client->getCache()->get($cacheKey);
299 
-      if ($token) {
300 
-        $this->setAccessToken($token);
301 
-      }
302 
-      if (!$this->isAccessTokenExpired()) {
303 
-        return;
304 
-      }
305 
-    }
306 
-
307 
-    $this->client->getLogger()->debug('OAuth2 access token expired');
308 
-    $this->refreshTokenRequest(
309 
-        array(
310 
-          'grant_type' => 'assertion',
311 
-          'assertion_type' => $assertionCredentials->assertionType,
312 
-          'assertion' => $assertionCredentials->generateAssertion(),
313 
-        )
314 
-    );
315 
-
316 
-    if ($cacheKey) {
317 
-      // Attempt to cache the token.
318 
-      $this->client->getCache()->set(
319 
-          $cacheKey,
320 
-          $this->getAccessToken()
321 
-      );
322 
-    }
288 
+	if (!$assertionCredentials) {
289 
+	  $assertionCredentials = $this->assertionCredentials;
290 
+	}
291 
+
292 
+	$cacheKey = $assertionCredentials->getCacheKey();
293 
+
294 
+	if ($cacheKey) {
295 
+	  // We can check whether we have a token available in the
296 
+	  // cache. If it is expired, we can retrieve a new one from
297 
+	  // the assertion.
298 
+	  $token = $this->client->getCache()->get($cacheKey);
299 
+	  if ($token) {
300 
+		$this->setAccessToken($token);
301 
+	  }
302 
+	  if (!$this->isAccessTokenExpired()) {
303 
+		return;
304 
+	  }
305 
+	}
306 
+
307 
+	$this->client->getLogger()->debug('OAuth2 access token expired');
308 
+	$this->refreshTokenRequest(
309 
+		array(
310 
+		  'grant_type' => 'assertion',
311 
+		  'assertion_type' => $assertionCredentials->assertionType,
312 
+		  'assertion' => $assertionCredentials->generateAssertion(),
313 
+		)
314 
+	);
315 
+
316 
+	if ($cacheKey) {
317 
+	  // Attempt to cache the token.
318 
+	  $this->client->getCache()->set(
319 
+		  $cacheKey,
320 
+		  $this->getAccessToken()
321 
+	  );
322 
+	}
323 323 
   }
324 324
325 325 
   private function refreshTokenRequest($params)
326 326 
   {
327 
-    if (isset($params['assertion'])) {
328 
-      $this->client->getLogger()->info(
329 
-          'OAuth2 access token refresh with Signed JWT assertion grants.'
330 
-      );
331 
-    } else {
332 
-      $this->client->getLogger()->info('OAuth2 access token refresh');
333 
-    }
334 
-
335 
-    $http = new Google_Http_Request(
336 
-        self::OAUTH2_TOKEN_URI,
337 
-        'POST',
338 
-        array(),
339 
-        $params
340 
-    );
341 
-    $http->disableGzip();
342 
-    $request = $this->client->getIo()->makeRequest($http);
343 
-
344 
-    $code = $request->getResponseHttpCode();
345 
-    $body = $request->getResponseBody();
346 
-    if (200 == $code) {
347 
-      $token = json_decode($body, true);
348 
-      if ($token == null) {
349 
-        throw new Google_Auth_Exception("Could not json decode the access token");
350 
-      }
351 
-
352 
-      if (! isset($token['access_token']) || ! isset($token['expires_in'])) {
353 
-        throw new Google_Auth_Exception("Invalid token format");
354 
-      }
355 
-
356 
-      if (isset($token['id_token'])) {
357 
-        $this->token['id_token'] = $token['id_token'];
358 
-      }
359 
-      $this->token['access_token'] = $token['access_token'];
360 
-      $this->token['expires_in'] = $token['expires_in'];
361 
-      $this->token['created'] = time();
362 
-    } else {
363 
-      throw new Google_Auth_Exception("Error refreshing the OAuth2 token, message: '$body'", $code);
364 
-    }
327 
+	if (isset($params['assertion'])) {
328 
+	  $this->client->getLogger()->info(
329 
+		  'OAuth2 access token refresh with Signed JWT assertion grants.'
330 
+	  );
331 
+	} else {
332 
+	  $this->client->getLogger()->info('OAuth2 access token refresh');
333 
+	}
334 
+
335 
+	$http = new Google_Http_Request(
336 
+		self::OAUTH2_TOKEN_URI,
337 
+		'POST',
338 
+		array(),
339 
+		$params
340 
+	);
341 
+	$http->disableGzip();
342 
+	$request = $this->client->getIo()->makeRequest($http);
343 
+
344 
+	$code = $request->getResponseHttpCode();
345 
+	$body = $request->getResponseBody();
346 
+	if (200 == $code) {
347 
+	  $token = json_decode($body, true);
348 
+	  if ($token == null) {
349 
+		throw new Google_Auth_Exception("Could not json decode the access token");
350 
+	  }
351 
+
352 
+	  if (! isset($token['access_token']) || ! isset($token['expires_in'])) {
353 
+		throw new Google_Auth_Exception("Invalid token format");
354 
+	  }
355 
+
356 
+	  if (isset($token['id_token'])) {
357 
+		$this->token['id_token'] = $token['id_token'];
358 
+	  }
359 
+	  $this->token['access_token'] = $token['access_token'];
360 
+	  $this->token['expires_in'] = $token['expires_in'];
361 
+	  $this->token['created'] = time();
362 
+	} else {
363 
+	  throw new Google_Auth_Exception("Error refreshing the OAuth2 token, message: '$body'", $code);
364 
+	}
365 365 
   }
366 366
367 367 
   /**
 
@@ -373,31 +373,31 @@  discard block
 
 block discarded – undo
373 373 
    */
374 374 
   public function revokeToken($token = null)
375 375 
   {
376 
-    if (!$token) {
377 
-      if (!$this->token) {
378 
-        // Not initialized, no token to actually revoke
379 
-        return false;
380 
-      } elseif (array_key_exists('refresh_token', $this->token)) {
381 
-        $token = $this->token['refresh_token'];
382 
-      } else {
383 
-        $token = $this->token['access_token'];
384 
-      }
385 
-    }
386 
-    $request = new Google_Http_Request(
387 
-        self::OAUTH2_REVOKE_URI,
388 
-        'POST',
389 
-        array(),
390 
-        "token=$token"
391 
-    );
392 
-    $request->disableGzip();
393 
-    $response = $this->client->getIo()->makeRequest($request);
394 
-    $code = $response->getResponseHttpCode();
395 
-    if ($code == 200) {
396 
-      $this->token = null;
397 
-      return true;
398 
-    }
399 
-
400 
-    return false;
376 
+	if (!$token) {
377 
+	  if (!$this->token) {
378 
+		// Not initialized, no token to actually revoke
379 
+		return false;
380 
+	  } elseif (array_key_exists('refresh_token', $this->token)) {
381 
+		$token = $this->token['refresh_token'];
382 
+	  } else {
383 
+		$token = $this->token['access_token'];
384 
+	  }
385 
+	}
386 
+	$request = new Google_Http_Request(
387 
+		self::OAUTH2_REVOKE_URI,
388 
+		'POST',
389 
+		array(),
390 
+		"token=$token"
391 
+	);
392 
+	$request->disableGzip();
393 
+	$response = $this->client->getIo()->makeRequest($request);
394 
+	$code = $response->getResponseHttpCode();
395 
+	if ($code == 200) {
396 
+	  $this->token = null;
397 
+	  return true;
398 
+	}
399 
+
400 
+	return false;
401 401 
   }
402 402
403 403 
   /**
 
@@ -406,15 +406,15 @@  discard block
 
 block discarded – undo
406 406 
    */
407 407 
   public function isAccessTokenExpired()
408 408 
   {
409 
-    if (!$this->token || !isset($this->token['created'])) {
410 
-      return true;
411 
-    }
409 
+	if (!$this->token || !isset($this->token['created'])) {
410 
+	  return true;
411 
+	}
412 412
413 
-    // If the token is set to expire in the next 30 seconds.
414 
-    $expired = ($this->token['created']
415 
-        + ($this->token['expires_in'] - 30)) < time();
413 
+	// If the token is set to expire in the next 30 seconds.
414 
+	$expired = ($this->token['created']
415 
+		+ ($this->token['expires_in'] - 30)) < time();
416 416
417 
-    return $expired;
417 
+	return $expired;
418 418 
   }
419 419
420 420 
   // Gets federated sign-on certificates to use for verifying identity tokens.
 
@@ -422,9 +422,9 @@  discard block
 
 block discarded – undo
422 422 
   // are PEM encoded certificates.
423 423 
   private function getFederatedSignOnCerts()
424 424 
   {
425 
-    return $this->retrieveCertsFromLocation(
426 
-        $this->client->getClassConfig($this, 'federated_signon_certs_url')
427 
-    );
425 
+	return $this->retrieveCertsFromLocation(
426 
+		$this->client->getClassConfig($this, 'federated_signon_certs_url')
427 
+	);
428 428 
   }
429 429
430 430 
   /**
 
@@ -436,36 +436,36 @@  discard block
 
 block discarded – undo
436 436 
    */
437 437 
   public function retrieveCertsFromLocation($url)
438 438 
   {
439 
-    // If we're retrieving a local file, just grab it.
440 
-    if ("http" != substr($url, 0, 4)) {
441 
-      $file = file_get_contents($url);
442 
-      if ($file) {
443 
-        return json_decode($file, true);
444 
-      } else {
445 
-        throw new Google_Auth_Exception(
446 
-            "Failed to retrieve verification certificates: '" .
447 
-            $url . "'."
448 
-        );
449 
-      }
450 
-    }
451 
-
452 
-    // This relies on makeRequest caching certificate responses.
453 
-    $request = $this->client->getIo()->makeRequest(
454 
-        new Google_Http_Request(
455 
-            $url
456 
-        )
457 
-    );
458 
-    if ($request->getResponseHttpCode() == 200) {
459 
-      $certs = json_decode($request->getResponseBody(), true);
460 
-      if ($certs) {
461 
-        return $certs;
462 
-      }
463 
-    }
464 
-    throw new Google_Auth_Exception(
465 
-        "Failed to retrieve verification certificates: '" .
466 
-        $request->getResponseBody() . "'.",
467 
-        $request->getResponseHttpCode()
468 
-    );
439 
+	// If we're retrieving a local file, just grab it.
440 
+	if ("http" != substr($url, 0, 4)) {
441 
+	  $file = file_get_contents($url);
442 
+	  if ($file) {
443 
+		return json_decode($file, true);
444 
+	  } else {
445 
+		throw new Google_Auth_Exception(
446 
+			"Failed to retrieve verification certificates: '" .
447 
+			$url . "'."
448 
+		);
449 
+	  }
450 
+	}
451 
+
452 
+	// This relies on makeRequest caching certificate responses.
453 
+	$request = $this->client->getIo()->makeRequest(
454 
+		new Google_Http_Request(
455 
+			$url
456 
+		)
457 
+	);
458 
+	if ($request->getResponseHttpCode() == 200) {
459 
+	  $certs = json_decode($request->getResponseBody(), true);
460 
+	  if ($certs) {
461 
+		return $certs;
462 
+	  }
463 
+	}
464 
+	throw new Google_Auth_Exception(
465 
+		"Failed to retrieve verification certificates: '" .
466 
+		$request->getResponseBody() . "'.",
467 
+		$request->getResponseHttpCode()
468 
+	);
469 469 
   }
470 470
471 471 
   /**
 
@@ -480,15 +480,15 @@  discard block
 
 block discarded – undo
480 480 
    */
481 481 
   public function verifyIdToken($id_token = null, $audience = null)
482 482 
   {
483 
-    if (!$id_token) {
484 
-      $id_token = $this->token['id_token'];
485 
-    }
486 
-    $certs = $this->getFederatedSignonCerts();
487 
-    if (!$audience) {
488 
-      $audience = $this->client->getClassConfig($this, 'client_id');
489 
-    }
490 
-
491 
-    return $this->verifySignedJwtWithCerts($id_token, $certs, $audience, self::OAUTH2_ISSUER);
483 
+	if (!$id_token) {
484 
+	  $id_token = $this->token['id_token'];
485 
+	}
486 
+	$certs = $this->getFederatedSignonCerts();
487 
+	if (!$audience) {
488 
+	  $audience = $this->client->getClassConfig($this, 'client_id');
489 
+	}
490 
+
491 
+	return $this->verifySignedJwtWithCerts($id_token, $certs, $audience, self::OAUTH2_ISSUER);
492 492 
   }
493 493
494 494 
   /**
 
@@ -503,125 +503,125 @@  discard block
 
 block discarded – undo
503 503 
    * @return mixed token information if valid, false if not
504 504 
    */
505 505 
   public function verifySignedJwtWithCerts(
506 
-      $jwt,
507 
-      $certs,
508 
-      $required_audience,
509 
-      $issuer = null,
510 
-      $max_expiry = null
506 
+	  $jwt,
507 
+	  $certs,
508 
+	  $required_audience,
509 
+	  $issuer = null,
510 
+	  $max_expiry = null
511 511 
   ) {
512 
-    if (!$max_expiry) {
513 
-      // Set the maximum time we will accept a token for.
514 
-      $max_expiry = self::MAX_TOKEN_LIFETIME_SECS;
515 
-    }
516 
-
517 
-    $segments = explode(".", $jwt);
518 
-    if (count($segments) != 3) {
519 
-      throw new Google_Auth_Exception("Wrong number of segments in token: $jwt");
520 
-    }
521 
-    $signed = $segments[0] . "." . $segments[1];
522 
-    $signature = Google_Utils::urlSafeB64Decode($segments[2]);
523 
-
524 
-    // Parse envelope.
525 
-    $envelope = json_decode(Google_Utils::urlSafeB64Decode($segments[0]), true);
526 
-    if (!$envelope) {
527 
-      throw new Google_Auth_Exception("Can't parse token envelope: " . $segments[0]);
528 
-    }
529 
-
530 
-    // Parse token
531 
-    $json_body = Google_Utils::urlSafeB64Decode($segments[1]);
532 
-    $payload = json_decode($json_body, true);
533 
-    if (!$payload) {
534 
-      throw new Google_Auth_Exception("Can't parse token payload: " . $segments[1]);
535 
-    }
536 
-
537 
-    // Check signature
538 
-    $verified = false;
539 
-    foreach ($certs as $keyName => $pem) {
540 
-      $public_key = new Google_Verifier_Pem($pem);
541 
-      if ($public_key->verify($signed, $signature)) {
542 
-        $verified = true;
543 
-        break;
544 
-      }
545 
-    }
546 
-
547 
-    if (!$verified) {
548 
-      throw new Google_Auth_Exception("Invalid token signature: $jwt");
549 
-    }
550 
-
551 
-    // Check issued-at timestamp
552 
-    $iat = 0;
553 
-    if (array_key_exists("iat", $payload)) {
554 
-      $iat = $payload["iat"];
555 
-    }
556 
-    if (!$iat) {
557 
-      throw new Google_Auth_Exception("No issue time in token: $json_body");
558 
-    }
559 
-    $earliest = $iat - self::CLOCK_SKEW_SECS;
560 
-
561 
-    // Check expiration timestamp
562 
-    $now = time();
563 
-    $exp = 0;
564 
-    if (array_key_exists("exp", $payload)) {
565 
-      $exp = $payload["exp"];
566 
-    }
567 
-    if (!$exp) {
568 
-      throw new Google_Auth_Exception("No expiration time in token: $json_body");
569 
-    }
570 
-    if ($exp >= $now + $max_expiry) {
571 
-      throw new Google_Auth_Exception(
572 
-          sprintf("Expiration time too far in future: %s", $json_body)
573 
-      );
574 
-    }
575 
-
576 
-    $latest = $exp + self::CLOCK_SKEW_SECS;
577 
-    if ($now < $earliest) {
578 
-      throw new Google_Auth_Exception(
579 
-          sprintf(
580 
-              "Token used too early, %s < %s: %s",
581 
-              $now,
582 
-              $earliest,
583 
-              $json_body
584 
-          )
585 
-      );
586 
-    }
587 
-    if ($now > $latest) {
588 
-      throw new Google_Auth_Exception(
589 
-          sprintf(
590 
-              "Token used too late, %s > %s: %s",
591 
-              $now,
592 
-              $latest,
593 
-              $json_body
594 
-          )
595 
-      );
596 
-    }
597 
-
598 
-    $iss = $payload['iss'];
599 
-    if ($issuer && $iss != $issuer) {
600 
-      throw new Google_Auth_Exception(
601 
-          sprintf(
602 
-              "Invalid issuer, %s != %s: %s",
603 
-              $iss,
604 
-              $issuer,
605 
-              $json_body
606 
-          )
607 
-      );
608 
-    }
609 
-
610 
-    // Check audience
611 
-    $aud = $payload["aud"];
612 
-    if ($aud != $required_audience) {
613 
-      throw new Google_Auth_Exception(
614 
-          sprintf(
615 
-              "Wrong recipient, %s != %s:",
616 
-              $aud,
617 
-              $required_audience,
618 
-              $json_body
619 
-          )
620 
-      );
621 
-    }
622 
-
623 
-    // All good.
624 
-    return new Google_Auth_LoginTicket($envelope, $payload);
512 
+	if (!$max_expiry) {
513 
+	  // Set the maximum time we will accept a token for.
514 
+	  $max_expiry = self::MAX_TOKEN_LIFETIME_SECS;
515 
+	}
516 
+
517 
+	$segments = explode(".", $jwt);
518 
+	if (count($segments) != 3) {
519 
+	  throw new Google_Auth_Exception("Wrong number of segments in token: $jwt");
520 
+	}
521 
+	$signed = $segments[0] . "." . $segments[1];
522 
+	$signature = Google_Utils::urlSafeB64Decode($segments[2]);
523 
+
524 
+	// Parse envelope.
525 
+	$envelope = json_decode(Google_Utils::urlSafeB64Decode($segments[0]), true);
526 
+	if (!$envelope) {
527 
+	  throw new Google_Auth_Exception("Can't parse token envelope: " . $segments[0]);
528 
+	}
529 
+
530 
+	// Parse token
531 
+	$json_body = Google_Utils::urlSafeB64Decode($segments[1]);
532 
+	$payload = json_decode($json_body, true);
533 
+	if (!$payload) {
534 
+	  throw new Google_Auth_Exception("Can't parse token payload: " . $segments[1]);
535 
+	}
536 
+
537 
+	// Check signature
538 
+	$verified = false;
539 
+	foreach ($certs as $keyName => $pem) {
540 
+	  $public_key = new Google_Verifier_Pem($pem);
541 
+	  if ($public_key->verify($signed, $signature)) {
542 
+		$verified = true;
543 
+		break;
544 
+	  }
545 
+	}
546 
+
547 
+	if (!$verified) {
548 
+	  throw new Google_Auth_Exception("Invalid token signature: $jwt");
549 
+	}
550 
+
551 
+	// Check issued-at timestamp
552 
+	$iat = 0;
553 
+	if (array_key_exists("iat", $payload)) {
554 
+	  $iat = $payload["iat"];
555 
+	}
556 
+	if (!$iat) {
557 
+	  throw new Google_Auth_Exception("No issue time in token: $json_body");
558 
+	}
559 
+	$earliest = $iat - self::CLOCK_SKEW_SECS;
560 
+
561 
+	// Check expiration timestamp
562 
+	$now = time();
563 
+	$exp = 0;
564 
+	if (array_key_exists("exp", $payload)) {
565 
+	  $exp = $payload["exp"];
566 
+	}
567 
+	if (!$exp) {
568 
+	  throw new Google_Auth_Exception("No expiration time in token: $json_body");
569 
+	}
570 
+	if ($exp >= $now + $max_expiry) {
571 
+	  throw new Google_Auth_Exception(
572 
+		  sprintf("Expiration time too far in future: %s", $json_body)
573 
+	  );
574 
+	}
575 
+
576 
+	$latest = $exp + self::CLOCK_SKEW_SECS;
577 
+	if ($now < $earliest) {
578 
+	  throw new Google_Auth_Exception(
579 
+		  sprintf(
580 
+			  "Token used too early, %s < %s: %s",
581 
+			  $now,
582 
+			  $earliest,
583 
+			  $json_body
584 
+		  )
585 
+	  );
586 
+	}
587 
+	if ($now > $latest) {
588 
+	  throw new Google_Auth_Exception(
589 
+		  sprintf(
590 
+			  "Token used too late, %s > %s: %s",
591 
+			  $now,
592 
+			  $latest,
593 
+			  $json_body
594 
+		  )
595 
+	  );
596 
+	}
597 
+
598 
+	$iss = $payload['iss'];
599 
+	if ($issuer && $iss != $issuer) {
600 
+	  throw new Google_Auth_Exception(
601 
+		  sprintf(
602 
+			  "Invalid issuer, %s != %s: %s",
603 
+			  $iss,
604 
+			  $issuer,
605 
+			  $json_body
606 
+		  )
607 
+	  );
608 
+	}
609 
+
610 
+	// Check audience
611 
+	$aud = $payload["aud"];
612 
+	if ($aud != $required_audience) {
613 
+	  throw new Google_Auth_Exception(
614 
+		  sprintf(
615 
+			  "Wrong recipient, %s != %s:",
616 
+			  $aud,
617 
+			  $required_audience,
618 
+			  $json_body
619 
+		  )
620 
+	  );
621 
+	}
622 
+
623 
+	// All good.
624 
+	return new Google_Auth_LoginTicket($envelope, $payload);
625 625 
   }
626 626
627 627 
   /**
 
@@ -629,10 +629,10 @@  discard block
 
 block discarded – undo
629 629 
    */
630 630 
   private function maybeAddParam($params, $name)
631 631 
   {
632 
-    $param = $this->client->getClassConfig($this, $name);
633 
-    if ($param != '') {
634 
-      $params[$name] = $param;
635 
-    }
636 
-    return $params;
632 
+	$param = $this->client->getClassConfig($this, $name);
633 
+	if ($param != '') {
634 
+	  $params[$name] = $param;
635 
+	}
636 
+	return $params;
637 637 
   }
638 638 
 }
Please login to merge, or discard this patch.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch 
@@ -16,7 +16,7 @@  discard block
 
 block discarded – undo
16 16 
  */
17 17
18 18 
 if (!class_exists('Google_Client')) {
19 
-  require_once dirname(__FILE__) . '/../autoload.php';
19 
+  require_once dirname(__FILE__).'/../autoload.php';
20 20 
 }
21 21
22 22 
 /**
 
@@ -119,7 +119,7 @@  discard block
 
 block discarded – undo
119 119 
       if ($decodedResponse != null && $decodedResponse['error']) {
120 120 
         $errorText = $decodedResponse['error'];
121 121 
         if (isset($decodedResponse['error_description'])) {
122 
-          $errorText .= ": " . $decodedResponse['error_description'];
122 
+          $errorText .= ": ".$decodedResponse['error_description'];
123 123 
         }
124 124 
       }
125 125 
       throw new Google_Auth_Exception(
 
@@ -171,7 +171,7 @@  discard block
 
 block discarded – undo
171 171 
       $params['state'] = $this->state;
172 172 
     }
173 173
174 
-    return self::OAUTH2_AUTH_URL . "?" . http_build_query($params, '', '&');
174 
+    return self::OAUTH2_AUTH_URL."?".http_build_query($params, '', '&');
175 175 
   }
176 176
177 177 
   /**
 
@@ -184,7 +184,7 @@  discard block
 
 block discarded – undo
184 184 
     if ($token == null) {
185 185 
       throw new Google_Auth_Exception('Could not json decode the token');
186 186 
     }
187 
-    if (! isset($token['access_token'])) {
187 
+    if (!isset($token['access_token'])) {
188 188 
       throw new Google_Auth_Exception("Invalid token format");
189 189 
     }
190 190 
     $this->token = $token;
 
@@ -239,7 +239,7 @@  discard block
 
 block discarded – undo
239 239 
         $this->refreshTokenWithAssertion();
240 240 
       } else {
241 241 
         $this->client->getLogger()->debug('OAuth2 access token expired');
242 
-        if (! array_key_exists('refresh_token', $this->token)) {
242 
+        if (!array_key_exists('refresh_token', $this->token)) {
243 243 
           $error = "The OAuth 2.0 access token has expired,"
244 244 
                   ." and a refresh token is not available. Refresh tokens"
245 245 
                   ." are not returned for responses that were auto-approved.";
 
@@ -255,7 +255,7 @@  discard block
 
 block discarded – undo
255 255
256 256 
     // Add the OAuth2 header to the request
257 257 
     $request->setRequestHeaders(
258 
-        array('Authorization' => 'Bearer ' . $this->token['access_token'])
258 
+        array('Authorization' => 'Bearer '.$this->token['access_token'])
259 259 
     );
260 260
261 261 
     return $request;
 
@@ -349,7 +349,7 @@  discard block
 
 block discarded – undo
349 349 
         throw new Google_Auth_Exception("Could not json decode the access token");
350 350 
       }
351 351
352 
-      if (! isset($token['access_token']) || ! isset($token['expires_in'])) {
352 
+      if (!isset($token['access_token']) || !isset($token['expires_in'])) {
353 353 
         throw new Google_Auth_Exception("Invalid token format");
354 354 
       }
355 355 
 
@@ -443,8 +443,8 @@  discard block
 
 block discarded – undo
443 443 
         return json_decode($file, true);
444 444 
       } else {
445 445 
         throw new Google_Auth_Exception(
446 
-            "Failed to retrieve verification certificates: '" .
447 
-            $url . "'."
446 
+            "Failed to retrieve verification certificates: '".
447 
+            $url."'."
448 448 
         );
449 449 
       }
450 450 
     }
 
@@ -462,8 +462,8 @@  discard block
 
 block discarded – undo
462 462 
       }
463 463 
     }
464 464 
     throw new Google_Auth_Exception(
465 
-        "Failed to retrieve verification certificates: '" .
466 
-        $request->getResponseBody() . "'.",
465 
+        "Failed to retrieve verification certificates: '".
466 
+        $request->getResponseBody()."'.",
467 467 
         $request->getResponseHttpCode()
468 468 
     );
469 469 
   }
 
@@ -518,20 +518,20 @@  discard block
 
 block discarded – undo
518 518 
     if (count($segments) != 3) {
519 519 
       throw new Google_Auth_Exception("Wrong number of segments in token: $jwt");
520 520 
     }
521 
-    $signed = $segments[0] . "." . $segments[1];
521 
+    $signed = $segments[0].".".$segments[1];
522 522 
     $signature = Google_Utils::urlSafeB64Decode($segments[2]);
523 523
524 524 
     // Parse envelope.
525 525 
     $envelope = json_decode(Google_Utils::urlSafeB64Decode($segments[0]), true);
526 526 
     if (!$envelope) {
527 
-      throw new Google_Auth_Exception("Can't parse token envelope: " . $segments[0]);
527 
+      throw new Google_Auth_Exception("Can't parse token envelope: ".$segments[0]);
528 528 
     }
529 529
530 530 
     // Parse token
531 531 
     $json_body = Google_Utils::urlSafeB64Decode($segments[1]);
532 532 
     $payload = json_decode($json_body, true);
533 533 
     if (!$payload) {
534 
-      throw new Google_Auth_Exception("Can't parse token payload: " . $segments[1]);
534 
+      throw new Google_Auth_Exception("Can't parse token payload: ".$segments[1]);
535 535 
     }
536 536
537 537 
     // Check signature
Please login to merge, or discard this patch.
geodirectory-admin/google-api-php-client/src/Google/Cache/File.php 3 patches
Doc Comments   +18 added lines patch added patch discarded remove patch 
@@ -129,6 +129,9 @@  discard block
 
 block discarded – undo
129 129 
     );
130 130 
   }
131 131
132 
+  /**
133 
+   * @param string $file
134 
+   */
132 135 
   private function getWriteableCacheFile($file)
133 136 
   {
134 137 
     return $this->getCacheFile($file, true);
 
@@ -139,6 +142,9 @@  discard block
 
 block discarded – undo
139 142 
     return $this->getCacheDir($file, $forWrite) . '/' . md5($file);
140 143 
   }
141 144
145 
+  /**
146 
+   * @param boolean $forWrite
147 
+   */
142 148 
   private function getCacheDir($file, $forWrite)
143 149 
   {
144 150 
     // use the first 2 characters of the hash as a directory prefix
 
@@ -157,11 +163,17 @@  discard block
 
 block discarded – undo
157 163 
     return $storageDir;
158 164 
   }
159 165
166 
+  /**
167 
+   * @param string $storageFile
168 
+   */
160 169 
   private function acquireReadLock($storageFile)
161 170 
   {
162 171 
     return $this->acquireLock(LOCK_SH, $storageFile);
163 172 
   }
164 173
174 
+  /**
175 
+   * @param string $storageFile
176 
+   */
165 177 
   private function acquireWriteLock($storageFile)
166 178 
   {
167 179 
     $rc = $this->acquireLock(LOCK_EX, $storageFile);
 
@@ -175,6 +187,9 @@  discard block
 
 block discarded – undo
175 187 
     return $rc;
176 188 
   }
177 189
190 
+  /**
191 
+   * @param integer $type
192 
+   */
178 193 
   private function acquireLock($type, $storageFile)
179 194 
   {
180 195 
     $mode = $type == LOCK_EX ? "w" : "r";
 
@@ -197,6 +212,9 @@  discard block
 
 block discarded – undo
197 212 
     return true;
198 213 
   }
199 214
215 
+  /**
216 
+   * @param string $storageFile
217 
+   */
200 218 
   public function unlock($storageFile)
201 219 
   {
202 220 
     if ($this->fh) {
Please login to merge, or discard this patch.
Indentation   +122 added lines, -122 removed lines patch added patch discarded remove patch 
@@ -40,167 +40,167 @@
 
 block discarded – undo
40 40
41 41 
   public function __construct(Google_Client $client)
42 42 
   {
43 
-    $this->client = $client;
44 
-    $this->path = $this->client->getClassConfig($this, 'directory');
43 
+	$this->client = $client;
44 
+	$this->path = $this->client->getClassConfig($this, 'directory');
45 45 
   }
46 46
47 47 
   public function get($key, $expiration = false)
48 48 
   {
49 
-    $storageFile = $this->getCacheFile($key);
50 
-    $data = false;
51 
-
52 
-    if (!file_exists($storageFile)) {
53 
-      $this->client->getLogger()->debug(
54 
-          'File cache miss',
55 
-          array('key' => $key, 'file' => $storageFile)
56 
-      );
57 
-      return false;
58 
-    }
59 
-
60 
-    if ($expiration) {
61 
-      $mtime = filemtime($storageFile);
62 
-      if ((time() - $mtime) >= $expiration) {
63 
-        $this->client->getLogger()->debug(
64 
-            'File cache miss (expired)',
65 
-            array('key' => $key, 'file' => $storageFile)
66 
-        );
67 
-        $this->delete($key);
68 
-        return false;
69 
-      }
70 
-    }
71 
-
72 
-    if ($this->acquireReadLock($storageFile)) {
73 
-      if (filesize($storageFile) > 0) {
74 
-        $data = fread($this->fh, filesize($storageFile));
75 
-        $data =  unserialize($data);
76 
-      } else {
77 
-        $this->client->getLogger()->debug(
78 
-            'Cache file was empty',
79 
-            array('file' => $storageFile)
80 
-        );
81 
-      }
82 
-      $this->unlock($storageFile);
83 
-    }
84 
-
85 
-    $this->client->getLogger()->debug(
86 
-        'File cache hit',
87 
-        array('key' => $key, 'file' => $storageFile, 'var' => $data)
88 
-    );
89 
-
90 
-    return $data;
49 
+	$storageFile = $this->getCacheFile($key);
50 
+	$data = false;
51 
+
52 
+	if (!file_exists($storageFile)) {
53 
+	  $this->client->getLogger()->debug(
54 
+		  'File cache miss',
55 
+		  array('key' => $key, 'file' => $storageFile)
56 
+	  );
57 
+	  return false;
58 
+	}
59 
+
60 
+	if ($expiration) {
61 
+	  $mtime = filemtime($storageFile);
62 
+	  if ((time() - $mtime) >= $expiration) {
63 
+		$this->client->getLogger()->debug(
64 
+			'File cache miss (expired)',
65 
+			array('key' => $key, 'file' => $storageFile)
66 
+		);
67 
+		$this->delete($key);
68 
+		return false;
69 
+	  }
70 
+	}
71 
+
72 
+	if ($this->acquireReadLock($storageFile)) {
73 
+	  if (filesize($storageFile) > 0) {
74 
+		$data = fread($this->fh, filesize($storageFile));
75 
+		$data =  unserialize($data);
76 
+	  } else {
77 
+		$this->client->getLogger()->debug(
78 
+			'Cache file was empty',
79 
+			array('file' => $storageFile)
80 
+		);
81 
+	  }
82 
+	  $this->unlock($storageFile);
83 
+	}
84 
+
85 
+	$this->client->getLogger()->debug(
86 
+		'File cache hit',
87 
+		array('key' => $key, 'file' => $storageFile, 'var' => $data)
88 
+	);
89 
+
90 
+	return $data;
91 91 
   }
92 92
93 93 
   public function set($key, $value)
94 94 
   {
95 
-    $storageFile = $this->getWriteableCacheFile($key);
96 
-    if ($this->acquireWriteLock($storageFile)) {
97 
-      // We serialize the whole request object, since we don't only want the
98 
-      // responseContent but also the postBody used, headers, size, etc.
99 
-      $data = serialize($value);
100 
-      $result = fwrite($this->fh, $data);
101 
-      $this->unlock($storageFile);
102 
-
103 
-      $this->client->getLogger()->debug(
104 
-          'File cache set',
105 
-          array('key' => $key, 'file' => $storageFile, 'var' => $value)
106 
-      );
107 
-    } else {
108 
-      $this->client->getLogger()->notice(
109 
-          'File cache set failed',
110 
-          array('key' => $key, 'file' => $storageFile)
111 
-      );
112 
-    }
95 
+	$storageFile = $this->getWriteableCacheFile($key);
96 
+	if ($this->acquireWriteLock($storageFile)) {
97 
+	  // We serialize the whole request object, since we don't only want the
98 
+	  // responseContent but also the postBody used, headers, size, etc.
99 
+	  $data = serialize($value);
100 
+	  $result = fwrite($this->fh, $data);
101 
+	  $this->unlock($storageFile);
102 
+
103 
+	  $this->client->getLogger()->debug(
104 
+		  'File cache set',
105 
+		  array('key' => $key, 'file' => $storageFile, 'var' => $value)
106 
+	  );
107 
+	} else {
108 
+	  $this->client->getLogger()->notice(
109 
+		  'File cache set failed',
110 
+		  array('key' => $key, 'file' => $storageFile)
111 
+	  );
112 
+	}
113 113 
   }
114 114
115 115 
   public function delete($key)
116 116 
   {
117 
-    $file = $this->getCacheFile($key);
118 
-    if (file_exists($file) && !unlink($file)) {
119 
-      $this->client->getLogger()->error(
120 
-          'File cache delete failed',
121 
-          array('key' => $key, 'file' => $file)
122 
-      );
123 
-      throw new Google_Cache_Exception("Cache file could not be deleted");
124 
-    }
125 
-
126 
-    $this->client->getLogger()->debug(
127 
-        'File cache delete',
128 
-        array('key' => $key, 'file' => $file)
129 
-    );
117 
+	$file = $this->getCacheFile($key);
118 
+	if (file_exists($file) && !unlink($file)) {
119 
+	  $this->client->getLogger()->error(
120 
+		  'File cache delete failed',
121 
+		  array('key' => $key, 'file' => $file)
122 
+	  );
123 
+	  throw new Google_Cache_Exception("Cache file could not be deleted");
124 
+	}
125 
+
126 
+	$this->client->getLogger()->debug(
127 
+		'File cache delete',
128 
+		array('key' => $key, 'file' => $file)
129 
+	);
130 130 
   }
131 131
132 132 
   private function getWriteableCacheFile($file)
133 133 
   {
134 
-    return $this->getCacheFile($file, true);
134 
+	return $this->getCacheFile($file, true);
135 135 
   }
136 136
137 137 
   private function getCacheFile($file, $forWrite = false)
138 138 
   {
139 
-    return $this->getCacheDir($file, $forWrite) . '/' . md5($file);
139 
+	return $this->getCacheDir($file, $forWrite) . '/' . md5($file);
140 140 
   }
141 141
142 142 
   private function getCacheDir($file, $forWrite)
143 143 
   {
144 
-    // use the first 2 characters of the hash as a directory prefix
145 
-    // this should prevent slowdowns due to huge directory listings
146 
-    // and thus give some basic amount of scalability
147 
-    $storageDir = $this->path . '/' . substr(md5($file), 0, 2);
148 
-    if ($forWrite && ! is_dir($storageDir)) {
149 
-      if (! mkdir($storageDir, 0755, true)) {
150 
-        $this->client->getLogger()->error(
151 
-            'File cache creation failed',
152 
-            array('dir' => $storageDir)
153 
-        );
154 
-        throw new Google_Cache_Exception("Could not create storage directory: $storageDir");
155 
-      }
156 
-    }
157 
-    return $storageDir;
144 
+	// use the first 2 characters of the hash as a directory prefix
145 
+	// this should prevent slowdowns due to huge directory listings
146 
+	// and thus give some basic amount of scalability
147 
+	$storageDir = $this->path . '/' . substr(md5($file), 0, 2);
148 
+	if ($forWrite && ! is_dir($storageDir)) {
149 
+	  if (! mkdir($storageDir, 0755, true)) {
150 
+		$this->client->getLogger()->error(
151 
+			'File cache creation failed',
152 
+			array('dir' => $storageDir)
153 
+		);
154 
+		throw new Google_Cache_Exception("Could not create storage directory: $storageDir");
155 
+	  }
156 
+	}
157 
+	return $storageDir;
158 158 
   }
159 159
160 160 
   private function acquireReadLock($storageFile)
161 161 
   {
162 
-    return $this->acquireLock(LOCK_SH, $storageFile);
162 
+	return $this->acquireLock(LOCK_SH, $storageFile);
163 163 
   }
164 164
165 165 
   private function acquireWriteLock($storageFile)
166 166 
   {
167 
-    $rc = $this->acquireLock(LOCK_EX, $storageFile);
168 
-    if (!$rc) {
169 
-      $this->client->getLogger()->notice(
170 
-          'File cache write lock failed',
171 
-          array('file' => $storageFile)
172 
-      );
173 
-      $this->delete($storageFile);
174 
-    }
175 
-    return $rc;
167 
+	$rc = $this->acquireLock(LOCK_EX, $storageFile);
168 
+	if (!$rc) {
169 
+	  $this->client->getLogger()->notice(
170 
+		  'File cache write lock failed',
171 
+		  array('file' => $storageFile)
172 
+	  );
173 
+	  $this->delete($storageFile);
174 
+	}
175 
+	return $rc;
176 176 
   }
177 177
178 178 
   private function acquireLock($type, $storageFile)
179 179 
   {
180 
-    $mode = $type == LOCK_EX ? "w" : "r";
181 
-    $this->fh = fopen($storageFile, $mode);
182 
-    if (!$this->fh) {
183 
-      $this->client->getLogger()->error(
184 
-          'Failed to open file during lock acquisition',
185 
-          array('file' => $storageFile)
186 
-      );
187 
-      return false;
188 
-    }
189 
-    $count = 0;
190 
-    while (!flock($this->fh, $type | LOCK_NB)) {
191 
-      // Sleep for 10ms.
192 
-      usleep(10000);
193 
-      if (++$count < self::MAX_LOCK_RETRIES) {
194 
-        return false;
195 
-      }
196 
-    }
197 
-    return true;
180 
+	$mode = $type == LOCK_EX ? "w" : "r";
181 
+	$this->fh = fopen($storageFile, $mode);
182 
+	if (!$this->fh) {
183 
+	  $this->client->getLogger()->error(
184 
+		  'Failed to open file during lock acquisition',
185 
+		  array('file' => $storageFile)
186 
+	  );
187 
+	  return false;
188 
+	}
189 
+	$count = 0;
190 
+	while (!flock($this->fh, $type | LOCK_NB)) {
191 
+	  // Sleep for 10ms.
192 
+	  usleep(10000);
193 
+	  if (++$count < self::MAX_LOCK_RETRIES) {
194 
+		return false;
195 
+	  }
196 
+	}
197 
+	return true;
198 198 
   }
199 199
200 200 
   public function unlock($storageFile)
201 201 
   {
202 
-    if ($this->fh) {
203 
-      flock($this->fh, LOCK_UN);
204 
-    }
202 
+	if ($this->fh) {
203 
+	  flock($this->fh, LOCK_UN);
204 
+	}
205 205 
   }
206 206 
 }
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -16,7 +16,7 @@  discard block
 
 block discarded – undo
16 16 
  */
17 17
18 18 
 if (!class_exists('Google_Client')) {
19 
-  require_once dirname(__FILE__) . '/../autoload.php';
19 
+  require_once dirname(__FILE__).'/../autoload.php';
20 20 
 }
21 21
22 22 
 /*
 
@@ -72,7 +72,7 @@  discard block
 
 block discarded – undo
72 72 
     if ($this->acquireReadLock($storageFile)) {
73 73 
       if (filesize($storageFile) > 0) {
74 74 
         $data = fread($this->fh, filesize($storageFile));
75 
-        $data =  unserialize($data);
75 
+        $data = unserialize($data);
76 76 
       } else {
77 77 
         $this->client->getLogger()->debug(
78 78 
             'Cache file was empty',
 
@@ -136,7 +136,7 @@  discard block
 
 block discarded – undo
136 136
137 137 
   private function getCacheFile($file, $forWrite = false)
138 138 
   {
139 
-    return $this->getCacheDir($file, $forWrite) . '/' . md5($file);
139 
+    return $this->getCacheDir($file, $forWrite).'/'.md5($file);
140 140 
   }
141 141
142 142 
   private function getCacheDir($file, $forWrite)
 
@@ -144,9 +144,9 @@  discard block
 
 block discarded – undo
144 144 
     // use the first 2 characters of the hash as a directory prefix
145 145 
     // this should prevent slowdowns due to huge directory listings
146 146 
     // and thus give some basic amount of scalability
147 
-    $storageDir = $this->path . '/' . substr(md5($file), 0, 2);
148 
-    if ($forWrite && ! is_dir($storageDir)) {
149 
-      if (! mkdir($storageDir, 0755, true)) {
147 
+    $storageDir = $this->path.'/'.substr(md5($file), 0, 2);
148 
+    if ($forWrite && !is_dir($storageDir)) {
149 
+      if (!mkdir($storageDir, 0755, true)) {
150 150 
         $this->client->getLogger()->error(
151 151 
             'File cache creation failed',
152 152 
             array('dir' => $storageDir)
Please login to merge, or discard this patch.
geodirectory-admin/google-api-php-client/src/Google/Client.php 3 patches
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -191,7 +191,7 @@  discard block
 
 block discarded – undo
191 191
192 192 
   /**
193 193 
    * @throws Google_Auth_Exception
194 
-   * @return array
194 
+   * @return string
195 195 
    * @visible For Testing
196 196 
    */
197 197 
   public function prepareScopes()
 
@@ -490,7 +490,7 @@  discard block
 
 block discarded – undo
490 490 
    * @param $audience string the expected consumer of the token
491 491 
    * @param $issuer string the expected issuer, defaults to Google
492 492 
    * @param [$max_expiry] the max lifetime of a token, defaults to MAX_TOKEN_LIFETIME_SECS
493 
-   * @return mixed token information if valid, false if not
493 
+   * @return Google_Auth_LoginTicket token information if valid, false if not
494 494 
    */
495 495 
   public function verifySignedJwt($id_token, $cert_location, $audience, $issuer, $max_expiry = null)
496 496 
   {
 
@@ -512,6 +512,7 @@  discard block
 
 block discarded – undo
512 512 
    * Will remove any previously configured scopes.
513 513 
    * @param array $scopes, ie: array('https://www.googleapis.com/auth/plus.login',
514 514 
    * 'https://www.googleapis.com/auth/moderator')
515 
+   * @param string[] $scopes
515 516 
    */
516 517 
   public function setScopes($scopes)
517 518 
   {
Please login to merge, or discard this patch.
Indentation   +160 added lines, -160 removed lines patch added patch discarded remove patch 
@@ -74,32 +74,32 @@  discard block
 
 block discarded – undo
74 74 
    */
75 75 
   public function __construct($config = null)
76 76 
   {
77 
-    if (is_string($config) && strlen($config)) {
78 
-      $config = new Google_Config($config);
79 
-    } else if ( !($config instanceof Google_Config)) {
80 
-      $config = new Google_Config();
77 
+	if (is_string($config) && strlen($config)) {
78 
+	  $config = new Google_Config($config);
79 
+	} else if ( !($config instanceof Google_Config)) {
80 
+	  $config = new Google_Config();
81 81
82 
-      if ($this->isAppEngine()) {
83 
-        // Automatically use Memcache if we're in AppEngine.
84 
-        $config->setCacheClass('Google_Cache_Memcache');
85 
-      }
82 
+	  if ($this->isAppEngine()) {
83 
+		// Automatically use Memcache if we're in AppEngine.
84 
+		$config->setCacheClass('Google_Cache_Memcache');
85 
+	  }
86 86
87 
-      if (version_compare(phpversion(), "5.3.4", "<=") || $this->isAppEngine()) {
88 
-        // Automatically disable compress.zlib, as currently unsupported.
89 
-        $config->setClassConfig('Google_Http_Request', 'disable_gzip', true);
90 
-      }
91 
-    }
87 
+	  if (version_compare(phpversion(), "5.3.4", "<=") || $this->isAppEngine()) {
88 
+		// Automatically disable compress.zlib, as currently unsupported.
89 
+		$config->setClassConfig('Google_Http_Request', 'disable_gzip', true);
90 
+	  }
91 
+	}
92 92
93 
-    if ($config->getIoClass() == Google_Config::USE_AUTO_IO_SELECTION) {
94 
-      if (function_exists('curl_version') && function_exists('curl_exec')
95 
-          && !$this->isAppEngine()) {
96 
-        $config->setIoClass("Google_IO_Curl");
97 
-      } else {
98 
-        $config->setIoClass("Google_IO_Stream");
99 
-      }
100 
-    }
93 
+	if ($config->getIoClass() == Google_Config::USE_AUTO_IO_SELECTION) {
94 
+	  if (function_exists('curl_version') && function_exists('curl_exec')
95 
+		  && !$this->isAppEngine()) {
96 
+		$config->setIoClass("Google_IO_Curl");
97 
+	  } else {
98 
+		$config->setIoClass("Google_IO_Stream");
99 
+	  }
100 
+	}
101 101
102 
-    $this->config = $config;
102 
+	$this->config = $config;
103 103 
   }
104 104
105 105 
   /**
 
@@ -109,7 +109,7 @@  discard block
 
 block discarded – undo
109 109 
    */
110 110 
   public function getLibraryVersion()
111 111 
   {
112 
-    return self::LIBVER;
112 
+	return self::LIBVER;
113 113 
   }
114 114
115 115 
   /**
 
@@ -124,8 +124,8 @@  discard block
 
 block discarded – undo
124 124 
    */
125 125 
   public function authenticate($code, $crossClient = false)
126 126 
   {
127 
-    $this->authenticated = true;
128 
-    return $this->getAuth()->authenticate($code, $crossClient);
127 
+	$this->authenticated = true;
128 
+	return $this->getAuth()->authenticate($code, $crossClient);
129 129 
   }
130 130
131 131 
   /**
 
@@ -141,18 +141,18 @@  discard block
 
 block discarded – undo
141 141 
    */
142 142 
   public function loadServiceAccountJson($jsonLocation, $scopes)
143 143 
   {
144 
-    $data = json_decode(file_get_contents($jsonLocation));
145 
-    if (isset($data->type) && $data->type == 'service_account') {
146 
-      // Service Account format.
147 
-      $cred = new Google_Auth_AssertionCredentials(
148 
-          $data->client_email,
149 
-          $scopes,
150 
-          $data->private_key
151 
-      );
152 
-      return $cred;
153 
-    } else {
154 
-      throw new Google_Exception("Invalid service account JSON file.");
155 
-    }
144 
+	$data = json_decode(file_get_contents($jsonLocation));
145 
+	if (isset($data->type) && $data->type == 'service_account') {
146 
+	  // Service Account format.
147 
+	  $cred = new Google_Auth_AssertionCredentials(
148 
+		  $data->client_email,
149 
+		  $scopes,
150 
+		  $data->private_key
151 
+	  );
152 
+	  return $cred;
153 
+	} else {
154 
+	  throw new Google_Exception("Invalid service account JSON file.");
155 
+	}
156 156 
   }
157 157
158 158 
   /**
 
@@ -165,16 +165,16 @@  discard block
 
 block discarded – undo
165 165 
    */
166 166 
   public function setAuthConfig($json)
167 167 
   {
168 
-    $data = json_decode($json);
169 
-    $key = isset($data->installed) ? 'installed' : 'web';
170 
-    if (!isset($data->$key)) {
171 
-      throw new Google_Exception("Invalid client secret JSON file.");
172 
-    }
173 
-    $this->setClientId($data->$key->client_id);
174 
-    $this->setClientSecret($data->$key->client_secret);
175 
-    if (isset($data->$key->redirect_uris)) {
176 
-      $this->setRedirectUri($data->$key->redirect_uris[0]);
177 
-    }
168 
+	$data = json_decode($json);
169 
+	$key = isset($data->installed) ? 'installed' : 'web';
170 
+	if (!isset($data->$key)) {
171 
+	  throw new Google_Exception("Invalid client secret JSON file.");
172 
+	}
173 
+	$this->setClientId($data->$key->client_id);
174 
+	$this->setClientSecret($data->$key->client_secret);
175 
+	if (isset($data->$key->redirect_uris)) {
176 
+	  $this->setRedirectUri($data->$key->redirect_uris[0]);
177 
+	}
178 178 
   }
179 179
180 180 
   /**
 
@@ -186,7 +186,7 @@  discard block
 
 block discarded – undo
186 186 
    */
187 187 
   public function setAuthConfigFile($file)
188 188 
   {
189 
-    $this->setAuthConfig(file_get_contents($file));
189 
+	$this->setAuthConfig(file_get_contents($file));
190 190 
   }
191 191
192 192 
   /**
 
@@ -196,11 +196,11 @@  discard block
 
 block discarded – undo
196 196 
    */
197 197 
   public function prepareScopes()
198 198 
   {
199 
-    if (empty($this->requestedScopes)) {
200 
-      throw new Google_Auth_Exception("No scopes specified");
201 
-    }
202 
-    $scopes = implode(' ', $this->requestedScopes);
203 
-    return $scopes;
199 
+	if (empty($this->requestedScopes)) {
200 
+	  throw new Google_Auth_Exception("No scopes specified");
201 
+	}
202 
+	$scopes = implode(' ', $this->requestedScopes);
203 
+	return $scopes;
204 204 
   }
205 205
206 206 
   /**
 
@@ -212,10 +212,10 @@  discard block
 
 block discarded – undo
212 212 
    */
213 213 
   public function setAccessToken($accessToken)
214 214 
   {
215 
-    if ($accessToken == 'null') {
216 
-      $accessToken = null;
217 
-    }
218 
-    $this->getAuth()->setAccessToken($accessToken);
215 
+	if ($accessToken == 'null') {
216 
+	  $accessToken = null;
217 
+	}
218 
+	$this->getAuth()->setAccessToken($accessToken);
219 219 
   }
220 220
221 221 
 
@@ -226,8 +226,8 @@  discard block
 
 block discarded – undo
226 226 
    */
227 227 
   public function setAuth(Google_Auth_Abstract $auth)
228 228 
   {
229 
-    $this->config->setAuthClass(get_class($auth));
230 
-    $this->auth = $auth;
229 
+	$this->config->setAuthClass(get_class($auth));
230 
+	$this->auth = $auth;
231 231 
   }
232 232
233 233 
   /**
 
@@ -236,8 +236,8 @@  discard block
 
 block discarded – undo
236 236 
    */
237 237 
   public function setIo(Google_IO_Abstract $io)
238 238 
   {
239 
-    $this->config->setIoClass(get_class($io));
240 
-    $this->io = $io;
239 
+	$this->config->setIoClass(get_class($io));
240 
+	$this->io = $io;
241 241 
   }
242 242
243 243 
   /**
 
@@ -246,8 +246,8 @@  discard block
 
 block discarded – undo
246 246 
    */
247 247 
   public function setCache(Google_Cache_Abstract $cache)
248 248 
   {
249 
-    $this->config->setCacheClass(get_class($cache));
250 
-    $this->cache = $cache;
249 
+	$this->config->setCacheClass(get_class($cache));
250 
+	$this->cache = $cache;
251 251 
   }
252 252
253 253 
   /**
 
@@ -256,8 +256,8 @@  discard block
 
 block discarded – undo
256 256 
    */
257 257 
   public function setLogger(Google_Logger_Abstract $logger)
258 258 
   {
259 
-    $this->config->setLoggerClass(get_class($logger));
260 
-    $this->logger = $logger;
259 
+	$this->config->setLoggerClass(get_class($logger));
260 
+	$this->logger = $logger;
261 261 
   }
262 262
263 263 
   /**
 
@@ -266,8 +266,8 @@  discard block
 
 block discarded – undo
266 266 
    */
267 267 
   public function createAuthUrl()
268 268 
   {
269 
-    $scopes = $this->prepareScopes();
270 
-    return $this->getAuth()->createAuthUrl($scopes);
269 
+	$scopes = $this->prepareScopes();
270 
+	return $this->getAuth()->createAuthUrl($scopes);
271 271 
   }
272 272
273 273 
   /**
 
@@ -278,11 +278,11 @@  discard block
 
 block discarded – undo
278 278 
    */
279 279 
   public function getAccessToken()
280 280 
   {
281 
-    $token = $this->getAuth()->getAccessToken();
282 
-    // The response is json encoded, so could be the string null.
283 
-    // It is arguable whether this check should be here or lower
284 
-    // in the library.
285 
-    return (null == $token || 'null' == $token || '[]' == $token) ? null : $token;
281 
+	$token = $this->getAuth()->getAccessToken();
282 
+	// The response is json encoded, so could be the string null.
283 
+	// It is arguable whether this check should be here or lower
284 
+	// in the library.
285 
+	return (null == $token || 'null' == $token || '[]' == $token) ? null : $token;
286 286 
   }
287 287
288 288 
   /**
 
@@ -291,7 +291,7 @@  discard block
 
 block discarded – undo
291 291 
    */
292 292 
   public function getRefreshToken()
293 293 
   {
294 
-    return $this->getAuth()->getRefreshToken();
294 
+	return $this->getAuth()->getRefreshToken();
295 295 
   }
296 296
297 297 
   /**
 
@@ -300,7 +300,7 @@  discard block
 
 block discarded – undo
300 300 
    */
301 301 
   public function isAccessTokenExpired()
302 302 
   {
303 
-    return $this->getAuth()->isAccessTokenExpired();
303 
+	return $this->getAuth()->isAccessTokenExpired();
304 304 
   }
305 305
306 306 
   /**
 
@@ -310,7 +310,7 @@  discard block
 
 block discarded – undo
310 310 
    */
311 311 
   public function setState($state)
312 312 
   {
313 
-    $this->getAuth()->setState($state);
313 
+	$this->getAuth()->setState($state);
314 314 
   }
315 315
316 316 
   /**
 
@@ -320,7 +320,7 @@  discard block
 
 block discarded – undo
320 320 
    */
321 321 
   public function setAccessType($accessType)
322 322 
   {
323 
-    $this->config->setAccessType($accessType);
323 
+	$this->config->setAccessType($accessType);
324 324 
   }
325 325
326 326 
   /**
 
@@ -330,7 +330,7 @@  discard block
 
 block discarded – undo
330 330 
    */
331 331 
   public function setApprovalPrompt($approvalPrompt)
332 332 
   {
333 
-    $this->config->setApprovalPrompt($approvalPrompt);
333 
+	$this->config->setApprovalPrompt($approvalPrompt);
334 334 
   }
335 335
336 336 
   /**
 
@@ -339,7 +339,7 @@  discard block
 
 block discarded – undo
339 339 
    */
340 340 
   public function setLoginHint($loginHint)
341 341 
   {
342 
-      $this->config->setLoginHint($loginHint);
342 
+	  $this->config->setLoginHint($loginHint);
343 343 
   }
344 344
345 345 
   /**
 
@@ -348,7 +348,7 @@  discard block
 
 block discarded – undo
348 348 
    */
349 349 
   public function setApplicationName($applicationName)
350 350 
   {
351 
-    $this->config->setApplicationName($applicationName);
351 
+	$this->config->setApplicationName($applicationName);
352 352 
   }
353 353
354 354 
   /**
 
@@ -357,7 +357,7 @@  discard block
 
 block discarded – undo
357 357 
    */
358 358 
   public function setClientId($clientId)
359 359 
   {
360 
-    $this->config->setClientId($clientId);
360 
+	$this->config->setClientId($clientId);
361 361 
   }
362 362
363 363 
   /**
 
@@ -366,7 +366,7 @@  discard block
 
 block discarded – undo
366 366 
    */
367 367 
   public function setClientSecret($clientSecret)
368 368 
   {
369 
-    $this->config->setClientSecret($clientSecret);
369 
+	$this->config->setClientSecret($clientSecret);
370 370 
   }
371 371
372 372 
   /**
 
@@ -375,7 +375,7 @@  discard block
 
 block discarded – undo
375 375 
    */
376 376 
   public function setRedirectUri($redirectUri)
377 377 
   {
378 
-    $this->config->setRedirectUri($redirectUri);
378 
+	$this->config->setRedirectUri($redirectUri);
379 379 
   }
380 380
381 381 
   /**
 
@@ -388,10 +388,10 @@  discard block
 
 block discarded – undo
388 388 
    */
389 389 
   public function setRequestVisibleActions($requestVisibleActions)
390 390 
   {
391 
-    if (is_array($requestVisibleActions)) {
392 
-      $requestVisibleActions = join(" ", $requestVisibleActions);
393 
-    }
394 
-    $this->config->setRequestVisibleActions($requestVisibleActions);
391 
+	if (is_array($requestVisibleActions)) {
392 
+	  $requestVisibleActions = join(" ", $requestVisibleActions);
393 
+	}
394 
+	$this->config->setRequestVisibleActions($requestVisibleActions);
395 395 
   }
396 396
397 397 
   /**
 
@@ -401,7 +401,7 @@  discard block
 
 block discarded – undo
401 401 
    */
402 402 
   public function setDeveloperKey($developerKey)
403 403 
   {
404 
-    $this->config->setDeveloperKey($developerKey);
404 
+	$this->config->setDeveloperKey($developerKey);
405 405 
   }
406 406
407 407 
   /**
 
@@ -412,7 +412,7 @@  discard block
 
 block discarded – undo
412 412 
    */
413 413 
   public function setHostedDomain($hd)
414 414 
   {
415 
-    $this->config->setHostedDomain($hd);
415 
+	$this->config->setHostedDomain($hd);
416 416 
   }
417 417
418 418 
   /**
 
@@ -423,7 +423,7 @@  discard block
 
 block discarded – undo
423 423 
    */
424 424 
   public function setPrompt($prompt)
425 425 
   {
426 
-    $this->config->setPrompt($prompt);
426 
+	$this->config->setPrompt($prompt);
427 427 
   }
428 428
429 429 
   /**
 
@@ -434,7 +434,7 @@  discard block
 
 block discarded – undo
434 434 
    */
435 435 
   public function setOpenidRealm($realm)
436 436 
   {
437 
-    $this->config->setOpenidRealm($realm);
437 
+	$this->config->setOpenidRealm($realm);
438 438 
   }
439 439
440 440 
   /**
 
@@ -445,7 +445,7 @@  discard block
 
 block discarded – undo
445 445 
    */
446 446 
   public function setIncludeGrantedScopes($include)
447 447 
   {
448 
-    $this->config->setIncludeGrantedScopes($include);
448 
+	$this->config->setIncludeGrantedScopes($include);
449 449 
   }
450 450
451 451 
   /**
 
@@ -454,7 +454,7 @@  discard block
 
 block discarded – undo
454 454 
    */
455 455 
   public function refreshToken($refreshToken)
456 456 
   {
457 
-    $this->getAuth()->refreshToken($refreshToken);
457 
+	$this->getAuth()->refreshToken($refreshToken);
458 458 
   }
459 459
460 460 
   /**
 
@@ -466,7 +466,7 @@  discard block
 
 block discarded – undo
466 466 
    */
467 467 
   public function revokeToken($token = null)
468 468 
   {
469 
-    return $this->getAuth()->revokeToken($token);
469 
+	return $this->getAuth()->revokeToken($token);
470 470 
   }
471 471
472 472 
   /**
 
@@ -479,7 +479,7 @@  discard block
 
 block discarded – undo
479 479 
    */
480 480 
   public function verifyIdToken($token = null)
481 481 
   {
482 
-    return $this->getAuth()->verifyIdToken($token);
482 
+	return $this->getAuth()->verifyIdToken($token);
483 483 
   }
484 484
485 485 
   /**
 
@@ -494,9 +494,9 @@  discard block
 
 block discarded – undo
494 494 
    */
495 495 
   public function verifySignedJwt($id_token, $cert_location, $audience, $issuer, $max_expiry = null)
496 496 
   {
497 
-    $auth = new Google_Auth_OAuth2($this);
498 
-    $certs = $auth->retrieveCertsFromLocation($cert_location);
499 
-    return $auth->verifySignedJwtWithCerts($id_token, $certs, $audience, $issuer, $max_expiry);
497 
+	$auth = new Google_Auth_OAuth2($this);
498 
+	$certs = $auth->retrieveCertsFromLocation($cert_location);
499 
+	return $auth->verifySignedJwtWithCerts($id_token, $certs, $audience, $issuer, $max_expiry);
500 500 
   }
501 501
502 502 
   /**
 
@@ -504,7 +504,7 @@  discard block
 
 block discarded – undo
504 504 
    */
505 505 
   public function setAssertionCredentials(Google_Auth_AssertionCredentials $creds)
506 506 
   {
507 
-    $this->getAuth()->setAssertionCredentials($creds);
507 
+	$this->getAuth()->setAssertionCredentials($creds);
508 508 
   }
509 509
510 510 
   /**
 
@@ -515,8 +515,8 @@  discard block
 
 block discarded – undo
515 515 
    */
516 516 
   public function setScopes($scopes)
517 517 
   {
518 
-    $this->requestedScopes = array();
519 
-    $this->addScope($scopes);
518 
+	$this->requestedScopes = array();
519 
+	$this->addScope($scopes);
520 520 
   }
521 521
522 522 
   /**
 
@@ -528,13 +528,13 @@  discard block
 
 block discarded – undo
528 528 
    */
529 529 
   public function addScope($scope_or_scopes)
530 530 
   {
531 
-    if (is_string($scope_or_scopes) && !in_array($scope_or_scopes, $this->requestedScopes)) {
532 
-      $this->requestedScopes[] = $scope_or_scopes;
533 
-    } else if (is_array($scope_or_scopes)) {
534 
-      foreach ($scope_or_scopes as $scope) {
535 
-        $this->addScope($scope);
536 
-      }
537 
-    }
531 
+	if (is_string($scope_or_scopes) && !in_array($scope_or_scopes, $this->requestedScopes)) {
532 
+	  $this->requestedScopes[] = $scope_or_scopes;
533 
+	} else if (is_array($scope_or_scopes)) {
534 
+	  foreach ($scope_or_scopes as $scope) {
535 
+		$this->addScope($scope);
536 
+	  }
537 
+	}
538 538 
   }
539 539
540 540 
   /**
 
@@ -544,7 +544,7 @@  discard block
 
 block discarded – undo
544 544 
    */
545 545 
   public function getScopes()
546 546 
   {
547 
-     return $this->requestedScopes;
547 
+	 return $this->requestedScopes;
548 548 
   }
549 549
550 550 
   /**
 
@@ -556,8 +556,8 @@  discard block
 
 block discarded – undo
556 556 
    */
557 557 
   public function setUseBatch($useBatch)
558 558 
   {
559 
-    // This is actually an alias for setDefer.
560 
-    $this->setDefer($useBatch);
559 
+	// This is actually an alias for setDefer.
560 
+	$this->setDefer($useBatch);
561 561 
   }
562 562
563 563 
   /**
 
@@ -568,7 +568,7 @@  discard block
 
 block discarded – undo
568 568 
    */
569 569 
   public function setDefer($defer)
570 570 
   {
571 
-    $this->deferExecution = $defer;
571 
+	$this->deferExecution = $defer;
572 572 
   }
573 573
574 574 
   /**
 
@@ -580,22 +580,22 @@  discard block
 
 block discarded – undo
580 580 
    */
581 581 
   public function execute($request)
582 582 
   {
583 
-    if ($request instanceof Google_Http_Request) {
584 
-      $request->setUserAgent(
585 
-          $this->getApplicationName()
586 
-          . " " . self::USER_AGENT_SUFFIX
587 
-          . $this->getLibraryVersion()
588 
-      );
589 
-      if (!$this->getClassConfig("Google_Http_Request", "disable_gzip")) {
590 
-        $request->enableGzip();
591 
-      }
592 
-      $request->maybeMoveParametersToBody();
593 
-      return Google_Http_REST::execute($this, $request);
594 
-    } else if ($request instanceof Google_Http_Batch) {
595 
-      return $request->execute();
596 
-    } else {
597 
-      throw new Google_Exception("Do not know how to execute this type of object.");
598 
-    }
583 
+	if ($request instanceof Google_Http_Request) {
584 
+	  $request->setUserAgent(
585 
+		  $this->getApplicationName()
586 
+		  . " " . self::USER_AGENT_SUFFIX
587 
+		  . $this->getLibraryVersion()
588 
+	  );
589 
+	  if (!$this->getClassConfig("Google_Http_Request", "disable_gzip")) {
590 
+		$request->enableGzip();
591 
+	  }
592 
+	  $request->maybeMoveParametersToBody();
593 
+	  return Google_Http_REST::execute($this, $request);
594 
+	} else if ($request instanceof Google_Http_Batch) {
595 
+	  return $request->execute();
596 
+	} else {
597 
+	  throw new Google_Exception("Do not know how to execute this type of object.");
598 
+	}
599 599 
   }
600 600
601 601 
   /**
 
@@ -604,7 +604,7 @@  discard block
 
 block discarded – undo
604 604 
    */
605 605 
   public function shouldDefer()
606 606 
   {
607 
-    return $this->deferExecution;
607 
+	return $this->deferExecution;
608 608 
   }
609 609
610 610 
   /**
 
@@ -612,11 +612,11 @@  discard block
 
 block discarded – undo
612 612 
    */
613 613 
   public function getAuth()
614 614 
   {
615 
-    if (!isset($this->auth)) {
616 
-      $class = $this->config->getAuthClass();
617 
-      $this->auth = new $class($this);
618 
-    }
619 
-    return $this->auth;
615 
+	if (!isset($this->auth)) {
616 
+	  $class = $this->config->getAuthClass();
617 
+	  $this->auth = new $class($this);
618 
+	}
619 
+	return $this->auth;
620 620 
   }
621 621
622 622 
   /**
 
@@ -624,11 +624,11 @@  discard block
 
 block discarded – undo
624 624 
    */
625 625 
   public function getIo()
626 626 
   {
627 
-    if (!isset($this->io)) {
628 
-      $class = $this->config->getIoClass();
629 
-      $this->io = new $class($this);
630 
-    }
631 
-    return $this->io;
627 
+	if (!isset($this->io)) {
628 
+	  $class = $this->config->getIoClass();
629 
+	  $this->io = new $class($this);
630 
+	}
631 
+	return $this->io;
632 632 
   }
633 633
634 634 
   /**
 
@@ -636,11 +636,11 @@  discard block
 
 block discarded – undo
636 636 
    */
637 637 
   public function getCache()
638 638 
   {
639 
-    if (!isset($this->cache)) {
640 
-      $class = $this->config->getCacheClass();
641 
-      $this->cache = new $class($this);
642 
-    }
643 
-    return $this->cache;
639 
+	if (!isset($this->cache)) {
640 
+	  $class = $this->config->getCacheClass();
641 
+	  $this->cache = new $class($this);
642 
+	}
643 
+	return $this->cache;
644 644 
   }
645 645
646 646 
   /**
 
@@ -648,11 +648,11 @@  discard block
 
 block discarded – undo
648 648 
    */
649 649 
   public function getLogger()
650 650 
   {
651 
-    if (!isset($this->logger)) {
652 
-      $class = $this->config->getLoggerClass();
653 
-      $this->logger = new $class($this);
654 
-    }
655 
-    return $this->logger;
651 
+	if (!isset($this->logger)) {
652 
+	  $class = $this->config->getLoggerClass();
653 
+	  $this->logger = new $class($this);
654 
+	}
655 
+	return $this->logger;
656 656 
   }
657 657
658 658 
   /**
 
@@ -663,10 +663,10 @@  discard block
 
 block discarded – undo
663 663 
    */
664 664 
   public function getClassConfig($class, $key = null)
665 665 
   {
666 
-    if (!is_string($class)) {
667 
-      $class = get_class($class);
668 
-    }
669 
-    return $this->config->getClassConfig($class, $key);
666 
+	if (!is_string($class)) {
667 
+	  $class = get_class($class);
668 
+	}
669 
+	return $this->config->getClassConfig($class, $key);
670 670 
   }
671 671
672 672 
   /**
 
@@ -680,10 +680,10 @@  discard block
 
 block discarded – undo
680 680 
    */
681 681 
   public function setClassConfig($class, $config, $value = null)
682 682 
   {
683 
-    if (!is_string($class)) {
684 
-      $class = get_class($class);
685 
-    }
686 
-    $this->config->setClassConfig($class, $config, $value);
683 
+	if (!is_string($class)) {
684 
+	  $class = get_class($class);
685 
+	}
686 
+	$this->config->setClassConfig($class, $config, $value);
687 687
688 688 
   }
689 689 
 
@@ -692,7 +692,7 @@  discard block
 
 block discarded – undo
692 692 
    */
693 693 
   public function getBasePath()
694 694 
   {
695 
-    return $this->config->getBasePath();
695 
+	return $this->config->getBasePath();
696 696 
   }
697 697
698 698 
   /**
 
@@ -700,7 +700,7 @@  discard block
 
 block discarded – undo
700 700 
    */
701 701 
   public function getApplicationName()
702 702 
   {
703 
-    return $this->config->getApplicationName();
703 
+	return $this->config->getApplicationName();
704 704 
   }
705 705
706 706 
   /**
 
@@ -709,7 +709,7 @@  discard block
 
 block discarded – undo
709 709 
    */
710 710 
   public function isAppEngine()
711 711 
   {
712 
-    return (isset($_SERVER['SERVER_SOFTWARE']) &&
713 
-        strpos($_SERVER['SERVER_SOFTWARE'], 'Google App Engine') !== false);
712 
+	return (isset($_SERVER['SERVER_SOFTWARE']) &&
713 
+		strpos($_SERVER['SERVER_SOFTWARE'], 'Google App Engine') !== false);
714 714 
   }
715 715 
 }
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -16,7 +16,7 @@  discard block
 
 block discarded – undo
16 16 
  */
17 17
18 18 
 if (!class_exists('Google_Client')) {
19 
-  require_once dirname(__FILE__) . '/autoload.php';
19 
+  require_once dirname(__FILE__).'/autoload.php';
20 20 
 }
21 21
22 22 
 /**
 
@@ -76,7 +76,7 @@  discard block
 
 block discarded – undo
76 76 
   {
77 77 
     if (is_string($config) && strlen($config)) {
78 78 
       $config = new Google_Config($config);
79 
-    } else if ( !($config instanceof Google_Config)) {
79 
+    } else if (!($config instanceof Google_Config)) {
80 80 
       $config = new Google_Config();
81 81
82 82 
       if ($this->isAppEngine()) {
 
@@ -583,7 +583,7 @@  discard block
 
 block discarded – undo
583 583 
     if ($request instanceof Google_Http_Request) {
584 584 
       $request->setUserAgent(
585 585 
           $this->getApplicationName()
586 
-          . " " . self::USER_AGENT_SUFFIX
586 
+          . " ".self::USER_AGENT_SUFFIX
587 587 
           . $this->getLibraryVersion()
588 588 
       );
589 589 
       if (!$this->getClassConfig("Google_Http_Request", "disable_gzip")) {
Please login to merge, or discard this patch.
geodirectory-admin/google-api-php-client/src/Google/Http/Request.php 3 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -79,7 +79,7 @@  discard block
 
 block discarded – undo
79 79
80 80 
   /**
81 81 
    * Set the base URL that path and query parameters will be added to.
82 
-   * @param $baseComponent string
82 
+   * @param string $baseComponent string
83 83 
    */
84 84 
   public function setBaseComponent($baseComponent)
85 85 
   {
 
@@ -132,7 +132,7 @@  discard block
 
 block discarded – undo
132 132
133 133 
   /**
134 134 
    * Set a new query parameter.
135 
-   * @param $key - string to set, does not need to be URL encoded
135 
+   * @param string $key - string to set, does not need to be URL encoded
136 136 
    * @param $value - string to set, does not need to be URL encoded
137 137 
    */
138 138 
   public function setQueryParam($key, $value)
 
@@ -141,7 +141,7 @@  discard block
 
 block discarded – undo
141 141 
   }
142 142
143 143 
   /**
144 
-   * @return string HTTP Response Code.
144 
+   * @return integer HTTP Response Code.
145 145 
    */
146 146 
   public function getResponseHttpCode()
147 147 
   {
Please login to merge, or discard this patch.
Indentation   +156 added lines, -156 removed lines patch added patch discarded remove patch 
@@ -32,9 +32,9 @@  discard block
 
 block discarded – undo
32 32 
   const GZIP_UA = " (gzip)";
33 33
34 34 
   private $batchHeaders = array(
35 
-    'Content-Type' => 'application/http',
36 
-    'Content-Transfer-Encoding' => 'binary',
37 
-    'MIME-Version' => '1.0',
35 
+	'Content-Type' => 'application/http',
36 
+	'Content-Transfer-Encoding' => 'binary',
37 
+	'MIME-Version' => '1.0',
38 38 
   );
39 39
40 40 
   protected $queryParams;
 
@@ -56,15 +56,15 @@  discard block
 
 block discarded – undo
56 56 
   public $accessKey;
57 57
58 58 
   public function __construct(
59 
-      $url,
60 
-      $method = 'GET',
61 
-      $headers = array(),
62 
-      $postBody = null
59 
+	  $url,
60 
+	  $method = 'GET',
61 
+	  $headers = array(),
62 
+	  $postBody = null
63 63 
   ) {
64 
-    $this->setUrl($url);
65 
-    $this->setRequestMethod($method);
66 
-    $this->setRequestHeaders($headers);
67 
-    $this->setPostBody($postBody);
64 
+	$this->setUrl($url);
65 
+	$this->setRequestMethod($method);
66 
+	$this->setRequestHeaders($headers);
67 
+	$this->setPostBody($postBody);
68 68 
   }
69 69
70 70 
   /**
 
@@ -74,7 +74,7 @@  discard block
 
 block discarded – undo
74 74 
    */
75 75 
   public function getBaseComponent()
76 76 
   {
77 
-    return $this->baseComponent;
77 
+	return $this->baseComponent;
78 78 
   }
79 79
80 80 
   /**
 
@@ -83,7 +83,7 @@  discard block
 
 block discarded – undo
83 83 
    */
84 84 
   public function setBaseComponent($baseComponent)
85 85 
   {
86 
-    $this->baseComponent = rtrim($baseComponent, '/');
86 
+	$this->baseComponent = rtrim($baseComponent, '/');
87 87 
   }
88 88
89 89 
   /**
 
@@ -91,9 +91,9 @@  discard block
 
 block discarded – undo
91 91 
    */
92 92 
   public function enableGzip()
93 93 
   {
94 
-    $this->setRequestHeaders(array("Accept-Encoding" => "gzip"));
95 
-    $this->canGzip = true;
96 
-    $this->setUserAgent($this->userAgent);
94 
+	$this->setRequestHeaders(array("Accept-Encoding" => "gzip"));
95 
+	$this->canGzip = true;
96 
+	$this->setUserAgent($this->userAgent);
97 97 
   }
98 98
99 99 
   /**
 
@@ -101,14 +101,14 @@  discard block
 
 block discarded – undo
101 101 
    */
102 102 
   public function disableGzip()
103 103 
   {
104 
-    if (
105 
-        isset($this->requestHeaders['accept-encoding']) &&
106 
-        $this->requestHeaders['accept-encoding'] == "gzip"
107 
-    ) {
108 
-      unset($this->requestHeaders['accept-encoding']);
109 
-    }
110 
-    $this->canGzip = false;
111 
-    $this->userAgent = str_replace(self::GZIP_UA, "", $this->userAgent);
104 
+	if (
105 
+		isset($this->requestHeaders['accept-encoding']) &&
106 
+		$this->requestHeaders['accept-encoding'] == "gzip"
107 
+	) {
108 
+	  unset($this->requestHeaders['accept-encoding']);
109 
+	}
110 
+	$this->canGzip = false;
111 
+	$this->userAgent = str_replace(self::GZIP_UA, "", $this->userAgent);
112 112 
   }
113 113
114 114 
   /**
 
@@ -117,7 +117,7 @@  discard block
 
 block discarded – undo
117 117 
    */
118 118 
   public function canGzip()
119 119 
   {
120 
-    return $this->canGzip;
120 
+	return $this->canGzip;
121 121 
   }
122 122
123 123 
   /**
 
@@ -127,7 +127,7 @@  discard block
 
 block discarded – undo
127 127 
    */
128 128 
   public function getQueryParams()
129 129 
   {
130 
-    return $this->queryParams;
130 
+	return $this->queryParams;
131 131 
   }
132 132
133 133 
   /**
 
@@ -137,7 +137,7 @@  discard block
 
 block discarded – undo
137 137 
    */
138 138 
   public function setQueryParam($key, $value)
139 139 
   {
140 
-    $this->queryParams[$key] = $value;
140 
+	$this->queryParams[$key] = $value;
141 141 
   }
142 142
143 143 
   /**
 
@@ -145,7 +145,7 @@  discard block
 
 block discarded – undo
145 145 
    */
146 146 
   public function getResponseHttpCode()
147 147 
   {
148 
-    return (int) $this->responseHttpCode;
148 
+	return (int) $this->responseHttpCode;
149 149 
   }
150 150
151 151 
   /**
 
@@ -153,7 +153,7 @@  discard block
 
 block discarded – undo
153 153 
    */
154 154 
   public function setResponseHttpCode($responseHttpCode)
155 155 
   {
156 
-    $this->responseHttpCode = $responseHttpCode;
156 
+	$this->responseHttpCode = $responseHttpCode;
157 157 
   }
158 158
159 159 
   /**
 
@@ -161,7 +161,7 @@  discard block
 
 block discarded – undo
161 161 
    */
162 162 
   public function getResponseHeaders()
163 163 
   {
164 
-    return $this->responseHeaders;
164 
+	return $this->responseHeaders;
165 165 
   }
166 166
167 167 
   /**
 
@@ -169,7 +169,7 @@  discard block
 
 block discarded – undo
169 169 
    */
170 170 
   public function getResponseBody()
171 171 
   {
172 
-    return $this->responseBody;
172 
+	return $this->responseBody;
173 173 
   }
174 174
175 175 
   /**
 
@@ -179,7 +179,7 @@  discard block
 
 block discarded – undo
179 179 
    */
180 180 
   public function setExpectedClass($class)
181 181 
   {
182 
-    $this->expectedClass = $class;
182 
+	$this->expectedClass = $class;
183 183 
   }
184 184
185 185 
   /**
 
@@ -188,7 +188,7 @@  discard block
 
 block discarded – undo
188 188 
    */
189 189 
   public function getExpectedClass()
190 190 
   {
191 
-    return $this->expectedClass;
191 
+	return $this->expectedClass;
192 192 
   }
193 193
194 194 
   /**
 
@@ -196,7 +196,7 @@  discard block
 
 block discarded – undo
196 196 
    */
197 197 
   public function enableExpectedRaw()
198 198 
   {
199 
-    $this->expectedRaw = true;
199 
+	$this->expectedRaw = true;
200 200 
   }
201 201
202 202 
   /**
 
@@ -204,7 +204,7 @@  discard block
 
 block discarded – undo
204 204 
    */
205 205 
   public function disableExpectedRaw()
206 206 
   {
207 
-    $this->expectedRaw = false;
207 
+	$this->expectedRaw = false;
208 208 
   }
209 209
210 210 
   /**
 
@@ -213,7 +213,7 @@  discard block
 
 block discarded – undo
213 213 
    */
214 214 
   public function getExpectedRaw()
215 215 
   {
216 
-    return $this->expectedRaw;
216 
+	return $this->expectedRaw;
217 217 
   }
218 218
219 219 
   /**
 
@@ -222,12 +222,12 @@  discard block
 
 block discarded – undo
222 222 
    */
223 223 
   public function setResponseHeaders($headers)
224 224 
   {
225 
-    $headers = Google_Utils::normalize($headers);
226 
-    if ($this->responseHeaders) {
227 
-      $headers = array_merge($this->responseHeaders, $headers);
228 
-    }
225 
+	$headers = Google_Utils::normalize($headers);
226 
+	if ($this->responseHeaders) {
227 
+	  $headers = array_merge($this->responseHeaders, $headers);
228 
+	}
229 229
230 
-    $this->responseHeaders = $headers;
230 
+	$this->responseHeaders = $headers;
231 231 
   }
232 232
233 233 
   /**
 
@@ -237,9 +237,9 @@  discard block
 
 block discarded – undo
237 237 
    */
238 238 
   public function getResponseHeader($key)
239 239 
   {
240 
-    return isset($this->responseHeaders[$key])
241 
-        ? $this->responseHeaders[$key]
242 
-        : false;
240 
+	return isset($this->responseHeaders[$key])
241 
+		? $this->responseHeaders[$key]
242 
+		: false;
243 243 
   }
244 244
245 245 
   /**
 
@@ -247,7 +247,7 @@  discard block
 
 block discarded – undo
247 247 
    */
248 248 
   public function setResponseBody($responseBody)
249 249 
   {
250 
-    $this->responseBody = $responseBody;
250 
+	$this->responseBody = $responseBody;
251 251 
   }
252 252
253 253 
   /**
 
@@ -255,10 +255,10 @@  discard block
 
 block discarded – undo
255 255 
    */
256 256 
   public function getUrl()
257 257 
   {
258 
-    return $this->baseComponent . $this->path .
259 
-        (count($this->queryParams) ?
260 
-            "?" . $this->buildQuery($this->queryParams) :
261 
-            '');
258 
+	return $this->baseComponent . $this->path .
259 
+		(count($this->queryParams) ?
260 
+			"?" . $this->buildQuery($this->queryParams) :
261 
+			'');
262 262 
   }
263 263
264 264 
   /**
 
@@ -266,7 +266,7 @@  discard block
 
 block discarded – undo
266 266 
    */
267 267 
   public function getRequestMethod()
268 268 
   {
269 
-    return $this->requestMethod;
269 
+	return $this->requestMethod;
270 270 
   }
271 271
272 272 
   /**
 
@@ -274,7 +274,7 @@  discard block
 
 block discarded – undo
274 274 
    */
275 275 
   public function getRequestHeaders()
276 276 
   {
277 
-    return $this->requestHeaders;
277 
+	return $this->requestHeaders;
278 278 
   }
279 279
280 280 
   /**
 
@@ -284,9 +284,9 @@  discard block
 
 block discarded – undo
284 284 
    */
285 285 
   public function getRequestHeader($key)
286 286 
   {
287 
-    return isset($this->requestHeaders[$key])
288 
-        ? $this->requestHeaders[$key]
289 
-        : false;
287 
+	return isset($this->requestHeaders[$key])
288 
+		? $this->requestHeaders[$key]
289 
+		: false;
290 290 
   }
291 291
292 292 
   /**
 
@@ -294,7 +294,7 @@  discard block
 
 block discarded – undo
294 294 
    */
295 295 
   public function getPostBody()
296 296 
   {
297 
-    return $this->postBody;
297 
+	return $this->postBody;
298 298 
   }
299 299
300 300 
   /**
 
@@ -302,26 +302,26 @@  discard block
 
 block discarded – undo
302 302 
    */
303 303 
   public function setUrl($url)
304 304 
   {
305 
-    if (substr($url, 0, 4) != 'http') {
306 
-      // Force the path become relative.
307 
-      if (substr($url, 0, 1) !== '/') {
308 
-        $url = '/' . $url;
309 
-      }
310 
-    }
311 
-    $parts = parse_url($url);
312 
-    if (isset($parts['host'])) {
313 
-      $this->baseComponent = sprintf(
314 
-          "%s%s%s",
315 
-          isset($parts['scheme']) ? $parts['scheme'] . "://" : '',
316 
-          isset($parts['host']) ? $parts['host'] : '',
317 
-          isset($parts['port']) ? ":" . $parts['port'] : ''
318 
-      );
319 
-    }
320 
-    $this->path = isset($parts['path']) ? $parts['path'] : '';
321 
-    $this->queryParams = array();
322 
-    if (isset($parts['query'])) {
323 
-      $this->queryParams = $this->parseQuery($parts['query']);
324 
-    }
305 
+	if (substr($url, 0, 4) != 'http') {
306 
+	  // Force the path become relative.
307 
+	  if (substr($url, 0, 1) !== '/') {
308 
+		$url = '/' . $url;
309 
+	  }
310 
+	}
311 
+	$parts = parse_url($url);
312 
+	if (isset($parts['host'])) {
313 
+	  $this->baseComponent = sprintf(
314 
+		  "%s%s%s",
315 
+		  isset($parts['scheme']) ? $parts['scheme'] . "://" : '',
316 
+		  isset($parts['host']) ? $parts['host'] : '',
317 
+		  isset($parts['port']) ? ":" . $parts['port'] : ''
318 
+	  );
319 
+	}
320 
+	$this->path = isset($parts['path']) ? $parts['path'] : '';
321 
+	$this->queryParams = array();
322 
+	if (isset($parts['query'])) {
323 
+	  $this->queryParams = $this->parseQuery($parts['query']);
324 
+	}
325 325 
   }
326 326
327 327 
   /**
 
@@ -331,7 +331,7 @@  discard block
 
 block discarded – undo
331 331 
    */
332 332 
   public function setRequestMethod($method)
333 333 
   {
334 
-    $this->requestMethod = strtoupper($method);
334 
+	$this->requestMethod = strtoupper($method);
335 335 
   }
336 336
337 337 
   /**
 
@@ -340,11 +340,11 @@  discard block
 
 block discarded – undo
340 340 
    */
341 341 
   public function setRequestHeaders($headers)
342 342 
   {
343 
-    $headers = Google_Utils::normalize($headers);
344 
-    if ($this->requestHeaders) {
345 
-      $headers = array_merge($this->requestHeaders, $headers);
346 
-    }
347 
-    $this->requestHeaders = $headers;
343 
+	$headers = Google_Utils::normalize($headers);
344 
+	if ($this->requestHeaders) {
345 
+	  $headers = array_merge($this->requestHeaders, $headers);
346 
+	}
347 
+	$this->requestHeaders = $headers;
348 348 
   }
349 349
350 350 
   /**
 
@@ -352,7 +352,7 @@  discard block
 
 block discarded – undo
352 352 
    */
353 353 
   public function setPostBody($postBody)
354 354 
   {
355 
-    $this->postBody = $postBody;
355 
+	$this->postBody = $postBody;
356 356 
   }
357 357
358 358 
   /**
 
@@ -361,10 +361,10 @@  discard block
 
 block discarded – undo
361 361 
    */
362 362 
   public function setUserAgent($userAgent)
363 363 
   {
364 
-    $this->userAgent = $userAgent;
365 
-    if ($this->canGzip) {
366 
-      $this->userAgent = $userAgent . self::GZIP_UA;
367 
-    }
364 
+	$this->userAgent = $userAgent;
365 
+	if ($this->canGzip) {
366 
+	  $this->userAgent = $userAgent . self::GZIP_UA;
367 
+	}
368 368 
   }
369 369
370 370 
   /**
 
@@ -372,7 +372,7 @@  discard block
 
 block discarded – undo
372 372 
    */
373 373 
   public function getUserAgent()
374 374 
   {
375 
-    return $this->userAgent;
375 
+	return $this->userAgent;
376 376 
   }
377 377
378 378 
   /**
 
@@ -383,29 +383,29 @@  discard block
 
 block discarded – undo
383 383 
    */
384 384 
   public function getCacheKey()
385 385 
   {
386 
-    $key = $this->getUrl();
386 
+	$key = $this->getUrl();
387 387
388 
-    if (isset($this->accessKey)) {
389 
-      $key .= $this->accessKey;
390 
-    }
388 
+	if (isset($this->accessKey)) {
389 
+	  $key .= $this->accessKey;
390 
+	}
391 391
392 
-    if (isset($this->requestHeaders['authorization'])) {
393 
-      $key .= $this->requestHeaders['authorization'];
394 
-    }
392 
+	if (isset($this->requestHeaders['authorization'])) {
393 
+	  $key .= $this->requestHeaders['authorization'];
394 
+	}
395 395
396 
-    return md5($key);
396 
+	return md5($key);
397 397 
   }
398 398
399 399 
   public function getParsedCacheControl()
400 400 
   {
401 
-    $parsed = array();
402 
-    $rawCacheControl = $this->getResponseHeader('cache-control');
403 
-    if ($rawCacheControl) {
404 
-      $rawCacheControl = str_replace(', ', '&', $rawCacheControl);
405 
-      parse_str($rawCacheControl, $parsed);
406 
-    }
401 
+	$parsed = array();
402 
+	$rawCacheControl = $this->getResponseHeader('cache-control');
403 
+	if ($rawCacheControl) {
404 
+	  $rawCacheControl = str_replace(', ', '&', $rawCacheControl);
405 
+	  parse_str($rawCacheControl, $parsed);
406 
+	}
407 407
408 
-    return $parsed;
408 
+	return $parsed;
409 409 
   }
410 410
411 411 
   /**
 
@@ -414,29 +414,29 @@  discard block
 
 block discarded – undo
414 414 
    */
415 415 
   public function toBatchString($id)
416 416 
   {
417 
-    $str = '';
418 
-    $path = parse_url($this->getUrl(), PHP_URL_PATH) . "?" .
419 
-        http_build_query($this->queryParams);
420 
-    $str .= $this->getRequestMethod() . ' ' . $path . " HTTP/1.1\n";
417 
+	$str = '';
418 
+	$path = parse_url($this->getUrl(), PHP_URL_PATH) . "?" .
419 
+		http_build_query($this->queryParams);
420 
+	$str .= $this->getRequestMethod() . ' ' . $path . " HTTP/1.1\n";
421 421
422 
-    foreach ($this->getRequestHeaders() as $key => $val) {
423 
-      $str .= $key . ': ' . $val . "\n";
424 
-    }
422 
+	foreach ($this->getRequestHeaders() as $key => $val) {
423 
+	  $str .= $key . ': ' . $val . "\n";
424 
+	}
425 425
426 
-    if ($this->getPostBody()) {
427 
-      $str .= "\n";
428 
-      $str .= $this->getPostBody();
429 
-    }
426 
+	if ($this->getPostBody()) {
427 
+	  $str .= "\n";
428 
+	  $str .= $this->getPostBody();
429 
+	}
430 430
431 
-    $headers = '';
432 
-    foreach ($this->batchHeaders as $key => $val) {
433 
-      $headers .= $key . ': ' . $val . "\n";
434 
-    }
431 
+	$headers = '';
432 
+	foreach ($this->batchHeaders as $key => $val) {
433 
+	  $headers .= $key . ': ' . $val . "\n";
434 
+	}
435 435
436 
-    $headers .= "Content-ID: $id\n";
437 
-    $str = $headers . "\n" . $str;
436 
+	$headers .= "Content-ID: $id\n";
437 
+	$str = $headers . "\n" . $str;
438 438
439 
-    return $str;
439 
+	return $str;
440 440 
   }
441 441
442 442 
   /**
 
@@ -446,21 +446,21 @@  discard block
 
 block discarded – undo
446 446 
    */
447 447 
   private function parseQuery($string)
448 448 
   {
449 
-    $return = array();
450 
-    $parts = explode("&", $string);
451 
-    foreach ($parts as $part) {
452 
-      list($key, $value) = explode('=', $part, 2);
453 
-      $value = urldecode($value);
454 
-      if (isset($return[$key])) {
455 
-        if (!is_array($return[$key])) {
456 
-          $return[$key] = array($return[$key]);
457 
-        }
458 
-        $return[$key][] = $value;
459 
-      } else {
460 
-        $return[$key] = $value;
461 
-      }
462 
-    }
463 
-    return $return;
449 
+	$return = array();
450 
+	$parts = explode("&", $string);
451 
+	foreach ($parts as $part) {
452 
+	  list($key, $value) = explode('=', $part, 2);
453 
+	  $value = urldecode($value);
454 
+	  if (isset($return[$key])) {
455 
+		if (!is_array($return[$key])) {
456 
+		  $return[$key] = array($return[$key]);
457 
+		}
458 
+		$return[$key][] = $value;
459 
+	  } else {
460 
+		$return[$key] = $value;
461 
+	  }
462 
+	}
463 
+	return $return;
464 464 
   }
465 465
466 466 
   /**
 
@@ -470,17 +470,17 @@  discard block
 
 block discarded – undo
470 470 
    */
471 471 
   private function buildQuery($parts)
472 472 
   {
473 
-    $return = array();
474 
-    foreach ($parts as $key => $value) {
475 
-      if (is_array($value)) {
476 
-        foreach ($value as $v) {
477 
-          $return[] = urlencode($key) . "=" . urlencode($v);
478 
-        }
479 
-      } else {
480 
-        $return[] = urlencode($key) . "=" . urlencode($value);
481 
-      }
482 
-    }
483 
-    return implode('&', $return);
473 
+	$return = array();
474 
+	foreach ($parts as $key => $value) {
475 
+	  if (is_array($value)) {
476 
+		foreach ($value as $v) {
477 
+		  $return[] = urlencode($key) . "=" . urlencode($v);
478 
+		}
479 
+	  } else {
480 
+		$return[] = urlencode($key) . "=" . urlencode($value);
481 
+	  }
482 
+	}
483 
+	return implode('&', $return);
484 484 
   }
485 485
486 486 
   /**
 
@@ -490,15 +490,15 @@  discard block
 
 block discarded – undo
490 490 
    */
491 491 
   public function maybeMoveParametersToBody()
492 492 
   {
493 
-    if ($this->getRequestMethod() == "POST" && empty($this->postBody)) {
494 
-      $this->setRequestHeaders(
495 
-          array(
496 
-            "content-type" =>
497 
-                "application/x-www-form-urlencoded; charset=UTF-8"
498 
-          )
499 
-      );
500 
-      $this->setPostBody($this->buildQuery($this->queryParams));
501 
-      $this->queryParams = array();
502 
-    }
493 
+	if ($this->getRequestMethod() == "POST" && empty($this->postBody)) {
494 
+	  $this->setRequestHeaders(
495 
+		  array(
496 
+			"content-type" =>
497 
+				"application/x-www-form-urlencoded; charset=UTF-8"
498 
+		  )
499 
+	  );
500 
+	  $this->setPostBody($this->buildQuery($this->queryParams));
501 
+	  $this->queryParams = array();
502 
+	}
503 503 
   }
504 504 
 }
Please login to merge, or discard this patch.
Spacing   +14 added lines, -15 removed lines patch added patch discarded remove patch 
@@ -16,7 +16,7 @@  discard block
 
 block discarded – undo
16 16 
  */
17 17
18 18 
 if (!class_exists('Google_Client')) {
19 
-  require_once dirname(__FILE__) . '/../autoload.php';
19 
+  require_once dirname(__FILE__).'/../autoload.php';
20 20 
 }
21 21
22 22 
 /**
 
@@ -255,10 +255,9 @@  discard block
 
 block discarded – undo
255 255 
    */
256 256 
   public function getUrl()
257 257 
   {
258 
-    return $this->baseComponent . $this->path .
258 
+    return $this->baseComponent.$this->path.
259 259 
         (count($this->queryParams) ?
260 
-            "?" . $this->buildQuery($this->queryParams) :
261 
-            '');
260 
+            "?".$this->buildQuery($this->queryParams) : '');
262 261 
   }
263 262
264 263 
   /**
 
@@ -305,16 +304,16 @@  discard block
 
 block discarded – undo
305 304 
     if (substr($url, 0, 4) != 'http') {
306 305 
       // Force the path become relative.
307 306 
       if (substr($url, 0, 1) !== '/') {
308 
-        $url = '/' . $url;
307 
+        $url = '/'.$url;
309 308 
       }
310 309 
     }
311 310 
     $parts = parse_url($url);
312 311 
     if (isset($parts['host'])) {
313 312 
       $this->baseComponent = sprintf(
314 313 
           "%s%s%s",
315 
-          isset($parts['scheme']) ? $parts['scheme'] . "://" : '',
314 
+          isset($parts['scheme']) ? $parts['scheme']."://" : '',
316 315 
           isset($parts['host']) ? $parts['host'] : '',
317 
-          isset($parts['port']) ? ":" . $parts['port'] : ''
316 
+          isset($parts['port']) ? ":".$parts['port'] : ''
318 317 
       );
319 318 
     }
320 319 
     $this->path = isset($parts['path']) ? $parts['path'] : '';
 
@@ -363,7 +362,7 @@  discard block
 
 block discarded – undo
363 362 
   {
364 363 
     $this->userAgent = $userAgent;
365 364 
     if ($this->canGzip) {
366 
-      $this->userAgent = $userAgent . self::GZIP_UA;
365 
+      $this->userAgent = $userAgent.self::GZIP_UA;
367 366 
     }
368 367 
   }
369 368 
 
@@ -415,12 +414,12 @@  discard block
 
 block discarded – undo
415 414 
   public function toBatchString($id)
416 415 
   {
417 416 
     $str = '';
418 
-    $path = parse_url($this->getUrl(), PHP_URL_PATH) . "?" .
417 
+    $path = parse_url($this->getUrl(), PHP_URL_PATH)."?".
419 418 
         http_build_query($this->queryParams);
420 
-    $str .= $this->getRequestMethod() . ' ' . $path . " HTTP/1.1\n";
419 
+    $str .= $this->getRequestMethod().' '.$path." HTTP/1.1\n";
421 420
422 421 
     foreach ($this->getRequestHeaders() as $key => $val) {
423 
-      $str .= $key . ': ' . $val . "\n";
422 
+      $str .= $key.': '.$val."\n";
424 423 
     }
425 424
426 425 
     if ($this->getPostBody()) {
 
@@ -430,11 +429,11 @@  discard block
 
 block discarded – undo
430 429
431 430 
     $headers = '';
432 431 
     foreach ($this->batchHeaders as $key => $val) {
433 
-      $headers .= $key . ': ' . $val . "\n";
432 
+      $headers .= $key.': '.$val."\n";
434 433 
     }
435 434
436 435 
     $headers .= "Content-ID: $id\n";
437 
-    $str = $headers . "\n" . $str;
436 
+    $str = $headers."\n".$str;
438 437
439 438 
     return $str;
440 439 
   }
 
@@ -474,10 +473,10 @@  discard block
 
 block discarded – undo
474 473 
     foreach ($parts as $key => $value) {
475 474 
       if (is_array($value)) {
476 475 
         foreach ($value as $v) {
477 
-          $return[] = urlencode($key) . "=" . urlencode($v);
476 
+          $return[] = urlencode($key)."=".urlencode($v);
478 477 
         }
479 478 
       } else {
480 
-        $return[] = urlencode($key) . "=" . urlencode($value);
479 
+        $return[] = urlencode($key)."=".urlencode($value);
481 480 
       }
482 481 
     }
483 482 
     return implode('&', $return);
Please login to merge, or discard this patch.
geodirectory-admin/google-api-php-client/src/Google/Logger/Abstract.php 3 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -261,7 +261,7 @@  discard block
 
 block discarded – undo
261 261 
   /**
262 262 
    * Logs with an arbitrary level.
263 263 
    *
264 
-   * @param mixed $level    The log level
264 
+   * @param string $level    The log level
265 265 
    * @param string $message The log message
266 266 
    * @param array $context  The log context
267 267 
    */
 
@@ -380,7 +380,7 @@  discard block
 
 block discarded – undo
380 380 
   /**
381 381 
    * Converts a given log level to the integer form.
382 382 
    *
383 
-   * @param  mixed $level   The logging level
383 
+   * @param  integer $level   The logging level
384 384 
    * @return integer $level The normalized level
385 385 
    * @throws Google_Logger_Exception If $level is invalid
386 386 
    */
Please login to merge, or discard this patch.
Indentation   +111 added lines, -111 removed lines patch added patch discarded remove patch 
@@ -88,14 +88,14 @@  discard block
 
 block discarded – undo
88 88 
    * @var array $levels Logging levels
89 89 
    */
90 90 
   protected static $levels = array(
91 
-      self::EMERGENCY  => 600,
92 
-      self::ALERT => 550,
93 
-      self::CRITICAL => 500,
94 
-      self::ERROR => 400,
95 
-      self::WARNING => 300,
96 
-      self::NOTICE => 250,
97 
-      self::INFO => 200,
98 
-      self::DEBUG => 100,
91 
+	  self::EMERGENCY  => 600,
92 
+	  self::ALERT => 550,
93 
+	  self::CRITICAL => 500,
94 
+	  self::ERROR => 400,
95 
+	  self::WARNING => 300,
96 
+	  self::NOTICE => 250,
97 
+	  self::INFO => 200,
98 
+	  self::DEBUG => 100,
99 99 
   );
100 100
101 101 
   /**
 
@@ -122,20 +122,20 @@  discard block
 
 block discarded – undo
122 122 
    */
123 123 
   public function __construct(Google_Client $client)
124 124 
   {
125 
-    $this->setLevel(
126 
-        $client->getClassConfig('Google_Logger_Abstract', 'level')
127 
-    );
125 
+	$this->setLevel(
126 
+		$client->getClassConfig('Google_Logger_Abstract', 'level')
127 
+	);
128 128
129 
-    $format = $client->getClassConfig('Google_Logger_Abstract', 'log_format');
130 
-    $this->logFormat = $format ? $format : self::DEFAULT_LOG_FORMAT;
129 
+	$format = $client->getClassConfig('Google_Logger_Abstract', 'log_format');
130 
+	$this->logFormat = $format ? $format : self::DEFAULT_LOG_FORMAT;
131 131
132 
-    $format = $client->getClassConfig('Google_Logger_Abstract', 'date_format');
133 
-    $this->dateFormat = $format ? $format : self::DEFAULT_DATE_FORMAT;
132 
+	$format = $client->getClassConfig('Google_Logger_Abstract', 'date_format');
133 
+	$this->dateFormat = $format ? $format : self::DEFAULT_DATE_FORMAT;
134 134
135 
-    $this->allowNewLines = (bool) $client->getClassConfig(
136 
-        'Google_Logger_Abstract',
137 
-        'allow_newlines'
138 
-    );
135 
+	$this->allowNewLines = (bool) $client->getClassConfig(
136 
+		'Google_Logger_Abstract',
137 
+		'allow_newlines'
138 
+	);
139 139 
   }
140 140
141 141 
   /**
 
@@ -145,7 +145,7 @@  discard block
 
 block discarded – undo
145 145 
    */
146 146 
   public function setLevel($level)
147 147 
   {
148 
-    $this->level = $this->normalizeLevel($level);
148 
+	$this->level = $this->normalizeLevel($level);
149 149 
   }
150 150
151 151 
   /**
 
@@ -156,7 +156,7 @@  discard block
 
 block discarded – undo
156 156 
    */
157 157 
   public function shouldHandle($level)
158 158 
   {
159 
-    return $this->normalizeLevel($level) >= $this->level;
159 
+	return $this->normalizeLevel($level) >= $this->level;
160 160 
   }
161 161
162 162 
   /**
 
@@ -167,7 +167,7 @@  discard block
 
 block discarded – undo
167 167 
    */
168 168 
   public function emergency($message, array $context = array())
169 169 
   {
170 
-    $this->log(self::EMERGENCY, $message, $context);
170 
+	$this->log(self::EMERGENCY, $message, $context);
171 171 
   }
172 172
173 173 
   /**
 
@@ -181,7 +181,7 @@  discard block
 
 block discarded – undo
181 181 
    */
182 182 
   public function alert($message, array $context = array())
183 183 
   {
184 
-    $this->log(self::ALERT, $message, $context);
184 
+	$this->log(self::ALERT, $message, $context);
185 185 
   }
186 186
187 187 
   /**
 
@@ -194,7 +194,7 @@  discard block
 
 block discarded – undo
194 194 
    */
195 195 
   public function critical($message, array $context = array())
196 196 
   {
197 
-    $this->log(self::CRITICAL, $message, $context);
197 
+	$this->log(self::CRITICAL, $message, $context);
198 198 
   }
199 199
200 200 
   /**
 
@@ -206,7 +206,7 @@  discard block
 
 block discarded – undo
206 206 
    */
207 207 
   public function error($message, array $context = array())
208 208 
   {
209 
-    $this->log(self::ERROR, $message, $context);
209 
+	$this->log(self::ERROR, $message, $context);
210 210 
   }
211 211
212 212 
   /**
 
@@ -220,7 +220,7 @@  discard block
 
 block discarded – undo
220 220 
    */
221 221 
   public function warning($message, array $context = array())
222 222 
   {
223 
-    $this->log(self::WARNING, $message, $context);
223 
+	$this->log(self::WARNING, $message, $context);
224 224 
   }
225 225
226 226 
   /**
 
@@ -231,7 +231,7 @@  discard block
 
 block discarded – undo
231 231 
    */
232 232 
   public function notice($message, array $context = array())
233 233 
   {
234 
-    $this->log(self::NOTICE, $message, $context);
234 
+	$this->log(self::NOTICE, $message, $context);
235 235 
   }
236 236
237 237 
   /**
 
@@ -244,7 +244,7 @@  discard block
 
 block discarded – undo
244 244 
    */
245 245 
   public function info($message, array $context = array())
246 246 
   {
247 
-    $this->log(self::INFO, $message, $context);
247 
+	$this->log(self::INFO, $message, $context);
248 248 
   }
249 249
250 250 
   /**
 
@@ -255,7 +255,7 @@  discard block
 
 block discarded – undo
255 255 
    */
256 256 
   public function debug($message, array $context = array())
257 257 
   {
258 
-    $this->log(self::DEBUG, $message, $context);
258 
+	$this->log(self::DEBUG, $message, $context);
259 259 
   }
260 260
261 261 
   /**
 
@@ -267,21 +267,21 @@  discard block
 
 block discarded – undo
267 267 
    */
268 268 
   public function log($level, $message, array $context = array())
269 269 
   {
270 
-    if (!$this->shouldHandle($level)) {
271 
-      return false;
272 
-    }
273 
-
274 
-    $levelName = is_int($level) ? array_search($level, self::$levels) : $level;
275 
-    $message = $this->interpolate(
276 
-        array(
277 
-            'message' => $message,
278 
-            'context' => $context,
279 
-            'level' => strtoupper($levelName),
280 
-            'datetime' => new DateTime(),
281 
-        )
282 
-    );
283 
-
284 
-    $this->write($message);
270 
+	if (!$this->shouldHandle($level)) {
271 
+	  return false;
272 
+	}
273 
+
274 
+	$levelName = is_int($level) ? array_search($level, self::$levels) : $level;
275 
+	$message = $this->interpolate(
276 
+		array(
277 
+			'message' => $message,
278 
+			'context' => $context,
279 
+			'level' => strtoupper($levelName),
280 
+			'datetime' => new DateTime(),
281 
+		)
282 
+	);
283 
+
284 
+	$this->write($message);
285 285 
   }
286 286
287 287 
   /**
 
@@ -292,26 +292,26 @@  discard block
 
 block discarded – undo
292 292 
    */
293 293 
   protected function interpolate(array $variables = array())
294 294 
   {
295 
-    $template = $this->logFormat;
296 
-
297 
-    if (!$variables['context']) {
298 
-      $template = str_replace('%context%', '', $template);
299 
-      unset($variables['context']);
300 
-    } else {
301 
-      $this->reverseJsonInContext($variables['context']);
302 
-    }
303 
-
304 
-    foreach ($variables as $key => $value) {
305 
-      if (strpos($template, '%'. $key .'%') !== false) {
306 
-        $template = str_replace(
307 
-            '%' . $key . '%',
308 
-            $this->export($value),
309 
-            $template
310 
-        );
311 
-      }
312 
-    }
313 
-
314 
-    return $template;
295 
+	$template = $this->logFormat;
296 
+
297 
+	if (!$variables['context']) {
298 
+	  $template = str_replace('%context%', '', $template);
299 
+	  unset($variables['context']);
300 
+	} else {
301 
+	  $this->reverseJsonInContext($variables['context']);
302 
+	}
303 
+
304 
+	foreach ($variables as $key => $value) {
305 
+	  if (strpos($template, '%'. $key .'%') !== false) {
306 
+		$template = str_replace(
307 
+			'%' . $key . '%',
308 
+			$this->export($value),
309 
+			$template
310 
+		);
311 
+	  }
312 
+	}
313 
+
314 
+	return $template;
315 315 
   }
316 316
317 317 
   /**
 
@@ -321,20 +321,20 @@  discard block
 
 block discarded – undo
321 321 
    */
322 322 
   protected function reverseJsonInContext(array &$context)
323 323 
   {
324 
-    if (!$context) {
325 
-      return;
326 
-    }
327 
-
328 
-    foreach ($context as $key => $val) {
329 
-      if (!$val || !is_string($val) || !($val[0] == '{' || $val[0] == '[')) {
330 
-        continue;
331 
-      }
332 
-
333 
-      $json = @json_decode($val);
334 
-      if (is_object($json) || is_array($json)) {
335 
-        $context[$key] = $json;
336 
-      }
337 
-    }
324 
+	if (!$context) {
325 
+	  return;
326 
+	}
327 
+
328 
+	foreach ($context as $key => $val) {
329 
+	  if (!$val || !is_string($val) || !($val[0] == '{' || $val[0] == '[')) {
330 
+		continue;
331 
+	  }
332 
+
333 
+	  $json = @json_decode($val);
334 
+	  if (is_object($json) || is_array($json)) {
335 
+		$context[$key] = $json;
336 
+	  }
337 
+	}
338 338 
   }
339 339
340 340 
   /**
 
@@ -344,37 +344,37 @@  discard block
 
 block discarded – undo
344 344 
    */
345 345 
   protected function export($value)
346 346 
   {
347 
-    if (is_string($value)) {
348 
-      if ($this->allowNewLines) {
349 
-        return $value;
350 
-      }
347 
+	if (is_string($value)) {
348 
+	  if ($this->allowNewLines) {
349 
+		return $value;
350 
+	  }
351 351
352 
-      return preg_replace('/[\r\n]+/', ' ', $value);
353 
-    }
352 
+	  return preg_replace('/[\r\n]+/', ' ', $value);
353 
+	}
354 354
355 
-    if (is_resource($value)) {
356 
-      return sprintf(
357 
-          'resource(%d) of type (%s)',
358 
-          $value,
359 
-          get_resource_type($value)
360 
-      );
361 
-    }
355 
+	if (is_resource($value)) {
356 
+	  return sprintf(
357 
+		  'resource(%d) of type (%s)',
358 
+		  $value,
359 
+		  get_resource_type($value)
360 
+	  );
361 
+	}
362 362
363 
-    if ($value instanceof DateTime) {
364 
-      return $value->format($this->dateFormat);
365 
-    }
363 
+	if ($value instanceof DateTime) {
364 
+	  return $value->format($this->dateFormat);
365 
+	}
366 366
367 
-    if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
368 
-      $options = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
367 
+	if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
368 
+	  $options = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
369 369
370 
-      if ($this->allowNewLines) {
371 
-        $options |= JSON_PRETTY_PRINT;
372 
-      }
370 
+	  if ($this->allowNewLines) {
371 
+		$options |= JSON_PRETTY_PRINT;
372 
+	  }
373 373
374 
-      return @json_encode($value, $options);
375 
-    }
374 
+	  return @json_encode($value, $options);
375 
+	}
376 376
377 
-    return str_replace('\\/', '/', @json_encode($value));
377 
+	return str_replace('\\/', '/', @json_encode($value));
378 378 
   }
379 379
380 380 
   /**
 
@@ -386,17 +386,17 @@  discard block
 
 block discarded – undo
386 386 
    */
387 387 
   protected function normalizeLevel($level)
388 388 
   {
389 
-    if (is_int($level) && array_search($level, self::$levels) !== false) {
390 
-      return $level;
391 
-    }
389 
+	if (is_int($level) && array_search($level, self::$levels) !== false) {
390 
+	  return $level;
391 
+	}
392 392
393 
-    if (is_string($level) && isset(self::$levels[$level])) {
394 
-      return self::$levels[$level];
395 
-    }
393 
+	if (is_string($level) && isset(self::$levels[$level])) {
394 
+	  return self::$levels[$level];
395 
+	}
396 396
397 
-    throw new Google_Logger_Exception(
398 
-        sprintf("Unknown LogLevel: '%s'", $level)
399 
-    );
397 
+	throw new Google_Logger_Exception(
398 
+		sprintf("Unknown LogLevel: '%s'", $level)
399 
+	);
400 400 
   }
401 401
402 402 
   /**
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -16,7 +16,7 @@  discard block
 
 block discarded – undo
16 16 
  */
17 17
18 18 
 if (!class_exists('Google_Client')) {
19 
-  require_once dirname(__FILE__) . '/../autoload.php';
19 
+  require_once dirname(__FILE__).'/../autoload.php';
20 20 
 }
21 21
22 22 
 /**
 
@@ -302,9 +302,9 @@  discard block
 
 block discarded – undo
302 302 
     }
303 303
304 304 
     foreach ($variables as $key => $value) {
305 
-      if (strpos($template, '%'. $key .'%') !== false) {
305 
+      if (strpos($template, '%'.$key.'%') !== false) {
306 306 
         $template = str_replace(
307 
-            '%' . $key . '%',
307 
+            '%'.$key.'%',
308 308 
             $this->export($value),
309 309 
             $template
310 310 
         );
Please login to merge, or discard this patch.
geodirectory-admin/google-api-php-client/src/Google/Model.php 3 patches
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -221,7 +221,7 @@  discard block
 
 block discarded – undo
221 221 
   /**
222 222 
    * Given a variable name, discover its type.
223 223 
    *
224 
-   * @param $name
224 
+   * @param string $name
225 225 
    * @param $item
226 226 
    * @return object The object from the item.
227 227 
    */
 
@@ -278,6 +278,9 @@  discard block
 
 block discarded – undo
278 278 
     return $key . "Type";
279 279 
   }
280 280
281 
+  /**
282 
+   * @param string $key
283 
+   */
281 284 
   protected function dataType($key)
282 285 
   {
283 286 
     return $key . "DataType";
Please login to merge, or discard this patch.
Indentation   +126 added lines, -126 removed lines patch added patch discarded remove patch 
@@ -38,12 +38,12 @@  discard block
 
 block discarded – undo
38 38 
    */
39 39 
   final public function __construct()
40 40 
   {
41 
-    if (func_num_args() == 1 && is_array(func_get_arg(0))) {
42 
-      // Initialize the model with the array's contents.
43 
-      $array = func_get_arg(0);
44 
-      $this->mapTypes($array);
45 
-    }
46 
-    $this->gapiInit();
41 
+	if (func_num_args() == 1 && is_array(func_get_arg(0))) {
42 
+	  // Initialize the model with the array's contents.
43 
+	  $array = func_get_arg(0);
44 
+	  $this->mapTypes($array);
45 
+	}
46 
+	$this->gapiInit();
47 47 
   }
48 48
49 49 
   /**
 
@@ -53,39 +53,39 @@  discard block
 
 block discarded – undo
53 53 
    */
54 54 
   public function __get($key)
55 55 
   {
56 
-    $keyTypeName = $this->keyType($key);
57 
-    $keyDataType = $this->dataType($key);
58 
-    if (isset($this->$keyTypeName) && !isset($this->processed[$key])) {
59 
-      if (isset($this->modelData[$key])) {
60 
-        $val = $this->modelData[$key];
61 
-      } else if (isset($this->$keyDataType) &&
62 
-          ($this->$keyDataType == 'array' || $this->$keyDataType == 'map')) {
63 
-        $val = array();
64 
-      } else {
65 
-        $val = null;
66 
-      }
56 
+	$keyTypeName = $this->keyType($key);
57 
+	$keyDataType = $this->dataType($key);
58 
+	if (isset($this->$keyTypeName) && !isset($this->processed[$key])) {
59 
+	  if (isset($this->modelData[$key])) {
60 
+		$val = $this->modelData[$key];
61 
+	  } else if (isset($this->$keyDataType) &&
62 
+		  ($this->$keyDataType == 'array' || $this->$keyDataType == 'map')) {
63 
+		$val = array();
64 
+	  } else {
65 
+		$val = null;
66 
+	  }
67 67
68 
-      if ($this->isAssociativeArray($val)) {
69 
-        if (isset($this->$keyDataType) && 'map' == $this->$keyDataType) {
70 
-          foreach ($val as $arrayKey => $arrayItem) {
71 
-              $this->modelData[$key][$arrayKey] =
72 
-                $this->createObjectFromName($keyTypeName, $arrayItem);
73 
-          }
74 
-        } else {
75 
-          $this->modelData[$key] = $this->createObjectFromName($keyTypeName, $val);
76 
-        }
77 
-      } else if (is_array($val)) {
78 
-        $arrayObject = array();
79 
-        foreach ($val as $arrayIndex => $arrayItem) {
80 
-          $arrayObject[$arrayIndex] =
81 
-            $this->createObjectFromName($keyTypeName, $arrayItem);
82 
-        }
83 
-        $this->modelData[$key] = $arrayObject;
84 
-      }
85 
-      $this->processed[$key] = true;
86 
-    }
68 
+	  if ($this->isAssociativeArray($val)) {
69 
+		if (isset($this->$keyDataType) && 'map' == $this->$keyDataType) {
70 
+		  foreach ($val as $arrayKey => $arrayItem) {
71 
+			  $this->modelData[$key][$arrayKey] =
72 
+				$this->createObjectFromName($keyTypeName, $arrayItem);
73 
+		  }
74 
+		} else {
75 
+		  $this->modelData[$key] = $this->createObjectFromName($keyTypeName, $val);
76 
+		}
77 
+	  } else if (is_array($val)) {
78 
+		$arrayObject = array();
79 
+		foreach ($val as $arrayIndex => $arrayItem) {
80 
+		  $arrayObject[$arrayIndex] =
81 
+			$this->createObjectFromName($keyTypeName, $arrayItem);
82 
+		}
83 
+		$this->modelData[$key] = $arrayObject;
84 
+	  }
85 
+	  $this->processed[$key] = true;
86 
+	}
87 87
88 
-    return isset($this->modelData[$key]) ? $this->modelData[$key] : null;
88 
+	return isset($this->modelData[$key]) ? $this->modelData[$key] : null;
89 89 
   }
90 90
91 91 
   /**
 
@@ -96,19 +96,19 @@  discard block
 
 block discarded – undo
96 96 
    */
97 97 
   protected function mapTypes($array)
98 98 
   {
99 
-    // Hard initialise simple types, lazy load more complex ones.
100 
-    foreach ($array as $key => $val) {
101 
-      if ( !property_exists($this, $this->keyType($key)) &&
102 
-        property_exists($this, $key)) {
103 
-          $this->$key = $val;
104 
-          unset($array[$key]);
105 
-      } elseif (property_exists($this, $camelKey = Google_Utils::camelCase($key))) {
106 
-          // This checks if property exists as camelCase, leaving it in array as snake_case
107 
-          // in case of backwards compatibility issues.
108 
-          $this->$camelKey = $val;
109 
-      }
110 
-    }
111 
-    $this->modelData = $array;
99 
+	// Hard initialise simple types, lazy load more complex ones.
100 
+	foreach ($array as $key => $val) {
101 
+	  if ( !property_exists($this, $this->keyType($key)) &&
102 
+		property_exists($this, $key)) {
103 
+		  $this->$key = $val;
104 
+		  unset($array[$key]);
105 
+	  } elseif (property_exists($this, $camelKey = Google_Utils::camelCase($key))) {
106 
+		  // This checks if property exists as camelCase, leaving it in array as snake_case
107 
+		  // in case of backwards compatibility issues.
108 
+		  $this->$camelKey = $val;
109 
+	  }
110 
+	}
111 
+	$this->modelData = $array;
112 112 
   }
113 113
114 114 
   /**
 
@@ -118,7 +118,7 @@  discard block
 
 block discarded – undo
118 118 
    */
119 119 
   protected function gapiInit()
120 120 
   {
121 
-    return;
121 
+	return;
122 122 
   }
123 123
124 124 
   /**
 
@@ -129,29 +129,29 @@  discard block
 
 block discarded – undo
129 129 
    */
130 130 
   public function toSimpleObject()
131 131 
   {
132 
-    $object = new stdClass();
132 
+	$object = new stdClass();
133 133
134 
-    // Process all other data.
135 
-    foreach ($this->modelData as $key => $val) {
136 
-      $result = $this->getSimpleValue($val);
137 
-      if ($result !== null) {
138 
-        $object->$key = $this->nullPlaceholderCheck($result);
139 
-      }
140 
-    }
134 
+	// Process all other data.
135 
+	foreach ($this->modelData as $key => $val) {
136 
+	  $result = $this->getSimpleValue($val);
137 
+	  if ($result !== null) {
138 
+		$object->$key = $this->nullPlaceholderCheck($result);
139 
+	  }
140 
+	}
141 141
142 
-    // Process all public properties.
143 
-    $reflect = new ReflectionObject($this);
144 
-    $props = $reflect->getProperties(ReflectionProperty::IS_PUBLIC);
145 
-    foreach ($props as $member) {
146 
-      $name = $member->getName();
147 
-      $result = $this->getSimpleValue($this->$name);
148 
-      if ($result !== null) {
149 
-        $name = $this->getMappedName($name);
150 
-        $object->$name = $this->nullPlaceholderCheck($result);
151 
-      }
152 
-    }
142 
+	// Process all public properties.
143 
+	$reflect = new ReflectionObject($this);
144 
+	$props = $reflect->getProperties(ReflectionProperty::IS_PUBLIC);
145 
+	foreach ($props as $member) {
146 
+	  $name = $member->getName();
147 
+	  $result = $this->getSimpleValue($this->$name);
148 
+	  if ($result !== null) {
149 
+		$name = $this->getMappedName($name);
150 
+		$object->$name = $this->nullPlaceholderCheck($result);
151 
+	  }
152 
+	}
153 153
154 
-    return $object;
154 
+	return $object;
155 155 
   }
156 156
157 157 
   /**
 
@@ -160,20 +160,20 @@  discard block
 
 block discarded – undo
160 160 
    */
161 161 
   private function getSimpleValue($value)
162 162 
   {
163 
-    if ($value instanceof Google_Model) {
164 
-      return $value->toSimpleObject();
165 
-    } else if (is_array($value)) {
166 
-      $return = array();
167 
-      foreach ($value as $key => $a_value) {
168 
-        $a_value = $this->getSimpleValue($a_value);
169 
-        if ($a_value !== null) {
170 
-          $key = $this->getMappedName($key);
171 
-          $return[$key] = $this->nullPlaceholderCheck($a_value);
172 
-        }
173 
-      }
174 
-      return $return;
175 
-    }
176 
-    return $value;
163 
+	if ($value instanceof Google_Model) {
164 
+	  return $value->toSimpleObject();
165 
+	} else if (is_array($value)) {
166 
+	  $return = array();
167 
+	  foreach ($value as $key => $a_value) {
168 
+		$a_value = $this->getSimpleValue($a_value);
169 
+		if ($a_value !== null) {
170 
+		  $key = $this->getMappedName($key);
171 
+		  $return[$key] = $this->nullPlaceholderCheck($a_value);
172 
+		}
173 
+	  }
174 
+	  return $return;
175 
+	}
176 
+	return $value;
177 177 
   }
178 178
179 179 
   /**
 
@@ -181,10 +181,10 @@  discard block
 
 block discarded – undo
181 181 
    */
182 182 
   private function nullPlaceholderCheck($value)
183 183 
   {
184 
-    if ($value === self::NULL_VALUE) {
185 
-      return null;
186 
-    }
187 
-    return $value;
184 
+	if ($value === self::NULL_VALUE) {
185 
+	  return null;
186 
+	}
187 
+	return $value;
188 188 
   }
189 189
190 190 
   /**
 
@@ -192,11 +192,11 @@  discard block
 
 block discarded – undo
192 192 
    */
193 193 
   private function getMappedName($key)
194 194 
   {
195 
-    if (isset($this->internal_gapi_mappings) &&
196 
-        isset($this->internal_gapi_mappings[$key])) {
197 
-      $key = $this->internal_gapi_mappings[$key];
198 
-    }
199 
-    return $key;
195 
+	if (isset($this->internal_gapi_mappings) &&
196 
+		isset($this->internal_gapi_mappings[$key])) {
197 
+	  $key = $this->internal_gapi_mappings[$key];
198 
+	}
199 
+	return $key;
200 200 
   }
201 201
202 202 
   /**
 
@@ -206,16 +206,16 @@  discard block
 
 block discarded – undo
206 206 
    */
207 207 
   protected function isAssociativeArray($array)
208 208 
   {
209 
-    if (!is_array($array)) {
210 
-      return false;
211 
-    }
212 
-    $keys = array_keys($array);
213 
-    foreach ($keys as $key) {
214 
-      if (is_string($key)) {
215 
-        return true;
216 
-      }
217 
-    }
218 
-    return false;
209 
+	if (!is_array($array)) {
210 
+	  return false;
211 
+	}
212 
+	$keys = array_keys($array);
213 
+	foreach ($keys as $key) {
214 
+	  if (is_string($key)) {
215 
+		return true;
216 
+	  }
217 
+	}
218 
+	return false;
219 219 
   }
220 220
221 221 
   /**
 
@@ -227,8 +227,8 @@  discard block
 
 block discarded – undo
227 227 
    */
228 228 
   private function createObjectFromName($name, $item)
229 229 
   {
230 
-    $type = $this->$name;
231 
-    return new $type($item);
230 
+	$type = $this->$name;
231 
+	return new $type($item);
232 232 
   }
233 233
234 234 
   /**
 
@@ -239,57 +239,57 @@  discard block
 
 block discarded – undo
239 239 
    */
240 240 
   public function assertIsArray($obj, $method)
241 241 
   {
242 
-    if ($obj && !is_array($obj)) {
243 
-      throw new Google_Exception(
244 
-          "Incorrect parameter type passed to $method(). Expected an array."
245 
-      );
246 
-    }
242 
+	if ($obj && !is_array($obj)) {
243 
+	  throw new Google_Exception(
244 
+		  "Incorrect parameter type passed to $method(). Expected an array."
245 
+	  );
246 
+	}
247 247 
   }
248 248
249 249 
   public function offsetExists($offset)
250 250 
   {
251 
-    return isset($this->$offset) || isset($this->modelData[$offset]);
251 
+	return isset($this->$offset) || isset($this->modelData[$offset]);
252 252 
   }
253 253
254 254 
   public function offsetGet($offset)
255 255 
   {
256 
-    return isset($this->$offset) ?
257 
-        $this->$offset :
258 
-        $this->__get($offset);
256 
+	return isset($this->$offset) ?
257 
+		$this->$offset :
258 
+		$this->__get($offset);
259 259 
   }
260 260
261 261 
   public function offsetSet($offset, $value)
262 262 
   {
263 
-    if (property_exists($this, $offset)) {
264 
-      $this->$offset = $value;
265 
-    } else {
266 
-      $this->modelData[$offset] = $value;
267 
-      $this->processed[$offset] = true;
268 
-    }
263 
+	if (property_exists($this, $offset)) {
264 
+	  $this->$offset = $value;
265 
+	} else {
266 
+	  $this->modelData[$offset] = $value;
267 
+	  $this->processed[$offset] = true;
268 
+	}
269 269 
   }
270 270
271 271 
   public function offsetUnset($offset)
272 272 
   {
273 
-    unset($this->modelData[$offset]);
273 
+	unset($this->modelData[$offset]);
274 274 
   }
275 275
276 276 
   protected function keyType($key)
277 277 
   {
278 
-    return $key . "Type";
278 
+	return $key . "Type";
279 279 
   }
280 280
281 281 
   protected function dataType($key)
282 282 
   {
283 
-    return $key . "DataType";
283 
+	return $key . "DataType";
284 284 
   }
285 285
286 286 
   public function __isset($key)
287 287 
   {
288 
-    return isset($this->modelData[$key]);
288 
+	return isset($this->modelData[$key]);
289 289 
   }
290 290
291 291 
   public function __unset($key)
292 292 
   {
293 
-    unset($this->modelData[$key]);
293 
+	unset($this->modelData[$key]);
294 294 
   }
295 295 
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -98,7 +98,7 @@  discard block
 
 block discarded – undo
98 98 
   {
99 99 
     // Hard initialise simple types, lazy load more complex ones.
100 100 
     foreach ($array as $key => $val) {
101 
-      if ( !property_exists($this, $this->keyType($key)) &&
101 
+      if (!property_exists($this, $this->keyType($key)) &&
102 102 
         property_exists($this, $key)) {
103 103 
           $this->$key = $val;
104 104 
           unset($array[$key]);
 
@@ -254,8 +254,7 @@  discard block
 
 block discarded – undo
254 254 
   public function offsetGet($offset)
255 255 
   {
256 256 
     return isset($this->$offset) ?
257 
-        $this->$offset :
258 
-        $this->__get($offset);
257 
+        $this->$offset : $this->__get($offset);
259 258 
   }
260 259
261 260 
   public function offsetSet($offset, $value)
 
@@ -275,12 +274,12 @@  discard block
 
 block discarded – undo
275 274
276 275 
   protected function keyType($key)
277 276 
   {
278 
-    return $key . "Type";
277 
+    return $key."Type";
279 278 
   }
280 279
281 280 
   protected function dataType($key)
282 281 
   {
283 
-    return $key . "DataType";
282 
+    return $key."DataType";
284 283 
   }
285 284
286 285 
   public function __isset($key)
Please login to merge, or discard this patch.