GeoDirectory / geodirectory

geodirectory.php

Braces +41 added lines, -13 removed lines

@@ -79,43 +79,71 @@
 /**

  * Do not store any revisions (except the one autosave per post).

  */

-if (!defined('WP_POST_REVISIONS')) define('WP_POST_REVISIONS', 0);

+if (!defined('WP_POST_REVISIONS')) {
+	define('WP_POST_REVISIONS', 0);
+}
 

 /**

  * Define constants

  */

-if(!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));

+if(!defined('GEODIRECTORY_PLUGIN_DIR')) {
+	define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));
+}
 

 /*

  * Declare database table names. All since version 1.0.0

  */

 

 /** Define the database name for the countries table. */

-if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');

+if (!defined('GEODIR_COUNTRIES_TABLE')) {
+	define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');
+}
 /** Define the database name for the custom fields table. */

-if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');

+if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) {
+	define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');
+}
 /** Define the database name for the icons table. */

-if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');

+if (!defined('GEODIR_ICON_TABLE')) {
+	define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');
+}
 /** Define the database name for the attachments table. */

-if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');

+if (!defined('GEODIR_ATTACHMENT_TABLE')) {
+	define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');
+}
 /** Define the database name for the review table. */

-if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');

+if (!defined('GEODIR_REVIEW_TABLE')) {
+	define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');
+}
 /** Define the database name for the custom sort fields table. */

-if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');

+if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) {
+	define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');
+}
 

 /*

  * Define our Google Analytic app settings

  */

-if (!defined('GEODIR_GA_CLIENTID')) define('GEODIR_GA_CLIENTID', '687912069872-sdpsjssrdt7t3ao1dnv1ib71hkckbt5s.apps.googleusercontent.com');

-if (!defined('GEODIR_GA_CLIENTSECRET')) define('GEODIR_GA_CLIENTSECRET', 'yBVkDpqJ1B9nAETHy738Zn8C'); //don't worry - this don't need to be secret in our case

-if (!defined('GEODIR_GA_REDIRECT')) define('GEODIR_GA_REDIRECT', 'urn:ietf:wg:oauth:2.0:oob');

-if (!defined('GEODIR_GA_SCOPE')) define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics');//.readonly

+if (!defined('GEODIR_GA_CLIENTID')) {
+	define('GEODIR_GA_CLIENTID', '687912069872-sdpsjssrdt7t3ao1dnv1ib71hkckbt5s.apps.googleusercontent.com');
+}
+if (!defined('GEODIR_GA_CLIENTSECRET')) {
+	define('GEODIR_GA_CLIENTSECRET', 'yBVkDpqJ1B9nAETHy738Zn8C');
+}
+//don't worry - this don't need to be secret in our case

+if (!defined('GEODIR_GA_REDIRECT')) {
+	define('GEODIR_GA_REDIRECT', 'urn:ietf:wg:oauth:2.0:oob');
+}
+if (!defined('GEODIR_GA_SCOPE')) {
+	define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics');
+}
+//.readonly

 

 

 /*

  * Localisation items.

  */

-if (!defined('GEODIRECTORY_TEXTDOMAIN')) define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');

+if (!defined('GEODIRECTORY_TEXTDOMAIN')) {
+	define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');
+}
 

 // Load geodirectory plugin textdomain.

 add_action( 'init', 'geodir_load_textdomain' );

Indentation +91 added lines, -91 removed lines

