GeoDirectory / geodirectory

geodirectory-admin/dummy-data/recruitment_jobs.php

Indentation +646 added lines, -646 removed lines

@@ -7,232 +7,232 @@ 
  */
 
 function geodir_property_sale_custom_fields($post_type='gd_place',$package_id=''){
-    $fields = array();
-    $package = ($package_id=='') ? '' : array($package_id);
-
-    // Salary
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'text',
-                      'data_type'           =>  'FLOAT',
-                      'decimal_point'       =>  '2',
-                      'admin_title'         =>  __('Salary', 'geodirectory'),
-                      'site_title'          =>  __('Salary', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter the Salary in $ (no currency symbol) ie: 25000', 'geodirectory'),
-                      'htmlvar_name'        =>  'salary',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  '\d+(\.\d{2})?',
-                      'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-usd',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true,
-                      'extra'        =>  array(
-                          'is_price'                  =>  1,
-                          'thousand_separator'        =>  'comma',
-                          'decimal_separator'         =>  'period',
-                          'decimal_display'           =>  'if',
-                          'currency_symbol'           =>  '$',
-                          'currency_symbol_placement' =>  'left'
-                      )
-    );
-
-
-
-    // Job Type
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Job Type', 'geodirectory'),
-                      'site_title'          =>  __('Job Type','geodirectory'),
-                      'admin_desc'          =>  __('Select the type of job.','geodirectory'),
-                      'htmlvar_name'        =>  'job_type',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-briefcase',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // Job Sector
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Job Sector','geodirectory'),
-                      'site_title'          =>  __('Job Sector','geodirectory'),
-                      'admin_desc'          =>  __('Select the job sector.','geodirectory'),
-                      'htmlvar_name'        =>  'job_sector',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	          =>  '[detail]',
-                      'is_required'         =>  true,
-                      'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-briefcase',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	      =>  true
-    );
-
-    // Required Experience
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'select',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Required Experience', 'geodirectory'),
-                      'site_title'          =>  __('Required Experience', 'geodirectory'),
-                      'admin_desc'          =>  __('Select the number of years required experience', 'geodirectory'),
-                      'htmlvar_name'        =>  'job_experience',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  true,
-                      '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'),
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-life-ring',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-    // Required Skills
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'textarea',
-                      'data_type'           =>  'TEXT',
-                      'admin_title'         =>  __('Required Skills', 'geodirectory'),
-                      'site_title'          =>  __('Required Skills', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter the required skills for the job', 'geodirectory'),
-                      'htmlvar_name'        =>  'property_area',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[detail],[listing]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-area-chart',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  true,
-                      'cat_filter'	        =>  true
-    );
-
-
-
-    // Company details fieldset
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'fieldset',
-                      'data_type'           =>  '',
-                      'admin_title'         =>  __('Company Details', 'geodirectory'),
-                      'site_title'          =>  __('Company Details', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter your company details here', 'geodirectory'),
-                      'htmlvar_name'        =>  'job_company_details',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'show_in' 	        =>  '[owntab]'
-
-    );
-
-    // Company Name
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'text',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Company Name', 'geodirectory'),
-                      'site_title'          =>  __('Company Name', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter your company name', 'geodirectory'),
-                      'htmlvar_name'        =>  'job_company_name',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[owntab]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-arrow-circle-right',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  false,
-                      'cat_filter'	        =>  false
-    );
-
-    // Company Logo
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'file',
-                      'data_type'           =>  '',
-                      'admin_title'         =>  __('Company Logo', 'geodirectory'),
-                      'site_title'          =>  __('Company Logo', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter your company Logo', 'geodirectory'),
-                      'htmlvar_name'        =>  'job_company_logo',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[owntab]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-arrow-circle-right',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  false,
-                      'cat_filter'	        =>  false,
-                      'extra'               =>  array(
-                          'gd_file_types'   =>  'jpg',
-                          'gd_file_types'   =>  'jpeg',
-                          'gd_file_types'   =>  'gif',
-                          'gd_file_types'   =>  'png',
-                      )
-    );
-
-    // Company Url
-    $fields[] = array('listing_type' => $post_type,
-                      'field_type'          =>  'url',
-                      'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Company Url', 'geodirectory'),
-                      'site_title'          =>  __('Company Url', 'geodirectory'),
-                      'admin_desc'          =>  __('Enter your company Url', 'geodirectory'),
-                      'htmlvar_name'        =>  'job_company_url',
-                      'is_active'           =>  true,
-                      'for_admin_use'       =>  false,
-                      'default_value'       =>  '',
-                      'show_in' 	        =>  '[owntab]',
-                      'is_required'         =>  false,
-                      'validation_pattern'  =>  '',
-                      'validation_msg'      =>  '',
-                      'required_msg'        =>  '',
-                      'field_icon'          =>  'fa fa-arrow-circle-right',
-                      'css_class'           =>  '',
-                      'cat_sort'            =>  false,
-                      'cat_filter'	        =>  false
-    );
-
-
-
-    /**
-     * Filter the array of default custom fields DB table data.
-     *
-     * @since 1.6.6
-     * @param string $fields The default custom fields as an array.
-     */
-    $fields = apply_filters('geodir_property_sale_custom_fields', $fields);
-
-    return  $fields;
+	$fields = array();
+	$package = ($package_id=='') ? '' : array($package_id);
+
+	// Salary
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'text',
+					  'data_type'           =>  'FLOAT',
+					  'decimal_point'       =>  '2',
+					  'admin_title'         =>  __('Salary', 'geodirectory'),
+					  'site_title'          =>  __('Salary', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter the Salary in $ (no currency symbol) ie: 25000', 'geodirectory'),
+					  'htmlvar_name'        =>  'salary',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  '\d+(\.\d{2})?',
+					  'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-usd',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true,
+					  'extra'        =>  array(
+						  'is_price'                  =>  1,
+						  'thousand_separator'        =>  'comma',
+						  'decimal_separator'         =>  'period',
+						  'decimal_display'           =>  'if',
+						  'currency_symbol'           =>  '$',
+						  'currency_symbol_placement' =>  'left'
+					  )
+	);
+
+
+
+	// Job Type
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Job Type', 'geodirectory'),
+					  'site_title'          =>  __('Job Type','geodirectory'),
+					  'admin_desc'          =>  __('Select the type of job.','geodirectory'),
+					  'htmlvar_name'        =>  'job_type',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-briefcase',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// Job Sector
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Job Sector','geodirectory'),
+					  'site_title'          =>  __('Job Sector','geodirectory'),
+					  'admin_desc'          =>  __('Select the job sector.','geodirectory'),
+					  'htmlvar_name'        =>  'job_sector',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	          =>  '[detail]',
+					  'is_required'         =>  true,
+					  'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-briefcase',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	      =>  true
+	);
+
+	// Required Experience
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'select',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Required Experience', 'geodirectory'),
+					  'site_title'          =>  __('Required Experience', 'geodirectory'),
+					  'admin_desc'          =>  __('Select the number of years required experience', 'geodirectory'),
+					  'htmlvar_name'        =>  'job_experience',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  true,
+					  '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'),
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-life-ring',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+	// Required Skills
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'textarea',
+					  'data_type'           =>  'TEXT',
+					  'admin_title'         =>  __('Required Skills', 'geodirectory'),
+					  'site_title'          =>  __('Required Skills', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter the required skills for the job', 'geodirectory'),
+					  'htmlvar_name'        =>  'property_area',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[detail],[listing]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-area-chart',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  true,
+					  'cat_filter'	        =>  true
+	);
+
+
+
+	// Company details fieldset
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'fieldset',
+					  'data_type'           =>  '',
+					  'admin_title'         =>  __('Company Details', 'geodirectory'),
+					  'site_title'          =>  __('Company Details', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter your company details here', 'geodirectory'),
+					  'htmlvar_name'        =>  'job_company_details',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'show_in' 	        =>  '[owntab]'
+
+	);
+
+	// Company Name
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'text',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Company Name', 'geodirectory'),
+					  'site_title'          =>  __('Company Name', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter your company name', 'geodirectory'),
+					  'htmlvar_name'        =>  'job_company_name',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[owntab]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-arrow-circle-right',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  false,
+					  'cat_filter'	        =>  false
+	);
+
+	// Company Logo
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'file',
+					  'data_type'           =>  '',
+					  'admin_title'         =>  __('Company Logo', 'geodirectory'),
+					  'site_title'          =>  __('Company Logo', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter your company Logo', 'geodirectory'),
+					  'htmlvar_name'        =>  'job_company_logo',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[owntab]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-arrow-circle-right',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  false,
+					  'cat_filter'	        =>  false,
+					  'extra'               =>  array(
+						  'gd_file_types'   =>  'jpg',
+						  'gd_file_types'   =>  'jpeg',
+						  'gd_file_types'   =>  'gif',
+						  'gd_file_types'   =>  'png',
+					  )
+	);
+
+	// Company Url
+	$fields[] = array('listing_type' => $post_type,
+					  'field_type'          =>  'url',
+					  'data_type'           =>  'VARCHAR',
+					  'admin_title'         =>  __('Company Url', 'geodirectory'),
+					  'site_title'          =>  __('Company Url', 'geodirectory'),
+					  'admin_desc'          =>  __('Enter your company Url', 'geodirectory'),
+					  'htmlvar_name'        =>  'job_company_url',
+					  'is_active'           =>  true,
+					  'for_admin_use'       =>  false,
+					  'default_value'       =>  '',
+					  'show_in' 	        =>  '[owntab]',
+					  'is_required'         =>  false,
+					  'validation_pattern'  =>  '',
+					  'validation_msg'      =>  '',
+					  'required_msg'        =>  '',
+					  'field_icon'          =>  'fa fa-arrow-circle-right',
+					  'css_class'           =>  '',
+					  'cat_sort'            =>  false,
+					  'cat_filter'	        =>  false
+	);
+
+
+
+	/**
+	 * Filter the array of default custom fields DB table data.
+	 *
+	 * @since 1.6.6
+	 * @param string $fields The default custom fields as an array.
+	 */
+	$fields = apply_filters('geodir_property_sale_custom_fields', $fields);
+
+	return  $fields;
 }
 
 global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2,$wpdb, $current_user,$dummy_post_index;
@@ -242,36 +242,36 @@ 
 $category_array = array('Apartments', 'Houses', 'Commercial', 'Land');
 
 if($dummy_post_index==1){
-    // add the dummy categories
-    geodir_dummy_data_taxonomies($post_type,$category_array );
+	// add the dummy categories
+	geodir_dummy_data_taxonomies($post_type,$category_array );
 
-    // add the dummy custom fields
-    $fields = geodir_property_sale_custom_fields($post_type);
-    geodir_create_dummy_fields($fields);
-    update_option($post_type.'_dummy_data_type','property_sale');
+	// add the dummy custom fields
+	$fields = geodir_property_sale_custom_fields($post_type);
+	geodir_create_dummy_fields($fields);
+	update_option($post_type.'_dummy_data_type','property_sale');
 }
 
 if (geodir_dummy_folder_exists())
-    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
+	$dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
 else
-    $dummy_image_url = 'http://www.wpgeodirectory.com/dummy';
+	$dummy_image_url = 'http://www.wpgeodirectory.com/dummy';
 
 $dummy_image_url = apply_filters('place_dummy_image_url', $dummy_image_url);
 
 switch ($dummy_post_index) {
 
-    case(1):
-        $image_array[] = "$dummy_image_url/ps/psf1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb1.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
+	case(1):
+		$image_array[] = "$dummy_image_url/ps/psf1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb1.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
 
 
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Eastern Lodge',
-            "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.
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Eastern Lodge',
+			"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.
 
 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.
 
@@ -280,42 +280,42 @@ 
 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.
 
 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.',
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(111) 677-4444',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '350000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Furnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '3',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1850',
-            'geodir_property_features' => 'Gas Central Heating,Triple Glazing,Front Garden,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-
-        break;
-    case 2:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Daisy Street',
-            "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.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(111) 677-4444',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '350000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Furnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '3',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1850',
+			'geodir_property_features' => 'Gas Central Heating,Triple Glazing,Front Garden,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+
+		break;
+	case 2:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Daisy Street',
+			"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.
 
 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.
 
@@ -325,42 +325,42 @@ 
 
 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.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Garage'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '230000',
-            "geodir_property_status" => 'Sold',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '5',
-            'geodir_property_bathrooms' => '3',
-            'geodir_property_area' => '2650',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Front Garden,Garage,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 3:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb3.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Northbay House',
-            "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.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Garage'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '230000',
+			"geodir_property_status" => 'Sold',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '5',
+			'geodir_property_bathrooms' => '3',
+			'geodir_property_area' => '2650',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Front Garden,Garage,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 3:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb3.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Northbay House',
+			"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.
 
 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.
 
@@ -370,43 +370,43 @@ 
 
 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.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '260000',
-            "geodir_property_status" => 'Under Offer',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '6',
-            'geodir_property_bathrooms' => '6',
-            'geodir_property_area' => '1650',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Triple Glazing,Off Road Parking,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-
-    case 4:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Jesmond Mansion',
-            "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.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '260000',
+			"geodir_property_status" => 'Under Offer',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '6',
+			'geodir_property_bathrooms' => '6',
+			'geodir_property_area' => '1650',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Triple Glazing,Off Road Parking,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+
+	case 4:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Jesmond Mansion',
+			"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.
 
 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.
 
@@ -416,42 +416,42 @@ 
 
 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.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '2300000',
-            "geodir_property_status" => 'Under Offer',
-            'geodir_property_furnishing' => 'Partially furnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '10',
-            'geodir_property_bathrooms' => '7',
-            'geodir_property_area' => '6600',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden,Garage,Private driveway,Fireplace',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 5:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Springfield Lodge',
-            "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.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '2300000',
+			"geodir_property_status" => 'Under Offer',
+			'geodir_property_furnishing' => 'Partially furnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '10',
+			'geodir_property_bathrooms' => '7',
+			'geodir_property_area' => '6600',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden,Garage,Private driveway,Fireplace',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 5:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Springfield Lodge',
+			"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.
 
 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.
 
@@ -461,42 +461,42 @@ 
 
 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.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '330000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Optional',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '4',
-            'geodir_property_bathrooms' => '3',
-            'geodir_property_area' => '3700',
-            'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 6:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf6.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl6.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb5.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Forrest Park',
-            "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.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '330000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Optional',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '4',
+			'geodir_property_bathrooms' => '3',
+			'geodir_property_area' => '3700',
+			'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 6:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf6.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl6.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb5.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Forrest Park',
+			"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.
 
 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.
 
@@ -506,42 +506,42 @@ 
 
 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.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[1])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '530000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Detached house',
-            'geodir_property_bedrooms' => '5',
-            'geodir_property_bathrooms' => '4',
-            'geodir_property_area' => '2250',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Front Garden,Private driveway',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 7:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf7.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb4.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Fraser Suites',
-            "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.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[1])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '530000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Detached house',
+			'geodir_property_bedrooms' => '5',
+			'geodir_property_bathrooms' => '4',
+			'geodir_property_area' => '2250',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Front Garden,Private driveway',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 7:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf7.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb4.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Fraser Suites',
+			"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.
 
 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.
 
@@ -551,42 +551,42 @@ 
 
 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.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[0])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '245000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Apartment',
-            'geodir_property_bedrooms' => '3',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1250',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 8:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf8.jpg";
-        $image_array[] = "$dummy_image_url/ps/psl2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Richmore Apartments',
-            "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.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[0])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '245000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Apartment',
+			'geodir_property_bedrooms' => '3',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1250',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 8:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf8.jpg";
+		$image_array[] = "$dummy_image_url/ps/psl2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Richmore Apartments',
+			"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.
 
 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.
 
@@ -596,43 +596,43 @@ 
 
 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.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[0])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '395000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Unfurnished',
-            'geodir_property_type' => 'Apartment',
-            'geodir_property_bedrooms' => '2',
-            'geodir_property_bathrooms' => '2',
-            'geodir_property_area' => '1750',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-
-    case 9:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf9.jpg";
-        $image_array[] = "$dummy_image_url/ps/psc9.jpg";
-        $image_array[] = "$dummy_image_url/ps/psb2.jpg";
-        $image_array[] = "$dummy_image_url/ps/psk.jpg";
-        $image_array[] = "$dummy_image_url/ps/psbr.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Hotel Alpina',
-            "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.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[0])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '395000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Unfurnished',
+			'geodir_property_type' => 'Apartment',
+			'geodir_property_bedrooms' => '2',
+			'geodir_property_bathrooms' => '2',
+			'geodir_property_area' => '1750',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+
+	case 9:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf9.jpg";
+		$image_array[] = "$dummy_image_url/ps/psc9.jpg";
+		$image_array[] = "$dummy_image_url/ps/psb2.jpg";
+		$image_array[] = "$dummy_image_url/ps/psk.jpg";
+		$image_array[] = "$dummy_image_url/ps/psbr.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Hotel Alpina',
+			"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.
 
 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.
 
@@ -642,39 +642,39 @@ 
 
 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.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[2])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '12500000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => 'Furnished',
-            'geodir_property_type' => 'Hotel',
-            'geodir_property_bedrooms' => '120',
-            'geodir_property_bathrooms' => '133',
-            'geodir_property_area' => '35000',
-            'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
-            "post_dummy" => '1'
-        );
-
-        break;
-
-    case 10:
-        $image_array = array();
-        $post_meta = array();
-        $image_array[] = "$dummy_image_url/ps/psf10.jpg";
-        $image_array[] = "$dummy_image_url/ps/psf102.jpg";
-
-        $post_info[] = array(
-            "listing_type" => $post_type,
-            "post_title" => 'Development Land',
-            "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.
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[2])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '12500000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => 'Furnished',
+			'geodir_property_type' => 'Hotel',
+			'geodir_property_bedrooms' => '120',
+			'geodir_property_bathrooms' => '133',
+			'geodir_property_area' => '35000',
+			'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage',
+			"post_dummy" => '1'
+		);
+
+		break;
+
+	case 10:
+		$image_array = array();
+		$post_meta = array();
+		$image_array[] = "$dummy_image_url/ps/psf10.jpg";
+		$image_array[] = "$dummy_image_url/ps/psf102.jpg";
+
+		$post_info[] = array(
+			"listing_type" => $post_type,
+			"post_title" => 'Development Land',
+			"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.
 
 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.
 
@@ -684,93 +684,93 @@ 
 
 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.',
 
-            "post_images" => $image_array,
-            "post_category" => array($post_type.'category' => array($category_array[3])),
-            "post_tags" => array('Tags', 'Sample Tags'),
-            "geodir_video" => '',
-            "geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
-            "geodir_contact" => '(222) 777-1111',
-            "geodir_email" => 'info@example.com',
-            "geodir_website" => 'http://example.com/',
-            "geodir_twitter" => 'http://example.com/',
-            "geodir_facebook" => 'http://example.com/',
-            "geodir_price" => '80000',
-            "geodir_property_status" => 'For Sale',
-            'geodir_property_furnishing' => '',
-            'geodir_property_type' => 'Land',
-            'geodir_property_bedrooms' => '',
-            'geodir_property_bathrooms' => '',
-            'geodir_property_area' => '250000',
-            'geodir_property_features' => '',
-            "post_dummy" => '1'
-        );
-
-        break;
+			"post_images" => $image_array,
+			"post_category" => array($post_type.'category' => array($category_array[3])),
+			"post_tags" => array('Tags', 'Sample Tags'),
+			"geodir_video" => '',
+			"geodir_timing" => 'Viewing Sunday 10 am to 9 pm',
+			"geodir_contact" => '(222) 777-1111',
+			"geodir_email" => 'info@example.com',
+			"geodir_website" => 'http://example.com/',
+			"geodir_twitter" => 'http://example.com/',
+			"geodir_facebook" => 'http://example.com/',
+			"geodir_price" => '80000',
+			"geodir_property_status" => 'For Sale',
+			'geodir_property_furnishing' => '',
+			'geodir_property_type' => 'Land',
+			'geodir_property_bedrooms' => '',
+			'geodir_property_bathrooms' => '',
+			'geodir_property_area' => '250000',
+			'geodir_property_features' => '',
+			"post_dummy" => '1'
+		);
+
+		break;
 
 } // end of switch
 
 foreach ($post_info as $post_info) {
-    $default_location = geodir_get_default_location();
-    if ($city_bound_lat1 > $city_bound_lat2)
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
-    else
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
+	$default_location = geodir_get_default_location();
+	if ($city_bound_lat1 > $city_bound_lat2)
+		$dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
+	else
+		$dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
 
 
-    if ($city_bound_lng1 > $city_bound_lng2)
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
-    else
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
+	if ($city_bound_lng1 > $city_bound_lng2)
+		$dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
+	else
+		$dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
 
-    $load_map = get_option('geodir_load_map');
+	$load_map = get_option('geodir_load_map');
     
-    if ($load_map == 'osm') {
-        $post_address = geodir_get_osm_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
-    } else {
-        $post_address = geodir_get_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
-    }
-
-    $postal_code = '';
-    if (!empty($post_address)) {
-        if ($load_map == 'osm') {
-            $address = !empty($post_address->formatted_address) ? $post_address->formatted_address : '';
-            $postal_code = !empty($post_address->address->postcode) ? $post_address->address->postcode : '';
-        } else {
-            $addresses = array();
-            $addresses_default = array();
+	if ($load_map == 'osm') {
+		$post_address = geodir_get_osm_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
+	} else {
+		$post_address = geodir_get_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude);
+	}
+
+	$postal_code = '';
+	if (!empty($post_address)) {
+		if ($load_map == 'osm') {
+			$address = !empty($post_address->formatted_address) ? $post_address->formatted_address : '';
+			$postal_code = !empty($post_address->address->postcode) ? $post_address->address->postcode : '';
+		} else {
+			$addresses = array();
+			$addresses_default = array();
             
-            foreach ($post_address as $add_key => $add_value) {
-                if ($add_key < 2 && !empty($add_value->long_name)) {
-                    $addresses_default[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'postal_code') {
-                    $postal_code = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'street_number') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'route') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'neighborhood') {
-                    $addresses[] = $add_value->long_name;
-                }
-                if ($add_value->types[0] == 'sublocality') {
-                    $addresses[] = $add_value->long_name;
-                }
-            }
-            $address = !empty($addresses) ? implode(', ', $addresses) : (!empty($addresses_default) ? implode(', ', $addresses_default) : '');
-        }
-
-        $post_info['post_address'] = !empty($address) ? $address : $default_location->city;
-        $post_info['post_city'] = $default_location->city;
-        $post_info['post_region'] = $default_location->region;
-        $post_info['post_country'] = $default_location->country;
-        $post_info['post_zip'] = $postal_code;
-        $post_info['post_latitude'] = $dummy_post_latitude;
-        $post_info['post_longitude'] = $dummy_post_longitude;
-    }
+			foreach ($post_address as $add_key => $add_value) {
+				if ($add_key < 2 && !empty($add_value->long_name)) {
+					$addresses_default[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'postal_code') {
+					$postal_code = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'street_number') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'route') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'neighborhood') {
+					$addresses[] = $add_value->long_name;
+				}
+				if ($add_value->types[0] == 'sublocality') {
+					$addresses[] = $add_value->long_name;
+				}
+			}
+			$address = !empty($addresses) ? implode(', ', $addresses) : (!empty($addresses_default) ? implode(', ', $addresses_default) : '');
+		}
+
+		$post_info['post_address'] = !empty($address) ? $address : $default_location->city;
+		$post_info['post_city'] = $default_location->city;
+		$post_info['post_region'] = $default_location->region;
+		$post_info['post_country'] = $default_location->country;
+		$post_info['post_zip'] = $postal_code;
+		$post_info['post_latitude'] = $dummy_post_latitude;
+		$post_info['post_longitude'] = $dummy_post_longitude;
+	}
     
-    geodir_save_listing($post_info, true);
-    echo 1;
+	geodir_save_listing($post_info, true);
+	echo 1;
 }

Spacing +15 added lines, -15 removed lines

@@ -6,9 +6,9 @@ 
  * @package GeoDirectory
  */
 
-function geodir_property_sale_custom_fields($post_type='gd_place',$package_id=''){
+function geodir_property_sale_custom_fields($post_type = 'gd_place', $package_id = '') {
     $fields = array();
-    $package = ($package_id=='') ? '' : array($package_id);
+    $package = ($package_id == '') ? '' : array($package_id);
 
     // Salary
     $fields[] = array('listing_type' => $post_type,
@@ -48,15 +48,15 @@ 
                       'field_type'          =>  'select',
                       'data_type'           =>  'VARCHAR',
                       'admin_title'         =>  __('Job Type', 'geodirectory'),
-                      'site_title'          =>  __('Job Type','geodirectory'),
-                      'admin_desc'          =>  __('Select the type of job.','geodirectory'),
+                      'site_title'          =>  __('Job Type', 'geodirectory'),
+                      'admin_desc'          =>  __('Select the type of job.', 'geodirectory'),
                       'htmlvar_name'        =>  'job_type',
                       'is_active'           =>  true,
                       'for_admin_use'       =>  false,
                       'default_value'       =>  '',
                       'show_in' 	        =>  '[detail],[listing]',
                       'is_required'         =>  true,
-                      'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
+                      'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other', 'geodirectory'),
                       'validation_pattern'  =>  '',
                       'validation_msg'      =>  '',
                       'required_msg'        =>  '',
@@ -70,16 +70,16 @@ 
     $fields[] = array('listing_type' => $post_type,
                       'field_type'          =>  'select',
                       'data_type'           =>  'VARCHAR',
-                      'admin_title'         =>  __('Job Sector','geodirectory'),
-                      'site_title'          =>  __('Job Sector','geodirectory'),
-                      'admin_desc'          =>  __('Select the job sector.','geodirectory'),
+                      'admin_title'         =>  __('Job Sector', 'geodirectory'),
+                      'site_title'          =>  __('Job Sector', 'geodirectory'),
+                      'admin_desc'          =>  __('Select the job sector.', 'geodirectory'),
                       'htmlvar_name'        =>  'job_sector',
                       'is_active'           =>  true,
                       'for_admin_use'       =>  false,
                       'default_value'       =>  '',
                       'show_in' 	          =>  '[detail]',
                       'is_required'         =>  true,
-                      'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
+                      'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies', 'geodirectory'),
                       'validation_pattern'  =>  '',
                       'validation_msg'      =>  '',
                       'required_msg'        =>  '',
@@ -102,7 +102,7 @@ 
                       'default_value'       =>  '',
                       'show_in' 	        =>  '[detail],[listing]',
                       'is_required'         =>  true,
-                      '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'),
+                      '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'),
                       'validation_pattern'  =>  '',
                       'validation_msg'      =>  '',
                       'required_msg'        =>  '',
@@ -235,24 +235,24 @@ 
     return  $fields;
 }
 
-global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2,$wpdb, $current_user,$dummy_post_index;
+global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2, $wpdb, $current_user, $dummy_post_index;
 $post_info = array();
 $image_array = array();
 $post_meta = array();
 $category_array = array('Apartments', 'Houses', 'Commercial', 'Land');
 