@@ -31,30 +31,30 @@ 
  * CHECK FOR OLD COMPATIBILITY PACKS AND DISABLE IF THEY ARE ACTIVE

  */

 if (is_admin()) {

-    /**

-     * Include WordPress core file so we can use core functions to check for active plugins.

-     */

-    include_once(ABSPATH . 'wp-admin/includes/plugin.php');

+	/**

+	 * Include WordPress core file so we can use core functions to check for active plugins.

+	 */

+	include_once(ABSPATH . 'wp-admin/includes/plugin.php');

 

-    if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {

-        deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');

-    }

+	if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {

+		deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');

+	}

 

-    if (is_plugin_active('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php')) {

-        deactivate_plugins('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php');

-    }

+	if (is_plugin_active('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php')) {

+		deactivate_plugins('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php');

+	}

 

-    if (is_plugin_active('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php')) {

-        deactivate_plugins('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php');

-    }

+	if (is_plugin_active('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php')) {

+		deactivate_plugins('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php');

+	}

 

-    if (is_plugin_active('geodir_avada_compatibility/geodir_avada_compatibility.php')) {

-        deactivate_plugins('geodir_avada_compatibility/geodir_avada_compatibility.php');

-    }

+	if (is_plugin_active('geodir_avada_compatibility/geodir_avada_compatibility.php')) {

+		deactivate_plugins('geodir_avada_compatibility/geodir_avada_compatibility.php');

+	}

 

-    if (is_plugin_active('geodir_compat_pack_divi/geodir_divi_compatibility.php')) {

-        deactivate_plugins('geodir_compat_pack_divi/geodir_divi_compatibility.php');

-    }

+	if (is_plugin_active('geodir_compat_pack_divi/geodir_divi_compatibility.php')) {

+		deactivate_plugins('geodir_compat_pack_divi/geodir_divi_compatibility.php');

+	}

 

 }

 

@@ -130,19 +130,19 @@ 
  * @package GeoDirectory

  */

 function geodir_error_log($log){

-    /*

+	/*

      * A filter to override the WP_DEBUG setting for function geodir_error_log().

      *

      * @since 1.5.7

      */

-    $should_log = apply_filters( 'geodir_log_errors', WP_DEBUG);

-    if ( true === $should_log ) {

-        if ( is_array( $log ) || is_object( $log ) ) {

-            error_log( print_r( $log, true ) );

-        } else {

-            error_log( $log );

-        }

-    }

+	$should_log = apply_filters( 'geodir_log_errors', WP_DEBUG);

+	if ( true === $should_log ) {

+		if ( is_array( $log ) || is_object( $log ) ) {

+			error_log( print_r( $log, true ) );

+		} else {

+			error_log( $log );

+		}

+	}

 }

 /**

  * Include all plugin functions.

@@ -181,72 +181,72 @@ 
  */

 if (is_admin() || defined( 'GD_TESTING_MODE' ) || ( defined( 'WP_CLI' ) && WP_CLI )) {

 

-    /**

-     * Include functions used in admin area only.

-     *

-     * @since 1.0.0

-     */

-    require_once('geodirectory-admin/admin_functions.php');

-    /**

-     * Most actions/hooks used in admin area only are called from here.

-     *

-     * @since 1.6.11

-     */

-    require_once('geodirectory-admin/admin_dummy_data_functions.php');

-    /**

-     * Most actions/hooks used in admin area only are called from here.

-     *

-     * @since 1.0.0

-     */

-    require_once('geodirectory-admin/admin_hooks_actions.php');

-    /**

-     * Most admin JS and CSS is called from here.

-     *

-     * @since 1.0.0

-     */

-    require_once('geodirectory-admin/admin_template_tags.php');

-    /**

-     * Include Google Analytics Class.

-     *

-     * @since 1.6.11

-     */

-    require_once('geodirectory-admin/class.analytics.stats.php');

-    /**

-     * Include any functions needed for upgrades.

-     *

-     * @since 1.0.0

-     */

-    require_once(geodir_plugin_path() . '/upgrade.php');

-    if (get_option('geodir_installed') != 1) {

-        /**

-         * Define language constants, here as they are not loaded yet.

-         *

-         * @since 1.0.0

-         */

-        require_once(geodir_plugin_path() . '/language.php');

-        /**

-         * Include the plugin install file that sets up the databases and any options on first run.

-         *

-         * @since 1.0.0

-         */

-        require_once('geodirectory-admin/admin_install.php');

-        register_activation_hook(__FILE__, 'geodir_activation');

-    }

-    register_deactivation_hook(__FILE__, 'geodir_deactivation');

-

-    /*

+	/**

+	 * Include functions used in admin area only.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once('geodirectory-admin/admin_functions.php');

+	/**

+	 * Most actions/hooks used in admin area only are called from here.

+	 *

+	 * @since 1.6.11

+	 */

+	require_once('geodirectory-admin/admin_dummy_data_functions.php');

+	/**

+	 * Most actions/hooks used in admin area only are called from here.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once('geodirectory-admin/admin_hooks_actions.php');

+	/**

+	 * Most admin JS and CSS is called from here.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once('geodirectory-admin/admin_template_tags.php');

+	/**

+	 * Include Google Analytics Class.

+	 *

+	 * @since 1.6.11

+	 */

+	require_once('geodirectory-admin/class.analytics.stats.php');

+	/**

+	 * Include any functions needed for upgrades.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once(geodir_plugin_path() . '/upgrade.php');

+	if (get_option('geodir_installed') != 1) {

+		/**

+		 * Define language constants, here as they are not loaded yet.

+		 *

+		 * @since 1.0.0

+		 */

+		require_once(geodir_plugin_path() . '/language.php');

+		/**

+		 * Include the plugin install file that sets up the databases and any options on first run.

+		 *

+		 * @since 1.0.0

+		 */

+		require_once('geodirectory-admin/admin_install.php');

+		register_activation_hook(__FILE__, 'geodir_activation');

+	}