-if($dummy_post_index==1){
+if ($dummy_post_index == 1) {
     // add the dummy categories
-    geodir_dummy_data_taxonomies($post_type,$category_array );
+    geodir_dummy_data_taxonomies($post_type, $category_array);
 
     // add the dummy custom fields
     $fields = geodir_property_sale_custom_fields($post_type);
     geodir_create_dummy_fields($fields);
-    update_option($post_type.'_dummy_data_type','property_sale');
+    update_option($post_type.'_dummy_data_type', 'property_sale');
 }
 
 if (geodir_dummy_folder_exists())
-    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
+    $dummy_image_url = geodir_plugin_url()."/geodirectory-admin/dummy";
 else
     $dummy_image_url = 'http://www.wpgeodirectory.com/dummy';
 

Braces +13 added lines, -10 removed lines

@@ -17,10 +17,11 @@ 
     update_option($post_type.'_dummy_data_type','standard_places');
 }
 
-if (geodir_dummy_folder_exists())
+if (geodir_dummy_folder_exists()) {
     $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy";
-else
+} else {
     $dummy_image_url = 'http://www.wpgeodirectory.com/dummy';
+}
 
 $dummy_image_url = apply_filters('place_dummy_image_url', $dummy_image_url);
 
@@ -1815,16 +1816,18 @@ 
 echo '###4.1';
 foreach ($post_info as $post_info) {echo '###5';
     $default_location = geodir_get_default_location();
-    if ($city_bound_lat1 > $city_bound_lat2)
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
-    else
-        $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
+    if ($city_bound_lat1 > $city_bound_lat2) {
+            $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1));
+    } else {
+            $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2));
+    }
 
 
-    if ($city_bound_lng1 > $city_bound_lng2)
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
-    else
-        $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
+    if ($city_bound_lng1 > $city_bound_lng2) {
+            $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1));
+    } else {
+            $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2));
+    }
 
     $load_map = get_option('geodir_load_map');
     

geodirectory-functions/ajax_handler_functions.php

Spacing +16 added lines, -16 removed lines

@@ -44,7 +44,7 @@ 
  */

 function geodir_on_wp()

 {

-    if(geodir_is_page('login')) {

+    if (geodir_is_page('login')) {

         geodir_user_signup();

     }

 

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

          * @package GeoDirectory

          */

-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');

+        include_once(geodir_plugin_path().'/geodirectory-functions/map-functions/get_markers.php');

         die;

     }

 

@@ -104,7 +104,7 @@ 
  * @todo check if nonce is required here and if so add one.

  */

 function geodir_ajax_handler() {

-    global $wpdb, $gd_session,$post;

+    global $wpdb, $gd_session, $post;

 

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

 		$gd_session->set('gd_listing_view', $_REQUEST['gd_listing_view']);

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

              * @package GeoDirectory

              */

-            include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php');

+            include_once(geodir_plugin_path().'/geodirectory-admin/geodir_admin_ajax.php');

         } else {

             wp_redirect(geodir_login_url());

             gd_die();

@@ -151,7 +151,7 @@ 
                          * @param string $posttype The post type to insert.

                          * @param string $datatype The type of dummy data to insert.

                          */

-                        do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);

+                        do_action('geodir_delete_dummy_posts', sanitize_key($_REQUEST['posttype']), $datatype);

                     break;

                 case "geodir_dummy_insert" :

                     if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))

@@ -163,7 +163,7 @@ 
                     $city_bound_lat2 = $_REQUEST['city_bound_lat2'];

                     $city_bound_lng2 = $_REQUEST['city_bound_lng2'];

 

-                    if (isset($_REQUEST['posttype'])){

+                    if (isset($_REQUEST['posttype'])) {

                         /**

                          * Used to insert the dummy post data per post type.

                          *

@@ -174,7 +174,7 @@ 
                          * @param string $datatype The type of dummy data to insert.

                          * @param int $post_index The item number to insert.

                          */

-                        do_action('geodir_insert_dummy_posts',sanitize_key($_REQUEST['posttype']),sanitize_key($_REQUEST['datatype']),absint($_REQUEST['insert_dummy_post_index']));

+                        do_action('geodir_insert_dummy_posts', sanitize_key($_REQUEST['posttype']), sanitize_key($_REQUEST['datatype']), absint($_REQUEST['insert_dummy_post_index']));

                     }

 

 

@@ -191,7 +191,7 @@ 
         if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend') {

             $template = locate_template(array("geodirectory/popup-forms.php"));

             if (!$template) {

-                $template = geodir_plugin_path() . '/geodirectory-templates/popup-forms.php';

+                $template = geodir_plugin_path().'/geodirectory-templates/popup-forms.php';

             }

             require_once($template);

         }

@@ -210,17 +210,17 @@ 
          * @since 1.0.0

          * @package GeoDirectory

          */

-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');

+        include_once(geodir_plugin_path().'/geodirectory-functions/map-functions/get_markers.php');

     }

 

     if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {

         if (is_user_logged_in()) {

             switch ($_REQUEST['ajax_action']):

                 case "add" :

-                    geodir_add_to_favorite((int)$_REQUEST['pid']);

+                    geodir_add_to_favorite((int) $_REQUEST['pid']);

                     break;

                 case "remove" :

-                    geodir_remove_from_favorite((int)$_REQUEST['pid']);

+                    geodir_remove_from_favorite((int) $_REQUEST['pid']);

                     break;

             endswitch;

         } else {

@@ -233,7 +233,7 @@ 
 

         $is_current_user_owner = true;

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

-            $is_current_user_owner = geodir_listing_belong_to_current_user((int)$_REQUEST['pid']);

+            $is_current_user_owner = geodir_listing_belong_to_current_user((int) $_REQUEST['pid']);

         }

 

         $request = $gd_session->get('listing');

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

          * @package GeoDirectory

          */

-        include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php');

+        include_once(geodir_plugin_path().'/geodirectory-functions/geodirectory_reg.php');

     }

 

     if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'geodir_get_term_list') {

@@ -375,7 +375,7 @@ 
 }

 

 

-function geodir_show_ga_stats(){

+function geodir_show_ga_stats() {

     if (isset($_REQUEST['ga_start'])) {

         $ga_start = $_REQUEST['ga_start'];

     } else {

@@ -389,5 +389,5 @@ 
     geodir_getGoogleAnalytics($_REQUEST['ga_page'], $ga_start, $ga_end);

     die;

 }

-add_action( 'wp_ajax_gdga', 'geodir_show_ga_stats' );

-add_action( 'wp_ajax_nopriv_gdga', 'geodir_show_ga_stats' );
\ No newline at end of file
+add_action('wp_ajax_gdga', 'geodir_show_ga_stats');

+add_action('wp_ajax_nopriv_gdga', 'geodir_show_ga_stats');
\ No newline at end of file

Braces +27 added lines, -20 removed lines

@@ -112,10 +112,11 @@ 
     }

 

     if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {

-        if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude']))

-            geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);

-        else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax']))

-            geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);

+        if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude'])) {
+                    geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);
+        } else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax'])) {
+                    geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);
+        }
     }

 

     if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') || isset($_REQUEST['create_field']) || isset($_REQUEST['sort_create_field'])) {

@@ -137,12 +138,13 @@ 
         if (current_user_can('manage_options')) {

             switch ($_REQUEST['geodir_autofill']):

                 case "geodir_dummy_delete" :

-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))

-                        return;

+                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename')) {
+                                            return;
+                    }
 

                     $datatype = isset($_REQUEST['datatype']) ? sanitize_key($_REQUEST['datatype']) : '';

-                    if (isset($_REQUEST['posttype']))

-                        /**

+                    if (isset($_REQUEST['posttype'])) {
+                                            /**

                          * Used to delete the dummy post data per post type.

                          *

                          * Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype'].

@@ -151,11 +153,13 @@ 
                          * @param string $posttype The post type to insert.

                          * @param string $datatype The type of dummy data to insert.

                          */

-                        do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);

+                        do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);
+                    }
                     break;

                 case "geodir_dummy_insert" :

-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))

-                        return;

+                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename')) {
+                                            return;
+                    }
 

                     global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;

                     $city_bound_lat1 = $_REQUEST['city_bound_lat1'];

@@ -254,8 +258,9 @@ 
                         } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

                             $redirect_to = get_permalink(geodir_add_listing_page_id());

                             $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);

-                        } else

-                            $redirect_to = get_permalink(geodir_add_listing_page_id());

+                        } else {
+                                                    $redirect_to = get_permalink(geodir_add_listing_page_id());
+                        }
 

                         wp_redirect($redirect_to);

                     } else {

@@ -268,9 +273,9 @@ 
 

                     $gd_session->un_set('listing');

 

-                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid']))

-                        wp_redirect(get_permalink($_REQUEST['pid']));

-                    else {

+                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid'])) {
+                                            wp_redirect(get_permalink($_REQUEST['pid']));
+                    } else {

                         geodir_remove_temp_images();

                         wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));

                     }

@@ -298,8 +303,9 @@ 
                             } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

                                 $redirect_to = get_permalink(geodir_add_listing_page_id());

                                 $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);

-                            } else

-                                $redirect_to = get_permalink(geodir_add_listing_page_id());

+                            } else {
+                                                            $redirect_to = get_permalink(geodir_add_listing_page_id());
+                            }
 

                             $gd_session->un_set('listing');

                             wp_redirect($redirect_to);

@@ -320,8 +326,9 @@ 
                             $lastid = wp_delete_post($_REQUEST['pid']);

                         }

 

-                        if ($lastid && !is_wp_error($lastid))

-                            wp_redirect($_SERVER['HTTP_REFERER']);

+                        if ($lastid && !is_wp_error($lastid)) {
+                                                    wp_redirect($_SERVER['HTTP_REFERER']);
+                        }
 

                         //wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );

                     }

Indentation +310 added lines, -310 removed lines

@@ -16,22 +16,22 @@ 
  */

 function geodir_on_wp_loaded()

 {

-    /**

-     * Called on the wp_loaded WP hook and used to send the send inquiry and send to friend forms.

-     *

-     * @since 1.0.0

-     */

-    do_action('giodir_handle_request_plugins_loaded');

-    global $wpdb;

+	/**

+	 * Called on the wp_loaded WP hook and used to send the send inquiry and send to friend forms.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('giodir_handle_request_plugins_loaded');

+	global $wpdb;

 

 

-    if (isset($_POST['sendact']) && $_POST['sendact'] == 'send_inqury') {

-        geodir_send_inquiry($_REQUEST); // function in custom_functions.php

+	if (isset($_POST['sendact']) && $_POST['sendact'] == 'send_inqury') {

+		geodir_send_inquiry($_REQUEST); // function in custom_functions.php

 

-    } elseif (isset($_POST['sendact']) && $_POST['sendact'] == 'email_frnd') {

-        geodir_send_friend($_REQUEST); // function in custom_functions.php

+	} elseif (isset($_POST['sendact']) && $_POST['sendact'] == 'email_frnd') {

+		geodir_send_friend($_REQUEST); // function in custom_functions.php

 

-    }

+	}

 

 }

 

@@ -44,9 +44,9 @@ 
  */

 function geodir_on_wp()

 {

-    if(geodir_is_page('login')) {

-        geodir_user_signup();

-    }

+	if(geodir_is_page('login')) {

+		geodir_user_signup();

+	}

 

 }

 

@@ -59,32 +59,32 @@ 
  */

 function geodir_on_init()

 {

-    /**

-     * Called on the wp_init WP hook at the start of the geodir_on_init() function.

-     *

-     * @since 1.0.0

-     */

-    do_action('giodir_handle_request');

-    global $wpdb;

+	/**

+	 * Called on the wp_init WP hook at the start of the geodir_on_init() function.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('giodir_handle_request');

+	global $wpdb;

 

 

 

 

-    if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && !current_user_can('manage_options') && !class_exists('BuddyPress')) {

-        show_admin_bar(false);

-    }

+	if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && !current_user_can('manage_options') && !class_exists('BuddyPress')) {

+		show_admin_bar(false);

+	}

 

 

-    if (isset($_REQUEST['ptype']) && $_REQUEST['ptype'] == 'get_markers') {

-        /**

-         * Contains map marker functions.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');

-        die;

-    }

+	if (isset($_REQUEST['ptype']) && $_REQUEST['ptype'] == 'get_markers') {

+		/**

+		 * Contains map marker functions.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');

+		die;

+	}

 

 

 

@@ -104,290 +104,290 @@ 
  * @todo check if nonce is required here and if so add one.

  */

 function geodir_ajax_handler() {

-    global $wpdb, $gd_session,$post;

+	global $wpdb, $gd_session,$post;

 

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

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

 		$gd_session->set('gd_listing_view', $_REQUEST['gd_listing_view']);

-        echo '1';

-    }

-

-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {

-        if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude']))

-            geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);

-        else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax']))

-            geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);

-    }

-

-    if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') || isset($_REQUEST['create_field']) || isset($_REQUEST['sort_create_field'])) {

-        if (current_user_can('manage_options')) {

-            /**

-             * Contains admin ajax handling functions.

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             */

-            include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php');

-        } else {

-            wp_redirect(geodir_login_url());

-            gd_die();

-        }

-    }

-

-    if (isset($_REQUEST['geodir_autofill']) && $_REQUEST['geodir_autofill'] != '' && isset($_REQUEST['_wpnonce'])) {

-        if (current_user_can('manage_options')) {

-            switch ($_REQUEST['geodir_autofill']):

-                case "geodir_dummy_delete" :

-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))

-                        return;

-

-                    $datatype = isset($_REQUEST['datatype']) ? sanitize_key($_REQUEST['datatype']) : '';

-                    if (isset($_REQUEST['posttype']))

-                        /**

-                         * Used to delete the dummy post data per post type.

-                         *

-                         * Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype'].

-                         *

-                         * @since 1.6.11

-                         * @param string $posttype The post type to insert.

-                         * @param string $datatype The type of dummy data to insert.

-                         */

-                        do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);

-                    break;

-                case "geodir_dummy_insert" :

-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))

-                        return;

-

-                    global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;

-                    $city_bound_lat1 = $_REQUEST['city_bound_lat1'];

-                    $city_bound_lng1 = $_REQUEST['city_bound_lng1'];

-                    $city_bound_lat2 = $_REQUEST['city_bound_lat2'];

-                    $city_bound_lng2 = $_REQUEST['city_bound_lng2'];

-

-                    if (isset($_REQUEST['posttype'])){

-                        /**

-                         * Used to insert the dummy post data per post type.

-                         *

-                         * Uses dynamic hook, geodir_insert_dummy_posts_$_REQUEST['posttype'].

-                         *

-                         * @since 1.6.11

-                         * @param string $posttype The post type to insert.

-                         * @param string $datatype The type of dummy data to insert.

-                         * @param int $post_index The item number to insert.

-                         */

-                        do_action('geodir_insert_dummy_posts',sanitize_key($_REQUEST['posttype']),sanitize_key($_REQUEST['datatype']),absint($_REQUEST['insert_dummy_post_index']));

-                    }

-

-

-                    break;

-            endswitch;

-        } else {

-            wp_redirect(geodir_login_url());

-            exit();

-        }

-    }

-

-    if (isset($_REQUEST['popuptype']) && $_REQUEST['popuptype'] != '' && isset($_REQUEST['post_id']) && $_REQUEST['post_id'] != '') {

-

-        if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend') {

-            $template = locate_template(array("geodirectory/popup-forms.php"));

-            if (!$template) {

-                $template = geodir_plugin_path() . '/geodirectory-templates/popup-forms.php';

-            }

-            require_once($template);

-        }

-

-        gd_die();

-    }

-

-    /*if(isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'filter_ajax'){

+		echo '1';

+	}

+

+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {

+		if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude']))

+			geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);

+		else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax']))

+			geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);

+	}

+

+	if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') || isset($_REQUEST['create_field']) || isset($_REQUEST['sort_create_field'])) {

+		if (current_user_can('manage_options')) {

+			/**

+			 * Contains admin ajax handling functions.

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 */

+			include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php');

+		} else {

+			wp_redirect(geodir_login_url());

+			gd_die();

+		}

+	}

+

+	if (isset($_REQUEST['geodir_autofill']) && $_REQUEST['geodir_autofill'] != '' && isset($_REQUEST['_wpnonce'])) {

+		if (current_user_can('manage_options')) {

+			switch ($_REQUEST['geodir_autofill']):

+				case "geodir_dummy_delete" :

+					if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))

+						return;

+

+					$datatype = isset($_REQUEST['datatype']) ? sanitize_key($_REQUEST['datatype']) : '';

+					if (isset($_REQUEST['posttype']))

+						/**

+						 * Used to delete the dummy post data per post type.

+						 *

+						 * Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype'].

+						 *

+						 * @since 1.6.11

+						 * @param string $posttype The post type to insert.

+						 * @param string $datatype The type of dummy data to insert.

+						 */

+						do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);

+					break;

+				case "geodir_dummy_insert" :

+					if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))

+						return;

+

+					global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;

+					$city_bound_lat1 = $_REQUEST['city_bound_lat1'];

+					$city_bound_lng1 = $_REQUEST['city_bound_lng1'];

+					$city_bound_lat2 = $_REQUEST['city_bound_lat2'];

+					$city_bound_lng2 = $_REQUEST['city_bound_lng2'];

+

+					if (isset($_REQUEST['posttype'])){

+						/**

+						 * Used to insert the dummy post data per post type.

+						 *

+						 * Uses dynamic hook, geodir_insert_dummy_posts_$_REQUEST['posttype'].

+						 *

+						 * @since 1.6.11

+						 * @param string $posttype The post type to insert.

+						 * @param string $datatype The type of dummy data to insert.

+						 * @param int $post_index The item number to insert.

+						 */

+						do_action('geodir_insert_dummy_posts',sanitize_key($_REQUEST['posttype']),sanitize_key($_REQUEST['datatype']),absint($_REQUEST['insert_dummy_post_index']));

+					}

+

+

+					break;

+			endswitch;

+		} else {

+			wp_redirect(geodir_login_url());

+			exit();

+		}

+	}

+

+	if (isset($_REQUEST['popuptype']) && $_REQUEST['popuptype'] != '' && isset($_REQUEST['post_id']) && $_REQUEST['post_id'] != '') {

+

+		if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend') {

+			$template = locate_template(array("geodirectory/popup-forms.php"));

+			if (!$template) {

+				$template = geodir_plugin_path() . '/geodirectory-templates/popup-forms.php';

+			}

+			require_once($template);

+		}

+

+		gd_die();

+	}

+

+	/*if(isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'filter_ajax'){

         include_once ( geodir_plugin_path() . '/geodirectory-templates/advance-search-form.php');

     }*/

 