+	register_deactivation_hook(__FILE__, 'geodir_deactivation');

+

+	/*

      * Show a upgrade warning message if applicable.

      *

      * @since 1.5.6

      */

-    global $pagenow;

-    if ( 'plugins.php' === $pagenow )

-    {

-        // Better update message

-        $file   = basename( __FILE__ );

-        $folder = basename( dirname( __FILE__ ) );

-        $hook = "in_plugin_update_message-{$folder}/{$file}";

-        add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 );

-    }

+	global $pagenow;

+	if ( 'plugins.php' === $pagenow )

+	{

+		// Better update message

+		$file   = basename( __FILE__ );

+		$folder = basename( dirname( __FILE__ ) );

+		$hook = "in_plugin_update_message-{$folder}/{$file}";

+		add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 );

+	}

 

 }
\ No newline at end of file

Spacing +25 added lines, -25 removed lines

@@ -34,7 +34,7 @@ 
     /**

      * Include WordPress core file so we can use core functions to check for active plugins.

      */

-    include_once(ABSPATH . 'wp-admin/includes/plugin.php');

+    include_once(ABSPATH.'wp-admin/includes/plugin.php');

 

     if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {

         deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');

@@ -68,8 +68,8 @@ 
  * @global string $plugin_file_name Base file name. 'geodirectory/geodirectory.php'.

  */

 global $wpdb, $plugin_prefix, $geodir_addon_list, $plugin_file_name;

-$plugin_prefix = $wpdb->prefix . 'geodir_';

-$plugin_file_name = basename(plugin_dir_path(__FILE__)) . '/' . basename(__FILE__);

+$plugin_prefix = $wpdb->prefix.'geodir_';

+$plugin_file_name = basename(plugin_dir_path(__FILE__)).'/'.basename(__FILE__);

 

 /*

  * This will store the cached post custom fields per package for each page load so not to run for each listing.

@@ -84,24 +84,24 @@ 
 /**

  * Define constants

  */

-if(!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));

+if (!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path(__FILE__));

 

 /*

  * Declare database table names. All since version 1.0.0

  */

 

 /** Define the database name for the countries table. */

-if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');

+if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix.'countries');

 /** Define the database name for the custom fields table. */

-if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');

+if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix.'custom_fields');

 /** Define the database name for the icons table. */

-if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');

+if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix.'post_icon');

 /** Define the database name for the attachments table. */

-if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');

+if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix.'attachments');

 /** Define the database name for the review table. */

-if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');

+if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix.'post_review');

 /** Define the database name for the custom sort fields table. */

-if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');