-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'map_ajax') {

-        /**

-         * Contains map marker functions.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');

-    }

-

-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {

-        if (is_user_logged_in()) {

-            switch ($_REQUEST['ajax_action']):

-                case "add" :

-                    geodir_add_to_favorite((int)$_REQUEST['pid']);

-                    break;

-                case "remove" :

-                    geodir_remove_from_favorite((int)$_REQUEST['pid']);

-                    break;

-            endswitch;

-        } else {

-            wp_redirect(geodir_login_url());

-            exit();

-        }

-    }

-

-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'add_listing') {

-

-        $is_current_user_owner = true;

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

-            $is_current_user_owner = geodir_listing_belong_to_current_user((int)$_REQUEST['pid']);

-        }

-

-        $request = $gd_session->get('listing');

-

-        if (is_user_logged_in() && $is_current_user_owner) {

-

-            switch ($_REQUEST['ajax_action']):

-                case "add":

-                case "update":

-

-                    if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {

-                        $last_id = geodir_save_listing();

-

-                        if ($last_id) {

-                            //$redirect_to = get_permalink( $last_id );

-                            $redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));

-

-                        } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-                            $redirect_to = get_permalink(geodir_add_listing_page_id());

-                            $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);

-                        } else

-                            $redirect_to = get_permalink(geodir_add_listing_page_id());

-

-                        wp_redirect($redirect_to);

-                    } else {

-                        $gd_session->un_set('listing');

-                        wp_redirect(home_url());

-                    }

-

-                    break;

-                case "cancel" :

-

-                    $gd_session->un_set('listing');

-

-                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid']))

-                        wp_redirect(get_permalink($_REQUEST['pid']));

-                    else {

-                        geodir_remove_temp_images();

-                        wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));

-                    }

-

-                    break;

-

-                case "publish" :

-

-                    if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {

-

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

-                            $new_post = array();

-                            $new_post['ID'] = $_REQUEST['pid'];

-

-                            $lastid = wp_update_post($new_post);

-

-                            $gd_session->un_set('listing');

-                            wp_redirect(get_permalink($lastid));

-                        } else {

-                            $last_id = geodir_save_listing();

-

-                            if ($last_id) {

-                                //$redirect_to = get_permalink( $last_id );

-                                $redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));

-                            } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-                                $redirect_to = get_permalink(geodir_add_listing_page_id());

-                                $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);

-                            } else

-                                $redirect_to = get_permalink(geodir_add_listing_page_id());

-

-                            $gd_session->un_set('listing');

-                            wp_redirect($redirect_to);

-                        }

-                    } else {

-                        $gd_session->un_set('listing');

-                        wp_redirect(home_url());

-                    }

-

-                    break;

-                case "delete" :

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

-                        global $current_user;

-

-                        if (get_option('geodir_disable_perm_delete')) {

-                            $lastid = wp_trash_post($_REQUEST['pid']);

-                        } else {

-                            $lastid = wp_delete_post($_REQUEST['pid']);

-                        }

-

-                        if ($lastid && !is_wp_error($lastid))

-                            wp_redirect($_SERVER['HTTP_REFERER']);

-

-                        //wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );

-                    }

-                    break;

-            endswitch;

-

-            $gd_session->un_set('listing');

-        } else {

-            $gd_session->un_set('listing');

-            wp_redirect(geodir_login_url());

-            exit();

-        }

-    }

-

-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'user_login') {

-        /**

-         * Contains registration and login functions.

-         * @todo Fix the file path.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php');

-    }

-

-    if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'geodir_get_term_list') {

-        $args = array('taxonomy' => sanitize_text_field($_REQUEST['term']));

-        if (!empty($_REQUEST['parent_only'])) {

-            $args['parent'] = 0;

-        }

-        $terms_o = get_terms($args);

-

-        // Skip terms which has no listing

-        if (!empty($terms_o)) {

-            $filter_terms = array();

-

-            foreach ($terms_o as $term) {

-                if (isset($term->count) && $term->count > 0) {

-                    $filter_terms[] = $term;

-                }

-            }

-            $terms_o = $filter_terms;

-        }

-

-        $terms = geodir_sort_terms($terms_o, 'count');

-        geodir_helper_cat_list_output($terms, intval($_REQUEST['limit']));

-        exit();

-    }

-

-    gd_die();

+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'map_ajax') {

+		/**

+		 * Contains map marker functions.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');

+	}

+

+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {

+		if (is_user_logged_in()) {

+			switch ($_REQUEST['ajax_action']):

+				case "add" :

+					geodir_add_to_favorite((int)$_REQUEST['pid']);

+					break;

+				case "remove" :

+					geodir_remove_from_favorite((int)$_REQUEST['pid']);

+					break;

+			endswitch;

+		} else {

+			wp_redirect(geodir_login_url());

+			exit();

+		}

+	}

+

+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'add_listing') {

+

+		$is_current_user_owner = true;

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

+			$is_current_user_owner = geodir_listing_belong_to_current_user((int)$_REQUEST['pid']);

+		}

+

+		$request = $gd_session->get('listing');

+

+		if (is_user_logged_in() && $is_current_user_owner) {

+

+			switch ($_REQUEST['ajax_action']):

+				case "add":

+				case "update":

+

+					if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {

+						$last_id = geodir_save_listing();

+

+						if ($last_id) {

+							//$redirect_to = get_permalink( $last_id );

+							$redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));

+

+						} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+							$redirect_to = get_permalink(geodir_add_listing_page_id());

+							$redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);

+						} else

+							$redirect_to = get_permalink(geodir_add_listing_page_id());

+

+						wp_redirect($redirect_to);

+					} else {

+						$gd_session->un_set('listing');

+						wp_redirect(home_url());

+					}

+

+					break;

+				case "cancel" :

+

+					$gd_session->un_set('listing');

+

+					if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid']))

+						wp_redirect(get_permalink($_REQUEST['pid']));

+					else {

+						geodir_remove_temp_images();

+						wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));

+					}

+

+					break;

+

+				case "publish" :

+

+					if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {

+

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

+							$new_post = array();

+							$new_post['ID'] = $_REQUEST['pid'];

+

+							$lastid = wp_update_post($new_post);

+

+							$gd_session->un_set('listing');

+							wp_redirect(get_permalink($lastid));

+						} else {

+							$last_id = geodir_save_listing();

+

+							if ($last_id) {

+								//$redirect_to = get_permalink( $last_id );

+								$redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));

+							} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+								$redirect_to = get_permalink(geodir_add_listing_page_id());

+								$redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);

+							} else

+								$redirect_to = get_permalink(geodir_add_listing_page_id());

+

+							$gd_session->un_set('listing');

+							wp_redirect($redirect_to);

+						}

+					} else {

+						$gd_session->un_set('listing');

+						wp_redirect(home_url());

+					}

+

+					break;

+				case "delete" :

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

+						global $current_user;

+

+						if (get_option('geodir_disable_perm_delete')) {

+							$lastid = wp_trash_post($_REQUEST['pid']);

+						} else {

+							$lastid = wp_delete_post($_REQUEST['pid']);

+						}

+

+						if ($lastid && !is_wp_error($lastid))

+							wp_redirect($_SERVER['HTTP_REFERER']);

+

+						//wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );

+					}

+					break;

+			endswitch;

+

+			$gd_session->un_set('listing');

+		} else {

+			$gd_session->un_set('listing');

+			wp_redirect(geodir_login_url());

+			exit();

+		}

+	}

+

+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'user_login') {

+		/**

+		 * Contains registration and login functions.

+		 * @todo Fix the file path.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php');

+	}

+

+	if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'geodir_get_term_list') {

+		$args = array('taxonomy' => sanitize_text_field($_REQUEST['term']));

+		if (!empty($_REQUEST['parent_only'])) {

+			$args['parent'] = 0;

+		}

+		$terms_o = get_terms($args);

+

+		// Skip terms which has no listing

+		if (!empty($terms_o)) {

+			$filter_terms = array();

+

+			foreach ($terms_o as $term) {

+				if (isset($term->count) && $term->count > 0) {

+					$filter_terms[] = $term;

+				}

+			}

+			$terms_o = $filter_terms;

+		}

+

+		$terms = geodir_sort_terms($terms_o, 'count');

+		geodir_helper_cat_list_output($terms, intval($_REQUEST['limit']));

+		exit();

+	}

+

+	gd_die();

 }

 

 

 function geodir_show_ga_stats(){

-    if (isset($_REQUEST['ga_start'])) {

-        $ga_start = $_REQUEST['ga_start'];

-    } else {

-        $ga_start = '';

-    }

-    if (isset($_REQUEST['ga_end'])) {

-        $ga_end = $_REQUEST['ga_end'];

-    } else {

-        $ga_end = '';

-    }

-    geodir_getGoogleAnalytics($_REQUEST['ga_page'], $ga_start, $ga_end);

-    die;

+	if (isset($_REQUEST['ga_start'])) {

+		$ga_start = $_REQUEST['ga_start'];

+	} else {

+		$ga_start = '';

+	}

+	if (isset($_REQUEST['ga_end'])) {

+		$ga_end = $_REQUEST['ga_end'];

+	} else {

+		$ga_end = '';

+	}

+	geodir_getGoogleAnalytics($_REQUEST['ga_page'], $ga_start, $ga_end);

+	die;

 }

 add_action( 'wp_ajax_gdga', 'geodir_show_ga_stats' );

 add_action( 'wp_ajax_nopriv_gdga', 'geodir_show_ga_stats' );
\ No newline at end of file

geodirectory-admin/google-api-php-client/src/Google/Auth/OAuth2.php

Doc Comments +2 added lines, -1 removed lines

@@ -500,7 +500,7 @@ 
    * @param [$issuer] the expected issues, defaults to Google
    * @param [$max_expiry] the max lifetime of a token, defaults to MAX_TOKEN_LIFETIME_SECS
    * @throws Google_Auth_Exception
-   * @return mixed token information if valid, false if not
+   * @return Google_Auth_LoginTicket token information if valid, false if not
    */
   public function verifySignedJwtWithCerts(
       $jwt,
@@ -626,6 +626,7 @@ 
 
   /**
    * Add a parameter to the auth params if not empty string.
+   * @param string $name
    */
   private function maybeAddParam($params, $name)
   {

Indentation +411 added lines, -411 removed lines

@@ -57,7 +57,7 @@ 
    */
   public function __construct(Google_Client $client)
   {
-    $this->client = $client;
+	$this->client = $client;
   }
 
   /**
@@ -72,8 +72,8 @@ 
    */
   public function authenticatedRequest(Google_Http_Request $request)
   {
-    $request = $this->sign($request);
-    return $this->client->getIo()->makeRequest($request);
+	$request = $this->sign($request);
+	return $this->client->getIo()->makeRequest($request);
   }
 
   /**
@@ -84,52 +84,52 @@ 
    */
   public function authenticate($code, $crossClient = false)
   {
-    if (strlen($code) == 0) {
-      throw new Google_Auth_Exception("Invalid code");
-    }
-
-    $arguments = array(
-          'code' => $code,
-          'grant_type' => 'authorization_code',
-          'client_id' => $this->client->getClassConfig($this, 'client_id'),
-          'client_secret' => $this->client->getClassConfig($this, 'client_secret')
-    );
-
-    if ($crossClient !== true) {
-        $arguments['redirect_uri'] = $this->client->getClassConfig($this, 'redirect_uri');
-    }
-
-    // We got here from the redirect from a successful authorization grant,
-    // fetch the access token
-    $request = new Google_Http_Request(
-        self::OAUTH2_TOKEN_URI,
-        'POST',
-        array(),
-        $arguments
-    );
-    $request->disableGzip();
-    $response = $this->client->getIo()->makeRequest($request);
-
-    if ($response->getResponseHttpCode() == 200) {
-      $this->setAccessToken($response->getResponseBody());
-      $this->token['created'] = time();
-      return $this->getAccessToken();
-    } else {
-      $decodedResponse = json_decode($response->getResponseBody(), true);
-      if ($decodedResponse != null && $decodedResponse['error']) {
-        $errorText = $decodedResponse['error'];
-        if (isset($decodedResponse['error_description'])) {
-          $errorText .= ": " . $decodedResponse['error_description'];
-        }
-      }
-      throw new Google_Auth_Exception(
-          sprintf(
-              "Error fetching OAuth2 access token, message: '%s'",
-              $errorText
-          ),
-          $response->getResponseHttpCode()
-      );
-    }
+	if (strlen($code) == 0) {
+	  throw new Google_Auth_Exception("Invalid code");
+	}
+
+	$arguments = array(
+		  'code' => $code,
+		  'grant_type' => 'authorization_code',
+		  'client_id' => $this->client->getClassConfig($this, 'client_id'),
+		  'client_secret' => $this->client->getClassConfig($this, 'client_secret')
+	);
+
+	if ($crossClient !== true) {
+		$arguments['redirect_uri'] = $this->client->getClassConfig($this, 'redirect_uri');
+	}
+
+	// We got here from the redirect from a successful authorization grant,
+	// fetch the access token
+	$request = new Google_Http_Request(
+		self::OAUTH2_TOKEN_URI,
+		'POST',
+		array(),
+		$arguments
+	);
+	$request->disableGzip();
+	$response = $this->client->getIo()->makeRequest($request);
+
+	if ($response->getResponseHttpCode() == 200) {
+	  $this->setAccessToken($response->getResponseBody());
+	  $this->token['created'] = time();
+	  return $this->getAccessToken();
+	} else {
+	  $decodedResponse = json_decode($response->getResponseBody(), true);
+	  if ($decodedResponse != null && $decodedResponse['error']) {
+		$errorText = $decodedResponse['error'];
+		if (isset($decodedResponse['error_description'])) {
+		  $errorText .= ": " . $decodedResponse['error_description'];
+		}
+	  }
+	  throw new Google_Auth_Exception(
+		  sprintf(
+			  "Error fetching OAuth2 access token, message: '%s'",
+			  $errorText
+		  ),
+		  $response->getResponseHttpCode()
+	  );
+	}
   }
 
   /**
@@ -141,37 +141,37 @@ 
    */
   public function createAuthUrl($scope)
   {
-    $params = array(
-        'response_type' => 'code',
-        'redirect_uri' => $this->client->getClassConfig($this, 'redirect_uri'),
-        'client_id' => $this->client->getClassConfig($this, 'client_id'),
-        'scope' => $scope,
-        'access_type' => $this->client->getClassConfig($this, 'access_type'),
-    );
-
-    // Prefer prompt to approval prompt.
-    if ($this->client->getClassConfig($this, 'prompt')) {
-      $params = $this->maybeAddParam($params, 'prompt');
-    } else {
-      $params = $this->maybeAddParam($params, 'approval_prompt');
-    }
-    $params = $this->maybeAddParam($params, 'login_hint');
-    $params = $this->maybeAddParam($params, 'hd');
-    $params = $this->maybeAddParam($params, 'openid.realm');
-    $params = $this->maybeAddParam($params, 'include_granted_scopes');
-
-    // If the list of scopes contains plus.login, add request_visible_actions
-    // to auth URL.
-    $rva = $this->client->getClassConfig($this, 'request_visible_actions');
-    if (strpos($scope, 'plus.login') && strlen($rva) > 0) {
-        $params['request_visible_actions'] = $rva;
-    }
-
-    if (isset($this->state)) {
-      $params['state'] = $this->state;
-    }
-
-    return self::OAUTH2_AUTH_URL . "?" . http_build_query($params, '', '&');
+	$params = array(
+		'response_type' => 'code',
+		'redirect_uri' => $this->client->getClassConfig($this, 'redirect_uri'),
+		'client_id' => $this->client->getClassConfig($this, 'client_id'),
+		'scope' => $scope,
+		'access_type' => $this->client->getClassConfig($this, 'access_type'),
+	);
+
+	// Prefer prompt to approval prompt.
+	if ($this->client->getClassConfig($this, 'prompt')) {
+	  $params = $this->maybeAddParam($params, 'prompt');
+	} else {
+	  $params = $this->maybeAddParam($params, 'approval_prompt');
+	}
+	$params = $this->maybeAddParam($params, 'login_hint');
+	$params = $this->maybeAddParam($params, 'hd');
+	$params = $this->maybeAddParam($params, 'openid.realm');
+	$params = $this->maybeAddParam($params, 'include_granted_scopes');
+
+	// If the list of scopes contains plus.login, add request_visible_actions
+	// to auth URL.
+	$rva = $this->client->getClassConfig($this, 'request_visible_actions');
+	if (strpos($scope, 'plus.login') && strlen($rva) > 0) {
+		$params['request_visible_actions'] = $rva;
+	}
+
+	if (isset($this->state)) {
+	  $params['state'] = $this->state;
+	}
+
+	return self::OAUTH2_AUTH_URL . "?" . http_build_query($params, '', '&');
   }
 
   /**
@@ -180,38 +180,38 @@ 
    */
   public function setAccessToken($token)
   {
-    $token = json_decode($token, true);
-    if ($token == null) {
-      throw new Google_Auth_Exception('Could not json decode the token');
-    }
-    if (! isset($token['access_token'])) {
-      throw new Google_Auth_Exception("Invalid token format");
-    }
-    $this->token = $token;
+	$token = json_decode($token, true);
+	if ($token == null) {
+	  throw new Google_Auth_Exception('Could not json decode the token');
+	}
+	if (! isset($token['access_token'])) {
+	  throw new Google_Auth_Exception("Invalid token format");
+	}
+	$this->token = $token;
   }
 
   public function getAccessToken()
   {
-    return json_encode($this->token);
+	return json_encode($this->token);
   }
 
   public function getRefreshToken()
   {
-    if (array_key_exists('refresh_token', $this->token)) {
-      return $this->token['refresh_token'];
-    } else {
-      return null;
-    }
+	if (array_key_exists('refresh_token', $this->token)) {
+	  return $this->token['refresh_token'];
+	} else {
+	  return null;
+	}
   }
 
   public function setState($state)
   {
-    $this->state = $state;
+	$this->state = $state;
   }
 
   public function setAssertionCredentials(Google_Auth_AssertionCredentials $creds)
   {
-    $this->assertionCredentials = $creds;
+	$this->assertionCredentials = $creds;
   }
 
   /**
@@ -222,43 +222,43 @@ 
    */
   public function sign(Google_Http_Request $request)
   {
-    // add the developer key to the request before signing it
-    if ($this->client->getClassConfig($this, 'developer_key')) {
-      $request->setQueryParam('key', $this->client->getClassConfig($this, 'developer_key'));
-    }
-
-    // Cannot sign the request without an OAuth access token.
-    if (null == $this->token && null == $this->assertionCredentials) {
-      return $request;
-    }
-
-    // Check if the token is set to expire in the next 30 seconds
-    // (or has already expired).
-    if ($this->isAccessTokenExpired()) {
-      if ($this->assertionCredentials) {
-        $this->refreshTokenWithAssertion();
-      } else {
-        $this->client->getLogger()->debug('OAuth2 access token expired');
-        if (! array_key_exists('refresh_token', $this->token)) {
-          $error = "The OAuth 2.0 access token has expired,"
-                  ." and a refresh token is not available. Refresh tokens"
-                  ." are not returned for responses that were auto-approved.";
-
-          $this->client->getLogger()->error($error);
-          throw new Google_Auth_Exception($error);
-        }
-        $this->refreshToken($this->token['refresh_token']);
-      }
-    }
-
-    $this->client->getLogger()->debug('OAuth2 authentication');
-
-    // Add the OAuth2 header to the request
-    $request->setRequestHeaders(
-        array('Authorization' => 'Bearer ' . $this->token['access_token'])
-    );
-
-    return $request;
+	// add the developer key to the request before signing it
+	if ($this->client->getClassConfig($this, 'developer_key')) {
+	  $request->setQueryParam('key', $this->client->getClassConfig($this, 'developer_key'));
+	}
+
+	// Cannot sign the request without an OAuth access token.
+	if (null == $this->token && null == $this->assertionCredentials) {
+	  return $request;
+	}
+
+	// Check if the token is set to expire in the next 30 seconds
+	// (or has already expired).
+	if ($this->isAccessTokenExpired()) {
+	  if ($this->assertionCredentials) {
+		$this->refreshTokenWithAssertion();
+	  } else {
+		$this->client->getLogger()->debug('OAuth2 access token expired');
+		if (! array_key_exists('refresh_token', $this->token)) {
+		  $error = "The OAuth 2.0 access token has expired,"
+				  ." and a refresh token is not available. Refresh tokens"
+				  ." are not returned for responses that were auto-approved.";
+
+		  $this->client->getLogger()->error($error);
+		  throw new Google_Auth_Exception($error);
+		}
+		$this->refreshToken($this->token['refresh_token']);
+	  }
+	}
+
+	$this->client->getLogger()->debug('OAuth2 authentication');
+
+	// Add the OAuth2 header to the request
+	$request->setRequestHeaders(
+		array('Authorization' => 'Bearer ' . $this->token['access_token'])
+	);
+
+	return $request;
   }
 
   /**
@@ -268,14 +268,14 @@ 
    */
   public function refreshToken($refreshToken)
   {
-    $this->refreshTokenRequest(
-        array(
-          'client_id' => $this->client->getClassConfig($this, 'client_id'),
-          'client_secret' => $this->client->getClassConfig($this, 'client_secret'),
-          'refresh_token' => $refreshToken,
-          'grant_type' => 'refresh_token'
-        )
-    );
+	$this->refreshTokenRequest(
+		array(
+		  'client_id' => $this->client->getClassConfig($this, 'client_id'),
+		  'client_secret' => $this->client->getClassConfig($this, 'client_secret'),
+		  'refresh_token' => $refreshToken,
+		  'grant_type' => 'refresh_token'
+		)
+	);
   }
 
   /**
@@ -285,83 +285,83 @@ 
    */
   public function refreshTokenWithAssertion($assertionCredentials = null)
   {
-    if (!$assertionCredentials) {
-      $assertionCredentials = $this->assertionCredentials;
-    }
-
-    $cacheKey = $assertionCredentials->getCacheKey();
-
-    if ($cacheKey) {
-      // We can check whether we have a token available in the
-      // cache. If it is expired, we can retrieve a new one from
-      // the assertion.
-      $token = $this->client->getCache()->get($cacheKey);
-      if ($token) {
-        $this->setAccessToken($token);
-      }
-      if (!$this->isAccessTokenExpired()) {
-        return;
-      }
-    }
-
-    $this->client->getLogger()->debug('OAuth2 access token expired');
-    $this->refreshTokenRequest(
-        array(
-          'grant_type' => 'assertion',
-          'assertion_type' => $assertionCredentials->assertionType,
-          'assertion' => $assertionCredentials->generateAssertion(),
-        )
-    );
-
-    if ($cacheKey) {
-      // Attempt to cache the token.
-      $this->client->getCache()->set(
-          $cacheKey,
-          $this->getAccessToken()
-      );
-    }
+	if (!$assertionCredentials) {
+	  $assertionCredentials = $this->assertionCredentials;
+	}
+
+	$cacheKey = $assertionCredentials->getCacheKey();
+
+	if ($cacheKey) {
+	  // We can check whether we have a token available in the
+	  // cache. If it is expired, we can retrieve a new one from
+	  // the assertion.
+	  $token = $this->client->getCache()->get($cacheKey);
+	  if ($token) {
+		$this->setAccessToken($token);
+	  }
+	  if (!$this->isAccessTokenExpired()) {
+		return;
+	  }
+	}
+
+	$this->client->getLogger()->debug('OAuth2 access token expired');
+	$this->refreshTokenRequest(
+		array(
+		  'grant_type' => 'assertion',
+		  'assertion_type' => $assertionCredentials->assertionType,
+		  'assertion' => $assertionCredentials->generateAssertion(),
+		)
+	);
+
+	if ($cacheKey) {
+	  // Attempt to cache the token.
+	  $this->client->getCache()->set(
+		  $cacheKey,
+		  $this->getAccessToken()
+	  );
+	}
   }
 
   private function refreshTokenRequest($params)
   {
-    if (isset($params['assertion'])) {
-      $this->client->getLogger()->info(
-          'OAuth2 access token refresh with Signed JWT assertion grants.'
-      );
-    } else {
-      $this->client->getLogger()->info('OAuth2 access token refresh');
-    }
-
-    $http = new Google_Http_Request(
-        self::OAUTH2_TOKEN_URI,
-        'POST',
-        array(),
-        $params
-    );
-    $http->disableGzip();
-    $request = $this->client->getIo()->makeRequest($http);
-
-    $code = $request->getResponseHttpCode();
-    $body = $request->getResponseBody();
-    if (200 == $code) {
-      $token = json_decode($body, true);
-      if ($token == null) {
-        throw new Google_Auth_Exception("Could not json decode the access token");
-      }
-
-      if (! isset($token['access_token']) || ! isset($token['expires_in'])) {
-        throw new Google_Auth_Exception("Invalid token format");
-      }
-
-      if (isset($token['id_token'])) {
-        $this->token['id_token'] = $token['id_token'];
-      }
-      $this->token['access_token'] = $token['access_token'];
-      $this->token['expires_in'] = $token['expires_in'];
-      $this->token['created'] = time();
-    } else {
-      throw new Google_Auth_Exception("Error refreshing the OAuth2 token, message: '$body'", $code);
-    }
+	if (isset($params['assertion'])) {
+	  $this->client->getLogger()->info(
+		  'OAuth2 access token refresh with Signed JWT assertion grants.'
+	  );
+	} else {
+	  $this->client->getLogger()->info('OAuth2 access token refresh');
+	}
+
+	$http = new Google_Http_Request(
+		self::OAUTH2_TOKEN_URI,
+		'POST',
+		array(),
+		$params
+	);
+	$http->disableGzip();
+	$request = $this->client->getIo()->makeRequest($http);
+
+	$code = $request->getResponseHttpCode();
+	$body = $request->getResponseBody();
+	if (200 == $code) {
+	  $token = json_decode($body, true);
+	  if ($token == null) {
+		throw new Google_Auth_Exception("Could not json decode the access token");
+	  }
+
+	  if (! isset($token['access_token']) || ! isset($token['expires_in'])) {
+		throw new Google_Auth_Exception("Invalid token format");
+	  }
+
+	  if (isset($token['id_token'])) {
+		$this->token['id_token'] = $token['id_token'];
+	  }
+	  $this->token['access_token'] = $token['access_token'];
+	  $this->token['expires_in'] = $token['expires_in'];
+	  $this->token['created'] = time();
+	} else {
+	  throw new Google_Auth_Exception("Error refreshing the OAuth2 token, message: '$body'", $code);
+	}
   }
 
   /**
@@ -373,31 +373,31 @@ 
    */
   public function revokeToken($token = null)
   {
-    if (!$token) {
-      if (!$this->token) {
-        // Not initialized, no token to actually revoke
-        return false;
-      } elseif (array_key_exists('refresh_token', $this->token)) {
-        $token = $this->token['refresh_token'];
-      } else {
-        $token = $this->token['access_token'];
-      }
-    }
-    $request = new Google_Http_Request(
-        self::OAUTH2_REVOKE_URI,
-        'POST',
-        array(),
-        "token=$token"
-    );
-    $request->disableGzip();
-    $response = $this->client->getIo()->makeRequest($request);
-    $code = $response->getResponseHttpCode();
-    if ($code == 200) {
-      $this->token = null;
-      return true;
-    }
-
-    return false;
+	if (!$token) {
+	  if (!$this->token) {
+		// Not initialized, no token to actually revoke
+		return false;
+	  } elseif (array_key_exists('refresh_token', $this->token)) {
+		$token = $this->token['refresh_token'];
+	  } else {
+		$token = $this->token['access_token'];
+	  }
+	}
+	$request = new Google_Http_Request(
+		self::OAUTH2_REVOKE_URI,
+		'POST',
+		array(),
+		"token=$token"
+	);
+	$request->disableGzip();
+	$response = $this->client->getIo()->makeRequest($request);
+	$code = $response->getResponseHttpCode();
+	if ($code == 200) {
+	  $this->token = null;
+	  return true;
+	}
+
+	return false;
   }
 
   /**
@@ -406,15 +406,15 @@ 
    */
   public function isAccessTokenExpired()
   {
-    if (!$this->token || !isset($this->token['created'])) {
-      return true;
-    }
+	if (!$this->token || !isset($this->token['created'])) {
+	  return true;
+	}
 
-    // If the token is set to expire in the next 30 seconds.
-    $expired = ($this->token['created']
-        + ($this->token['expires_in'] - 30)) < time();
+	// If the token is set to expire in the next 30 seconds.
+	$expired = ($this->token['created']
+		+ ($this->token['expires_in'] - 30)) < time();
 
-    return $expired;
+	return $expired;
   }
 
   // Gets federated sign-on certificates to use for verifying identity tokens.
@@ -422,9 +422,9 @@ 
   // are PEM encoded certificates.
   private function getFederatedSignOnCerts()
   {
-    return $this->retrieveCertsFromLocation(
-        $this->client->getClassConfig($this, 'federated_signon_certs_url')
-    );
+	return $this->retrieveCertsFromLocation(
+		$this->client->getClassConfig($this, 'federated_signon_certs_url')
+	);
   }
 
   /**
@@ -436,36 +436,36 @@ 
    */
   public function retrieveCertsFromLocation($url)
   {
-    // If we're retrieving a local file, just grab it.
-    if ("http" != substr($url, 0, 4)) {
-      $file = file_get_contents($url);
-      if ($file) {
-        return json_decode($file, true);
-      } else {
-        throw new Google_Auth_Exception(
-            "Failed to retrieve verification certificates: '" .
-            $url . "'."
-        );
-      }
-    }
-
-    // This relies on makeRequest caching certificate responses.
-    $request = $this->client->getIo()->makeRequest(
-        new Google_Http_Request(
-            $url
-        )
-    );
-    if ($request->getResponseHttpCode() == 200) {
-      $certs = json_decode($request->getResponseBody(), true);
-      if ($certs) {
-        return $certs;
-      }
-    }
-    throw new Google_Auth_Exception(
-        "Failed to retrieve verification certificates: '" .
-        $request->getResponseBody() . "'.",
-        $request->getResponseHttpCode()
-    );
+	// If we're retrieving a local file, just grab it.
+	if ("http" != substr($url, 0, 4)) {
+	  $file = file_get_contents($url);
+	  if ($file) {
+		return json_decode($file, true);
+	  } else {
+		throw new Google_Auth_Exception(
+			"Failed to retrieve verification certificates: '" .
+			$url . "'."
+		);
+	  }
+	}
+
+	// This relies on makeRequest caching certificate responses.
+	$request = $this->client->getIo()->makeRequest(
+		new Google_Http_Request(
+			$url
+		)
+	);
+	if ($request->getResponseHttpCode() == 200) {
+	  $certs = json_decode($request->getResponseBody(), true);
+	  if ($certs) {
+		return $certs;
+	  }
+	}
+	throw new Google_Auth_Exception(
+		"Failed to retrieve verification certificates: '" .
+		$request->getResponseBody() . "'.",
+		$request->getResponseHttpCode()
+	);
   }
 
   /**
@@ -480,15 +480,15 @@ 
    */
   public function verifyIdToken($id_token = null, $audience = null)
   {
-    if (!$id_token) {
-      $id_token = $this->token['id_token'];
-    }
-    $certs = $this->getFederatedSignonCerts();
-    if (!$audience) {
-      $audience = $this->client->getClassConfig($this, 'client_id');
-    }
-
-    return $this->verifySignedJwtWithCerts($id_token, $certs, $audience, self::OAUTH2_ISSUER);
+	if (!$id_token) {
+	  $id_token = $this->token['id_token'];
+	}
+	$certs = $this->getFederatedSignonCerts();
+	if (!$audience) {
+	  $audience = $this->client->getClassConfig($this, 'client_id');
+	}
+
+	return $this->verifySignedJwtWithCerts($id_token, $certs, $audience, self::OAUTH2_ISSUER);
   }
 
   /**
@@ -503,125 +503,125 @@ 
    * @return mixed token information if valid, false if not
    */
   public function verifySignedJwtWithCerts(
-      $jwt,
-      $certs,
-      $required_audience,
-      $issuer = null,
-      $max_expiry = null
+	  $jwt,
+	  $certs,
+	  $required_audience,
+	  $issuer = null,
+	  $max_expiry = null
   ) {
-    if (!$max_expiry) {
-      // Set the maximum time we will accept a token for.
-      $max_expiry = self::MAX_TOKEN_LIFETIME_SECS;
-    }
-
-    $segments = explode(".", $jwt);
-    if (count($segments) != 3) {
-      throw new Google_Auth_Exception("Wrong number of segments in token: $jwt");
-    }
-    $signed = $segments[0] . "." . $segments[1];
-    $signature = Google_Utils::urlSafeB64Decode($segments[2]);
-
-    // Parse envelope.
-    $envelope = json_decode(Google_Utils::urlSafeB64Decode($segments[0]), true);
-    if (!$envelope) {
-      throw new Google_Auth_Exception("Can't parse token envelope: " . $segments[0]);
-    }
-
-    // Parse token
-    $json_body = Google_Utils::urlSafeB64Decode($segments[1]);
-    $payload = json_decode($json_body, true);
-    if (!$payload) {
-      throw new Google_Auth_Exception("Can't parse token payload: " . $segments[1]);
-    }
-
-    // Check signature
-    $verified = false;
-    foreach ($certs as $keyName => $pem) {
-      $public_key = new Google_Verifier_Pem($pem);
-      if ($public_key->verify($signed, $signature)) {
-        $verified = true;
-        break;
-      }
-    }
-
-    if (!$verified) {
-      throw new Google_Auth_Exception("Invalid token signature: $jwt");
-    }
-
-    // Check issued-at timestamp
-    $iat = 0;
-    if (array_key_exists("iat", $payload)) {
-      $iat = $payload["iat"];
-    }
-    if (!$iat) {
-      throw new Google_Auth_Exception("No issue time in token: $json_body");
-    }
-    $earliest = $iat - self::CLOCK_SKEW_SECS;
-
-    // Check expiration timestamp
-    $now = time();
-    $exp = 0;
-    if (array_key_exists("exp", $payload)) {
-      $exp = $payload["exp"];
-    }
-    if (!$exp) {
-      throw new Google_Auth_Exception("No expiration time in token: $json_body");
-    }
-    if ($exp >= $now + $max_expiry) {
-      throw new Google_Auth_Exception(
-          sprintf("Expiration time too far in future: %s", $json_body)
-      );
-    }
-
-    $latest = $exp + self::CLOCK_SKEW_SECS;
-    if ($now < $earliest) {
-      throw new Google_Auth_Exception(
-          sprintf(
-              "Token used too early, %s < %s: %s",
-              $now,
-              $earliest,
-              $json_body
-          )
-      );
-    }
-    if ($now > $latest) {
-      throw new Google_Auth_Exception(
-          sprintf(
-              "Token used too late, %s > %s: %s",
-              $now,
-              $latest,
-              $json_body
-          )
-      );
-    }
-
-    $iss = $payload['iss'];
-    if ($issuer && $iss != $issuer) {
-      throw new Google_Auth_Exception(
-          sprintf(
-              "Invalid issuer, %s != %s: %s",
-              $iss,
-              $issuer,
-              $json_body
-          )
-      );
-    }
-
-    // Check audience
-    $aud = $payload["aud"];
-    if ($aud != $required_audience) {
-      throw new Google_Auth_Exception(
-          sprintf(
-              "Wrong recipient, %s != %s:",
-              $aud,
-              $required_audience,
-              $json_body
-          )
-      );
-    }
-
-    // All good.
-    return new Google_Auth_LoginTicket($envelope, $payload);
+	if (!$max_expiry) {
+	  // Set the maximum time we will accept a token for.
+	  $max_expiry = self::MAX_TOKEN_LIFETIME_SECS;
+	}
+
+	$segments = explode(".", $jwt);
+	if (count($segments) != 3) {
+	  throw new Google_Auth_Exception("Wrong number of segments in token: $jwt");
+	}
+	$signed = $segments[0] . "." . $segments[1];
+	$signature = Google_Utils::urlSafeB64Decode($segments[2]);
+
+	// Parse envelope.
+	$envelope = json_decode(Google_Utils::urlSafeB64Decode($segments[0]), true);
+	if (!$envelope) {
+	  throw new Google_Auth_Exception("Can't parse token envelope: " . $segments[0]);
+	}
+
+	// Parse token
+	$json_body = Google_Utils::urlSafeB64Decode($segments[1]);
+	$payload = json_decode($json_body, true);
+	if (!$payload) {
+	  throw new Google_Auth_Exception("Can't parse token payload: " . $segments[1]);
+	}
+
+	// Check signature
+	$verified = false;
+	foreach ($certs as $keyName => $pem) {
+	  $public_key = new Google_Verifier_Pem($pem);
+	  if ($public_key->verify($signed, $signature)) {
+		$verified = true;
+		break;
+	  }
+	}
+
+	if (!$verified) {
+	  throw new Google_Auth_Exception("Invalid token signature: $jwt");
+	}
+
+	// Check issued-at timestamp
+	$iat = 0;
+	if (array_key_exists("iat", $payload)) {
+	  $iat = $payload["iat"];
+	}
+	if (!$iat) {
+	  throw new Google_Auth_Exception("No issue time in token: $json_body");
+	}
+	$earliest = $iat - self::CLOCK_SKEW_SECS;
+
+	// Check expiration timestamp
+	$now = time();
+	$exp = 0;
+	if (array_key_exists("exp", $payload)) {
+	  $exp = $payload["exp"];
+	}
+	if (!$exp) {
+	  throw new Google_Auth_Exception("No expiration time in token: $json_body");
+	}
+	if ($exp >= $now + $max_expiry) {
+	  throw new Google_Auth_Exception(
+		  sprintf("Expiration time too far in future: %s", $json_body)
+	  );
+	}
+
+	$latest = $exp + self::CLOCK_SKEW_SECS;
+	if ($now < $earliest) {
+	  throw new Google_Auth_Exception(
+		  sprintf(
+			  "Token used too early, %s < %s: %s",
+			  $now,
+			  $earliest,
+			  $json_body
+		  )
+	  );
+	}
+	if ($now > $latest) {
+	  throw new Google_Auth_Exception(
+		  sprintf(
+			  "Token used too late, %s > %s: %s",
+			  $now,
+			  $latest,
+			  $json_body
+		  )
+	  );
+	}
+
+	$iss = $payload['iss'];
+	if ($issuer && $iss != $issuer) {
+	  throw new Google_Auth_Exception(
+		  sprintf(
+			  "Invalid issuer, %s != %s: %s",
+			  $iss,
+			  $issuer,
+			  $json_body
+		  )
+	  );
+	}
+
+	// Check audience
+	$aud = $payload["aud"];
+	if ($aud != $required_audience) {
+	  throw new Google_Auth_Exception(
+		  sprintf(
+			  "Wrong recipient, %s != %s:",
+			  $aud,
+			  $required_audience,
+			  $json_body
+		  )
+	  );
+	}
+
+	// All good.
+	return new Google_Auth_LoginTicket($envelope, $payload);
   }
 
   /**
@@ -629,10 +629,10 @@ 
    */
   private function maybeAddParam($params, $name)
   {
-    $param = $this->client->getClassConfig($this, $name);
-    if ($param != '') {
-      $params[$name] = $param;
-    }
-    return $params;
+	$param = $this->client->getClassConfig($this, $name);
+	if ($param != '') {
+	  $params[$name] = $param;
+	}
+	return $params;
   }
 }

Spacing +14 added lines, -14 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 /**
@@ -119,7 +119,7 @@ 
       if ($decodedResponse != null && $decodedResponse['error']) {
         $errorText = $decodedResponse['error'];
         if (isset($decodedResponse['error_description'])) {
-          $errorText .= ": " . $decodedResponse['error_description'];
+          $errorText .= ": ".$decodedResponse['error_description'];
         }
       }
       throw new Google_Auth_Exception(
@@ -171,7 +171,7 @@ 
       $params['state'] = $this->state;
     }
 
-    return self::OAUTH2_AUTH_URL . "?" . http_build_query($params, '', '&');
+    return self::OAUTH2_AUTH_URL."?".http_build_query($params, '', '&');
   }
 
   /**
@@ -184,7 +184,7 @@ 
     if ($token == null) {
       throw new Google_Auth_Exception('Could not json decode the token');
     }
-    if (! isset($token['access_token'])) {
+    if (!isset($token['access_token'])) {
       throw new Google_Auth_Exception("Invalid token format");
     }
     $this->token = $token;
@@ -239,7 +239,7 @@ 
         $this->refreshTokenWithAssertion();
       } else {
         $this->client->getLogger()->debug('OAuth2 access token expired');
-        if (! array_key_exists('refresh_token', $this->token)) {
+        if (!array_key_exists('refresh_token', $this->token)) {
           $error = "The OAuth 2.0 access token has expired,"
                   ." and a refresh token is not available. Refresh tokens"
                   ." are not returned for responses that were auto-approved.";
@@ -255,7 +255,7 @@ 
 
     // Add the OAuth2 header to the request
     $request->setRequestHeaders(
-        array('Authorization' => 'Bearer ' . $this->token['access_token'])
+        array('Authorization' => 'Bearer '.$this->token['access_token'])
     );
 
     return $request;
@@ -349,7 +349,7 @@ 
         throw new Google_Auth_Exception("Could not json decode the access token");
       }
 
-      if (! isset($token['access_token']) || ! isset($token['expires_in'])) {
+      if (!isset($token['access_token']) || !isset($token['expires_in'])) {
         throw new Google_Auth_Exception("Invalid token format");
       }
 
@@ -443,8 +443,8 @@ 
         return json_decode($file, true);
       } else {
         throw new Google_Auth_Exception(
-            "Failed to retrieve verification certificates: '" .
-            $url . "'."
+            "Failed to retrieve verification certificates: '".
+            $url."'."
         );
       }
     }
@@ -462,8 +462,8 @@ 
       }
     }
     throw new Google_Auth_Exception(
-        "Failed to retrieve verification certificates: '" .
-        $request->getResponseBody() . "'.",
+        "Failed to retrieve verification certificates: '".
+        $request->getResponseBody()."'.",
         $request->getResponseHttpCode()
     );
   }
@@ -518,20 +518,20 @@ 
     if (count($segments) != 3) {
       throw new Google_Auth_Exception("Wrong number of segments in token: $jwt");
     }
-    $signed = $segments[0] . "." . $segments[1];
+    $signed = $segments[0].".".$segments[1];
     $signature = Google_Utils::urlSafeB64Decode($segments[2]);
 
     // Parse envelope.
     $envelope = json_decode(Google_Utils::urlSafeB64Decode($segments[0]), true);
     if (!$envelope) {
-      throw new Google_Auth_Exception("Can't parse token envelope: " . $segments[0]);
+      throw new Google_Auth_Exception("Can't parse token envelope: ".$segments[0]);
     }
 
     // Parse token
     $json_body = Google_Utils::urlSafeB64Decode($segments[1]);
     $payload = json_decode($json_body, true);
     if (!$payload) {
-      throw new Google_Auth_Exception("Can't parse token payload: " . $segments[1]);
+      throw new Google_Auth_Exception("Can't parse token payload: ".$segments[1]);
     }
 
     // Check signature

geodirectory-admin/google-api-php-client/src/Google/Cache/File.php

Doc Comments +18 added lines

@@ -129,6 +129,9 @@ 
     );
   }
 
+  /**
+   * @param string $file
+   */
   private function getWriteableCacheFile($file)
   {
     return $this->getCacheFile($file, true);
@@ -139,6 +142,9 @@ 
     return $this->getCacheDir($file, $forWrite) . '/' . md5($file);
   }
 
+  /**
+   * @param boolean $forWrite
+   */
   private function getCacheDir($file, $forWrite)
   {
     // use the first 2 characters of the hash as a directory prefix
@@ -157,11 +163,17 @@ 
     return $storageDir;
   }
 
+  /**
+   * @param string $storageFile
+   */
   private function acquireReadLock($storageFile)
   {
     return $this->acquireLock(LOCK_SH, $storageFile);
   }
 
+  /**
+   * @param string $storageFile
+   */
   private function acquireWriteLock($storageFile)
   {
     $rc = $this->acquireLock(LOCK_EX, $storageFile);
@@ -175,6 +187,9 @@ 
     return $rc;
   }
 
+  /**
+   * @param integer $type
+   */
   private function acquireLock($type, $storageFile)
   {
     $mode = $type == LOCK_EX ? "w" : "r";
@@ -197,6 +212,9 @@ 
     return true;
   }
 
+  /**
+   * @param string $storageFile
+   */
   public function unlock($storageFile)
   {
     if ($this->fh) {

Indentation +122 added lines, -122 removed lines

@@ -40,167 +40,167 @@
 
   public function __construct(Google_Client $client)
   {
-    $this->client = $client;
-    $this->path = $this->client->getClassConfig($this, 'directory');
+	$this->client = $client;
+	$this->path = $this->client->getClassConfig($this, 'directory');
   }
 
   public function get($key, $expiration = false)
   {
-    $storageFile = $this->getCacheFile($key);
-    $data = false;
-
-    if (!file_exists($storageFile)) {
-      $this->client->getLogger()->debug(
-          'File cache miss',
-          array('key' => $key, 'file' => $storageFile)
-      );
-      return false;
-    }
-
-    if ($expiration) {
-      $mtime = filemtime($storageFile);
-      if ((time() - $mtime) >= $expiration) {
-        $this->client->getLogger()->debug(
-            'File cache miss (expired)',
-            array('key' => $key, 'file' => $storageFile)
-        );
-        $this->delete($key);
-        return false;
-      }
-    }
-
-    if ($this->acquireReadLock($storageFile)) {
-      if (filesize($storageFile) > 0) {
-        $data = fread($this->fh, filesize($storageFile));
-        $data =  unserialize($data);
-      } else {
-        $this->client->getLogger()->debug(
-            'Cache file was empty',
-            array('file' => $storageFile)
-        );
-      }
-      $this->unlock($storageFile);
-    }
-
-    $this->client->getLogger()->debug(
-        'File cache hit',
-        array('key' => $key, 'file' => $storageFile, 'var' => $data)
-    );
-
-    return $data;
+	$storageFile = $this->getCacheFile($key);
+	$data = false;
+
+	if (!file_exists($storageFile)) {
+	  $this->client->getLogger()->debug(
+		  'File cache miss',
+		  array('key' => $key, 'file' => $storageFile)
+	  );
+	  return false;
+	}
+
+	if ($expiration) {
+	  $mtime = filemtime($storageFile);
+	  if ((time() - $mtime) >= $expiration) {
+		$this->client->getLogger()->debug(
+			'File cache miss (expired)',
+			array('key' => $key, 'file' => $storageFile)
+		);
+		$this->delete($key);
+		return false;
+	  }
+	}
+
+	if ($this->acquireReadLock($storageFile)) {
+	  if (filesize($storageFile) > 0) {
+		$data = fread($this->fh, filesize($storageFile));
+		$data =  unserialize($data);
+	  } else {
+		$this->client->getLogger()->debug(
+			'Cache file was empty',
+			array('file' => $storageFile)
+		);
+	  }
+	  $this->unlock($storageFile);
+	}
+
+	$this->client->getLogger()->debug(
+		'File cache hit',
+		array('key' => $key, 'file' => $storageFile, 'var' => $data)
+	);
+
+	return $data;
   }
 
   public function set($key, $value)
   {
-    $storageFile = $this->getWriteableCacheFile($key);
-    if ($this->acquireWriteLock($storageFile)) {
-      // We serialize the whole request object, since we don't only want the
-      // responseContent but also the postBody used, headers, size, etc.
-      $data = serialize($value);
-      $result = fwrite($this->fh, $data);
-      $this->unlock($storageFile);
-
-      $this->client->getLogger()->debug(
-          'File cache set',
-          array('key' => $key, 'file' => $storageFile, 'var' => $value)
-      );
-    } else {
-      $this->client->getLogger()->notice(
-          'File cache set failed',
-          array('key' => $key, 'file' => $storageFile)
-      );
-    }
+	$storageFile = $this->getWriteableCacheFile($key);
+	if ($this->acquireWriteLock($storageFile)) {
+	  // We serialize the whole request object, since we don't only want the
+	  // responseContent but also the postBody used, headers, size, etc.
+	  $data = serialize($value);
+	  $result = fwrite($this->fh, $data);
+	  $this->unlock($storageFile);
+
+	  $this->client->getLogger()->debug(
+		  'File cache set',
+		  array('key' => $key, 'file' => $storageFile, 'var' => $value)
+	  );
+	} else {
+	  $this->client->getLogger()->notice(
+		  'File cache set failed',
+		  array('key' => $key, 'file' => $storageFile)
+	  );
+	}
   }
 
   public function delete($key)
   {
-    $file = $this->getCacheFile($key);
-    if (file_exists($file) && !unlink($file)) {
-      $this->client->getLogger()->error(
-          'File cache delete failed',
-          array('key' => $key, 'file' => $file)
-      );
-      throw new Google_Cache_Exception("Cache file could not be deleted");
-    }
-
-    $this->client->getLogger()->debug(
-        'File cache delete',
-        array('key' => $key, 'file' => $file)
-    );
+	$file = $this->getCacheFile($key);
+	if (file_exists($file) && !unlink($file)) {
+	  $this->client->getLogger()->error(
+		  'File cache delete failed',
+		  array('key' => $key, 'file' => $file)
+	  );
+	  throw new Google_Cache_Exception("Cache file could not be deleted");
+	}
+
+	$this->client->getLogger()->debug(
+		'File cache delete',
+		array('key' => $key, 'file' => $file)
+	);
   }
 
   private function getWriteableCacheFile($file)
   {
-    return $this->getCacheFile($file, true);
+	return $this->getCacheFile($file, true);
   }
 
   private function getCacheFile($file, $forWrite = false)
   {
-    return $this->getCacheDir($file, $forWrite) . '/' . md5($file);
+	return $this->getCacheDir($file, $forWrite) . '/' . md5($file);
   }
 
   private function getCacheDir($file, $forWrite)
   {
-    // use the first 2 characters of the hash as a directory prefix
-    // this should prevent slowdowns due to huge directory listings
-    // and thus give some basic amount of scalability
-    $storageDir = $this->path . '/' . substr(md5($file), 0, 2);
-    if ($forWrite && ! is_dir($storageDir)) {
-      if (! mkdir($storageDir, 0755, true)) {
-        $this->client->getLogger()->error(
-            'File cache creation failed',
-            array('dir' => $storageDir)
-        );
-        throw new Google_Cache_Exception("Could not create storage directory: $storageDir");
-      }
-    }
-    return $storageDir;
+	// use the first 2 characters of the hash as a directory prefix
+	// this should prevent slowdowns due to huge directory listings
+	// and thus give some basic amount of scalability
+	$storageDir = $this->path . '/' . substr(md5($file), 0, 2);
+	if ($forWrite && ! is_dir($storageDir)) {
+	  if (! mkdir($storageDir, 0755, true)) {
+		$this->client->getLogger()->error(
+			'File cache creation failed',
+			array('dir' => $storageDir)
+		);
+		throw new Google_Cache_Exception("Could not create storage directory: $storageDir");
+	  }
+	}
+	return $storageDir;
   }
 
   private function acquireReadLock($storageFile)
   {
-    return $this->acquireLock(LOCK_SH, $storageFile);
+	return $this->acquireLock(LOCK_SH, $storageFile);
   }
 
   private function acquireWriteLock($storageFile)
   {
-    $rc = $this->acquireLock(LOCK_EX, $storageFile);
-    if (!$rc) {
-      $this->client->getLogger()->notice(
-          'File cache write lock failed',
-          array('file' => $storageFile)
-      );
-      $this->delete($storageFile);
-    }
-    return $rc;
+	$rc = $this->acquireLock(LOCK_EX, $storageFile);
+	if (!$rc) {
+	  $this->client->getLogger()->notice(
+		  'File cache write lock failed',
+		  array('file' => $storageFile)
+	  );
+	  $this->delete($storageFile);
+	}
+	return $rc;
   }
 
   private function acquireLock($type, $storageFile)
   {
-    $mode = $type == LOCK_EX ? "w" : "r";
-    $this->fh = fopen($storageFile, $mode);
-    if (!$this->fh) {
-      $this->client->getLogger()->error(
-          'Failed to open file during lock acquisition',
-          array('file' => $storageFile)
-      );
-      return false;
-    }
-    $count = 0;
-    while (!flock($this->fh, $type | LOCK_NB)) {
-      // Sleep for 10ms.
-      usleep(10000);
-      if (++$count < self::MAX_LOCK_RETRIES) {
-        return false;
-      }
-    }
-    return true;
+	$mode = $type == LOCK_EX ? "w" : "r";
+	$this->fh = fopen($storageFile, $mode);
+	if (!$this->fh) {
+	  $this->client->getLogger()->error(
+		  'Failed to open file during lock acquisition',
+		  array('file' => $storageFile)
+	  );
+	  return false;
+	}
+	$count = 0;
+	while (!flock($this->fh, $type | LOCK_NB)) {
+	  // Sleep for 10ms.
+	  usleep(10000);
+	  if (++$count < self::MAX_LOCK_RETRIES) {
+		return false;
+	  }
+	}
+	return true;
   }
 
   public function unlock($storageFile)
   {
-    if ($this->fh) {
-      flock($this->fh, LOCK_UN);
-    }
+	if ($this->fh) {
+	  flock($this->fh, LOCK_UN);
+	}
   }
 }

Spacing +6 added lines, -6 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 /*
@@ -72,7 +72,7 @@ 
     if ($this->acquireReadLock($storageFile)) {
       if (filesize($storageFile) > 0) {
         $data = fread($this->fh, filesize($storageFile));
-        $data =  unserialize($data);
+        $data = unserialize($data);
       } else {
         $this->client->getLogger()->debug(
             'Cache file was empty',
@@ -136,7 +136,7 @@ 
 
   private function getCacheFile($file, $forWrite = false)
   {
-    return $this->getCacheDir($file, $forWrite) . '/' . md5($file);
+    return $this->getCacheDir($file, $forWrite).'/'.md5($file);
   }
 
   private function getCacheDir($file, $forWrite)
@@ -144,9 +144,9 @@ 
     // use the first 2 characters of the hash as a directory prefix
     // this should prevent slowdowns due to huge directory listings
     // and thus give some basic amount of scalability
-    $storageDir = $this->path . '/' . substr(md5($file), 0, 2);
-    if ($forWrite && ! is_dir($storageDir)) {
-      if (! mkdir($storageDir, 0755, true)) {
+    $storageDir = $this->path.'/'.substr(md5($file), 0, 2);
+    if ($forWrite && !is_dir($storageDir)) {
+      if (!mkdir($storageDir, 0755, true)) {
         $this->client->getLogger()->error(
             'File cache creation failed',
             array('dir' => $storageDir)

geodirectory-admin/google-api-php-client/src/Google/Client.php

Doc Comments +3 added lines, -2 removed lines

@@ -191,7 +191,7 @@ 
 
   /**
    * @throws Google_Auth_Exception
-   * @return array
+   * @return string
    * @visible For Testing
    */
   public function prepareScopes()
@@ -490,7 +490,7 @@ 
    * @param $audience string the expected consumer of the token
    * @param $issuer string the expected issuer, defaults to Google
    * @param [$max_expiry] the max lifetime of a token, defaults to MAX_TOKEN_LIFETIME_SECS
-   * @return mixed token information if valid, false if not
+   * @return Google_Auth_LoginTicket token information if valid, false if not
    */
   public function verifySignedJwt($id_token, $cert_location, $audience, $issuer, $max_expiry = null)
   {
@@ -512,6 +512,7 @@ 
    * Will remove any previously configured scopes.
    * @param array $scopes, ie: array('https://www.googleapis.com/auth/plus.login',
    * 'https://www.googleapis.com/auth/moderator')
+   * @param string[] $scopes
    */
   public function setScopes($scopes)
   {

Indentation +160 added lines, -160 removed lines

@@ -74,32 +74,32 @@ 
    */
   public function __construct($config = null)
   {
-    if (is_string($config) && strlen($config)) {
-      $config = new Google_Config($config);
-    } else if ( !($config instanceof Google_Config)) {
-      $config = new Google_Config();
+	if (is_string($config) && strlen($config)) {
+	  $config = new Google_Config($config);
+	} else if ( !($config instanceof Google_Config)) {
+	  $config = new Google_Config();
 
-      if ($this->isAppEngine()) {
-        // Automatically use Memcache if we're in AppEngine.
-        $config->setCacheClass('Google_Cache_Memcache');
-      }
+	  if ($this->isAppEngine()) {
+		// Automatically use Memcache if we're in AppEngine.
+		$config->setCacheClass('Google_Cache_Memcache');
+	  }
 
-      if (version_compare(phpversion(), "5.3.4", "<=") || $this->isAppEngine()) {
-        // Automatically disable compress.zlib, as currently unsupported.
-        $config->setClassConfig('Google_Http_Request', 'disable_gzip', true);
-      }
-    }
+	  if (version_compare(phpversion(), "5.3.4", "<=") || $this->isAppEngine()) {
+		// Automatically disable compress.zlib, as currently unsupported.
+		$config->setClassConfig('Google_Http_Request', 'disable_gzip', true);
+	  }
+	}
 
-    if ($config->getIoClass() == Google_Config::USE_AUTO_IO_SELECTION) {
-      if (function_exists('curl_version') && function_exists('curl_exec')
-          && !$this->isAppEngine()) {
-        $config->setIoClass("Google_IO_Curl");
-      } else {
-        $config->setIoClass("Google_IO_Stream");
-      }
-    }
+	if ($config->getIoClass() == Google_Config::USE_AUTO_IO_SELECTION) {
+	  if (function_exists('curl_version') && function_exists('curl_exec')
+		  && !$this->isAppEngine()) {
+		$config->setIoClass("Google_IO_Curl");
+	  } else {
+		$config->setIoClass("Google_IO_Stream");
+	  }
+	}
 
-    $this->config = $config;
+	$this->config = $config;
   }
 
   /**
@@ -109,7 +109,7 @@ 
    */
   public function getLibraryVersion()
   {
-    return self::LIBVER;
+	return self::LIBVER;
   }
 
   /**
@@ -124,8 +124,8 @@ 
    */
   public function authenticate($code, $crossClient = false)
   {
-    $this->authenticated = true;
-    return $this->getAuth()->authenticate($code, $crossClient);
+	$this->authenticated = true;
+	return $this->getAuth()->authenticate($code, $crossClient);
   }
   
   /**
@@ -141,18 +141,18 @@ 
    */
   public function loadServiceAccountJson($jsonLocation, $scopes)
   {
-    $data = json_decode(file_get_contents($jsonLocation));
-    if (isset($data->type) && $data->type == 'service_account') {
-      // Service Account format.
-      $cred = new Google_Auth_AssertionCredentials(
-          $data->client_email,
-          $scopes,
-          $data->private_key
-      );
-      return $cred;
-    } else {
-      throw new Google_Exception("Invalid service account JSON file.");
-    }
+	$data = json_decode(file_get_contents($jsonLocation));
+	if (isset($data->type) && $data->type == 'service_account') {
+	  // Service Account format.
+	  $cred = new Google_Auth_AssertionCredentials(
+		  $data->client_email,
+		  $scopes,
+		  $data->private_key
+	  );
+	  return $cred;
+	} else {
+	  throw new Google_Exception("Invalid service account JSON file.");
+	}
   }
 
   /**
@@ -165,16 +165,16 @@ 
    */
   public function setAuthConfig($json)
   {
-    $data = json_decode($json);
-    $key = isset($data->installed) ? 'installed' : 'web';
-    if (!isset($data->$key)) {
-      throw new Google_Exception("Invalid client secret JSON file.");
-    }
-    $this->setClientId($data->$key->client_id);
-    $this->setClientSecret($data->$key->client_secret);
-    if (isset($data->$key->redirect_uris)) {
-      $this->setRedirectUri($data->$key->redirect_uris[0]);
-    }
+	$data = json_decode($json);
+	$key = isset($data->installed) ? 'installed' : 'web';
+	if (!isset($data->$key)) {
+	  throw new Google_Exception("Invalid client secret JSON file.");
+	}
+	$this->setClientId($data->$key->client_id);
+	$this->setClientSecret($data->$key->client_secret);
+	if (isset($data->$key->redirect_uris)) {
+	  $this->setRedirectUri($data->$key->redirect_uris[0]);
+	}
   }
 
   /**
@@ -186,7 +186,7 @@ 
    */
   public function setAuthConfigFile($file)
   {
-    $this->setAuthConfig(file_get_contents($file));
+	$this->setAuthConfig(file_get_contents($file));
   }
 
   /**
@@ -196,11 +196,11 @@ 
    */
   public function prepareScopes()
   {
-    if (empty($this->requestedScopes)) {
-      throw new Google_Auth_Exception("No scopes specified");
-    }
-    $scopes = implode(' ', $this->requestedScopes);
-    return $scopes;
+	if (empty($this->requestedScopes)) {
+	  throw new Google_Auth_Exception("No scopes specified");
+	}
+	$scopes = implode(' ', $this->requestedScopes);
+	return $scopes;
   }
 
   /**
@@ -212,10 +212,10 @@ 
    */
   public function setAccessToken($accessToken)
   {
-    if ($accessToken == 'null') {
-      $accessToken = null;
-    }
-    $this->getAuth()->setAccessToken($accessToken);
+	if ($accessToken == 'null') {
+	  $accessToken = null;
+	}
+	$this->getAuth()->setAccessToken($accessToken);
   }
 
 
@@ -226,8 +226,8 @@ 
    */
   public function setAuth(Google_Auth_Abstract $auth)
   {
-    $this->config->setAuthClass(get_class($auth));
-    $this->auth = $auth;
+	$this->config->setAuthClass(get_class($auth));
+	$this->auth = $auth;
   }
 
   /**
@@ -236,8 +236,8 @@ 
    */
   public function setIo(Google_IO_Abstract $io)
   {
-    $this->config->setIoClass(get_class($io));
-    $this->io = $io;
+	$this->config->setIoClass(get_class($io));
+	$this->io = $io;
   }
 
   /**
@@ -246,8 +246,8 @@ 
    */
   public function setCache(Google_Cache_Abstract $cache)
   {
-    $this->config->setCacheClass(get_class($cache));
-    $this->cache = $cache;
+	$this->config->setCacheClass(get_class($cache));
+	$this->cache = $cache;
   }
 
   /**
@@ -256,8 +256,8 @@ 
    */
   public function setLogger(Google_Logger_Abstract $logger)
   {
-    $this->config->setLoggerClass(get_class($logger));
-    $this->logger = $logger;
+	$this->config->setLoggerClass(get_class($logger));
+	$this->logger = $logger;
   }
 
   /**
@@ -266,8 +266,8 @@ 
    */
   public function createAuthUrl()
   {
-    $scopes = $this->prepareScopes();
-    return $this->getAuth()->createAuthUrl($scopes);
+	$scopes = $this->prepareScopes();
+	return $this->getAuth()->createAuthUrl($scopes);
   }
 
   /**
@@ -278,11 +278,11 @@ 
    */
   public function getAccessToken()
   {
-    $token = $this->getAuth()->getAccessToken();
-    // The response is json encoded, so could be the string null.
-    // It is arguable whether this check should be here or lower
-    // in the library.
-    return (null == $token || 'null' == $token || '[]' == $token) ? null : $token;
+	$token = $this->getAuth()->getAccessToken();
+	// The response is json encoded, so could be the string null.
+	// It is arguable whether this check should be here or lower
+	// in the library.
+	return (null == $token || 'null' == $token || '[]' == $token) ? null : $token;
   }
 
   /**
@@ -291,7 +291,7 @@ 
    */
   public function getRefreshToken()
   {
-    return $this->getAuth()->getRefreshToken();
+	return $this->getAuth()->getRefreshToken();
   }
 
   /**
@@ -300,7 +300,7 @@ 
    */
   public function isAccessTokenExpired()
   {
-    return $this->getAuth()->isAccessTokenExpired();
+	return $this->getAuth()->isAccessTokenExpired();
   }
 
   /**
@@ -310,7 +310,7 @@ 
    */
   public function setState($state)
   {
-    $this->getAuth()->setState($state);
+	$this->getAuth()->setState($state);
   }
 
   /**
@@ -320,7 +320,7 @@ 
    */
   public function setAccessType($accessType)
   {
-    $this->config->setAccessType($accessType);
+	$this->config->setAccessType($accessType);
   }
 
   /**
@@ -330,7 +330,7 @@ 
    */
   public function setApprovalPrompt($approvalPrompt)
   {
-    $this->config->setApprovalPrompt($approvalPrompt);
+	$this->config->setApprovalPrompt($approvalPrompt);
   }
 
   /**
@@ -339,7 +339,7 @@ 
    */
   public function setLoginHint($loginHint)
   {
-      $this->config->setLoginHint($loginHint);
+	  $this->config->setLoginHint($loginHint);
   }
 
   /**
@@ -348,7 +348,7 @@ 
    */
   public function setApplicationName($applicationName)
   {
-    $this->config->setApplicationName($applicationName);
+	$this->config->setApplicationName($applicationName);
   }
 
   /**
@@ -357,7 +357,7 @@ 
    */
   public function setClientId($clientId)
   {
-    $this->config->setClientId($clientId);
+	$this->config->setClientId($clientId);
   }
 
   /**
@@ -366,7 +366,7 @@ 
    */
   public function setClientSecret($clientSecret)
   {
-    $this->config->setClientSecret($clientSecret);
+	$this->config->setClientSecret($clientSecret);
   }
 
   /**
@@ -375,7 +375,7 @@ 
    */
   public function setRedirectUri($redirectUri)
   {
-    $this->config->setRedirectUri($redirectUri);
+	$this->config->setRedirectUri($redirectUri);
   }
 
   /**
@@ -388,10 +388,10 @@ 
    */
   public function setRequestVisibleActions($requestVisibleActions)
   {
-    if (is_array($requestVisibleActions)) {
-      $requestVisibleActions = join(" ", $requestVisibleActions);
-    }
-    $this->config->setRequestVisibleActions($requestVisibleActions);
+	if (is_array($requestVisibleActions)) {
+	  $requestVisibleActions = join(" ", $requestVisibleActions);
+	}
+	$this->config->setRequestVisibleActions($requestVisibleActions);
   }
 
   /**
@@ -401,7 +401,7 @@ 
    */
   public function setDeveloperKey($developerKey)
   {
-    $this->config->setDeveloperKey($developerKey);
+	$this->config->setDeveloperKey($developerKey);
   }
 
   /**
@@ -412,7 +412,7 @@ 
    */
   public function setHostedDomain($hd)
   {
-    $this->config->setHostedDomain($hd);
+	$this->config->setHostedDomain($hd);
   }
 
   /**
@@ -423,7 +423,7 @@ 
    */
   public function setPrompt($prompt)
   {
-    $this->config->setPrompt($prompt);
+	$this->config->setPrompt($prompt);
   }
 
   /**
@@ -434,7 +434,7 @@ 
    */
   public function setOpenidRealm($realm)
   {
-    $this->config->setOpenidRealm($realm);
+	$this->config->setOpenidRealm($realm);
   }
 
   /**
@@ -445,7 +445,7 @@ 
    */
   public function setIncludeGrantedScopes($include)
   {
-    $this->config->setIncludeGrantedScopes($include);
+	$this->config->setIncludeGrantedScopes($include);
   }
 
   /**
@@ -454,7 +454,7 @@ 
    */
   public function refreshToken($refreshToken)
   {
-    $this->getAuth()->refreshToken($refreshToken);
+	$this->getAuth()->refreshToken($refreshToken);
   }
 
   /**
@@ -466,7 +466,7 @@ 
    */
   public function revokeToken($token = null)
   {
-    return $this->getAuth()->revokeToken($token);
+	return $this->getAuth()->revokeToken($token);
   }
 
   /**
@@ -479,7 +479,7 @@ 
    */
   public function verifyIdToken($token = null)
   {
-    return $this->getAuth()->verifyIdToken($token);
+	return $this->getAuth()->verifyIdToken($token);
   }
 
   /**
@@ -494,9 +494,9 @@ 
    */
   public function verifySignedJwt($id_token, $cert_location, $audience, $issuer, $max_expiry = null)
   {
-    $auth = new Google_Auth_OAuth2($this);
-    $certs = $auth->retrieveCertsFromLocation($cert_location);
-    return $auth->verifySignedJwtWithCerts($id_token, $certs, $audience, $issuer, $max_expiry);
+	$auth = new Google_Auth_OAuth2($this);
+	$certs = $auth->retrieveCertsFromLocation($cert_location);
+	return $auth->verifySignedJwtWithCerts($id_token, $certs, $audience, $issuer, $max_expiry);
   }
 
   /**
@@ -504,7 +504,7 @@ 
    */
   public function setAssertionCredentials(Google_Auth_AssertionCredentials $creds)
   {
-    $this->getAuth()->setAssertionCredentials($creds);
+	$this->getAuth()->setAssertionCredentials($creds);
   }
 
   /**
@@ -515,8 +515,8 @@ 
    */
   public function setScopes($scopes)
   {
-    $this->requestedScopes = array();
-    $this->addScope($scopes);
+	$this->requestedScopes = array();
+	$this->addScope($scopes);
   }
 
   /**
@@ -528,13 +528,13 @@ 
    */
   public function addScope($scope_or_scopes)
   {
-    if (is_string($scope_or_scopes) && !in_array($scope_or_scopes, $this->requestedScopes)) {
-      $this->requestedScopes[] = $scope_or_scopes;
-    } else if (is_array($scope_or_scopes)) {
-      foreach ($scope_or_scopes as $scope) {
-        $this->addScope($scope);
-      }
-    }
+	if (is_string($scope_or_scopes) && !in_array($scope_or_scopes, $this->requestedScopes)) {
+	  $this->requestedScopes[] = $scope_or_scopes;
+	} else if (is_array($scope_or_scopes)) {
+	  foreach ($scope_or_scopes as $scope) {
+		$this->addScope($scope);
+	  }
+	}
   }
 
   /**
@@ -544,7 +544,7 @@ 
    */
   public function getScopes()
   {
-     return $this->requestedScopes;
+	 return $this->requestedScopes;
   }
 
   /**
@@ -556,8 +556,8 @@ 
    */
   public function setUseBatch($useBatch)
   {
-    // This is actually an alias for setDefer.
-    $this->setDefer($useBatch);
+	// This is actually an alias for setDefer.
+	$this->setDefer($useBatch);
   }
 
   /**
@@ -568,7 +568,7 @@ 
    */
   public function setDefer($defer)
   {
-    $this->deferExecution = $defer;
+	$this->deferExecution = $defer;
   }
 
   /**
@@ -580,22 +580,22 @@ 
    */
   public function execute($request)
   {
-    if ($request instanceof Google_Http_Request) {
-      $request->setUserAgent(
-          $this->getApplicationName()
-          . " " . self::USER_AGENT_SUFFIX
-          . $this->getLibraryVersion()
-      );
-      if (!$this->getClassConfig("Google_Http_Request", "disable_gzip")) {
-        $request->enableGzip();
-      }
-      $request->maybeMoveParametersToBody();
-      return Google_Http_REST::execute($this, $request);
-    } else if ($request instanceof Google_Http_Batch) {
-      return $request->execute();
-    } else {
-      throw new Google_Exception("Do not know how to execute this type of object.");
-    }
+	if ($request instanceof Google_Http_Request) {
+	  $request->setUserAgent(
+		  $this->getApplicationName()
+		  . " " . self::USER_AGENT_SUFFIX
+		  . $this->getLibraryVersion()
+	  );
+	  if (!$this->getClassConfig("Google_Http_Request", "disable_gzip")) {
+		$request->enableGzip();
+	  }
+	  $request->maybeMoveParametersToBody();
+	  return Google_Http_REST::execute($this, $request);
+	} else if ($request instanceof Google_Http_Batch) {
+	  return $request->execute();
+	} else {
+	  throw new Google_Exception("Do not know how to execute this type of object.");
+	}
   }
 
   /**
@@ -604,7 +604,7 @@ 
    */
   public function shouldDefer()
   {
-    return $this->deferExecution;
+	return $this->deferExecution;
   }
 
   /**
@@ -612,11 +612,11 @@ 
    */
   public function getAuth()
   {
-    if (!isset($this->auth)) {
-      $class = $this->config->getAuthClass();
-      $this->auth = new $class($this);
-    }
-    return $this->auth;
+	if (!isset($this->auth)) {
+	  $class = $this->config->getAuthClass();
+	  $this->auth = new $class($this);
+	}
+	return $this->auth;
   }
 
   /**
@@ -624,11 +624,11 @@ 
    */
   public function getIo()
   {
-    if (!isset($this->io)) {
-      $class = $this->config->getIoClass();
-      $this->io = new $class($this);
-    }
-    return $this->io;
+	if (!isset($this->io)) {
+	  $class = $this->config->getIoClass();
+	  $this->io = new $class($this);
+	}
+	return $this->io;
   }
 
   /**
@@ -636,11 +636,11 @@ 
    */
   public function getCache()
   {
-    if (!isset($this->cache)) {
-      $class = $this->config->getCacheClass();
-      $this->cache = new $class($this);
-    }
-    return $this->cache;
+	if (!isset($this->cache)) {
+	  $class = $this->config->getCacheClass();
+	  $this->cache = new $class($this);
+	}
+	return $this->cache;
   }
 
   /**
@@ -648,11 +648,11 @@ 
    */
   public function getLogger()
   {
-    if (!isset($this->logger)) {
-      $class = $this->config->getLoggerClass();
-      $this->logger = new $class($this);
-    }
-    return $this->logger;
+	if (!isset($this->logger)) {
+	  $class = $this->config->getLoggerClass();
+	  $this->logger = new $class($this);
+	}
+	return $this->logger;
   }
 
   /**
@@ -663,10 +663,10 @@ 
    */
   public function getClassConfig($class, $key = null)
   {
-    if (!is_string($class)) {
-      $class = get_class($class);
-    }
-    return $this->config->getClassConfig($class, $key);
+	if (!is_string($class)) {
+	  $class = get_class($class);
+	}
+	return $this->config->getClassConfig($class, $key);
   }
 
   /**
@@ -680,10 +680,10 @@ 
    */
   public function setClassConfig($class, $config, $value = null)
   {
-    if (!is_string($class)) {
-      $class = get_class($class);
-    }
-    $this->config->setClassConfig($class, $config, $value);
+	if (!is_string($class)) {
+	  $class = get_class($class);
+	}
+	$this->config->setClassConfig($class, $config, $value);
 
   }
 
@@ -692,7 +692,7 @@ 
    */
   public function getBasePath()
   {
-    return $this->config->getBasePath();
+	return $this->config->getBasePath();
   }
 
   /**
@@ -700,7 +700,7 @@ 
    */
   public function getApplicationName()
   {
-    return $this->config->getApplicationName();
+	return $this->config->getApplicationName();
   }
 
   /**
@@ -709,7 +709,7 @@ 
    */
   public function isAppEngine()
   {
-    return (isset($_SERVER['SERVER_SOFTWARE']) &&
-        strpos($_SERVER['SERVER_SOFTWARE'], 'Google App Engine') !== false);
+	return (isset($_SERVER['SERVER_SOFTWARE']) &&
+		strpos($_SERVER['SERVER_SOFTWARE'], 'Google App Engine') !== false);
   }
 }

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/autoload.php';
+  require_once dirname(__FILE__).'/autoload.php';
 }
 
 /**
@@ -76,7 +76,7 @@ 
   {
     if (is_string($config) && strlen($config)) {
       $config = new Google_Config($config);
-    } else if ( !($config instanceof Google_Config)) {
+    } else if (!($config instanceof Google_Config)) {
       $config = new Google_Config();
 
       if ($this->isAppEngine()) {
@@ -583,7 +583,7 @@ 
     if ($request instanceof Google_Http_Request) {
       $request->setUserAgent(
           $this->getApplicationName()
-          . " " . self::USER_AGENT_SUFFIX
+          . " ".self::USER_AGENT_SUFFIX
           . $this->getLibraryVersion()
       );
       if (!$this->getClassConfig("Google_Http_Request", "disable_gzip")) {

geodirectory-admin/google-api-php-client/src/Google/Http/Request.php

Doc Comments +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
   
   /**
    * Set the base URL that path and query parameters will be added to.
-   * @param $baseComponent string
+   * @param string $baseComponent string
    */
   public function setBaseComponent($baseComponent)
   {
@@ -132,7 +132,7 @@ 
 
   /**
    * Set a new query parameter.
-   * @param $key - string to set, does not need to be URL encoded
+   * @param string $key - string to set, does not need to be URL encoded
    * @param $value - string to set, does not need to be URL encoded
    */
   public function setQueryParam($key, $value)
@@ -141,7 +141,7 @@ 
   }
 
   /**
-   * @return string HTTP Response Code.
+   * @return integer HTTP Response Code.
    */
   public function getResponseHttpCode()
   {

Indentation +156 added lines, -156 removed lines

@@ -32,9 +32,9 @@ 
   const GZIP_UA = " (gzip)";
 
   private $batchHeaders = array(
-    'Content-Type' => 'application/http',
-    'Content-Transfer-Encoding' => 'binary',
-    'MIME-Version' => '1.0',
+	'Content-Type' => 'application/http',
+	'Content-Transfer-Encoding' => 'binary',
+	'MIME-Version' => '1.0',
   );
 
   protected $queryParams;
@@ -56,15 +56,15 @@ 
   public $accessKey;
 
   public function __construct(
-      $url,
-      $method = 'GET',
-      $headers = array(),
-      $postBody = null
+	  $url,
+	  $method = 'GET',
+	  $headers = array(),
+	  $postBody = null
   ) {
-    $this->setUrl($url);
-    $this->setRequestMethod($method);
-    $this->setRequestHeaders($headers);
-    $this->setPostBody($postBody);
+	$this->setUrl($url);
+	$this->setRequestMethod($method);
+	$this->setRequestHeaders($headers);
+	$this->setPostBody($postBody);
   }
 
   /**
@@ -74,7 +74,7 @@ 
    */
   public function getBaseComponent()
   {
-    return $this->baseComponent;
+	return $this->baseComponent;
   }
   
   /**
@@ -83,7 +83,7 @@ 
    */
   public function setBaseComponent($baseComponent)
   {
-    $this->baseComponent = rtrim($baseComponent, '/');
+	$this->baseComponent = rtrim($baseComponent, '/');
   }
   
   /**
@@ -91,9 +91,9 @@ 
    */
   public function enableGzip()
   {
-    $this->setRequestHeaders(array("Accept-Encoding" => "gzip"));
-    $this->canGzip = true;
-    $this->setUserAgent($this->userAgent);
+	$this->setRequestHeaders(array("Accept-Encoding" => "gzip"));
+	$this->canGzip = true;
+	$this->setUserAgent($this->userAgent);
   }
   
   /**
@@ -101,14 +101,14 @@ 
    */
   public function disableGzip()
   {
-    if (
-        isset($this->requestHeaders['accept-encoding']) &&
-        $this->requestHeaders['accept-encoding'] == "gzip"
-    ) {
-      unset($this->requestHeaders['accept-encoding']);
-    }
-    $this->canGzip = false;
-    $this->userAgent = str_replace(self::GZIP_UA, "", $this->userAgent);
+	if (
+		isset($this->requestHeaders['accept-encoding']) &&
+		$this->requestHeaders['accept-encoding'] == "gzip"
+	) {
+	  unset($this->requestHeaders['accept-encoding']);
+	}
+	$this->canGzip = false;
+	$this->userAgent = str_replace(self::GZIP_UA, "", $this->userAgent);
   }
   
   /**
@@ -117,7 +117,7 @@ 
    */
   public function canGzip()
   {
-    return $this->canGzip;
+	return $this->canGzip;
   }
 
   /**
@@ -127,7 +127,7 @@ 
    */
   public function getQueryParams()
   {
-    return $this->queryParams;
+	return $this->queryParams;
   }
 
   /**
@@ -137,7 +137,7 @@ 
    */
   public function setQueryParam($key, $value)
   {
-    $this->queryParams[$key] = $value;
+	$this->queryParams[$key] = $value;
   }
 
   /**
@@ -145,7 +145,7 @@ 
    */
   public function getResponseHttpCode()
   {
-    return (int) $this->responseHttpCode;
+	return (int) $this->responseHttpCode;
   }
 
   /**
@@ -153,7 +153,7 @@ 
    */
   public function setResponseHttpCode($responseHttpCode)
   {
-    $this->responseHttpCode = $responseHttpCode;
+	$this->responseHttpCode = $responseHttpCode;
   }
 
   /**
@@ -161,7 +161,7 @@ 
    */
   public function getResponseHeaders()
   {
-    return $this->responseHeaders;
+	return $this->responseHeaders;
   }
 
   /**
@@ -169,7 +169,7 @@ 
    */
   public function getResponseBody()
   {
-    return $this->responseBody;
+	return $this->responseBody;
   }
   
   /**
@@ -179,7 +179,7 @@ 
    */
   public function setExpectedClass($class)
   {
-    $this->expectedClass = $class;
+	$this->expectedClass = $class;
   }
   
   /**
@@ -188,7 +188,7 @@ 
    */
   public function getExpectedClass()
   {
-    return $this->expectedClass;
+	return $this->expectedClass;
   }
 
   /**
@@ -196,7 +196,7 @@ 
    */
   public function enableExpectedRaw()
   {
-    $this->expectedRaw = true;
+	$this->expectedRaw = true;
   }
 
   /**
@@ -204,7 +204,7 @@ 
    */
   public function disableExpectedRaw()
   {
-    $this->expectedRaw = false;
+	$this->expectedRaw = false;
   }
 
   /**
@@ -213,7 +213,7 @@ 
    */
   public function getExpectedRaw()
   {
-    return $this->expectedRaw;
+	return $this->expectedRaw;
   }
 
   /**
@@ -222,12 +222,12 @@ 
    */
   public function setResponseHeaders($headers)
   {
-    $headers = Google_Utils::normalize($headers);
-    if ($this->responseHeaders) {
-      $headers = array_merge($this->responseHeaders, $headers);
-    }
+	$headers = Google_Utils::normalize($headers);
+	if ($this->responseHeaders) {
+	  $headers = array_merge($this->responseHeaders, $headers);
+	}
 
-    $this->responseHeaders = $headers;
+	$this->responseHeaders = $headers;
   }
 
   /**
@@ -237,9 +237,9 @@ 
    */
   public function getResponseHeader($key)
   {
-    return isset($this->responseHeaders[$key])
-        ? $this->responseHeaders[$key]
-        : false;
+	return isset($this->responseHeaders[$key])
+		? $this->responseHeaders[$key]
+		: false;
   }
 
   /**
@@ -247,7 +247,7 @@ 
    */
   public function setResponseBody($responseBody)
   {
-    $this->responseBody = $responseBody;
+	$this->responseBody = $responseBody;
   }
 
   /**
@@ -255,10 +255,10 @@ 
    */
   public function getUrl()
   {
-    return $this->baseComponent . $this->path .
-        (count($this->queryParams) ?
-            "?" . $this->buildQuery($this->queryParams) :
-            '');
+	return $this->baseComponent . $this->path .
+		(count($this->queryParams) ?
+			"?" . $this->buildQuery($this->queryParams) :
+			'');
   }
 
   /**
@@ -266,7 +266,7 @@ 
    */
   public function getRequestMethod()
   {
-    return $this->requestMethod;
+	return $this->requestMethod;
   }
 
   /**
@@ -274,7 +274,7 @@ 
    */
   public function getRequestHeaders()
   {
-    return $this->requestHeaders;
+	return $this->requestHeaders;
   }
 
   /**
@@ -284,9 +284,9 @@ 
    */
   public function getRequestHeader($key)
   {
-    return isset($this->requestHeaders[$key])
-        ? $this->requestHeaders[$key]
-        : false;
+	return isset($this->requestHeaders[$key])
+		? $this->requestHeaders[$key]
+		: false;
   }
 
   /**
@@ -294,7 +294,7 @@ 
    */
   public function getPostBody()
   {
-    return $this->postBody;
+	return $this->postBody;
   }
 
   /**
@@ -302,26 +302,26 @@ 
    */
   public function setUrl($url)
   {
-    if (substr($url, 0, 4) != 'http') {
-      // Force the path become relative.
-      if (substr($url, 0, 1) !== '/') {
-        $url = '/' . $url;
-      }
-    }
-    $parts = parse_url($url);
-    if (isset($parts['host'])) {
-      $this->baseComponent = sprintf(
-          "%s%s%s",
-          isset($parts['scheme']) ? $parts['scheme'] . "://" : '',
-          isset($parts['host']) ? $parts['host'] : '',
-          isset($parts['port']) ? ":" . $parts['port'] : ''
-      );
-    }
-    $this->path = isset($parts['path']) ? $parts['path'] : '';
-    $this->queryParams = array();
-    if (isset($parts['query'])) {
-      $this->queryParams = $this->parseQuery($parts['query']);
-    }
+	if (substr($url, 0, 4) != 'http') {
+	  // Force the path become relative.
+	  if (substr($url, 0, 1) !== '/') {
+		$url = '/' . $url;
+	  }
+	}
+	$parts = parse_url($url);
+	if (isset($parts['host'])) {
+	  $this->baseComponent = sprintf(
+		  "%s%s%s",
+		  isset($parts['scheme']) ? $parts['scheme'] . "://" : '',
+		  isset($parts['host']) ? $parts['host'] : '',
+		  isset($parts['port']) ? ":" . $parts['port'] : ''
+	  );
+	}
+	$this->path = isset($parts['path']) ? $parts['path'] : '';
+	$this->queryParams = array();
+	if (isset($parts['query'])) {
+	  $this->queryParams = $this->parseQuery($parts['query']);
+	}
   }
 
   /**
@@ -331,7 +331,7 @@ 
    */
   public function setRequestMethod($method)
   {
-    $this->requestMethod = strtoupper($method);
+	$this->requestMethod = strtoupper($method);
   }
 
   /**
@@ -340,11 +340,11 @@ 
    */
   public function setRequestHeaders($headers)
   {
-    $headers = Google_Utils::normalize($headers);
-    if ($this->requestHeaders) {
-      $headers = array_merge($this->requestHeaders, $headers);
-    }
-    $this->requestHeaders = $headers;
+	$headers = Google_Utils::normalize($headers);
+	if ($this->requestHeaders) {
+	  $headers = array_merge($this->requestHeaders, $headers);
+	}
+	$this->requestHeaders = $headers;
   }
 
   /**
@@ -352,7 +352,7 @@ 
    */
   public function setPostBody($postBody)
   {
-    $this->postBody = $postBody;
+	$this->postBody = $postBody;
   }
 
   /**
@@ -361,10 +361,10 @@ 
    */
   public function setUserAgent($userAgent)
   {
-    $this->userAgent = $userAgent;
-    if ($this->canGzip) {
-      $this->userAgent = $userAgent . self::GZIP_UA;
-    }
+	$this->userAgent = $userAgent;
+	if ($this->canGzip) {
+	  $this->userAgent = $userAgent . self::GZIP_UA;
+	}
   }
 
   /**
@@ -372,7 +372,7 @@ 
    */
   public function getUserAgent()
   {
-    return $this->userAgent;
+	return $this->userAgent;
   }
 
   /**
@@ -383,29 +383,29 @@ 
    */
   public function getCacheKey()
   {
-    $key = $this->getUrl();
+	$key = $this->getUrl();
 
-    if (isset($this->accessKey)) {
-      $key .= $this->accessKey;
-    }
+	if (isset($this->accessKey)) {
+	  $key .= $this->accessKey;
+	}
 
-    if (isset($this->requestHeaders['authorization'])) {
-      $key .= $this->requestHeaders['authorization'];
-    }
+	if (isset($this->requestHeaders['authorization'])) {
+	  $key .= $this->requestHeaders['authorization'];
+	}
 
-    return md5($key);
+	return md5($key);
   }
 
   public function getParsedCacheControl()
   {
-    $parsed = array();
-    $rawCacheControl = $this->getResponseHeader('cache-control');
-    if ($rawCacheControl) {
-      $rawCacheControl = str_replace(', ', '&', $rawCacheControl);
-      parse_str($rawCacheControl, $parsed);
-    }
+	$parsed = array();
+	$rawCacheControl = $this->getResponseHeader('cache-control');
+	if ($rawCacheControl) {
+	  $rawCacheControl = str_replace(', ', '&', $rawCacheControl);
+	  parse_str($rawCacheControl, $parsed);
+	}
 
-    return $parsed;
+	return $parsed;
   }
 
   /**
@@ -414,29 +414,29 @@ 
    */
   public function toBatchString($id)
   {
-    $str = '';
-    $path = parse_url($this->getUrl(), PHP_URL_PATH) . "?" .
-        http_build_query($this->queryParams);
-    $str .= $this->getRequestMethod() . ' ' . $path . " HTTP/1.1\n";
+	$str = '';
+	$path = parse_url($this->getUrl(), PHP_URL_PATH) . "?" .
+		http_build_query($this->queryParams);
+	$str .= $this->getRequestMethod() . ' ' . $path . " HTTP/1.1\n";
 
-    foreach ($this->getRequestHeaders() as $key => $val) {
-      $str .= $key . ': ' . $val . "\n";
-    }
+	foreach ($this->getRequestHeaders() as $key => $val) {
+	  $str .= $key . ': ' . $val . "\n";
+	}
 
-    if ($this->getPostBody()) {
-      $str .= "\n";
-      $str .= $this->getPostBody();
-    }
+	if ($this->getPostBody()) {
+	  $str .= "\n";
+	  $str .= $this->getPostBody();
+	}
     
-    $headers = '';
-    foreach ($this->batchHeaders as $key => $val) {
-      $headers .= $key . ': ' . $val . "\n";
-    }
+	$headers = '';
+	foreach ($this->batchHeaders as $key => $val) {
+	  $headers .= $key . ': ' . $val . "\n";
+	}
 
-    $headers .= "Content-ID: $id\n";
-    $str = $headers . "\n" . $str;
+	$headers .= "Content-ID: $id\n";
+	$str = $headers . "\n" . $str;
 
-    return $str;
+	return $str;
   }
   
   /**
@@ -446,21 +446,21 @@ 
    */
   private function parseQuery($string)
   {
-    $return = array();
-    $parts = explode("&", $string);
-    foreach ($parts as $part) {
-      list($key, $value) = explode('=', $part, 2);
-      $value = urldecode($value);
-      if (isset($return[$key])) {
-        if (!is_array($return[$key])) {
-          $return[$key] = array($return[$key]);
-        }
-        $return[$key][] = $value;
-      } else {
-        $return[$key] = $value;
-      }
-    }
-    return $return;
+	$return = array();
+	$parts = explode("&", $string);
+	foreach ($parts as $part) {
+	  list($key, $value) = explode('=', $part, 2);
+	  $value = urldecode($value);
+	  if (isset($return[$key])) {
+		if (!is_array($return[$key])) {
+		  $return[$key] = array($return[$key]);
+		}
+		$return[$key][] = $value;
+	  } else {
+		$return[$key] = $value;
+	  }
+	}
+	return $return;
   }
   
   /**
@@ -470,17 +470,17 @@ 
    */
   private function buildQuery($parts)
   {
-    $return = array();
-    foreach ($parts as $key => $value) {
-      if (is_array($value)) {
-        foreach ($value as $v) {
-          $return[] = urlencode($key) . "=" . urlencode($v);
-        }
-      } else {
-        $return[] = urlencode($key) . "=" . urlencode($value);
-      }
-    }
-    return implode('&', $return);
+	$return = array();
+	foreach ($parts as $key => $value) {
+	  if (is_array($value)) {
+		foreach ($value as $v) {
+		  $return[] = urlencode($key) . "=" . urlencode($v);
+		}
+	  } else {
+		$return[] = urlencode($key) . "=" . urlencode($value);
+	  }
+	}
+	return implode('&', $return);
   }
   
   /**
@@ -490,15 +490,15 @@ 
    */
   public function maybeMoveParametersToBody()
   {
-    if ($this->getRequestMethod() == "POST" && empty($this->postBody)) {
-      $this->setRequestHeaders(
-          array(
-            "content-type" =>
-                "application/x-www-form-urlencoded; charset=UTF-8"
-          )
-      );
-      $this->setPostBody($this->buildQuery($this->queryParams));
-      $this->queryParams = array();
-    }
+	if ($this->getRequestMethod() == "POST" && empty($this->postBody)) {
+	  $this->setRequestHeaders(
+		  array(
+			"content-type" =>
+				"application/x-www-form-urlencoded; charset=UTF-8"
+		  )
+	  );
+	  $this->setPostBody($this->buildQuery($this->queryParams));
+	  $this->queryParams = array();
+	}
   }
 }

Spacing +14 added lines, -15 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 /**
@@ -255,10 +255,9 @@ 
    */
   public function getUrl()
   {
-    return $this->baseComponent . $this->path .
+    return $this->baseComponent.$this->path.
         (count($this->queryParams) ?
-            "?" . $this->buildQuery($this->queryParams) :
-            '');
+            "?".$this->buildQuery($this->queryParams) : '');
   }
 
   /**
@@ -305,16 +304,16 @@ 
     if (substr($url, 0, 4) != 'http') {
       // Force the path become relative.
       if (substr($url, 0, 1) !== '/') {
-        $url = '/' . $url;
+        $url = '/'.$url;
       }
     }
     $parts = parse_url($url);
     if (isset($parts['host'])) {
       $this->baseComponent = sprintf(
           "%s%s%s",
-          isset($parts['scheme']) ? $parts['scheme'] . "://" : '',
+          isset($parts['scheme']) ? $parts['scheme']."://" : '',
           isset($parts['host']) ? $parts['host'] : '',
-          isset($parts['port']) ? ":" . $parts['port'] : ''
+          isset($parts['port']) ? ":".$parts['port'] : ''
       );
     }
     $this->path = isset($parts['path']) ? $parts['path'] : '';
@@ -363,7 +362,7 @@ 
   {
     $this->userAgent = $userAgent;
     if ($this->canGzip) {
-      $this->userAgent = $userAgent . self::GZIP_UA;
+      $this->userAgent = $userAgent.self::GZIP_UA;
     }
   }
 
@@ -415,12 +414,12 @@ 
   public function toBatchString($id)
   {
     $str = '';
-    $path = parse_url($this->getUrl(), PHP_URL_PATH) . "?" .
+    $path = parse_url($this->getUrl(), PHP_URL_PATH)."?".
         http_build_query($this->queryParams);
-    $str .= $this->getRequestMethod() . ' ' . $path . " HTTP/1.1\n";
+    $str .= $this->getRequestMethod().' '.$path." HTTP/1.1\n";
 
     foreach ($this->getRequestHeaders() as $key => $val) {
-      $str .= $key . ': ' . $val . "\n";
+      $str .= $key.': '.$val."\n";
     }
 
     if ($this->getPostBody()) {
@@ -430,11 +429,11 @@ 
     
     $headers = '';
     foreach ($this->batchHeaders as $key => $val) {
-      $headers .= $key . ': ' . $val . "\n";
+      $headers .= $key.': '.$val."\n";
     }
 
     $headers .= "Content-ID: $id\n";
-    $str = $headers . "\n" . $str;
+    $str = $headers."\n".$str;
 
     return $str;
   }
@@ -474,10 +473,10 @@ 
     foreach ($parts as $key => $value) {
       if (is_array($value)) {
         foreach ($value as $v) {
-          $return[] = urlencode($key) . "=" . urlencode($v);
+          $return[] = urlencode($key)."=".urlencode($v);
         }
       } else {
-        $return[] = urlencode($key) . "=" . urlencode($value);
+        $return[] = urlencode($key)."=".urlencode($value);
       }
     }
     return implode('&', $return);

geodirectory-admin/google-api-php-client/src/Google/Logger/Abstract.php

Doc Comments +2 added lines, -2 removed lines

@@ -261,7 +261,7 @@ 
   /**
    * Logs with an arbitrary level.
    *
-   * @param mixed $level    The log level
+   * @param string $level    The log level
    * @param string $message The log message
    * @param array $context  The log context
    */
@@ -380,7 +380,7 @@ 
   /**
    * Converts a given log level to the integer form.
    *
-   * @param  mixed $level   The logging level
+   * @param  integer $level   The logging level
    * @return integer $level The normalized level
    * @throws Google_Logger_Exception If $level is invalid
    */

Indentation +111 added lines, -111 removed lines

@@ -88,14 +88,14 @@ 
    * @var array $levels Logging levels
    */
   protected static $levels = array(
-      self::EMERGENCY  => 600,
-      self::ALERT => 550,
-      self::CRITICAL => 500,
-      self::ERROR => 400,
-      self::WARNING => 300,
-      self::NOTICE => 250,
-      self::INFO => 200,
-      self::DEBUG => 100,
+	  self::EMERGENCY  => 600,
+	  self::ALERT => 550,
+	  self::CRITICAL => 500,
+	  self::ERROR => 400,
+	  self::WARNING => 300,
+	  self::NOTICE => 250,
+	  self::INFO => 200,
+	  self::DEBUG => 100,
   );
 
   /**
@@ -122,20 +122,20 @@ 
    */
   public function __construct(Google_Client $client)
   {
-    $this->setLevel(
-        $client->getClassConfig('Google_Logger_Abstract', 'level')
-    );
+	$this->setLevel(
+		$client->getClassConfig('Google_Logger_Abstract', 'level')
+	);
 
-    $format = $client->getClassConfig('Google_Logger_Abstract', 'log_format');
-    $this->logFormat = $format ? $format : self::DEFAULT_LOG_FORMAT;
+	$format = $client->getClassConfig('Google_Logger_Abstract', 'log_format');
+	$this->logFormat = $format ? $format : self::DEFAULT_LOG_FORMAT;
 
-    $format = $client->getClassConfig('Google_Logger_Abstract', 'date_format');
-    $this->dateFormat = $format ? $format : self::DEFAULT_DATE_FORMAT;
+	$format = $client->getClassConfig('Google_Logger_Abstract', 'date_format');
+	$this->dateFormat = $format ? $format : self::DEFAULT_DATE_FORMAT;
 
-    $this->allowNewLines = (bool) $client->getClassConfig(
-        'Google_Logger_Abstract',
-        'allow_newlines'
-    );
+	$this->allowNewLines = (bool) $client->getClassConfig(
+		'Google_Logger_Abstract',
+		'allow_newlines'
+	);
   }
 
   /**
@@ -145,7 +145,7 @@ 
    */
   public function setLevel($level)
   {
-    $this->level = $this->normalizeLevel($level);
+	$this->level = $this->normalizeLevel($level);
   }
 
   /**
@@ -156,7 +156,7 @@ 
    */
   public function shouldHandle($level)
   {
-    return $this->normalizeLevel($level) >= $this->level;
+	return $this->normalizeLevel($level) >= $this->level;
   }
 
   /**
@@ -167,7 +167,7 @@ 
    */
   public function emergency($message, array $context = array())
   {
-    $this->log(self::EMERGENCY, $message, $context);
+	$this->log(self::EMERGENCY, $message, $context);
   }
 
   /**
@@ -181,7 +181,7 @@ 
    */
   public function alert($message, array $context = array())
   {
-    $this->log(self::ALERT, $message, $context);
+	$this->log(self::ALERT, $message, $context);
   }
 
   /**
@@ -194,7 +194,7 @@ 
    */
   public function critical($message, array $context = array())
   {
-    $this->log(self::CRITICAL, $message, $context);
+	$this->log(self::CRITICAL, $message, $context);
   }
 
   /**
@@ -206,7 +206,7 @@ 
    */
   public function error($message, array $context = array())
   {
-    $this->log(self::ERROR, $message, $context);
+	$this->log(self::ERROR, $message, $context);
   }
 
   /**
@@ -220,7 +220,7 @@ 
    */
   public function warning($message, array $context = array())
   {
-    $this->log(self::WARNING, $message, $context);
+	$this->log(self::WARNING, $message, $context);
   }
 
   /**
@@ -231,7 +231,7 @@ 
    */
   public function notice($message, array $context = array())
   {
-    $this->log(self::NOTICE, $message, $context);
+	$this->log(self::NOTICE, $message, $context);
   }
 
   /**
@@ -244,7 +244,7 @@ 
    */
   public function info($message, array $context = array())
   {
-    $this->log(self::INFO, $message, $context);
+	$this->log(self::INFO, $message, $context);
   }
 
   /**
@@ -255,7 +255,7 @@ 
    */
   public function debug($message, array $context = array())
   {
-    $this->log(self::DEBUG, $message, $context);
+	$this->log(self::DEBUG, $message, $context);
   }
 
   /**
@@ -267,21 +267,21 @@ 
    */
   public function log($level, $message, array $context = array())
   {
-    if (!$this->shouldHandle($level)) {
-      return false;
-    }
-
-    $levelName = is_int($level) ? array_search($level, self::$levels) : $level;
-    $message = $this->interpolate(
-        array(
-            'message' => $message,
-            'context' => $context,
-            'level' => strtoupper($levelName),
-            'datetime' => new DateTime(),
-        )
-    );
-
-    $this->write($message);
+	if (!$this->shouldHandle($level)) {
+	  return false;
+	}
+
+	$levelName = is_int($level) ? array_search($level, self::$levels) : $level;
+	$message = $this->interpolate(
+		array(
+			'message' => $message,
+			'context' => $context,
+			'level' => strtoupper($levelName),
+			'datetime' => new DateTime(),
+		)
+	);
+
+	$this->write($message);
   }
 
   /**
@@ -292,26 +292,26 @@ 
    */
   protected function interpolate(array $variables = array())
   {
-    $template = $this->logFormat;
-
-    if (!$variables['context']) {
-      $template = str_replace('%context%', '', $template);
-      unset($variables['context']);
-    } else {
-      $this->reverseJsonInContext($variables['context']);
-    }
-
-    foreach ($variables as $key => $value) {
-      if (strpos($template, '%'. $key .'%') !== false) {
-        $template = str_replace(
-            '%' . $key . '%',
-            $this->export($value),
-            $template
-        );
-      }
-    }
-
-    return $template;
+	$template = $this->logFormat;
+
+	if (!$variables['context']) {
+	  $template = str_replace('%context%', '', $template);
+	  unset($variables['context']);
+	} else {
+	  $this->reverseJsonInContext($variables['context']);
+	}
+
+	foreach ($variables as $key => $value) {
+	  if (strpos($template, '%'. $key .'%') !== false) {
+		$template = str_replace(
+			'%' . $key . '%',
+			$this->export($value),
+			$template
+		);
+	  }
+	}
+
+	return $template;
   }
 
   /**
@@ -321,20 +321,20 @@ 
    */
   protected function reverseJsonInContext(array &$context)
   {
-    if (!$context) {
-      return;
-    }
-
-    foreach ($context as $key => $val) {
-      if (!$val || !is_string($val) || !($val[0] == '{' || $val[0] == '[')) {
-        continue;
-      }
-
-      $json = @json_decode($val);
-      if (is_object($json) || is_array($json)) {
-        $context[$key] = $json;
-      }
-    }
+	if (!$context) {
+	  return;
+	}
+
+	foreach ($context as $key => $val) {
+	  if (!$val || !is_string($val) || !($val[0] == '{' || $val[0] == '[')) {
+		continue;
+	  }
+
+	  $json = @json_decode($val);
+	  if (is_object($json) || is_array($json)) {
+		$context[$key] = $json;
+	  }
+	}
   }
 
   /**
@@ -344,37 +344,37 @@ 
    */
   protected function export($value)
   {
-    if (is_string($value)) {
-      if ($this->allowNewLines) {
-        return $value;
-      }
+	if (is_string($value)) {
+	  if ($this->allowNewLines) {
+		return $value;
+	  }
 
-      return preg_replace('/[\r\n]+/', ' ', $value);
-    }
+	  return preg_replace('/[\r\n]+/', ' ', $value);
+	}
 
-    if (is_resource($value)) {
-      return sprintf(
-          'resource(%d) of type (%s)',
-          $value,
-          get_resource_type($value)
-      );
-    }
+	if (is_resource($value)) {
+	  return sprintf(
+		  'resource(%d) of type (%s)',
+		  $value,
+		  get_resource_type($value)
+	  );
+	}
 
-    if ($value instanceof DateTime) {
-      return $value->format($this->dateFormat);
-    }
+	if ($value instanceof DateTime) {
+	  return $value->format($this->dateFormat);
+	}
 
-    if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
-      $options = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
+	if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
+	  $options = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
 
-      if ($this->allowNewLines) {
-        $options |= JSON_PRETTY_PRINT;
-      }
+	  if ($this->allowNewLines) {
+		$options |= JSON_PRETTY_PRINT;
+	  }
 
-      return @json_encode($value, $options);
-    }
+	  return @json_encode($value, $options);
+	}
 
-    return str_replace('\\/', '/', @json_encode($value));
+	return str_replace('\\/', '/', @json_encode($value));
   }
 
   /**
@@ -386,17 +386,17 @@ 
    */
   protected function normalizeLevel($level)
   {
-    if (is_int($level) && array_search($level, self::$levels) !== false) {
-      return $level;
-    }
+	if (is_int($level) && array_search($level, self::$levels) !== false) {
+	  return $level;
+	}
 
-    if (is_string($level) && isset(self::$levels[$level])) {
-      return self::$levels[$level];
-    }
+	if (is_string($level) && isset(self::$levels[$level])) {
+	  return self::$levels[$level];
+	}
 
-    throw new Google_Logger_Exception(
-        sprintf("Unknown LogLevel: '%s'", $level)
-    );
+	throw new Google_Logger_Exception(
+		sprintf("Unknown LogLevel: '%s'", $level)
+	);
   }
 
   /**

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 /**
@@ -302,9 +302,9 @@ 
     }
 
     foreach ($variables as $key => $value) {
-      if (strpos($template, '%'. $key .'%') !== false) {
+      if (strpos($template, '%'.$key.'%') !== false) {
         $template = str_replace(
-            '%' . $key . '%',
+            '%'.$key.'%',
             $this->export($value),
             $template
         );

geodirectory-admin/google-api-php-client/src/Google/Model.php

Doc Comments +4 added lines, -1 removed lines

@@ -221,7 +221,7 @@ 
   /**
    * Given a variable name, discover its type.
    *
-   * @param $name
+   * @param string $name
    * @param $item
    * @return object The object from the item.
    */
@@ -278,6 +278,9 @@ 
     return $key . "Type";
   }
 
+  /**
+   * @param string $key
+   */
   protected function dataType($key)
   {
     return $key . "DataType";

Indentation +126 added lines, -126 removed lines

@@ -38,12 +38,12 @@ 
    */
   final public function __construct()
   {
-    if (func_num_args() == 1 && is_array(func_get_arg(0))) {
-      // Initialize the model with the array's contents.
-      $array = func_get_arg(0);
-      $this->mapTypes($array);
-    }
-    $this->gapiInit();
+	if (func_num_args() == 1 && is_array(func_get_arg(0))) {
+	  // Initialize the model with the array's contents.
+	  $array = func_get_arg(0);
+	  $this->mapTypes($array);
+	}
+	$this->gapiInit();
   }
 
   /**
@@ -53,39 +53,39 @@ 
    */
   public function __get($key)
   {
-    $keyTypeName = $this->keyType($key);
-    $keyDataType = $this->dataType($key);
-    if (isset($this->$keyTypeName) && !isset($this->processed[$key])) {
-      if (isset($this->modelData[$key])) {
-        $val = $this->modelData[$key];
-      } else if (isset($this->$keyDataType) &&
-          ($this->$keyDataType == 'array' || $this->$keyDataType == 'map')) {
-        $val = array();
-      } else {
-        $val = null;
-      }
+	$keyTypeName = $this->keyType($key);
+	$keyDataType = $this->dataType($key);
+	if (isset($this->$keyTypeName) && !isset($this->processed[$key])) {
+	  if (isset($this->modelData[$key])) {
+		$val = $this->modelData[$key];
+	  } else if (isset($this->$keyDataType) &&
+		  ($this->$keyDataType == 'array' || $this->$keyDataType == 'map')) {
+		$val = array();
+	  } else {
+		$val = null;
+	  }
 
-      if ($this->isAssociativeArray($val)) {
-        if (isset($this->$keyDataType) && 'map' == $this->$keyDataType) {
-          foreach ($val as $arrayKey => $arrayItem) {
-              $this->modelData[$key][$arrayKey] =
-                $this->createObjectFromName($keyTypeName, $arrayItem);
-          }
-        } else {
-          $this->modelData[$key] = $this->createObjectFromName($keyTypeName, $val);
-        }
-      } else if (is_array($val)) {
-        $arrayObject = array();
-        foreach ($val as $arrayIndex => $arrayItem) {
-          $arrayObject[$arrayIndex] =
-            $this->createObjectFromName($keyTypeName, $arrayItem);
-        }
-        $this->modelData[$key] = $arrayObject;
-      }
-      $this->processed[$key] = true;
-    }
+	  if ($this->isAssociativeArray($val)) {
+		if (isset($this->$keyDataType) && 'map' == $this->$keyDataType) {
+		  foreach ($val as $arrayKey => $arrayItem) {
+			  $this->modelData[$key][$arrayKey] =
+				$this->createObjectFromName($keyTypeName, $arrayItem);
+		  }
+		} else {
+		  $this->modelData[$key] = $this->createObjectFromName($keyTypeName, $val);
+		}
+	  } else if (is_array($val)) {
+		$arrayObject = array();
+		foreach ($val as $arrayIndex => $arrayItem) {
+		  $arrayObject[$arrayIndex] =
+			$this->createObjectFromName($keyTypeName, $arrayItem);
+		}
+		$this->modelData[$key] = $arrayObject;
+	  }
+	  $this->processed[$key] = true;
+	}
 
-    return isset($this->modelData[$key]) ? $this->modelData[$key] : null;
+	return isset($this->modelData[$key]) ? $this->modelData[$key] : null;
   }
 
   /**
@@ -96,19 +96,19 @@ 
    */
   protected function mapTypes($array)
   {
-    // Hard initialise simple types, lazy load more complex ones.
-    foreach ($array as $key => $val) {
-      if ( !property_exists($this, $this->keyType($key)) &&
-        property_exists($this, $key)) {
-          $this->$key = $val;
-          unset($array[$key]);
-      } elseif (property_exists($this, $camelKey = Google_Utils::camelCase($key))) {
-          // This checks if property exists as camelCase, leaving it in array as snake_case
-          // in case of backwards compatibility issues.
-          $this->$camelKey = $val;
-      }
-    }
-    $this->modelData = $array;
+	// Hard initialise simple types, lazy load more complex ones.
+	foreach ($array as $key => $val) {
+	  if ( !property_exists($this, $this->keyType($key)) &&
+		property_exists($this, $key)) {
+		  $this->$key = $val;
+		  unset($array[$key]);
+	  } elseif (property_exists($this, $camelKey = Google_Utils::camelCase($key))) {
+		  // This checks if property exists as camelCase, leaving it in array as snake_case
+		  // in case of backwards compatibility issues.
+		  $this->$camelKey = $val;
+	  }
+	}
+	$this->modelData = $array;
   }
 
   /**
@@ -118,7 +118,7 @@ 
    */
   protected function gapiInit()
   {
-    return;
+	return;
   }
 
   /**
@@ -129,29 +129,29 @@ 
    */
   public function toSimpleObject()
   {
-    $object = new stdClass();
+	$object = new stdClass();
 
-    // Process all other data.
-    foreach ($this->modelData as $key => $val) {
-      $result = $this->getSimpleValue($val);
-      if ($result !== null) {
-        $object->$key = $this->nullPlaceholderCheck($result);
-      }
-    }
+	// Process all other data.
+	foreach ($this->modelData as $key => $val) {
+	  $result = $this->getSimpleValue($val);
+	  if ($result !== null) {
+		$object->$key = $this->nullPlaceholderCheck($result);
+	  }
+	}
 
-    // Process all public properties.
-    $reflect = new ReflectionObject($this);
-    $props = $reflect->getProperties(ReflectionProperty::IS_PUBLIC);
-    foreach ($props as $member) {
-      $name = $member->getName();
-      $result = $this->getSimpleValue($this->$name);
-      if ($result !== null) {
-        $name = $this->getMappedName($name);
-        $object->$name = $this->nullPlaceholderCheck($result);
-      }
-    }
+	// Process all public properties.
+	$reflect = new ReflectionObject($this);
+	$props = $reflect->getProperties(ReflectionProperty::IS_PUBLIC);
+	foreach ($props as $member) {
+	  $name = $member->getName();
+	  $result = $this->getSimpleValue($this->$name);
+	  if ($result !== null) {
+		$name = $this->getMappedName($name);
+		$object->$name = $this->nullPlaceholderCheck($result);
+	  }
+	}
 
-    return $object;
+	return $object;
   }
 
   /**
@@ -160,20 +160,20 @@ 
    */
   private function getSimpleValue($value)
   {
-    if ($value instanceof Google_Model) {
-      return $value->toSimpleObject();
-    } else if (is_array($value)) {
-      $return = array();
-      foreach ($value as $key => $a_value) {
-        $a_value = $this->getSimpleValue($a_value);
-        if ($a_value !== null) {
-          $key = $this->getMappedName($key);
-          $return[$key] = $this->nullPlaceholderCheck($a_value);
-        }
-      }
-      return $return;
-    }
-    return $value;
+	if ($value instanceof Google_Model) {
+	  return $value->toSimpleObject();
+	} else if (is_array($value)) {
+	  $return = array();
+	  foreach ($value as $key => $a_value) {
+		$a_value = $this->getSimpleValue($a_value);
+		if ($a_value !== null) {
+		  $key = $this->getMappedName($key);
+		  $return[$key] = $this->nullPlaceholderCheck($a_value);
+		}
+	  }
+	  return $return;
+	}
+	return $value;
   }
   
   /**
@@ -181,10 +181,10 @@ 
    */
   private function nullPlaceholderCheck($value)
   {
-    if ($value === self::NULL_VALUE) {
-      return null;
-    }
-    return $value;
+	if ($value === self::NULL_VALUE) {
+	  return null;
+	}
+	return $value;
   }
 
   /**
@@ -192,11 +192,11 @@ 
    */
   private function getMappedName($key)
   {
-    if (isset($this->internal_gapi_mappings) &&
-        isset($this->internal_gapi_mappings[$key])) {
-      $key = $this->internal_gapi_mappings[$key];
-    }
-    return $key;
+	if (isset($this->internal_gapi_mappings) &&
+		isset($this->internal_gapi_mappings[$key])) {
+	  $key = $this->internal_gapi_mappings[$key];
+	}
+	return $key;
   }
 
   /**
@@ -206,16 +206,16 @@ 
    */
   protected function isAssociativeArray($array)
   {
-    if (!is_array($array)) {
-      return false;
-    }
-    $keys = array_keys($array);
-    foreach ($keys as $key) {
-      if (is_string($key)) {
-        return true;
-      }
-    }
-    return false;
+	if (!is_array($array)) {
+	  return false;
+	}
+	$keys = array_keys($array);
+	foreach ($keys as $key) {
+	  if (is_string($key)) {
+		return true;
+	  }
+	}
+	return false;
   }
 
   /**
@@ -227,8 +227,8 @@ 
    */
   private function createObjectFromName($name, $item)
   {
-    $type = $this->$name;
-    return new $type($item);
+	$type = $this->$name;
+	return new $type($item);
   }
 
   /**
@@ -239,57 +239,57 @@ 
    */
   public function assertIsArray($obj, $method)
   {
-    if ($obj && !is_array($obj)) {
-      throw new Google_Exception(
-          "Incorrect parameter type passed to $method(). Expected an array."
-      );
-    }
+	if ($obj && !is_array($obj)) {
+	  throw new Google_Exception(
+		  "Incorrect parameter type passed to $method(). Expected an array."
+	  );
+	}
   }
 
   public function offsetExists($offset)
   {
-    return isset($this->$offset) || isset($this->modelData[$offset]);
+	return isset($this->$offset) || isset($this->modelData[$offset]);
   }
 
   public function offsetGet($offset)
   {
-    return isset($this->$offset) ?
-        $this->$offset :
-        $this->__get($offset);
+	return isset($this->$offset) ?
+		$this->$offset :
+		$this->__get($offset);
   }
 
   public function offsetSet($offset, $value)
   {
-    if (property_exists($this, $offset)) {
-      $this->$offset = $value;
-    } else {
-      $this->modelData[$offset] = $value;
-      $this->processed[$offset] = true;
-    }
+	if (property_exists($this, $offset)) {
+	  $this->$offset = $value;
+	} else {
+	  $this->modelData[$offset] = $value;
+	  $this->processed[$offset] = true;
+	}
   }
 
   public function offsetUnset($offset)
   {
-    unset($this->modelData[$offset]);
+	unset($this->modelData[$offset]);
   }
 
   protected function keyType($key)
   {
-    return $key . "Type";
+	return $key . "Type";
   }
 
   protected function dataType($key)
   {
-    return $key . "DataType";
+	return $key . "DataType";
   }
 
   public function __isset($key)
   {
-    return isset($this->modelData[$key]);
+	return isset($this->modelData[$key]);
   }
 
   public function __unset($key)
   {
-    unset($this->modelData[$key]);
+	unset($this->modelData[$key]);
   }
 }