+if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix.'custom_sort_fields');

 

 /*

  * Define our Google Analytic app settings

@@ -109,7 +109,7 @@ 
 if (!defined('GEODIR_GA_CLIENTID')) define('GEODIR_GA_CLIENTID', '687912069872-sdpsjssrdt7t3ao1dnv1ib71hkckbt5s.apps.googleusercontent.com');

 if (!defined('GEODIR_GA_CLIENTSECRET')) define('GEODIR_GA_CLIENTSECRET', 'yBVkDpqJ1B9nAETHy738Zn8C'); //don't worry - this don't need to be secret in our case

 if (!defined('GEODIR_GA_REDIRECT')) define('GEODIR_GA_REDIRECT', 'urn:ietf:wg:oauth:2.0:oob');

-if (!defined('GEODIR_GA_SCOPE')) define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics');//.readonly

+if (!defined('GEODIR_GA_SCOPE')) define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics'); //.readonly

 

 

 /*

@@ -118,7 +118,7 @@ 
 if (!defined('GEODIRECTORY_TEXTDOMAIN')) define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');

 

 // Load geodirectory plugin textdomain.

-add_action( 'init', 'geodir_load_textdomain' );

+add_action('init', 'geodir_load_textdomain');

 

 /*

  * A function to log GD errors no matter the type given.

@@ -129,18 +129,18 @@ 
  * @param mixed $log The thing that should be logged.

  * @package GeoDirectory

  */