Spacing +4 added lines, -5 removed lines

@@ -98,7 +98,7 @@ 
   {
     // Hard initialise simple types, lazy load more complex ones.
     foreach ($array as $key => $val) {
-      if ( !property_exists($this, $this->keyType($key)) &&
+      if (!property_exists($this, $this->keyType($key)) &&
         property_exists($this, $key)) {
           $this->$key = $val;
           unset($array[$key]);
@@ -254,8 +254,7 @@ 
   public function offsetGet($offset)
   {
     return isset($this->$offset) ?
-        $this->$offset :
-        $this->__get($offset);
+        $this->$offset : $this->__get($offset);
   }
 
   public function offsetSet($offset, $value)
@@ -275,12 +274,12 @@ 
 
   protected function keyType($key)
   {
-    return $key . "Type";
+    return $key."Type";
   }
 
   protected function dataType($key)
   {
-    return $key . "DataType";
+    return $key."DataType";
   }
 
   public function __isset($key)

geodirectory-admin/google-api-php-client/src/Google/Service/AdExchangeBuyer.php

Doc Comments +8 added lines, -8 removed lines

@@ -435,7 +435,7 @@ 
    * (accounts.patch)
    *
    * @param int $id The account id
-   * @param Google_Account $postBody
+   * @param Google_Service_AdExchangeBuyer_Account $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_AdExchangeBuyer_Account
    */
@@ -450,7 +450,7 @@ 
    * Updates an existing account. (accounts.update)
    *
    * @param int $id The account id
-   * @param Google_Account $postBody
+   * @param Google_Service_AdExchangeBuyer_Account $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_AdExchangeBuyer_Account
    */
@@ -539,7 +539,7 @@ 
    * updated.
    * @param string $billingId The billing id associated with the budget being
    * updated.
-   * @param Google_Budget $postBody
+   * @param Google_Service_AdExchangeBuyer_Budget $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_AdExchangeBuyer_Budget
    */
@@ -559,7 +559,7 @@ 
    * updated.
    * @param string $billingId The billing id associated with the budget being
    * updated.
-   * @param Google_Budget $postBody
+   * @param Google_Service_AdExchangeBuyer_Budget $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_AdExchangeBuyer_Budget
    */
@@ -601,7 +601,7 @@ 
   /**
    * Submit a new creative. (creatives.insert)
    *
-   * @param Google_Creative $postBody
+   * @param Google_Service_AdExchangeBuyer_Creative $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_AdExchangeBuyer_Creative
    */
@@ -762,7 +762,7 @@ 
    *
    * @param string $accountId The account id to insert the pretargeting config
    * for.
-   * @param Google_PretargetingConfig $postBody
+   * @param Google_Service_AdExchangeBuyer_PretargetingConfig $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_AdExchangeBuyer_PretargetingConfig
    */
@@ -795,7 +795,7 @@ 
    * @param string $accountId The account id to update the pretargeting config
    * for.
    * @param string $configId The specific id of the configuration to update.
-   * @param Google_PretargetingConfig $postBody
+   * @param Google_Service_AdExchangeBuyer_PretargetingConfig $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_AdExchangeBuyer_PretargetingConfig
    */
@@ -812,7 +812,7 @@ 
    * @param string $accountId The account id to update the pretargeting config
    * for.
    * @param string $configId The specific id of the configuration to update.
-   * @param Google_PretargetingConfig $postBody
+   * @param Google_Service_AdExchangeBuyer_PretargetingConfig $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_AdExchangeBuyer_PretargetingConfig
    */

Indentation +652 added lines, -652 removed lines

@@ -33,7 +33,7 @@ 
 {
   /** Manage your Ad Exchange buyer account configuration. */
   const ADEXCHANGE_BUYER =
-      "https://www.googleapis.com/auth/adexchange.buyer";
+	  "https://www.googleapis.com/auth/adexchange.buyer";
 
   public $accounts;
   public $billingInfo;
@@ -51,343 +51,343 @@ 
    */
   public function __construct(Google_Client $client)
   {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'adexchangebuyer/v1.3/';
-    $this->version = 'v1.3';
-    $this->serviceName = 'adexchangebuyer';
-
-    $this->accounts = new Google_Service_AdExchangeBuyer_Accounts_Resource(
-        $this,
-        $this->serviceName,
-        'accounts',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'accounts/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),'patch' => array(
-              'path' => 'accounts/{id}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'accounts/{id}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->billingInfo = new Google_Service_AdExchangeBuyer_BillingInfo_Resource(
-        $this,
-        $this->serviceName,
-        'billingInfo',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'billinginfo/{accountId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'billinginfo',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->budget = new Google_Service_AdExchangeBuyer_Budget_Resource(
-        $this,
-        $this->serviceName,
-        'budget',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'billinginfo/{accountId}/{billingId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'billingId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'billinginfo/{accountId}/{billingId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'billingId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'billinginfo/{accountId}/{billingId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'billingId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->creatives = new Google_Service_AdExchangeBuyer_Creatives_Resource(
-        $this,
-        $this->serviceName,
-        'creatives',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'creatives/{accountId}/{buyerCreativeId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'buyerCreativeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'creatives',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'list' => array(
-              'path' => 'creatives',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'statusFilter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'buyerCreativeId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'accountId' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                  'repeated' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->directDeals = new Google_Service_AdExchangeBuyer_DirectDeals_Resource(
-        $this,
-        $this->serviceName,
-        'directDeals',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'directdeals/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'directdeals',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->performanceReport = new Google_Service_AdExchangeBuyer_PerformanceReport_Resource(
-        $this,
-        $this->serviceName,
-        'performanceReport',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'performancereport',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'endDateTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'startDateTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->pretargetingConfig = new Google_Service_AdExchangeBuyer_PretargetingConfig_Resource(
-        $this,
-        $this->serviceName,
-        'pretargetingConfig',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'pretargetingconfigs/{accountId}/{configId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'configId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'pretargetingconfigs/{accountId}/{configId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'configId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'pretargetingconfigs/{accountId}',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'pretargetingconfigs/{accountId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'pretargetingconfigs/{accountId}/{configId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'configId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'pretargetingconfigs/{accountId}/{configId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'configId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
+	parent::__construct($client);
+	$this->rootUrl = 'https://www.googleapis.com/';
+	$this->servicePath = 'adexchangebuyer/v1.3/';
+	$this->version = 'v1.3';
+	$this->serviceName = 'adexchangebuyer';
+
+	$this->accounts = new Google_Service_AdExchangeBuyer_Accounts_Resource(
+		$this,
+		$this->serviceName,
+		'accounts',
+		array(
+		  'methods' => array(
+			'get' => array(
+			  'path' => 'accounts/{id}',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(
+				'id' => array(
+				  'location' => 'path',
+				  'type' => 'integer',
+				  'required' => true,
+				),
+			  ),
+			),'list' => array(
+			  'path' => 'accounts',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(),
+			),'patch' => array(
+			  'path' => 'accounts/{id}',
+			  'httpMethod' => 'PATCH',
+			  'parameters' => array(
+				'id' => array(
+				  'location' => 'path',
+				  'type' => 'integer',
+				  'required' => true,
+				),
+			  ),
+			),'update' => array(
+			  'path' => 'accounts/{id}',
+			  'httpMethod' => 'PUT',
+			  'parameters' => array(
+				'id' => array(
+				  'location' => 'path',
+				  'type' => 'integer',
+				  'required' => true,
+				),
+			  ),
+			),
+		  )
+		)
+	);
+	$this->billingInfo = new Google_Service_AdExchangeBuyer_BillingInfo_Resource(
+		$this,
+		$this->serviceName,
+		'billingInfo',
+		array(
+		  'methods' => array(
+			'get' => array(
+			  'path' => 'billinginfo/{accountId}',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'path',
+				  'type' => 'integer',
+				  'required' => true,
+				),
+			  ),
+			),'list' => array(
+			  'path' => 'billinginfo',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(),
+			),
+		  )
+		)
+	);
+	$this->budget = new Google_Service_AdExchangeBuyer_Budget_Resource(
+		$this,
+		$this->serviceName,
+		'budget',
+		array(
+		  'methods' => array(
+			'get' => array(
+			  'path' => 'billinginfo/{accountId}/{billingId}',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+				'billingId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+			  ),
+			),'patch' => array(
+			  'path' => 'billinginfo/{accountId}/{billingId}',
+			  'httpMethod' => 'PATCH',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+				'billingId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+			  ),
+			),'update' => array(
+			  'path' => 'billinginfo/{accountId}/{billingId}',
+			  'httpMethod' => 'PUT',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+				'billingId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+			  ),
+			),
+		  )
+		)
+	);
+	$this->creatives = new Google_Service_AdExchangeBuyer_Creatives_Resource(
+		$this,
+		$this->serviceName,
+		'creatives',
+		array(
+		  'methods' => array(
+			'get' => array(
+			  'path' => 'creatives/{accountId}/{buyerCreativeId}',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'path',
+				  'type' => 'integer',
+				  'required' => true,
+				),
+				'buyerCreativeId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+			  ),
+			),'insert' => array(
+			  'path' => 'creatives',
+			  'httpMethod' => 'POST',
+			  'parameters' => array(),
+			),'list' => array(
+			  'path' => 'creatives',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(
+				'statusFilter' => array(
+				  'location' => 'query',
+				  'type' => 'string',
+				),
+				'pageToken' => array(
+				  'location' => 'query',
+				  'type' => 'string',
+				),
+				'maxResults' => array(
+				  'location' => 'query',
+				  'type' => 'integer',
+				),
+				'buyerCreativeId' => array(
+				  'location' => 'query',
+				  'type' => 'string',
+				  'repeated' => true,
+				),
+				'accountId' => array(
+				  'location' => 'query',
+				  'type' => 'integer',
+				  'repeated' => true,
+				),
+			  ),
+			),
+		  )
+		)
+	);
+	$this->directDeals = new Google_Service_AdExchangeBuyer_DirectDeals_Resource(
+		$this,
+		$this->serviceName,
+		'directDeals',
+		array(
+		  'methods' => array(
+			'get' => array(
+			  'path' => 'directdeals/{id}',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(
+				'id' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+			  ),
+			),'list' => array(
+			  'path' => 'directdeals',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(),
+			),
+		  )
+		)
+	);
+	$this->performanceReport = new Google_Service_AdExchangeBuyer_PerformanceReport_Resource(
+		$this,
+		$this->serviceName,
+		'performanceReport',
+		array(
+		  'methods' => array(
+			'list' => array(
+			  'path' => 'performancereport',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'query',
+				  'type' => 'string',
+				  'required' => true,
+				),
+				'endDateTime' => array(
+				  'location' => 'query',
+				  'type' => 'string',
+				  'required' => true,
+				),
+				'startDateTime' => array(
+				  'location' => 'query',
+				  'type' => 'string',
+				  'required' => true,
+				),
+				'pageToken' => array(
+				  'location' => 'query',
+				  'type' => 'string',
+				),
+				'maxResults' => array(
+				  'location' => 'query',
+				  'type' => 'integer',
+				),
+			  ),
+			),
+		  )
+		)
+	);
+	$this->pretargetingConfig = new Google_Service_AdExchangeBuyer_PretargetingConfig_Resource(
+		$this,
+		$this->serviceName,
+		'pretargetingConfig',
+		array(
+		  'methods' => array(
+			'delete' => array(
+			  'path' => 'pretargetingconfigs/{accountId}/{configId}',
+			  'httpMethod' => 'DELETE',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+				'configId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+			  ),
+			),'get' => array(
+			  'path' => 'pretargetingconfigs/{accountId}/{configId}',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+				'configId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+			  ),
+			),'insert' => array(
+			  'path' => 'pretargetingconfigs/{accountId}',
+			  'httpMethod' => 'POST',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+			  ),
+			),'list' => array(
+			  'path' => 'pretargetingconfigs/{accountId}',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+			  ),
+			),'patch' => array(
+			  'path' => 'pretargetingconfigs/{accountId}/{configId}',
+			  'httpMethod' => 'PATCH',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+				'configId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+			  ),
+			),'update' => array(
+			  'path' => 'pretargetingconfigs/{accountId}/{configId}',
+			  'httpMethod' => 'PUT',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+				'configId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+			  ),
+			),
+		  )
+		)
+	);
   }
 }
 
@@ -412,9 +412,9 @@ 
    */
   public function get($id, $optParams = array())
   {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_Account");
+	$params = array('id' => $id);
+	$params = array_merge($params, $optParams);
+	return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_Account");
   }
 
   /**
@@ -425,9 +425,9 @@ 
    */
   public function listAccounts($optParams = array())
   {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_AccountsList");
+	$params = array();
+	$params = array_merge($params, $optParams);
+	return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_AccountsList");
   }
 
   /**
@@ -441,9 +441,9 @@ 
    */
   public function patch($id, Google_Service_AdExchangeBuyer_Account $postBody, $optParams = array())
   {
-    $params = array('id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AdExchangeBuyer_Account");
+	$params = array('id' => $id, 'postBody' => $postBody);
+	$params = array_merge($params, $optParams);
+	return $this->call('patch', array($params), "Google_Service_AdExchangeBuyer_Account");
   }
 
   /**
@@ -456,9 +456,9 @@ 
    */
   public function update($id, Google_Service_AdExchangeBuyer_Account $postBody, $optParams = array())
   {
-    $params = array('id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AdExchangeBuyer_Account");
+	$params = array('id' => $id, 'postBody' => $postBody);
+	$params = array_merge($params, $optParams);
+	return $this->call('update', array($params), "Google_Service_AdExchangeBuyer_Account");
   }
 }
 
@@ -483,9 +483,9 @@ 
    */
   public function get($accountId, $optParams = array())
   {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_BillingInfo");
+	$params = array('accountId' => $accountId);
+	$params = array_merge($params, $optParams);
+	return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_BillingInfo");
   }
 
   /**
@@ -497,9 +497,9 @@ 
    */
   public function listBillingInfo($optParams = array())
   {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_BillingInfoList");
+	$params = array();
+	$params = array_merge($params, $optParams);
+	return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_BillingInfoList");
   }
 }
 
@@ -525,9 +525,9 @@ 
    */
   public function get($accountId, $billingId, $optParams = array())
   {
-    $params = array('accountId' => $accountId, 'billingId' => $billingId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_Budget");
+	$params = array('accountId' => $accountId, 'billingId' => $billingId);
+	$params = array_merge($params, $optParams);
+	return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_Budget");
   }
 
   /**
@@ -545,9 +545,9 @@ 
    */
   public function patch($accountId, $billingId, Google_Service_AdExchangeBuyer_Budget $postBody, $optParams = array())
   {
-    $params = array('accountId' => $accountId, 'billingId' => $billingId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AdExchangeBuyer_Budget");
+	$params = array('accountId' => $accountId, 'billingId' => $billingId, 'postBody' => $postBody);
+	$params = array_merge($params, $optParams);
+	return $this->call('patch', array($params), "Google_Service_AdExchangeBuyer_Budget");
   }
 
   /**
@@ -565,9 +565,9 @@ 
    */
   public function update($accountId, $billingId, Google_Service_AdExchangeBuyer_Budget $postBody, $optParams = array())
   {
-    $params = array('accountId' => $accountId, 'billingId' => $billingId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AdExchangeBuyer_Budget");
+	$params = array('accountId' => $accountId, 'billingId' => $billingId, 'postBody' => $postBody);
+	$params = array_merge($params, $optParams);
+	return $this->call('update', array($params), "Google_Service_AdExchangeBuyer_Budget");
   }
 }
 
@@ -593,9 +593,9 @@ 
    */
   public function get($accountId, $buyerCreativeId, $optParams = array())
   {
-    $params = array('accountId' => $accountId, 'buyerCreativeId' => $buyerCreativeId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_Creative");
+	$params = array('accountId' => $accountId, 'buyerCreativeId' => $buyerCreativeId);
+	$params = array_merge($params, $optParams);
+	return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_Creative");
   }
 
   /**
@@ -607,9 +607,9 @@ 
    */
   public function insert(Google_Service_AdExchangeBuyer_Creative $postBody, $optParams = array())
   {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_AdExchangeBuyer_Creative");
+	$params = array('postBody' => $postBody);
+	$params = array_merge($params, $optParams);
+	return $this->call('insert', array($params), "Google_Service_AdExchangeBuyer_Creative");
   }
 
   /**
@@ -633,9 +633,9 @@ 
    */
   public function listCreatives($optParams = array())
   {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_CreativesList");
+	$params = array();
+	$params = array_merge($params, $optParams);
+	return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_CreativesList");
   }
 }
 
@@ -659,9 +659,9 @@ 
    */
   public function get($id, $optParams = array())
   {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_DirectDeal");
+	$params = array('id' => $id);
+	$params = array_merge($params, $optParams);
+	return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_DirectDeal");
   }
 
   /**
@@ -673,9 +673,9 @@ 
    */
   public function listDirectDeals($optParams = array())
   {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_DirectDealsList");
+	$params = array();
+	$params = array_merge($params, $optParams);
+	return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_DirectDealsList");
   }
 }
 
@@ -710,9 +710,9 @@ 
    */
   public function listPerformanceReport($accountId, $endDateTime, $startDateTime, $optParams = array())
   {
-    $params = array('accountId' => $accountId, 'endDateTime' => $endDateTime, 'startDateTime' => $startDateTime);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_PerformanceReportList");
+	$params = array('accountId' => $accountId, 'endDateTime' => $endDateTime, 'startDateTime' => $startDateTime);
+	$params = array_merge($params, $optParams);
+	return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_PerformanceReportList");
   }
 }
 
@@ -737,9 +737,9 @@ 
    */
   public function delete($accountId, $configId, $optParams = array())
   {
-    $params = array('accountId' => $accountId, 'configId' => $configId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
+	$params = array('accountId' => $accountId, 'configId' => $configId);
+	$params = array_merge($params, $optParams);
+	return $this->call('delete', array($params));
   }
 
   /**
@@ -752,9 +752,9 @@ 
    */
   public function get($accountId, $configId, $optParams = array())
   {
-    $params = array('accountId' => $accountId, 'configId' => $configId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfig");
+	$params = array('accountId' => $accountId, 'configId' => $configId);
+	$params = array_merge($params, $optParams);
+	return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfig");
   }
 
   /**
@@ -768,9 +768,9 @@ 
    */
   public function insert($accountId, Google_Service_AdExchangeBuyer_PretargetingConfig $postBody, $optParams = array())
   {
-    $params = array('accountId' => $accountId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfig");
+	$params = array('accountId' => $accountId, 'postBody' => $postBody);
+	$params = array_merge($params, $optParams);
+	return $this->call('insert', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfig");
   }
 
   /**
@@ -783,9 +783,9 @@ 
    */
   public function listPretargetingConfig($accountId, $optParams = array())
   {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfigList");
+	$params = array('accountId' => $accountId);
+	$params = array_merge($params, $optParams);
+	return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfigList");
   }
 
   /**
@@ -801,9 +801,9 @@ 
    */
   public function patch($accountId, $configId, Google_Service_AdExchangeBuyer_PretargetingConfig $postBody, $optParams = array())
   {
-    $params = array('accountId' => $accountId, 'configId' => $configId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfig");
+	$params = array('accountId' => $accountId, 'configId' => $configId, 'postBody' => $postBody);
+	$params = array_merge($params, $optParams);
+	return $this->call('patch', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfig");
   }
 
   /**
@@ -818,9 +818,9 @@ 
    */
   public function update($accountId, $configId, Google_Service_AdExchangeBuyer_PretargetingConfig $postBody, $optParams = array())
   {
-    $params = array('accountId' => $accountId, 'configId' => $configId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfig");
+	$params = array('accountId' => $accountId, 'configId' => $configId, 'postBody' => $postBody);
+	$params = array_merge($params, $optParams);
+	return $this->call('update', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfig");
   }
 }
 
@@ -845,67 +845,67 @@ 
 
   public function setBidderLocation($bidderLocation)
   {
-    $this->bidderLocation = $bidderLocation;
+	$this->bidderLocation = $bidderLocation;
   }
   public function getBidderLocation()
   {
-    return $this->bidderLocation;
+	return $this->bidderLocation;
   }
   public function setCookieMatchingNid($cookieMatchingNid)
   {
-    $this->cookieMatchingNid = $cookieMatchingNid;
+	$this->cookieMatchingNid = $cookieMatchingNid;
   }
   public function getCookieMatchingNid()
   {
-    return $this->cookieMatchingNid;
+	return $this->cookieMatchingNid;
   }
   public function setCookieMatchingUrl($cookieMatchingUrl)
   {
-    $this->cookieMatchingUrl = $cookieMatchingUrl;
+	$this->cookieMatchingUrl = $cookieMatchingUrl;
   }
   public function getCookieMatchingUrl()
   {
-    return $this->cookieMatchingUrl;
+	return $this->cookieMatchingUrl;
   }
   public function setId($id)
   {
-    $this->id = $id;
+	$this->id = $id;
   }
   public function getId()
   {
-    return $this->id;
+	return $this->id;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
   public function setMaximumActiveCreatives($maximumActiveCreatives)
   {
-    $this->maximumActiveCreatives = $maximumActiveCreatives;
+	$this->maximumActiveCreatives = $maximumActiveCreatives;
   }
   public function getMaximumActiveCreatives()
   {
-    return $this->maximumActiveCreatives;
+	return $this->maximumActiveCreatives;
   }
   public function setMaximumTotalQps($maximumTotalQps)
   {
-    $this->maximumTotalQps = $maximumTotalQps;
+	$this->maximumTotalQps = $maximumTotalQps;
   }
   public function getMaximumTotalQps()
   {
-    return $this->maximumTotalQps;
+	return $this->maximumTotalQps;
   }
   public function setNumberActiveCreatives($numberActiveCreatives)
   {
-    $this->numberActiveCreatives = $numberActiveCreatives;
+	$this->numberActiveCreatives = $numberActiveCreatives;
   }
   public function getNumberActiveCreatives()
   {
-    return $this->numberActiveCreatives;
+	return $this->numberActiveCreatives;
   }
 }
 
@@ -920,27 +920,27 @@ 
 
   public function setMaximumQps($maximumQps)
   {
-    $this->maximumQps = $maximumQps;
+	$this->maximumQps = $maximumQps;
   }
   public function getMaximumQps()
   {
-    return $this->maximumQps;
+	return $this->maximumQps;
   }
   public function setRegion($region)
   {
-    $this->region = $region;
+	$this->region = $region;
   }
   public function getRegion()
   {
-    return $this->region;
+	return $this->region;
   }
   public function setUrl($url)
   {
-    $this->url = $url;
+	$this->url = $url;
   }
   public function getUrl()
   {
-    return $this->url;
+	return $this->url;
   }
 }
 
@@ -956,19 +956,19 @@ 
 
   public function setItems($items)
   {
-    $this->items = $items;
+	$this->items = $items;
   }
   public function getItems()
   {
-    return $this->items;
+	return $this->items;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
 }
 
@@ -985,35 +985,35 @@ 
 
   public function setAccountId($accountId)
   {
-    $this->accountId = $accountId;
+	$this->accountId = $accountId;
   }
   public function getAccountId()
   {
-    return $this->accountId;
+	return $this->accountId;
   }
   public function setAccountName($accountName)
   {
-    $this->accountName = $accountName;
+	$this->accountName = $accountName;
   }
   public function getAccountName()
   {
-    return $this->accountName;
+	return $this->accountName;
   }
   public function setBillingId($billingId)
   {
-    $this->billingId = $billingId;
+	$this->billingId = $billingId;
   }
   public function getBillingId()
   {
-    return $this->billingId;
+	return $this->billingId;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
 }
 
@@ -1029,19 +1029,19 @@ 
 
   public function setItems($items)
   {
-    $this->items = $items;
+	$this->items = $items;
   }
   public function getItems()
   {
-    return $this->items;
+	return $this->items;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
 }
 
@@ -1059,51 +1059,51 @@ 
 
   public function setAccountId($accountId)
   {
-    $this->accountId = $accountId;
+	$this->accountId = $accountId;
   }
   public function getAccountId()
   {
-    return $this->accountId;
+	return $this->accountId;
   }
   public function setBillingId($billingId)
   {
-    $this->billingId = $billingId;
+	$this->billingId = $billingId;
   }
   public function getBillingId()
   {
-    return $this->billingId;
+	return $this->billingId;
   }
   public function setBudgetAmount($budgetAmount)
   {
-    $this->budgetAmount = $budgetAmount;
+	$this->budgetAmount = $budgetAmount;
   }
   public function getBudgetAmount()
   {
-    return $this->budgetAmount;
+	return $this->budgetAmount;
   }
   public function setCurrencyCode($currencyCode)
   {
-    $this->currencyCode = $currencyCode;
+	$this->currencyCode = $currencyCode;
   }
   public function getCurrencyCode()
   {
-    return $this->currencyCode;
+	return $this->currencyCode;
   }
   public function setId($id)
   {
-    $this->id = $id;
+	$this->id = $id;
   }
   public function getId()
   {
-    return $this->id;
+	return $this->id;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
 }
 
@@ -1111,7 +1111,7 @@ 
 {
   protected $collection_key = 'vendorType';
   protected $internal_gapi_mappings = array(
-        "hTMLSnippet" => "HTMLSnippet",
+		"hTMLSnippet" => "HTMLSnippet",
   );
   public $hTMLSnippet;
   public $accountId;
@@ -1140,163 +1140,163 @@ 
 
   public function setHTMLSnippet($hTMLSnippet)
   {
-    $this->hTMLSnippet = $hTMLSnippet;
+	$this->hTMLSnippet = $hTMLSnippet;
   }
   public function getHTMLSnippet()
   {
-    return $this->hTMLSnippet;
+	return $this->hTMLSnippet;
   }
   public function setAccountId($accountId)
   {
-    $this->accountId = $accountId;
+	$this->accountId = $accountId;
   }
   public function getAccountId()
   {
-    return $this->accountId;
+	return $this->accountId;
   }
   public function setAdvertiserId($advertiserId)
   {
-    $this->advertiserId = $advertiserId;
+	$this->advertiserId = $advertiserId;
   }
   public function getAdvertiserId()
   {
-    return $this->advertiserId;
+	return $this->advertiserId;
   }
   public function setAdvertiserName($advertiserName)
   {
-    $this->advertiserName = $advertiserName;
+	$this->advertiserName = $advertiserName;
   }
   public function getAdvertiserName()
   {
-    return $this->advertiserName;
+	return $this->advertiserName;
   }
   public function setAgencyId($agencyId)
   {
-    $this->agencyId = $agencyId;
+	$this->agencyId = $agencyId;
   }
   public function getAgencyId()
   {
-    return $this->agencyId;
+	return $this->agencyId;
   }
   public function setAttribute($attribute)
   {
-    $this->attribute = $attribute;
+	$this->attribute = $attribute;
   }
   public function getAttribute()
   {
-    return $this->attribute;
+	return $this->attribute;
   }
   public function setBuyerCreativeId($buyerCreativeId)
   {
-    $this->buyerCreativeId = $buyerCreativeId;
+	$this->buyerCreativeId = $buyerCreativeId;
   }
   public function getBuyerCreativeId()
   {
-    return $this->buyerCreativeId;
+	return $this->buyerCreativeId;
   }
   public function setClickThroughUrl($clickThroughUrl)
   {
-    $this->clickThroughUrl = $clickThroughUrl;
+	$this->clickThroughUrl = $clickThroughUrl;
   }
   public function getClickThroughUrl()
   {
-    return $this->clickThroughUrl;
+	return $this->clickThroughUrl;
   }
   public function setCorrections($corrections)
   {
-    $this->corrections = $corrections;
+	$this->corrections = $corrections;
   }
   public function getCorrections()
   {
-    return $this->corrections;
+	return $this->corrections;
   }
   public function setDisapprovalReasons($disapprovalReasons)
   {
-    $this->disapprovalReasons = $disapprovalReasons;
+	$this->disapprovalReasons = $disapprovalReasons;
   }
   public function getDisapprovalReasons()
   {
-    return $this->disapprovalReasons;
+	return $this->disapprovalReasons;
   }
   public function setFilteringReasons(Google_Service_AdExchangeBuyer_CreativeFilteringReasons $filteringReasons)
   {
-    $this->filteringReasons = $filteringReasons;
+	$this->filteringReasons = $filteringReasons;
   }
   public function getFilteringReasons()
   {
-    return $this->filteringReasons;
+	return $this->filteringReasons;
   }
   public function setHeight($height)
   {
-    $this->height = $height;
+	$this->height = $height;
   }
   public function getHeight()
   {
-    return $this->height;
+	return $this->height;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
   public function setProductCategories($productCategories)
   {
-    $this->productCategories = $productCategories;
+	$this->productCategories = $productCategories;
   }
   public function getProductCategories()
   {
-    return $this->productCategories;
+	return $this->productCategories;
   }
   public function setRestrictedCategories($restrictedCategories)
   {
-    $this->restrictedCategories = $restrictedCategories;
+	$this->restrictedCategories = $restrictedCategories;
   }
   public function getRestrictedCategories()
   {
-    return $this->restrictedCategories;
+	return $this->restrictedCategories;
   }
   public function setSensitiveCategories($sensitiveCategories)
   {
-    $this->sensitiveCategories = $sensitiveCategories;
+	$this->sensitiveCategories = $sensitiveCategories;
   }
   public function getSensitiveCategories()
   {
-    return $this->sensitiveCategories;
+	return $this->sensitiveCategories;
   }
   public function setStatus($status)
   {
-    $this->status = $status;
+	$this->status = $status;
   }
   public function getStatus()
   {
-    return $this->status;
+	return $this->status;
   }
   public function setVendorType($vendorType)
   {
-    $this->vendorType = $vendorType;
+	$this->vendorType = $vendorType;
   }
   public function getVendorType()
   {
-    return $this->vendorType;
+	return $this->vendorType;
   }
   public function setVideoURL($videoURL)
   {
-    $this->videoURL = $videoURL;
+	$this->videoURL = $videoURL;
   }
   public function getVideoURL()
   {
-    return $this->videoURL;
+	return $this->videoURL;
   }
   public function setWidth($width)
   {
-    $this->width = $width;
+	$this->width = $width;
   }
   public function getWidth()
   {
-    return $this->width;
+	return $this->width;
   }
 }
 
@@ -1311,19 +1311,19 @@ 
 
   public function setDetails($details)
   {
-    $this->details = $details;
+	$this->details = $details;
   }
   public function getDetails()
   {
-    return $this->details;
+	return $this->details;
   }
   public function setReason($reason)
   {
-    $this->reason = $reason;
+	$this->reason = $reason;
   }
   public function getReason()
   {
-    return $this->reason;
+	return $this->reason;
   }
 }
 
@@ -1338,19 +1338,19 @@ 
 
   public function setDetails($details)
   {
-    $this->details = $details;
+	$this->details = $details;
   }
   public function getDetails()
   {
-    return $this->details;
+	return $this->details;
   }
   public function setReason($reason)
   {
-    $this->reason = $reason;
+	$this->reason = $reason;
   }
   public function getReason()
   {
-    return $this->reason;
+	return $this->reason;
   }
 }
 
@@ -1366,19 +1366,19 @@ 
 
   public function setDate($date)
   {
-    $this->date = $date;
+	$this->date = $date;
   }
   public function getDate()
   {
-    return $this->date;
+	return $this->date;
   }
   public function setReasons($reasons)
   {
-    $this->reasons = $reasons;
+	$this->reasons = $reasons;
   }
   public function getReasons()
   {
-    return $this->reasons;
+	return $this->reasons;
   }
 }
 
@@ -1392,19 +1392,19 @@ 
 
   public function setFilteringCount($filteringCount)
   {
-    $this->filteringCount = $filteringCount;
+	$this->filteringCount = $filteringCount;
   }
   public function getFilteringCount()
   {
-    return $this->filteringCount;
+	return $this->filteringCount;
   }
   public function setFilteringStatus($filteringStatus)
   {
-    $this->filteringStatus = $filteringStatus;
+	$this->filteringStatus = $filteringStatus;
   }
   public function getFilteringStatus()
   {
-    return $this->filteringStatus;
+	return $this->filteringStatus;
   }
 }
 
@@ -1421,27 +1421,27 @@ 
 
   public function setItems($items)
   {
-    $this->items = $items;
+	$this->items = $items;
   }
   public function getItems()
   {
-    return $this->items;
+	return $this->items;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
   public function setNextPageToken($nextPageToken)
   {
-    $this->nextPageToken = $nextPageToken;
+	$this->nextPageToken = $nextPageToken;
   }
   public function getNextPageToken()
   {
-    return $this->nextPageToken;
+	return $this->nextPageToken;
   }
 }
 
@@ -1465,99 +1465,99 @@ 
 
   public function setAccountId($accountId)
   {
-    $this->accountId = $accountId;
+	$this->accountId = $accountId;
   }
   public function getAccountId()
   {
-    return $this->accountId;
+	return $this->accountId;
   }
   public function setAdvertiser($advertiser)
   {
-    $this->advertiser = $advertiser;
+	$this->advertiser = $advertiser;
   }
   public function getAdvertiser()
   {
-    return $this->advertiser;
+	return $this->advertiser;
   }
   public function setCurrencyCode($currencyCode)
   {
-    $this->currencyCode = $currencyCode;
+	$this->currencyCode = $currencyCode;
   }
   public function getCurrencyCode()
   {
-    return $this->currencyCode;
+	return $this->currencyCode;
   }
   public function setEndTime($endTime)
   {
-    $this->endTime = $endTime;
+	$this->endTime = $endTime;
   }
   public function getEndTime()
   {
-    return $this->endTime;
+	return $this->endTime;
   }
   public function setFixedCpm($fixedCpm)
   {
-    $this->fixedCpm = $fixedCpm;
+	$this->fixedCpm = $fixedCpm;
   }
   public function getFixedCpm()
   {
-    return $this->fixedCpm;
+	return $this->fixedCpm;
   }
   public function setId($id)
   {
-    $this->id = $id;
+	$this->id = $id;
   }
   public function getId()
   {
-    return $this->id;
+	return $this->id;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
   public function setName($name)
   {
-    $this->name = $name;
+	$this->name = $name;
   }
   public function getName()
   {
-    return $this->name;
+	return $this->name;
   }
   public function setPrivateExchangeMinCpm($privateExchangeMinCpm)
   {
-    $this->privateExchangeMinCpm = $privateExchangeMinCpm;
+	$this->privateExchangeMinCpm = $privateExchangeMinCpm;
   }
   public function getPrivateExchangeMinCpm()
   {
-    return $this->privateExchangeMinCpm;
+	return $this->privateExchangeMinCpm;
   }
   public function setPublisherBlocksOverriden($publisherBlocksOverriden)
   {
-    $this->publisherBlocksOverriden = $publisherBlocksOverriden;
+	$this->publisherBlocksOverriden = $publisherBlocksOverriden;
   }
   public function getPublisherBlocksOverriden()
   {
-    return $this->publisherBlocksOverriden;
+	return $this->publisherBlocksOverriden;
   }
   public function setSellerNetwork($sellerNetwork)
   {
-    $this->sellerNetwork = $sellerNetwork;
+	$this->sellerNetwork = $sellerNetwork;
   }
   public function getSellerNetwork()
   {
-    return $this->sellerNetwork;
+	return $this->sellerNetwork;
   }
   public function setStartTime($startTime)
   {
-    $this->startTime = $startTime;
+	$this->startTime = $startTime;
   }
   public function getStartTime()
   {
-    return $this->startTime;
+	return $this->startTime;
   }
 }
 
@@ -1573,19 +1573,19 @@ 
 
   public function setDirectDeals($directDeals)
   {
-    $this->directDeals = $directDeals;
+	$this->directDeals = $directDeals;
   }
   public function getDirectDeals()
   {
-    return $this->directDeals;
+	return $this->directDeals;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
 }
 
@@ -1620,179 +1620,179 @@ 
 
   public function setBidRate($bidRate)
   {
-    $this->bidRate = $bidRate;
+	$this->bidRate = $bidRate;
   }
   public function getBidRate()
   {
-    return $this->bidRate;
+	return $this->bidRate;
   }
   public function setBidRequestRate($bidRequestRate)
   {
-    $this->bidRequestRate = $bidRequestRate;
+	$this->bidRequestRate = $bidRequestRate;
   }
   public function getBidRequestRate()
   {
-    return $this->bidRequestRate;
+	return $this->bidRequestRate;
   }
   public function setCalloutStatusRate($calloutStatusRate)
   {
-    $this->calloutStatusRate = $calloutStatusRate;
+	$this->calloutStatusRate = $calloutStatusRate;
   }
   public function getCalloutStatusRate()
   {
-    return $this->calloutStatusRate;
+	return $this->calloutStatusRate;
   }
   public function setCookieMatcherStatusRate($cookieMatcherStatusRate)
   {
-    $this->cookieMatcherStatusRate = $cookieMatcherStatusRate;
+	$this->cookieMatcherStatusRate = $cookieMatcherStatusRate;
   }
   public function getCookieMatcherStatusRate()
   {
-    return $this->cookieMatcherStatusRate;
+	return $this->cookieMatcherStatusRate;
   }
   public function setCreativeStatusRate($creativeStatusRate)
   {
-    $this->creativeStatusRate = $creativeStatusRate;
+	$this->creativeStatusRate = $creativeStatusRate;
   }
   public function getCreativeStatusRate()
   {
-    return $this->creativeStatusRate;
+	return $this->creativeStatusRate;
   }
   public function setFilteredBidRate($filteredBidRate)
   {
-    $this->filteredBidRate = $filteredBidRate;
+	$this->filteredBidRate = $filteredBidRate;
   }
   public function getFilteredBidRate()
   {
-    return $this->filteredBidRate;
+	return $this->filteredBidRate;
   }
   public function setHostedMatchStatusRate($hostedMatchStatusRate)
   {
-    $this->hostedMatchStatusRate = $hostedMatchStatusRate;
+	$this->hostedMatchStatusRate = $hostedMatchStatusRate;
   }
   public function getHostedMatchStatusRate()
   {
-    return $this->hostedMatchStatusRate;
+	return $this->hostedMatchStatusRate;
   }
   public function setInventoryMatchRate($inventoryMatchRate)
   {
-    $this->inventoryMatchRate = $inventoryMatchRate;
+	$this->inventoryMatchRate = $inventoryMatchRate;
   }
   public function getInventoryMatchRate()
   {
-    return $this->inventoryMatchRate;
+	return $this->inventoryMatchRate;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
   public function setLatency50thPercentile($latency50thPercentile)
   {
-    $this->latency50thPercentile = $latency50thPercentile;
+	$this->latency50thPercentile = $latency50thPercentile;
   }
   public function getLatency50thPercentile()
   {
-    return $this->latency50thPercentile;
+	return $this->latency50thPercentile;
   }
   public function setLatency85thPercentile($latency85thPercentile)
   {
-    $this->latency85thPercentile = $latency85thPercentile;
+	$this->latency85thPercentile = $latency85thPercentile;
   }
   public function getLatency85thPercentile()
   {
-    return $this->latency85thPercentile;
+	return $this->latency85thPercentile;
   }
   public function setLatency95thPercentile($latency95thPercentile)
   {
-    $this->latency95thPercentile = $latency95thPercentile;
+	$this->latency95thPercentile = $latency95thPercentile;
   }
   public function getLatency95thPercentile()
   {
-    return $this->latency95thPercentile;
+	return $this->latency95thPercentile;
   }
   public function setNoQuotaInRegion($noQuotaInRegion)
   {
-    $this->noQuotaInRegion = $noQuotaInRegion;
+	$this->noQuotaInRegion = $noQuotaInRegion;
   }
   public function getNoQuotaInRegion()
   {
-    return $this->noQuotaInRegion;
+	return $this->noQuotaInRegion;
   }
   public function setOutOfQuota($outOfQuota)
   {
-    $this->outOfQuota = $outOfQuota;
+	$this->outOfQuota = $outOfQuota;
   }
   public function getOutOfQuota()
   {
-    return $this->outOfQuota;
+	return $this->outOfQuota;
   }
   public function setPixelMatchRequests($pixelMatchRequests)
   {
-    $this->pixelMatchRequests = $pixelMatchRequests;
+	$this->pixelMatchRequests = $pixelMatchRequests;
   }
   public function getPixelMatchRequests()
   {
-    return $this->pixelMatchRequests;
+	return $this->pixelMatchRequests;
   }
   public function setPixelMatchResponses($pixelMatchResponses)
   {
-    $this->pixelMatchResponses = $pixelMatchResponses;
+	$this->pixelMatchResponses = $pixelMatchResponses;
   }
   public function getPixelMatchResponses()
   {
-    return $this->pixelMatchResponses;
+	return $this->pixelMatchResponses;
   }
   public function setQuotaConfiguredLimit($quotaConfiguredLimit)
   {
-    $this->quotaConfiguredLimit = $quotaConfiguredLimit;
+	$this->quotaConfiguredLimit = $quotaConfiguredLimit;
   }
   public function getQuotaConfiguredLimit()
   {
-    return $this->quotaConfiguredLimit;
+	return $this->quotaConfiguredLimit;
   }
   public function setQuotaThrottledLimit($quotaThrottledLimit)
   {
-    $this->quotaThrottledLimit = $quotaThrottledLimit;
+	$this->quotaThrottledLimit = $quotaThrottledLimit;
   }
   public function getQuotaThrottledLimit()
   {
-    return $this->quotaThrottledLimit;
+	return $this->quotaThrottledLimit;
   }
   public function setRegion($region)
   {
-    $this->region = $region;
+	$this->region = $region;
   }
   public function getRegion()
   {
-    return $this->region;
+	return $this->region;
   }
   public function setSuccessfulRequestRate($successfulRequestRate)
   {
-    $this->successfulRequestRate = $successfulRequestRate;
+	$this->successfulRequestRate = $successfulRequestRate;
   }
   public function getSuccessfulRequestRate()
   {
-    return $this->successfulRequestRate;
+	return $this->successfulRequestRate;
   }
   public function setTimestamp($timestamp)
   {
-    $this->timestamp = $timestamp;
+	$this->timestamp = $timestamp;
   }
   public function getTimestamp()
   {
-    return $this->timestamp;
+	return $this->timestamp;
   }
   public function setUnsuccessfulRequestRate($unsuccessfulRequestRate)
   {
-    $this->unsuccessfulRequestRate = $unsuccessfulRequestRate;
+	$this->unsuccessfulRequestRate = $unsuccessfulRequestRate;
   }
   public function getUnsuccessfulRequestRate()
   {
-    return $this->unsuccessfulRequestRate;
+	return $this->unsuccessfulRequestRate;
   }
 }
 
@@ -1808,19 +1808,19 @@ 
 
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
   public function setPerformanceReport($performanceReport)
   {
-    $this->performanceReport = $performanceReport;
+	$this->performanceReport = $performanceReport;
   }
   public function getPerformanceReport()
   {
-    return $this->performanceReport;
+	return $this->performanceReport;
   }
 }
 
@@ -1859,187 +1859,187 @@ 
 
   public function setBillingId($billingId)
   {
-    $this->billingId = $billingId;
+	$this->billingId = $billingId;
   }
   public function getBillingId()
   {
-    return $this->billingId;
+	return $this->billingId;
   }
   public function setConfigId($configId)
   {
-    $this->configId = $configId;
+	$this->configId = $configId;
   }
   public function getConfigId()
   {
-    return $this->configId;
+	return $this->configId;
   }
   public function setConfigName($configName)
   {
-    $this->configName = $configName;
+	$this->configName = $configName;
   }
   public function getConfigName()
   {
-    return $this->configName;
+	return $this->configName;
   }
   public function setCreativeType($creativeType)
   {
-    $this->creativeType = $creativeType;
+	$this->creativeType = $creativeType;
   }
   public function getCreativeType()
   {
-    return $this->creativeType;
+	return $this->creativeType;
   }
   public function setDimensions($dimensions)
   {
-    $this->dimensions = $dimensions;
+	$this->dimensions = $dimensions;
   }
   public function getDimensions()
   {
-    return $this->dimensions;
+	return $this->dimensions;
   }
   public function setExcludedContentLabels($excludedContentLabels)
   {
-    $this->excludedContentLabels = $excludedContentLabels;
+	$this->excludedContentLabels = $excludedContentLabels;
   }
   public function getExcludedContentLabels()
   {
-    return $this->excludedContentLabels;
+	return $this->excludedContentLabels;
   }
   public function setExcludedGeoCriteriaIds($excludedGeoCriteriaIds)
   {
-    $this->excludedGeoCriteriaIds = $excludedGeoCriteriaIds;
+	$this->excludedGeoCriteriaIds = $excludedGeoCriteriaIds;
   }
   public function getExcludedGeoCriteriaIds()
   {
-    return $this->excludedGeoCriteriaIds;
+	return $this->excludedGeoCriteriaIds;
   }
   public function setExcludedPlacements($excludedPlacements)
   {
-    $this->excludedPlacements = $excludedPlacements;
+	$this->excludedPlacements = $excludedPlacements;
   }
   public function getExcludedPlacements()
   {
-    return $this->excludedPlacements;
+	return $this->excludedPlacements;
   }
   public function setExcludedUserLists($excludedUserLists)
   {
-    $this->excludedUserLists = $excludedUserLists;
+	$this->excludedUserLists = $excludedUserLists;
   }
   public function getExcludedUserLists()
   {
-    return $this->excludedUserLists;
+	return $this->excludedUserLists;
   }
   public function setExcludedVerticals($excludedVerticals)
   {
-    $this->excludedVerticals = $excludedVerticals;
+	$this->excludedVerticals = $excludedVerticals;
   }
   public function getExcludedVerticals()
   {
-    return $this->excludedVerticals;
+	return $this->excludedVerticals;
   }
   public function setGeoCriteriaIds($geoCriteriaIds)
   {
-    $this->geoCriteriaIds = $geoCriteriaIds;
+	$this->geoCriteriaIds = $geoCriteriaIds;
   }
   public function getGeoCriteriaIds()
   {
-    return $this->geoCriteriaIds;
+	return $this->geoCriteriaIds;
   }
   public function setIsActive($isActive)
   {
-    $this->isActive = $isActive;
+	$this->isActive = $isActive;
   }
   public function getIsActive()
   {
-    return $this->isActive;
+	return $this->isActive;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
   public function setLanguages($languages)
   {
-    $this->languages = $languages;
+	$this->languages = $languages;
   }
   public function getLanguages()
   {
-    return $this->languages;
+	return $this->languages;
   }
   public function setMobileCarriers($mobileCarriers)
   {
-    $this->mobileCarriers = $mobileCarriers;
+	$this->mobileCarriers = $mobileCarriers;
   }
   public function getMobileCarriers()
   {
-    return $this->mobileCarriers;
+	return $this->mobileCarriers;
   }
   public function setMobileDevices($mobileDevices)
   {
-    $this->mobileDevices = $mobileDevices;
+	$this->mobileDevices = $mobileDevices;
   }
   public function getMobileDevices()
   {
-    return $this->mobileDevices;
+	return $this->mobileDevices;
   }
   public function setMobileOperatingSystemVersions($mobileOperatingSystemVersions)
   {
-    $this->mobileOperatingSystemVersions = $mobileOperatingSystemVersions;
+	$this->mobileOperatingSystemVersions = $mobileOperatingSystemVersions;
   }
   public function getMobileOperatingSystemVersions()
   {
-    return $this->mobileOperatingSystemVersions;
+	return $this->mobileOperatingSystemVersions;
   }
   public function setPlacements($placements)
   {
-    $this->placements = $placements;
+	$this->placements = $placements;
   }
   public function getPlacements()
   {
-    return $this->placements;
+	return $this->placements;
   }
   public function setPlatforms($platforms)
   {
-    $this->platforms = $platforms;
+	$this->platforms = $platforms;
   }
   public function getPlatforms()
   {
-    return $this->platforms;
+	return $this->platforms;
   }
   public function setSupportedCreativeAttributes($supportedCreativeAttributes)
   {
-    $this->supportedCreativeAttributes = $supportedCreativeAttributes;
+	$this->supportedCreativeAttributes = $supportedCreativeAttributes;
   }
   public function getSupportedCreativeAttributes()
   {
-    return $this->supportedCreativeAttributes;
+	return $this->supportedCreativeAttributes;
   }
   public function setUserLists($userLists)
   {
-    $this->userLists = $userLists;
+	$this->userLists = $userLists;
   }
   public function getUserLists()
   {
-    return $this->userLists;
+	return $this->userLists;
   }
   public function setVendorTypes($vendorTypes)
   {
-    $this->vendorTypes = $vendorTypes;
+	$this->vendorTypes = $vendorTypes;
   }
   public function getVendorTypes()
   {
-    return $this->vendorTypes;
+	return $this->vendorTypes;
   }
   public function setVerticals($verticals)
   {
-    $this->verticals = $verticals;
+	$this->verticals = $verticals;
   }
   public function getVerticals()
   {
-    return $this->verticals;
+	return $this->verticals;
   }
 }
 
@@ -2053,19 +2053,19 @@ 
 
   public function setHeight($height)
   {
-    $this->height = $height;
+	$this->height = $height;
   }
   public function getHeight()
   {
-    return $this->height;
+	return $this->height;
   }
   public function setWidth($width)
   {
-    $this->width = $width;
+	$this->width = $width;
   }
   public function getWidth()
   {
-    return $this->width;
+	return $this->width;
   }
 }
 
@@ -2079,19 +2079,19 @@ 
 
   public function setToken($token)
   {
-    $this->token = $token;
+	$this->token = $token;
   }
   public function getToken()
   {
-    return $this->token;
+	return $this->token;
   }
   public function setType($type)
   {
-    $this->type = $type;
+	$this->type = $type;
   }
   public function getType()
   {
-    return $this->type;
+	return $this->type;
   }
 }
 
@@ -2107,19 +2107,19 @@ 
 
   public function setItems($items)
   {
-    $this->items = $items;
+	$this->items = $items;
   }
   public function getItems()
   {
-    return $this->items;
+	return $this->items;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
 }
 
@@ -2133,18 +2133,18 @@ 
 
   public function setToken($token)
   {
-    $this->token = $token;
+	$this->token = $token;
   }
   public function getToken()
   {
-    return $this->token;
+	return $this->token;
   }
   public function setType($type)
   {
-    $this->type = $type;
+	$this->type = $type;
   }
   public function getType()
   {
-    return $this->type;
+	return $this->type;
   }
 }

Spacing +14 added lines, -14 removed lines

@@ -73,11 +73,11 @@ 
                   'required' => true,
                 ),
               ),
-            ),'list' => array(
+            ), 'list' => array(
               'path' => 'accounts',
               'httpMethod' => 'GET',
               'parameters' => array(),
-            ),'patch' => array(
+            ), 'patch' => array(
               'path' => 'accounts/{id}',
               'httpMethod' => 'PATCH',
               'parameters' => array(
@@ -87,7 +87,7 @@ 
                   'required' => true,
                 ),
               ),
-            ),'update' => array(
+            ), 'update' => array(
               'path' => 'accounts/{id}',
               'httpMethod' => 'PUT',
               'parameters' => array(
@@ -117,7 +117,7 @@ 
                   'required' => true,
                 ),
               ),
-            ),'list' => array(
+            ), 'list' => array(
               'path' => 'billinginfo',
               'httpMethod' => 'GET',
               'parameters' => array(),
@@ -146,7 +146,7 @@ 
                   'required' => true,
                 ),
               ),
-            ),'patch' => array(
+            ), 'patch' => array(
               'path' => 'billinginfo/{accountId}/{billingId}',
               'httpMethod' => 'PATCH',
               'parameters' => array(
@@ -161,7 +161,7 @@ 
                   'required' => true,
                 ),
               ),
-            ),'update' => array(
+            ), 'update' => array(
               'path' => 'billinginfo/{accountId}/{billingId}',
               'httpMethod' => 'PUT',
               'parameters' => array(
@@ -201,11 +201,11 @@ 
                   'required' => true,
                 ),
               ),
-            ),'insert' => array(
+            ), 'insert' => array(
               'path' => 'creatives',
               'httpMethod' => 'POST',
               'parameters' => array(),
-            ),'list' => array(
+            ), 'list' => array(
               'path' => 'creatives',
               'httpMethod' => 'GET',
               'parameters' => array(
@@ -252,7 +252,7 @@ 
                   'required' => true,
                 ),
               ),
-            ),'list' => array(
+            ), 'list' => array(
               'path' => 'directdeals',
               'httpMethod' => 'GET',
               'parameters' => array(),
@@ -319,7 +319,7 @@ 
                   'required' => true,
                 ),
               ),