-function geodir_error_log($log){

+function geodir_error_log($log) {

     /*

      * A filter to override the WP_DEBUG setting for function geodir_error_log().

      *

      * @since 1.5.7

      */

-    $should_log = apply_filters( 'geodir_log_errors', WP_DEBUG);

-    if ( true === $should_log ) {

-        if ( is_array( $log ) || is_object( $log ) ) {

-            error_log( print_r( $log, true ) );

+    $should_log = apply_filters('geodir_log_errors', WP_DEBUG);

+    if (true === $should_log) {

+        if (is_array($log) || is_object($log)) {

+            error_log(print_r($log, true));

         } else {

-            error_log( $log );

+            error_log($log);

         }

     }

 }

@@ -179,7 +179,7 @@ 
 /*

  * Admin init + activation hooks

  */

-if (is_admin() || defined( 'GD_TESTING_MODE' ) || ( defined( 'WP_CLI' ) && WP_CLI )) {

+if (is_admin() || defined('GD_TESTING_MODE') || (defined('WP_CLI') && WP_CLI)) {

 

     /**

      * Include functions used in admin area only.

@@ -216,14 +216,14 @@ 
      *

      * @since 1.0.0

      */

-    require_once(geodir_plugin_path() . '/upgrade.php');

+    require_once(geodir_plugin_path().'/upgrade.php');

     if (get_option('geodir_installed') != 1) {

         /**

          * Define language constants, here as they are not loaded yet.

          *

          * @since 1.0.0

          */

-        require_once(geodir_plugin_path() . '/language.php');

+        require_once(geodir_plugin_path().'/language.php');

         /**

          * Include the plugin install file that sets up the databases and any options on first run.

          *

@@ -240,13 +240,13 @@ 
      * @since 1.5.6

      */

     global $pagenow;

-    if ( 'plugins.php' === $pagenow )

+    if ('plugins.php' === $pagenow)

     {

         // Better update message

-        $file   = basename( __FILE__ );

-        $folder = basename( dirname( __FILE__ ) );

+        $file   = basename(__FILE__);

+        $folder = basename(dirname(__FILE__));

         $hook = "in_plugin_update_message-{$folder}/{$file}";

-        add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 );

+        add_action($hook, 'geodire_admin_upgrade_notice', 20, 2);

     }

 

 }
\ No newline at end of file

geodirectory-functions/ajax_handler_functions.php

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 +341 added lines, -341 removed lines

@@ -16,19 +16,19 @@ 
  */

 function geodir_on_wp_loaded()

 {

-    /**

-     * Called on the wp_loaded WP hook and used to send the send inquiry 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 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

 

-    }

+	}

 

 }

 

@@ -41,9 +41,9 @@ 
  */

 function geodir_on_wp()

 {

-    if(geodir_is_page('login')) {

-        geodir_user_signup();

-    }

+	if(geodir_is_page('login')) {

+		geodir_user_signup();

+	}

 

 }

 

@@ -57,36 +57,36 @@ 
  */

 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;

+	}

     

-    if ( class_exists( 'WPSEO_Frontend' ) && !is_admin() ) {

-        add_action( 'template_redirect', 'geodir_remove_yoast_seo_metas' );

-    }

+	if ( class_exists( 'WPSEO_Frontend' ) && !is_admin() ) {

+		add_action( 'template_redirect', 'geodir_remove_yoast_seo_metas' );

+	}

 }

 

 

@@ -103,328 +103,328 @@ 
  * @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') {

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

+			$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();

-    }

+	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();

+	}

     

-    if ( !empty($_REQUEST['geodir_ajax'] ) && $_REQUEST['geodir_ajax'] == 'duplicate' && geodir_is_wpml() ) {

-        if ( !empty( $_REQUEST['_nonce'] ) && wp_verify_nonce( $_REQUEST['_nonce'], 'geodir_duplicate_nonce' ) ) {

-            $json = array();

-            $json['success'] = false;

+	if ( !empty($_REQUEST['geodir_ajax'] ) && $_REQUEST['geodir_ajax'] == 'duplicate' && geodir_is_wpml() ) {

+		if ( !empty( $_REQUEST['_nonce'] ) && wp_verify_nonce( $_REQUEST['_nonce'], 'geodir_duplicate_nonce' ) ) {

+			$json = array();

+			$json['success'] = false;

             

-            $post_id = !empty( $_REQUEST['post_id'] ) ? absint( $_REQUEST['post_id'] ) : 0;

-            $langs = !empty( $_REQUEST['dups'] ) ? explode( ',', sanitize_text_field( $_REQUEST['dups'] ) ) : array();

+			$post_id = !empty( $_REQUEST['post_id'] ) ? absint( $_REQUEST['post_id'] ) : 0;

+			$langs = !empty( $_REQUEST['dups'] ) ? explode( ',', sanitize_text_field( $_REQUEST['dups'] ) ) : array();

             

-            if ( !empty( $post_id ) && !empty( $langs ) ) {

-                if ( geodir_wpml_allowed_to_duplicate( $post_id ) ) {

-                    global $sitepress;

+			if ( !empty( $post_id ) && !empty( $langs ) ) {

+				if ( geodir_wpml_allowed_to_duplicate( $post_id ) ) {

+					global $sitepress;

                     

-                    $element_type = 'post_' . get_post_type( $post_id );

-                    $master_post_id = $sitepress->get_original_element_id( $post_id, $element_type );

+					$element_type = 'post_' . get_post_type( $post_id );

+					$master_post_id = $sitepress->get_original_element_id( $post_id, $element_type );

                     

-                    if ( $master_post_id == $post_id ) {

-                        $_REQUEST['icl_ajx_action'] = 'make_duplicates';

+					if ( $master_post_id == $post_id ) {

+						$_REQUEST['icl_ajx_action'] = 'make_duplicates';

                         

-                        foreach ( $langs as $lang ) {

-                            $return = $sitepress->make_duplicate( $master_post_id, $lang );

-                        }

-                        $json['success'] = true;

-                    } else {

-                        $json['error'] = __( 'Translation can be done from original listing only.', 'geodirectory' );

-                    }

-                } else {

-                    $json['error'] = __( 'You are not allowed to translate this listing.', 'geodirectory' );

-                }

-            }

+						foreach ( $langs as $lang ) {

+							$return = $sitepress->make_duplicate( $master_post_id, $lang );

+						}

+						$json['success'] = true;

+					} else {

+						$json['error'] = __( 'Translation can be done from original listing only.', 'geodirectory' );

+					}

+				} else {

+					$json['error'] = __( 'You are not allowed to translate this listing.', 'geodirectory' );

+				}

+			}

             

-            wp_send_json( $json );

-        }

-    }

+			wp_send_json( $json );

+		}

+	}

 

-    gd_die();

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

-    }

-    try {

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

-    } catch (Exception $e) {

-        geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) );

-    }

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

+	}

+	try {

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

+	} catch (Exception $e) {

+		geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) );

+	}

+	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

Spacing +33 added lines, -33 removed lines