-            ),'get' => array(
+            ), 'get' => array(
               'path' => 'pretargetingconfigs/{accountId}/{configId}',
               'httpMethod' => 'GET',
               'parameters' => array(
@@ -334,7 +334,7 @@ 
                   'required' => true,
                 ),
               ),
-            ),'insert' => array(
+            ), 'insert' => array(
               'path' => 'pretargetingconfigs/{accountId}',
               'httpMethod' => 'POST',
               'parameters' => array(
@@ -344,7 +344,7 @@ 
                   'required' => true,
                 ),
               ),
-            ),'list' => array(
+            ), 'list' => array(
               'path' => 'pretargetingconfigs/{accountId}',
               'httpMethod' => 'GET',
               'parameters' => array(
@@ -354,7 +354,7 @@ 
                   'required' => true,
                 ),
               ),
-            ),'patch' => array(
+            ), 'patch' => array(
               'path' => 'pretargetingconfigs/{accountId}/{configId}',
               'httpMethod' => 'PATCH',
               'parameters' => array(
@@ -369,7 +369,7 @@ 
                   'required' => true,
                 ),
               ),
-            ),'update' => array(
+            ), 'update' => array(
               'path' => 'pretargetingconfigs/{accountId}/{configId}',
               'httpMethod' => 'PUT',
               'parameters' => array(