@@ -41,7 +41,7 @@ 
  */

 function geodir_on_wp()

 {

-    if(geodir_is_page('login')) {

+    if (geodir_is_page('login')) {

         geodir_user_signup();

     }

 

@@ -80,12 +80,12 @@ 
          * @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;

     }

     

-    if ( class_exists( 'WPSEO_Frontend' ) && !is_admin() ) {

-        add_action( 'template_redirect', 'geodir_remove_yoast_seo_metas' );

+    if (class_exists('WPSEO_Frontend') && !is_admin()) {

+        add_action('template_redirect', 'geodir_remove_yoast_seo_metas');

     }

 }

 

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

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

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

@@ -162,7 +162,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.

                          *

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

                     }

 

 

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

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

         }

@@ -209,17 +209,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 {

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

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

@@ -370,37 +370,37 @@ 
         exit();

     }

     

-    if ( !empty($_REQUEST['geodir_ajax'] ) && $_REQUEST['geodir_ajax'] == 'duplicate' && geodir_is_wpml() ) {

-        if ( !empty( $_REQUEST['_nonce'] ) && wp_verify_nonce( $_REQUEST['_nonce'], 'geodir_duplicate_nonce' ) ) {

+    if (!empty($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'duplicate' && geodir_is_wpml()) {

+        if (!empty($_REQUEST['_nonce']) && wp_verify_nonce($_REQUEST['_nonce'], 'geodir_duplicate_nonce')) {

             $json = array();

             $json['success'] = false;

             

-            $post_id = !empty( $_REQUEST['post_id'] ) ? absint( $_REQUEST['post_id'] ) : 0;

-            $langs = !empty( $_REQUEST['dups'] ) ? explode( ',', sanitize_text_field( $_REQUEST['dups'] ) ) : array();

+            $post_id = !empty($_REQUEST['post_id']) ? absint($_REQUEST['post_id']) : 0;

+            $langs = !empty($_REQUEST['dups']) ? explode(',', sanitize_text_field($_REQUEST['dups'])) : array();

             

-            if ( !empty( $post_id ) && !empty( $langs ) ) {

-                if ( geodir_wpml_allowed_to_duplicate( $post_id ) ) {

+            if (!empty($post_id) && !empty($langs)) {

+                if (geodir_wpml_allowed_to_duplicate($post_id)) {

                     global $sitepress;

                     

-                    $element_type = 'post_' . get_post_type( $post_id );

-                    $master_post_id = $sitepress->get_original_element_id( $post_id, $element_type );

+                    $element_type = 'post_'.get_post_type($post_id);

+                    $master_post_id = $sitepress->get_original_element_id($post_id, $element_type);

                     

-                    if ( $master_post_id == $post_id ) {

+                    if ($master_post_id == $post_id) {

                         $_REQUEST['icl_ajx_action'] = 'make_duplicates';

                         

-                        foreach ( $langs as $lang ) {

-                            $return = $sitepress->make_duplicate( $master_post_id, $lang );

+                        foreach ($langs as $lang) {

+                            $return = $sitepress->make_duplicate($master_post_id, $lang);

                         }

                         $json['success'] = true;

                     } else {

-                        $json['error'] = __( 'Translation can be done from original listing only.', 'geodirectory' );

+                        $json['error'] = __('Translation can be done from original listing only.', 'geodirectory');

                     }

                 } else {

-                    $json['error'] = __( 'You are not allowed to translate this listing.', 'geodirectory' );

+                    $json['error'] = __('You are not allowed to translate this listing.', 'geodirectory');

                 }

             }

             

-            wp_send_json( $json );

+            wp_send_json($json);

         }

     }

 

@@ -408,7 +408,7 @@ 
 }

 

 

-function geodir_show_ga_stats(){

+function geodir_show_ga_stats() {

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

         $ga_start = $_REQUEST['ga_start'];

     } else {

@@ -422,9 +422,9 @@ 
     try {

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

     } catch (Exception $e) {

-        geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) );

+        geodir_error_log(wp_sprintf(__('GD Google Analytics API Error(%s) : %s', 'geodirectory'), $e->getCode(), $e->getMessage()));

     }

     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

geodirectory-templates/login_frm.php

Indentation +40 added lines, -40 removed lines

@@ -10,13 +10,13 @@ 
  */

 

 if (isset($_GET['redirect_to']) && $_GET['redirect_to'] != '') {

-    $redirect_to = $_GET['redirect_to'];

+	$redirect_to = $_GET['redirect_to'];

 } else {

-    //echo $_SERVER['HTTP_HOST'] ;

-    $redirect_to = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';

-    if (strpos($redirect_to, $_SERVER['HTTP_HOST']) === false) {

-        $redirect_to = home_url();

-    }

+	//echo $_SERVER['HTTP_HOST'] ;

+	$redirect_to = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';

+	if (strpos($redirect_to, $_SERVER['HTTP_HOST']) === false) {

+		$redirect_to = home_url();

+	}

 

 }

 

@@ -38,37 +38,37 @@ 
     <h4>

         <?php

 

-            /**

-             * Filter the `SIGN_IN_PAGE_TITLE` title text on login form template.

-             *

-             * @since 1.0.0

-             */

-            echo apply_filters('geodir_login_page_title', SIGN_IN_PAGE_TITLE);

+			/**

+			 * Filter the `SIGN_IN_PAGE_TITLE` title text on login form template.

+			 *

+			 * @since 1.0.0

+			 */

+			echo apply_filters('geodir_login_page_title', SIGN_IN_PAGE_TITLE);

 

-        ?>

+		?>

     </h4>

     <?php

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

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

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

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

-    }

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

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

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

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

+	}

 

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

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

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

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

 

-    do_action('geodir_login_error_messages');

+	do_action('geodir_login_error_messages');

 

-    ?>

+	?>

     <form name="cus_loginform" id="cus_loginform" method="post">

 

         <div class="form_row clearfix">

             <input placeholder='<?php echo USERNAME_TEXT; ?>' type="text" name="log" id="user_login"

                    value="<?php global $user_login;

-                   if (!isset($user_login)) {

-                       $user_login = '';

-                   }

-                   echo esc_attr($user_login); ?>" size="20" class="textfield"/>

+				   if (!isset($user_login)) {

+					   $user_login = '';

+				   }

+				   echo esc_attr($user_login); ?>" size="20" class="textfield"/>

             <span class="user_loginInfo"></span>

         </div>

 

@@ -79,14 +79,14 @@ 
         </div>

 

         <?php

-        /**

-         * This is a default WordPress action that calls any additional elements needed for any login forms.

-         *

-         * We use this action before the remember me checkbox on the sigin form.

-         *

-         * @since 1.0.0

-         */

-        do_action('login_form'); ?>

+		/**

+		 * This is a default WordPress action that calls any additional elements needed for any login forms.

+		 *

+		 * We use this action before the remember me checkbox on the sigin form.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('login_form'); ?>

         <p class="rember">

             <input name="rememberme" type="checkbox" id="rememberme" value="forever" class="fl"/>

             <?php echo REMEMBER_ON_COMPUTER_TEXT; ?>

@@ -110,12 +110,12 @@ 
                 <input placeholder='<?php echo USERNAME_EMAIL_TEXT; ?>' type="text" name="user_login"

                        value="<?php echo esc_attr($user_login); ?>" size="20" class="user_login1 textfield"/>

                 <?php

-                /**

-                 * Called before the get new password button in the login box template.

-                 *

-                 * @since 1.0.0

-                 */

-                do_action('lostpassword_form'); ?>

+				/**

+				 * Called before the get new password button in the login box template.

+				 *

+				 * @since 1.0.0

+				 */

+				do_action('lostpassword_form'); ?>

             </div>

             <input type="submit" name="get_new_password" value="<?php echo GET_NEW_PW_TEXT; ?>" class="geodir_button"/>

         </form>

Spacing +3 added lines, -3 removed lines

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

     <?php

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

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

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

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

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

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

     }

 

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

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

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

 

     do_action('geodir_login_error_messages');

 

Braces +3 added lines, -2 removed lines

@@ -54,8 +54,9 @@
         echo "<p class=\"error_msg\"> " . INVALID_USER_PW_MSG . " </p>";

     }

 

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

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

+    if (isset($_REQUEST['checkemail']) && $_REQUEST['checkemail'] == 'confirm') {
+            echo '<p class="sucess_msg">' . PW_SEND_CONFIRM_MSG . '</p>';
+    }
 

     do_action('geodir_login_error_messages');

 

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)