moonstonemedia / Simple-Calendar

includes/updates/update-v3013.php

Spacing +9 added lines, -9 removed lines

@@ -9,7 +9,7 @@ 
 use Carbon\Carbon;
 use SimpleCalendar\Post_Types;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,7 +23,7 @@ 
 	 *
 	 * @param array $posts
 	 */
-	public function __construct( $posts ) {
+	public function __construct($posts) {
 
 		$this->update_options();
 	}
@@ -34,22 +34,22 @@ 
 	 */
 	public function update_options() {
 
-		$settings_advanced = get_option( 'simple-calendar_settings_advanced' );
+		$settings_advanced = get_option('simple-calendar_settings_advanced');
 		
 		// Remove stored always_enqueue value
-		if ( isset( $settings_advanced['assets']['always_enqueue'] ) ) {
-			unset( $settings_advanced['assets']['always_enqueue'] );
+		if (isset($settings_advanced['assets']['always_enqueue'])) {
+			unset($settings_advanced['assets']['always_enqueue']);
 		}
 
 		// Remove stored disable_js value
-		if ( isset( $settings_advanced['assets']['disable_js'] ) ) {
-			unset( $settings_advanced['assets']['disable_js'] );
+		if (isset($settings_advanced['assets']['disable_js'])) {
+			unset($settings_advanced['assets']['disable_js']);
 		}
 
-		update_option( 'simple-calendar_settings_advanced', $settings_advanced );
+		update_option('simple-calendar_settings_advanced', $settings_advanced);
 
 		// Delete legacy options.
-		delete_option( 'simple-calendar_defaults' );
+		delete_option('simple-calendar_defaults');
 	}
 
 }

includes/admin/assets.php

Spacing +28 added lines, -28 removed lines

@@ -6,7 +6,7 @@ 
  */
 namespace SimpleCalendar\Admin;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -34,9 +34,9 @@ 
 	 */
 	public function __construct() {
 
-		$this->min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG == true ) ? '' : '.min';
+		$this->min = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG == true) ? '' : '.min';
 
-		add_action( 'admin_enqueue_scripts', array( $this, 'load' ) );
+		add_action('admin_enqueue_scripts', array($this, 'load'));
 	}
 
 	/**
@@ -46,10 +46,10 @@ 
 	 */
 	public function load() {
 
-		$css_path        = SIMPLE_CALENDAR_ASSETS . 'css/';
-		$css_path_vendor = $css_path . 'vendor/';
-		$js_path         = SIMPLE_CALENDAR_ASSETS . 'js/';
-		$js_path_vendor  = $js_path . 'vendor/';
+		$css_path        = SIMPLE_CALENDAR_ASSETS.'css/';
+		$css_path_vendor = $css_path.'vendor/';
+		$js_path         = SIMPLE_CALENDAR_ASSETS.'js/';
+		$js_path_vendor  = $js_path.'vendor/';
 
 		/* ====================== *
 		 * Register Admin Scripts *
@@ -58,21 +58,21 @@ 
 		// TipTip uses ".minified.js" filename ending.
 		wp_register_script(
 			'simcal-tiptip',
-			$js_path_vendor . 'jquery.tipTip' . ( ( $this->min !== '' ) ? '.minified' : '' ) . '.js',
-			array( 'jquery' ),
+			$js_path_vendor.'jquery.tipTip'.(($this->min !== '') ? '.minified' : '').'.js',
+			array('jquery'),
 			'1.3',
 			true
 		);
 		wp_register_script(
 			'simcal-select2',
-			$js_path_vendor . 'select2' . $this->min . '.js',
+			$js_path_vendor.'select2'.$this->min.'.js',
 			array(),
 			'4.0',
 			true
 		);
 		wp_register_script(
 			'simcal-admin',
-			$js_path . 'admin' . $this->min . '.js',
+			$js_path.'admin'.$this->min.'.js',
 			array(
 				'jquery',
 				'jquery-ui-sortable',
@@ -86,8 +86,8 @@ 
 		);
 		wp_register_script(
 			'simcal-admin-add-calendar',
-			$js_path . 'admin-add-calendar' . $this->min . '.js',
-			array( 'simcal-select2' ),
+			$js_path.'admin-add-calendar'.$this->min.'.js',
+			array('simcal-select2'),
 			SIMPLE_CALENDAR_VERSION,
 			true
 		);
@@ -98,13 +98,13 @@ 
 
 		wp_register_style(
 			'simcal-select2',
-			$css_path_vendor . 'select2' . $this->min . '.css',
+			$css_path_vendor.'select2'.$this->min.'.css',
 			array(),
 			'4.0.0'
 		);
 		wp_register_style(
 			'simcal-admin',
-			$css_path . 'admin' . $this->min . '.css',
+			$css_path.'admin'.$this->min.'.css',
 			array(
 				'wp-color-picker',
 				'simcal-select2',
@@ -113,21 +113,21 @@ 
 		);
 		wp_register_style(
 			'simcal-admin-add-calendar',
-			$css_path . 'admin-add-calendar' . $this->min . '.css',
-			array( 'simcal-select2' ),
+			$css_path.'admin-add-calendar'.$this->min.'.css',
+			array('simcal-select2'),
 			SIMPLE_CALENDAR_VERSION
 		);
 
-		if ( simcal_is_admin_screen() !== false ) {
+		if (simcal_is_admin_screen() !== false) {
 
-			wp_enqueue_script( 'simcal-admin' );
+			wp_enqueue_script('simcal-admin');
 			wp_localize_script(
 				'simcal-admin',
 				'simcal_admin',
 				simcal_common_scripts_variables()
 			);
 
-			wp_enqueue_style( 'simcal-admin' );
+			wp_enqueue_style('simcal-admin');
 
 		} else {
 
@@ -135,25 +135,25 @@ 
 			$screen = get_current_screen();
 
 			$post_types = array();
-			$settings = get_option( 'simple-calendar_settings_calendars' );
-			if ( isset( $settings['general']['attach_calendars_posts'] ) ) {
+			$settings = get_option('simple-calendar_settings_calendars');
+			if (isset($settings['general']['attach_calendars_posts'])) {
 				$post_types = $settings['general']['attach_calendars_posts'];
 			}
 
 			$conditions = array(
-				in_array( $post_type, (array) $post_types ),
+				in_array($post_type, (array) $post_types),
 				$screen->id == 'widgets',
 			);
 
-			if ( in_array( true, $conditions ) ) {
+			if (in_array(true, $conditions)) {
 
-				wp_enqueue_script( 'simcal-admin-add-calendar' );
-				wp_localize_script( 'simcal-admin-add-calendar', 'simcal_admin', array(
+				wp_enqueue_script('simcal-admin-add-calendar');
+				wp_localize_script('simcal-admin-add-calendar', 'simcal_admin', array(
 					'locale'   => get_locale(),
 					'text_dir' => is_rtl() ? 'rtl' : 'ltr',
-				) );
+				));
 
-				wp_enqueue_style( 'simcal-admin-add-calendar' );
+				wp_enqueue_style('simcal-admin-add-calendar');
 			}
 
 		}

includes/admin/fields/select.php

Spacing +24 added lines, -24 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Field;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -51,32 +51,32 @@ 
 	 *
 	 * @param array $field
 	 */
-	public function __construct( $field ) {
+	public function __construct($field) {
 
 		$class = 'simcal-field-select';
 
-		$enhanced = isset( $field['enhanced'] ) ? $field['enhanced'] : '';
-		if ( 'enhanced' == $enhanced )  {
+		$enhanced = isset($field['enhanced']) ? $field['enhanced'] : '';
+		if ('enhanced' == $enhanced) {
 			$this->enhanced = true;
 			$class .= ' simcal-field-select-enhanced';
 		}
 
-		$multiselect = isset( $field['multiselect'] ) ? $field['multiselect'] : '';
-		if ( 'multiselect' == $multiselect ) {
+		$multiselect = isset($field['multiselect']) ? $field['multiselect'] : '';
+		if ('multiselect' == $multiselect) {
 			$this->multiselect = true;
 			$class .= ' simcal-field-multiselect';
 		}
 
-		if ( isset( $field['default'] ) ) {
+		if (isset($field['default'])) {
 			$this->default = $field['default'];
 		}
 
 		$this->type_class = $class;
 
-		$allow_void = isset( $field['allow_void'] ) ? $field['allow_void'] : '';
+		$allow_void = isset($field['allow_void']) ? $field['allow_void'] : '';
 		$this->allow_void = 'allow_void' == $allow_void ? true : false;
 
-		parent::__construct( $field );
+		parent::__construct($field);
 	}
 
 	/**
@@ -86,36 +86,36 @@ 
 	 */
 	public function html() {
 
-		if ( $this->multiselect === true && ! is_array( $this->value ) ) {
-			$this->value = explode( ',', $this->value );
+		if ($this->multiselect === true && ! is_array($this->value)) {
+			$this->value = explode(',', $this->value);
 		}
 
-		if ( $this->default ) {
-			if ( empty( $this->value ) || $this->value == '' ) {
+		if ($this->default) {
+			if (empty($this->value) || $this->value == '') {
 				$this->value = $this->default;
 			}
 		}
 
 		?>
-		<select name="<?php echo $this->name; ?><?php if ( $this->multiselect === true ) { echo '[]'; } ?>"
+		<select name="<?php echo $this->name; ?><?php if ($this->multiselect === true) { echo '[]'; } ?>"
 		        id="<?php echo $this->id; ?>"
 		        style="<?php echo $this->style; ?>"
 		        class="<?php echo $this->class; ?>"
 				<?php echo $this->attributes; ?>
-				<?php echo ( $this->multiselect === true ) ? ' multiple="multiple"' : ''; ?>>
+				<?php echo ($this->multiselect === true) ? ' multiple="multiple"' : ''; ?>>
 			<?php
 
-			if ( $this->allow_void === true ) {
-				echo '<option value=""' . selected( '', $this->value, false ) . '></option>';
+			if ($this->allow_void === true) {
+				echo '<option value=""'.selected('', $this->value, false).'></option>';
 			}
 
-			foreach ( $this->options as $option => $name ) {
-				if ( is_array( $this->value ) ) {
-					$selected =	selected( in_array( $option, $this->value ), true, false );
+			foreach ($this->options as $option => $name) {
+				if (is_array($this->value)) {
+					$selected = selected(in_array($option, $this->value), true, false);
 				} else {
-					$selected = selected( $this->value, trim( strval( $option ) ), false );
+					$selected = selected($this->value, trim(strval($option)), false);
 				}
-				echo '<option value="' . $option . '" ' . $selected . '>' . esc_attr( $name ) . '</option>';
+				echo '<option value="'.$option.'" '.$selected.'>'.esc_attr($name).'</option>';
 			}
 
 			?>
@@ -124,8 +124,8 @@ 
 
 		echo $this->tooltip;
 
-		if ( ! empty( $this->description ) ) {
-			echo '<p class="description">' . wp_kses_post( $this->description ) . '</p>';
+		if ( ! empty($this->description)) {
+			echo '<p class="description">'.wp_kses_post($this->description).'</p>';
 		}
 
 	}

includes/abstracts/calendar.php

Indentation +2 added lines, -2 removed lines

@@ -784,8 +784,8 @@
 				if ( 'yes' == $poweredby ) {
 					$align = is_rtl() ? 'left' : 'right';
 					echo '<small class="simcal-powered simcal-align-' . $align .'">' .
-					     sprintf( __( 'Powered by <a href="%s" target="_blank">Simple Calendar</a>', 'google-calendar-events' ), simcal_get_url( 'home' ) ) .
-					     '</small>';
+						 sprintf( __( 'Powered by <a href="%s" target="_blank">Simple Calendar</a>', 'google-calendar-events' ), simcal_get_url( 'home' ) ) .
+						 '</small>';
 				}
 
 				echo '</div>';

Spacing +172 added lines, -172 removed lines

@@ -11,7 +11,7 @@ 
 use SimpleCalendar\Events\Event_Builder;
 use SimpleCalendar\Events\Events;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -234,12 +234,12 @@ 
 	 * @param int|object|\WP_Post|Calendar $calendar
 	 * @param string $view
 	 */
-	public function __construct( $calendar, $view = '' ) {
+	public function __construct($calendar, $view = '') {
 
 		// Set the post object.
-		$this->set_post_object( $calendar );
+		$this->set_post_object($calendar);
 
-		if ( ! is_null( $this->post ) ) {
+		if ( ! is_null($this->post)) {
 
 			// Set calendar type and events source.
 			$this->set_taxonomies();
@@ -256,23 +256,23 @@ 
 			$this->set_events_template();
 
 			// Get events source data.
-			$feed = simcal_get_feed( $this );
-			if ( $feed instanceof Feed ) {
-				if ( ! empty( $feed->events ) ) {
-					if ( is_array( $feed->events ) ) {
-						$this->set_events( $feed->events );
-						if ( 'use_calendar' == get_post_meta( $this->id, '_feed_timezone_setting', true ) ) {
+			$feed = simcal_get_feed($this);
+			if ($feed instanceof Feed) {
+				if ( ! empty($feed->events)) {
+					if (is_array($feed->events)) {
+						$this->set_events($feed->events);
+						if ('use_calendar' == get_post_meta($this->id, '_feed_timezone_setting', true)) {
 							$this->timezone = $feed->timezone;
 							$this->set_start();
 						}
-					} elseif ( is_string( $feed->events ) ) {
+					} elseif (is_string($feed->events)) {
 						$this->errors[] = $feed->events;
 					}
 				}
 			}
 
 			// Set general purpose timestamps.
-			$now = Carbon::now( $this->timezone );
+			$now = Carbon::now($this->timezone);
 			$this->now    = $now->getTimestamp();
 			$this->today  = $now->startOfDay()->getTimestamp();
 			$this->offset = $now->getOffset();
@@ -283,26 +283,26 @@ 
 			$this->set_datetime_separator();
 
 			// Set earliest and latest event timestamps.
-			if ( $this->events && is_array( $this->events ) ) {
-				$this->earliest_event = intval( current( array_keys( $this->events ) ) );
-				$this->latest_event   = intval( key( array_slice( $this->events, -1, 1, true ) ) );
+			if ($this->events && is_array($this->events)) {
+				$this->earliest_event = intval(current(array_keys($this->events)));
+				$this->latest_event   = intval(key(array_slice($this->events, -1, 1, true)));
 			}
 
 			// Set calendar end.
 			$this->set_end();
 
 			// Set view.
-			if ( ! $view ) {
+			if ( ! $view) {
 
-				$calendar_view = get_post_meta( $this->id, '_calendar_view', true );
-				$calendar_view = isset( $calendar_view[ $this->type ] ) ? $calendar_view[ $this->type ] : '';
+				$calendar_view = get_post_meta($this->id, '_calendar_view', true);
+				$calendar_view = isset($calendar_view[$this->type]) ? $calendar_view[$this->type] : '';
 
-				$view = esc_attr( $calendar_view );
+				$view = esc_attr($calendar_view);
 			}
 		}
 
 		// Get view.
-		$this->view = $this->get_view( $view );
+		$this->view = $this->get_view($view);
 	}
 
 	/**
@@ -314,8 +314,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function __isset( $key ) {
-		return metadata_exists( 'post', $this->id, '_' . $key );
+	public function __isset($key) {
+		return metadata_exists('post', $this->id, '_'.$key);
 	}
 
 	/**
@@ -327,9 +327,9 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function __get( $key ) {
-		$value = get_post_meta( $this->id, '_' . $key, true );
-		if ( ! empty( $value ) ) {
+	public function __get($key) {
+		$value = get_post_meta($this->id, '_'.$key, true);
+		if ( ! empty($value)) {
 			$this->$key = $value;
 		}
 		return $value;
@@ -342,17 +342,17 @@ 
 	 *
 	 * @param int|object|\WP_Post|Calendar $calendar
 	 */
-	public function set_post_object( $calendar ) {
-		if ( is_numeric( $calendar ) ) {
-			$this->id   = absint( $calendar );
-			$this->post = get_post( $this->id );
-		} elseif ( $calendar instanceof Calendar ) {
-			$this->id   = absint( $calendar->id );
+	public function set_post_object($calendar) {
+		if (is_numeric($calendar)) {
+			$this->id   = absint($calendar);
+			$this->post = get_post($this->id);
+		} elseif ($calendar instanceof Calendar) {
+			$this->id   = absint($calendar->id);
 			$this->post = $calendar->post;
-		} elseif ( $calendar instanceof \WP_Post ) {
-			$this->id   = absint( $calendar->ID );
+		} elseif ($calendar instanceof \WP_Post) {
+			$this->id   = absint($calendar->ID);
 			$this->post = $calendar;
-		} elseif ( isset( $calendar->id ) && isset( $calendar->post ) ) {
+		} elseif (isset($calendar->id) && isset($calendar->post)) {
 			$this->id   = $calendar->id;
 			$this->post = $calendar->post;
 		}
@@ -366,8 +366,8 @@ 
 	 * @return string
 	 */
 	public function get_title() {
-		$title = isset( $this->post->post_title ) ? $this->post->post_title : '';
-		return apply_filters( 'simcal_calendar_title', $title );
+		$title = isset($this->post->post_title) ? $this->post->post_title : '';
+		return apply_filters('simcal_calendar_title', $title);
 	}
 
 	/**
@@ -389,16 +389,16 @@ 
 	 */
 	protected function set_taxonomies() {
 		// Set calendar type.
-		if ( $type = wp_get_object_terms( $this->id, 'calendar_type' ) ) {
-			$this->type = sanitize_title( current( $type )->name );
+		if ($type = wp_get_object_terms($this->id, 'calendar_type')) {
+			$this->type = sanitize_title(current($type)->name);
 		} else {
-			$this->type = apply_filters( 'simcal_calendar_default_type', 'default-calendar' );
+			$this->type = apply_filters('simcal_calendar_default_type', 'default-calendar');
 		}
 		// Set feed type.
-		if ( $feed_type = wp_get_object_terms( $this->id, 'calendar_feed' ) ) {
-			$this->feed = sanitize_title( current( $feed_type )->name );
+		if ($feed_type = wp_get_object_terms($this->id, 'calendar_feed')) {
+			$this->feed = sanitize_title(current($feed_type)->name);
 		} else {
-			$this->feed = apply_filters( 'simcal_calendar_default_feed', 'google' );
+			$this->feed = apply_filters('simcal_calendar_default_feed', 'google');
 		}
 	}
 
@@ -410,7 +410,7 @@ 
 	 * @return Events
 	 */
 	public function get_events() {
-		return new Events( $this->events, $this->timezone );
+		return new Events($this->events, $this->timezone);
 	}
 
 	/**
@@ -420,14 +420,14 @@ 
 	 *
 	 * @param array $array
 	 */
-	public function set_events( array $array ) {
+	public function set_events(array $array) {
 
 		$events = array();
 
-		if ( ! empty( $array ) ) {
-			foreach ( $array as $tz => $e ) {
-				foreach ( $e as $event ) {
-					$events[ $tz ][] = $event instanceof Event ? $event : new Event( $event );
+		if ( ! empty($array)) {
+			foreach ($array as $tz => $e) {
+				foreach ($e as $event) {
+					$events[$tz][] = $event instanceof Event ? $event : new Event($event);
 				}
 			}
 		}
@@ -444,24 +444,24 @@ 
 	 *
 	 * @return string
 	 */
-	public function set_events_template( $template = '' ) {
-		if ( empty( $template ) ) {
-			$template = isset( $this->post->post_content ) ? $this->post->post_content : '';
+	public function set_events_template($template = '') {
+		if (empty($template)) {
+			$template = isset($this->post->post_content) ? $this->post->post_content : '';
 		}
 
 		// TODO: Removed wpautop() call.
 
-		$event_formatting = get_post_meta( $this->id, '_event_formatting', true );
+		$event_formatting = get_post_meta($this->id, '_event_formatting', true);
 
-		switch( $event_formatting ) {
+		switch ($event_formatting) {
 			case 'none':
-				$this->events_template =  wp_kses_post( trim( $template ) );
+				$this->events_template = wp_kses_post(trim($template));
 				break;
 			case 'no_linebreaks':
-				$this->events_template =  wpautop( wp_kses_post( trim( $template ) ), false );
+				$this->events_template = wpautop(wp_kses_post(trim($template)), false);
 				break;
 			default:
-				$this->events_template =  wpautop( wp_kses_post( trim( $template ) ), true );
+				$this->events_template = wpautop(wp_kses_post(trim($template)), true);
 		}
 
 		//$this->events_template =  wpautop( wp_kses_post( trim( $template ) ), true );
@@ -474,37 +474,37 @@ 
 	 *
 	 * @param string $tz Timezone.
 	 */
-	public function set_timezone( $tz = '' ) {
+	public function set_timezone($tz = '') {
 
-		$site_tz = esc_attr( simcal_get_wp_timezone() );
+		$site_tz = esc_attr(simcal_get_wp_timezone());
 
-		if ( $this->feed === 'grouped-calendars' ) {
+		if ($this->feed === 'grouped-calendars') {
 			$this->timezone = $site_tz;
 			return;
 		}
 
-		if ( empty( $tz ) ) {
+		if (empty($tz)) {
 
-			$timezone_setting = get_post_meta( $this->id, '_feed_timezone_setting', true );
+			$timezone_setting = get_post_meta($this->id, '_feed_timezone_setting', true);
 
-			if ( 'use_site' == $timezone_setting ) {
+			if ('use_site' == $timezone_setting) {
 				$tz = $site_tz;
-			} elseif ( 'use_custom' == $timezone_setting ) {
-				$custom_timezone = esc_attr( get_post_meta( $this->id, '_feed_timezone', true ) );
+			} elseif ('use_custom' == $timezone_setting) {
+				$custom_timezone = esc_attr(get_post_meta($this->id, '_feed_timezone', true));
 				// One may be using a non standard timezone in GMT (UTC) offset format.
-				if ( ( strpos( $custom_timezone, 'UTC+' ) === 0 ) || ( strpos( $custom_timezone, 'UTC-' ) === 0 ) ) {
-					$tz = simcal_get_timezone_from_gmt_offset( substr( $custom_timezone, 3 ) );
+				if ((strpos($custom_timezone, 'UTC+') === 0) || (strpos($custom_timezone, 'UTC-') === 0)) {
+					$tz = simcal_get_timezone_from_gmt_offset(substr($custom_timezone, 3));
 				} else {
-					$tz = ! empty( $custom_timezone ) ? $custom_timezone : 'UTC';
+					$tz = ! empty($custom_timezone) ? $custom_timezone : 'UTC';
 				}
 			}
 
-			$this->timezone = empty( $tz ) ? 'UTC' : $tz;
+			$this->timezone = empty($tz) ? 'UTC' : $tz;
 			return;
 		}
 
 		$this->site_timezone = $site_tz;
-		$this->timezone = simcal_esc_timezone( $tz, $this->timezone );
+		$this->timezone = simcal_esc_timezone($tz, $this->timezone);
 	}
 
 	/**
@@ -514,20 +514,20 @@ 
 	 *
 	 * @param string $format PHP datetime format.
 	 */
-	public function set_date_format( $format = '' ) {
+	public function set_date_format($format = '') {
 
 		$date_format_custom = $date_format_default = $format;
 
-		if ( empty( $date_format_custom ) ) {
+		if (empty($date_format_custom)) {
 
-			$date_format_option  = esc_attr( get_post_meta( $this->id, '_calendar_date_format_setting', true ) );
-			$date_format_default = esc_attr( get_option( 'date_format' ) );
+			$date_format_option  = esc_attr(get_post_meta($this->id, '_calendar_date_format_setting', true));
+			$date_format_default = esc_attr(get_option('date_format'));
 			$date_format_custom  = '';
 
-			if ( 'use_custom' == $date_format_option ) {
-				$date_format_custom = esc_attr( get_post_meta( $this->id, '_calendar_date_format', true ) );
-			} elseif ( 'use_custom_php' == $date_format_option ) {
-				$date_format_custom = esc_attr( get_post_meta( $this->id, '_calendar_date_format_php', true ) );
+			if ('use_custom' == $date_format_option) {
+				$date_format_custom = esc_attr(get_post_meta($this->id, '_calendar_date_format', true));
+			} elseif ('use_custom_php' == $date_format_option) {
+				$date_format_custom = esc_attr(get_post_meta($this->id, '_calendar_date_format_php', true));
 			}
 		}
 
@@ -541,20 +541,20 @@ 
 	 *
 	 * @param string $format PHP datetime format.
 	 */
-	public function set_time_format( $format = '' ) {
+	public function set_time_format($format = '') {
 
 		$time_format_custom = $time_format_default = $format;
 
-		if ( empty( $time_format_custom ) ) {
+		if (empty($time_format_custom)) {
 
-			$time_format_option  = esc_attr( get_post_meta( $this->id, '_calendar_time_format_setting', true ) );
-			$time_format_default = esc_attr( get_option( 'time_format' ) );
+			$time_format_option  = esc_attr(get_post_meta($this->id, '_calendar_time_format_setting', true));
+			$time_format_default = esc_attr(get_option('time_format'));
 			$time_format_custom  = '';
 
-			if ( 'use_custom' == $time_format_option ) {
-				$time_format_custom = esc_attr( get_post_meta( $this->id, '_calendar_time_format', true ) );
-			} elseif ( 'use_custom_php' == $time_format_option ) {
-				$time_format_custom = esc_attr( get_post_meta( $this->id, '_calendar_time_format_php', true ) );
+			if ('use_custom' == $time_format_option) {
+				$time_format_custom = esc_attr(get_post_meta($this->id, '_calendar_time_format', true));
+			} elseif ('use_custom_php' == $time_format_option) {
+				$time_format_custom = esc_attr(get_post_meta($this->id, '_calendar_time_format_php', true));
 			}
 		}
 
@@ -568,13 +568,13 @@ 
 	 *
 	 * @param string $separator A UTF8 character used as separator.
 	 */
-	public function set_datetime_separator( $separator = '' ) {
+	public function set_datetime_separator($separator = '') {
 
-		if ( empty( $separator ) ) {
-			$separator = get_post_meta( $this->id, '_calendar_datetime_separator', true );
+		if (empty($separator)) {
+			$separator = get_post_meta($this->id, '_calendar_datetime_separator', true);
 		}
 
-		$this->datetime_separator = esc_attr( $separator );
+		$this->datetime_separator = esc_attr($separator);
 	}
 
 	/**
@@ -584,18 +584,18 @@ 
 	 *
 	 * @param int $weekday From 0 (Sunday) to 6 (Friday).
 	 */
-	public function set_start_of_week( $weekday = -1 ) {
+	public function set_start_of_week($weekday = -1) {
 
-		$week_starts = is_int( $weekday ) ? $weekday : -1;
+		$week_starts = is_int($weekday) ? $weekday : -1;
 
-		if ( $week_starts < 0 || $week_starts > 6 ) {
+		if ($week_starts < 0 || $week_starts > 6) {
 
-			$week_starts_setting = get_post_meta( $this->id, '_calendar_week_starts_on_setting', true );
-			$week_starts         = intval( get_option( 'start_of_week' ) );
+			$week_starts_setting = get_post_meta($this->id, '_calendar_week_starts_on_setting', true);
+			$week_starts         = intval(get_option('start_of_week'));
 
-			if ( 'use_custom' == $week_starts_setting ) {
-				$week_starts_on = get_post_meta( $this->id, '_calendar_week_starts_on', true );
-				$week_starts    = is_numeric( $week_starts_on ) ? intval( $week_starts_on ) : $week_starts;
+			if ('use_custom' == $week_starts_setting) {
+				$week_starts_on = get_post_meta($this->id, '_calendar_week_starts_on', true);
+				$week_starts    = is_numeric($week_starts_on) ? intval($week_starts_on) : $week_starts;
 			}
 		}
 
@@ -609,51 +609,51 @@ 
 	 *
 	 * @param int $timestamp
 	 */
-	public function set_start( $timestamp = 0 ) {
+	public function set_start($timestamp = 0) {
 
-		if ( is_int( $timestamp ) && $timestamp !== 0 ) {
+		if (is_int($timestamp) && $timestamp !== 0) {
 			$this->start = $timestamp;
 			return;
 		}
 
-		$this->start = Carbon::now( $this->timezone )->getTimestamp();
+		$this->start = Carbon::now($this->timezone)->getTimestamp();
 
-		$calendar_begins = esc_attr( get_post_meta( $this->id, '_calendar_begins', true ) );
-		$nth = max( absint( get_post_meta( $this->id, '_calendar_begins_nth', true ) ), 1 );
+		$calendar_begins = esc_attr(get_post_meta($this->id, '_calendar_begins', true));
+		$nth = max(absint(get_post_meta($this->id, '_calendar_begins_nth', true)), 1);
 
-		if ( 'today' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->getTimestamp();
-		} elseif ( 'days_before' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->subDays( $nth )->getTimestamp();
-		} elseif ( 'days_after' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->addDays( $nth )->getTimestamp();
-		} elseif ( 'this_week' == $calendar_begins ) {
-			$week = new Carbon( 'now', $this->timezone );
-			$week->setWeekStartsAt( $this->week_starts );
+		if ('today' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->getTimestamp();
+		} elseif ('days_before' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->subDays($nth)->getTimestamp();
+		} elseif ('days_after' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->addDays($nth)->getTimestamp();
+		} elseif ('this_week' == $calendar_begins) {
+			$week = new Carbon('now', $this->timezone);
+			$week->setWeekStartsAt($this->week_starts);
 			$this->start = $week->startOfWeek()->getTimestamp();
-		} elseif ( 'weeks_before' == $calendar_begins ) {
-			$week = new Carbon( 'now', $this->timezone );
-			$week->setWeekStartsAt( $this->week_starts );
-			$this->start = $week->startOfWeek()->subWeeks( $nth )->getTimestamp();
-		} elseif ( 'weeks_after' == $calendar_begins ) {
-			$week = new Carbon( 'now', $this->timezone );
-			$week->setWeekStartsAt( $this->week_starts );
-			$this->start = $week->startOfWeek()->addWeeks( $nth )->getTimestamp();
-		} elseif ( 'this_month' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->startOfMonth()->getTimeStamp();
-		} elseif ( 'months_before' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->subMonths( $nth )->startOfMonth()->getTimeStamp();
-		} elseif ( 'months_after' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->addMonths( $nth )->startOfMonth()->getTimeStamp();
-		} elseif ( 'this_year' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->startOfYear()->getTimestamp();
-		} elseif ( 'years_before' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->subYears( $nth )->startOfYear()->getTimeStamp();
-		} elseif ( 'years_after' == $calendar_begins ) {
-			$this->start = Carbon::today( $this->timezone )->addYears( $nth )->startOfYear()->getTimeStamp();
-		} elseif ( 'custom_date' == $calendar_begins ) {
-			if ( $date = get_post_meta( $this->id, '_calendar_begins_custom_date', true ) ) {
-				$this->start = Carbon::createFromFormat( 'Y-m-d', esc_attr( $date ), $this->timezone )->setTimezone( $this->timezone )->startOfDay()->getTimestamp();
+		} elseif ('weeks_before' == $calendar_begins) {
+			$week = new Carbon('now', $this->timezone);
+			$week->setWeekStartsAt($this->week_starts);
+			$this->start = $week->startOfWeek()->subWeeks($nth)->getTimestamp();
+		} elseif ('weeks_after' == $calendar_begins) {
+			$week = new Carbon('now', $this->timezone);
+			$week->setWeekStartsAt($this->week_starts);
+			$this->start = $week->startOfWeek()->addWeeks($nth)->getTimestamp();
+		} elseif ('this_month' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->startOfMonth()->getTimeStamp();
+		} elseif ('months_before' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->subMonths($nth)->startOfMonth()->getTimeStamp();
+		} elseif ('months_after' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->addMonths($nth)->startOfMonth()->getTimeStamp();
+		} elseif ('this_year' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->startOfYear()->getTimestamp();
+		} elseif ('years_before' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->subYears($nth)->startOfYear()->getTimeStamp();
+		} elseif ('years_after' == $calendar_begins) {
+			$this->start = Carbon::today($this->timezone)->addYears($nth)->startOfYear()->getTimeStamp();
+		} elseif ('custom_date' == $calendar_begins) {
+			if ($date = get_post_meta($this->id, '_calendar_begins_custom_date', true)) {
+				$this->start = Carbon::createFromFormat('Y-m-d', esc_attr($date), $this->timezone)->setTimezone($this->timezone)->startOfDay()->getTimestamp();
 			}
 		}
 	}
@@ -665,8 +665,8 @@ 
 	 *
 	 * @param int $timestamp
 	 */
-	public function set_end( $timestamp = 0 ) {
-		$latest = is_int( $timestamp ) && $timestamp !== 0 ? $timestamp : $this->latest_event;
+	public function set_end($timestamp = 0) {
+		$latest = is_int($timestamp) && $timestamp !== 0 ? $timestamp : $this->latest_event;
 		$this->end = $latest > $this->start ? $latest : $this->start;
 	}
 
@@ -677,14 +677,14 @@ 
 	 *
 	 * @param string|bool $static
 	 */
-	public function set_static( $static = '' ) {
+	public function set_static($static = '') {
 
-		if ( ! empty( $static ) && is_bool( $static ) ) {
+		if ( ! empty($static) && is_bool($static)) {
 			$this->static = $static;
 			return;
 		}
 
-		if ( 'yes' == get_post_meta( $this->id, '_calendar_is_static', true ) ) {
+		if ('yes' == get_post_meta($this->id, '_calendar_is_static', true)) {
 			$this->static = true;
 			return;
 		}
@@ -712,7 +712,7 @@ 
 	 *
 	 * @return Calendar_View
 	 */
-	abstract public function get_view( $view = '' );
+	abstract public function get_view($view = '');
 
 	/**
 	 * Get event HTML parsed by template.
@@ -724,11 +724,11 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_event_html( Event $event, $template = '' ) {
-		$event_builder = new Event_Builder( $event, $this );
+	public function get_event_html(Event $event, $template = '') {
+		$event_builder = new Event_Builder($event, $this);
 		// Use the event template to parse tags; if empty, fallback to calendar post content.
-		$template = empty( $template ) ? ( empty( $event->template ) ? $this->events_template : $event->template ) : $template;
-		return $event_builder->parse_event_template_tags( $template );
+		$template = empty($template) ? (empty($event->template) ? $this->events_template : $event->template) : $template;
+		return $event_builder->parse_event_template_tags($template);
 	}
 
 	/**
@@ -738,58 +738,58 @@ 
 	 *
 	 * @param string $view The calendar view to display.
 	 */
-	public function html( $view = '' ) {
+	public function html($view = '') {
 
-		$view = empty( $view ) ? $this->view : $this->get_view( $view );
+		$view = empty($view) ? $this->view : $this->get_view($view);
 
-		if ( $view instanceof Calendar_View ) {
+		if ($view instanceof Calendar_View) {
 
-			if ( ! empty( $this->errors ) ) {
+			if ( ! empty($this->errors)) {
 
-				if ( current_user_can( 'manage_options' )  ) {
+				if (current_user_can('manage_options')) {
 					echo '<pre><code>';
-					foreach ( $this->errors as $error ) { echo $error; }
+					foreach ($this->errors as $error) { echo $error; }
 					echo '</code></pre>';
 				}
 
 			} else {
 
 				// Get a CSS class from the class name of the calendar view (minus namespace part).
-				$view_name  = implode( '-', array_map( 'lcfirst', explode( '_', strtolower( get_class( $view ) ) ) ) );
-				$view_class = substr( $view_name, strrpos( $view_name, '\\' ) + 1 );
+				$view_name  = implode('-', array_map('lcfirst', explode('_', strtolower(get_class($view)))));
+				$view_class = substr($view_name, strrpos($view_name, '\\') + 1);
 
-				$calendar_class = trim( implode( ' simcal-', apply_filters( 'simcal_calendar_class', array(
+				$calendar_class = trim(implode(' simcal-', apply_filters('simcal_calendar_class', array(
 					'simcal-calendar',
 					$this->type,
 					$view_class,
-				), $this->id ) ) );
-
-				echo '<div class="' . $calendar_class . '" '
-									. 'data-calendar-id="'    . $this->id . '" '
-									. 'data-timezone="'       . $this->timezone . '" '
-									. 'data-offset="'         . $this->offset . '" '
-									. 'data-week-start="'     . $this->week_starts . '" '
-									. 'data-calendar-start="' . $this->start .'" '
-									. 'data-calendar-end="'   . $this->end . '" '
-									. 'data-events-first="'   . $this->earliest_event .'" '
-									. 'data-events-last="'    . $this->latest_event . '"'
+				), $this->id)));
+
+				echo '<div class="'.$calendar_class.'" '
+									. 'data-calendar-id="'.$this->id.'" '
+									. 'data-timezone="'.$this->timezone.'" '
+									. 'data-offset="'.$this->offset.'" '
+									. 'data-week-start="'.$this->week_starts.'" '
+									. 'data-calendar-start="'.$this->start.'" '
+									. 'data-calendar-end="'.$this->end.'" '
+									. 'data-events-first="'.$this->earliest_event.'" '
+									. 'data-events-last="'.$this->latest_event.'"'
 									. '>';
 
-				date_default_timezone_set( $this->timezone );
-				do_action( 'simcal_calendar_html_before', $this->id );
+				date_default_timezone_set($this->timezone);
+				do_action('simcal_calendar_html_before', $this->id);
 
 				$view->html();
 
-				do_action( 'simcal_calendar_html_after', $this->id );
-				date_default_timezone_set( $this->site_timezone );
+				do_action('simcal_calendar_html_after', $this->id);
+				date_default_timezone_set($this->site_timezone);
 
 				//$settings = get_option( 'simple-calendar_settings_calendars' );
-				$poweredby = get_post_meta( $this->id, '_poweredby', true );
+				$poweredby = get_post_meta($this->id, '_poweredby', true);
 
-				if ( 'yes' == $poweredby ) {
+				if ('yes' == $poweredby) {
 					$align = is_rtl() ? 'left' : 'right';
-					echo '<small class="simcal-powered simcal-align-' . $align .'">' .
-					     sprintf( __( 'Powered by <a href="%s" target="_blank">Simple Calendar</a>', 'google-calendar-events' ), simcal_get_url( 'home' ) ) .
+					echo '<small class="simcal-powered simcal-align-'.$align.'">'.
+					     sprintf(__('Powered by <a href="%s" target="_blank">Simple Calendar</a>', 'google-calendar-events'), simcal_get_url('home')).
 					     '</small>';
 				}
 

includes/events/event-builder.php

Indentation +64 added lines, -64 removed lines

@@ -594,21 +594,21 @@ 
 		if ( ! $event->whole_day ) {
 
 			$time_start = $this->calendar->datetime_separator .
-			              ' <span class="simcal-event-start simcal-event-start-time" ' .
-			              'data-event-start="' . $start->getTimestamp() . '" ' .
-			              'data-event-format="' . $this->calendar->time_format . '" ' .
-			              'itemprop="startDate" data-content="' . $start->toIso8601String() . '">' .
-			              date_i18n( $this->calendar->time_format, $start->getTimestamp() ) .
-			              '</span> ';
+						  ' <span class="simcal-event-start simcal-event-start-time" ' .
+						  'data-event-start="' . $start->getTimestamp() . '" ' .
+						  'data-event-format="' . $this->calendar->time_format . '" ' .
+						  'itemprop="startDate" data-content="' . $start->toIso8601String() . '">' .
+						  date_i18n( $this->calendar->time_format, $start->getTimestamp() ) .
+						  '</span> ';
 
 			if ( $end instanceof Carbon ) {
 
 				$time_end = ' <span class="simcal-event-end simcal-event-end-time" ' .
-				            'data-event-end="' . $end->getTimestamp() . '" ' .
-				            'data-event-format="' . $this->calendar->time_format . '" ' .
-				            'itemprop="endDate" data-content="' . $end->toIso8601String() . '">' .
-				            date_i18n( $this->calendar->time_format, $end->getTimestamp() ) .
-				            '</span> ';
+							'data-event-end="' . $end->getTimestamp() . '" ' .
+							'data-event-format="' . $this->calendar->time_format . '" ' .
+							'itemprop="endDate" data-content="' . $end->toIso8601String() . '">' .
+							date_i18n( $this->calendar->time_format, $end->getTimestamp() ) .
+							'</span> ';
 
 			}
 
@@ -617,23 +617,23 @@ 
 		if ( $event->multiple_days ) {
 
 			$output = ' <span class="simcal-event-start simcal-event-start-date" ' .
-			          'data-event-start="' . $start->getTimestamp() . '" ' .
-			          'data-event-format="' . $this->calendar->date_format . '" ' .
-			          'itemprop="startDate" data-content="' . $start->toIso8601String() . '">' .
-			          date_i18n( $this->calendar->date_format, $start->getTimestamp() ) .
-			          '</span> ' .
-			          $time_start;
+					  'data-event-start="' . $start->getTimestamp() . '" ' .
+					  'data-event-format="' . $this->calendar->date_format . '" ' .
+					  'itemprop="startDate" data-content="' . $start->toIso8601String() . '">' .
+					  date_i18n( $this->calendar->date_format, $start->getTimestamp() ) .
+					  '</span> ' .
+					  $time_start;
 
 			if ( $end instanceof Carbon ) {
 
 				$output .= '-' .
-				           ' <span class="simcal-event-start simcal-event-end-date" ' .
-				           'data-event-start="' . $end->getTimestamp() . '" ' .
-				           'data-event-format="' . $this->calendar->date_format . '" ' .
-				           'itemprop="endDate" data-content="' . $end->toIso8601String() . '">' .
-				           date_i18n( $this->calendar->date_format, $end->getTimestamp() ) .
-				           '</span> ' .
-				           $time_end;
+						   ' <span class="simcal-event-start simcal-event-end-date" ' .
+						   'data-event-start="' . $end->getTimestamp() . '" ' .
+						   'data-event-format="' . $this->calendar->date_format . '" ' .
+						   'itemprop="endDate" data-content="' . $end->toIso8601String() . '">' .
+						   date_i18n( $this->calendar->date_format, $end->getTimestamp() ) .
+						   '</span> ' .
+						   $time_end;
 			}
 
 		} else {
@@ -641,12 +641,12 @@ 
 			$time_end = ! empty( $time_start ) && ! empty( $time_end ) ? ' - ' . $time_end : '';
 
 			$output = ' <span class="simcal-event-start simcal-event-start-date" ' .
-			          'data-event-start="' . $start->getTimestamp() . '" ' .
-			          'data-event-format="' . $this->calendar->date_format . '">' .
-			          date_i18n( $this->calendar->date_format, $start->getTimestamp() ) .
-			          '</span> ' .
-			          $time_start .
-			          $time_end;
+					  'data-event-start="' . $start->getTimestamp() . '" ' .
+					  'data-event-format="' . $this->calendar->date_format . '">' .
+					  date_i18n( $this->calendar->date_format, $start->getTimestamp() ) .
+					  '</span> ' .
+					  $time_start .
+					  $time_end;
 
 		}
 
@@ -705,11 +705,11 @@ 
 		}
 
 		return '<span class="simcal-event-' . $bound . ' ' . 'simcal-event-' . $bound . '-' . $format . '" ' .
-		       'data-event-' . $bound . '="' . $event_dt->getTimestamp() . '" ' .
-		       'data-event-format="' . $dt_format . '" ' .
-		       'itemprop="' . $bound . 'Date" data-content="' . $event_dt->toIso8601String() . '">' .
-		       $value .
-		       '</span>';
+			   'data-event-' . $bound . '="' . $event_dt->getTimestamp() . '" ' .
+			   'data-event-format="' . $dt_format . '" ' .
+			   'itemprop="' . $bound . 'Date" data-content="' . $event_dt->toIso8601String() . '">' .
+			   $value .
+			   '</span>';
 	}
 
 	/**
@@ -928,35 +928,35 @@ 
 		$tagregexp = implode( '|', array_values( $this->tags ) );
 
 		return '/'
-		       . '\\['                              // Opening bracket
-		       . '(\\[?)'                           // 1: Optional second opening bracket for escaping tags: [[tag]]
-		       . "($tagregexp)"                     // 2: Tag name
-		       . '(?![\\w-])'                       // Not followed by word character or hyphen
-		       . '('                                // 3: Unroll the loop: Inside the opening tag
-		       .     '[^\\]\\/]*'                   // Not a closing bracket or forward slash
-		       .     '(?:'
-		       .         '\\/(?!\\])'               // A forward slash not followed by a closing bracket
-		       .         '[^\\]\\/]*'               // Not a closing bracket or forward slash
-		       .     ')*?'
-		       . ')'
-		       . '(?:'
-		       .     '(\\/)'                        // 4: Self closing tag ...
-		       .     '\\]'                          // ... and closing bracket
-		       . '|'
-		       .     '\\]'                          // Closing bracket
-		       .     '(?:'
-		       .         '('                        // 5: Unroll the loop: Optionally, anything between the opening and closing tags
-		       .             '[^\\[]*+'             // Not an opening bracket
-		       .             '(?:'
-		       .                 '\\[(?!\\/\\2\\])' // An opening bracket not followed by the closing tag
-		       .                 '[^\\[]*+'         // Not an opening bracket
-		       .             ')*+'
-		       .         ')'
-		       .         '\\[\\/\\2\\]'             // Closing tag
-		       .     ')?'
-		       . ')'
-		       . '(\\]?)'                           // 6: Optional second closing bracket for escaping tags: [[tag]]
-		       . '/s';
+			   . '\\['                              // Opening bracket
+			   . '(\\[?)'                           // 1: Optional second opening bracket for escaping tags: [[tag]]
+			   . "($tagregexp)"                     // 2: Tag name
+			   . '(?![\\w-])'                       // Not followed by word character or hyphen
+			   . '('                                // 3: Unroll the loop: Inside the opening tag
+			   .     '[^\\]\\/]*'                   // Not a closing bracket or forward slash
+			   .     '(?:'
+			   .         '\\/(?!\\])'               // A forward slash not followed by a closing bracket
+			   .         '[^\\]\\/]*'               // Not a closing bracket or forward slash
+			   .     ')*?'
+			   . ')'
+			   . '(?:'
+			   .     '(\\/)'                        // 4: Self closing tag ...
+			   .     '\\]'                          // ... and closing bracket
+			   . '|'
+			   .     '\\]'                          // Closing bracket
+			   .     '(?:'
+			   .         '('                        // 5: Unroll the loop: Optionally, anything between the opening and closing tags
+			   .             '[^\\[]*+'             // Not an opening bracket
+			   .             '(?:'
+			   .                 '\\[(?!\\/\\2\\])' // An opening bracket not followed by the closing tag
+			   .                 '[^\\[]*+'         // Not an opening bracket
+			   .             ')*+'
+			   .         ')'
+			   .         '\\[\\/\\2\\]'             // Closing tag
+			   .     ')?'
+			   . ')'
+			   . '(\\]?)'                           // 6: Optional second closing bracket for escaping tags: [[tag]]
+			   . '/s';
 	}
 
 }

Spacing +311 added lines, -311 removed lines

@@ -9,7 +9,7 @@ 
 use Carbon\Carbon;
 use SimpleCalendar\Abstracts\Calendar;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -54,7 +54,7 @@ 
 	 * @param Event    $event
 	 * @param Calendar $calendar
 	 */
-	public function __construct( Event $event, Calendar $calendar ) {
+	public function __construct(Event $event, Calendar $calendar) {
 		$this->event    = $event;
 		$this->calendar = $calendar;
 		$this->tags     = $this->get_content_tags();
@@ -74,85 +74,85 @@ 
 			 * Content Tags *
 			 * ============ */
 
-			'title',                 // The event title.
-			'event-title',           // @deprecated An alias for 'title' tag.
-			'description',           // The event description.
-
-			'when',                  // Date and time of the event.
-			'start-time',            // Start time of the event.
-			'start-date',            // Start date of the event.
-			'start-custom',          // @deprecated Start time in a user defined format (set by tag 'format' attribute).
-			'start-human',           // Start time in a human friendly format.
-			'end-time',              // End time of the event.
-			'end-date',              // End date of the event.
-			'end-custom',            // @deprecated End date-time in a user defined format (set by tag 'format' attribute).
-			'end-human',             // End date-time in a human friendly format.
-
-			'duration',              // How long the events lasts, in a human-readable format.
-			'length',                // @deprecated An alias of 'duration' tag.
-
-			'location',              // Alias of start-location.
-			'start-location',        // Location name where the event starts.
-			'maps-link',             // @deprecated An alias for 'start-location-link' tag.
-			'start-location-link',   // Link to Google Maps querying the event start location address.
-			'end-location',          // Location name where the event ends.
-			'end-location-link',     // Link to Google Maps querying the event end location address.
-
-			'link',                  // An HTML link to the event URL.
-			'url',                   // A string with the raw event link URL.
-
-			'calendar',              // The title of the source calendar.
-			'feed-title',            // @deprecated An alias of 'calendar'.
-
-			'id',                    // The event unique ID.
-			'uid',                   // An alias of ID.
-			'ical-id',               // iCal ID.
-			'event-id',              // @deprecated An alias for 'id' tag.
-			'calendar-id',           // The calendar ID.
-			'feed-id',               // @deprecated An alias for 'calendar-id' tag.
-			'cal-id',                // @deprecated An alias for 'calendar-id' tag.
+			'title', // The event title.
+			'event-title', // @deprecated An alias for 'title' tag.
+			'description', // The event description.
+
+			'when', // Date and time of the event.
+			'start-time', // Start time of the event.
+			'start-date', // Start date of the event.
+			'start-custom', // @deprecated Start time in a user defined format (set by tag 'format' attribute).
+			'start-human', // Start time in a human friendly format.
+			'end-time', // End time of the event.
+			'end-date', // End date of the event.
+			'end-custom', // @deprecated End date-time in a user defined format (set by tag 'format' attribute).
+			'end-human', // End date-time in a human friendly format.
+
+			'duration', // How long the events lasts, in a human-readable format.
+			'length', // @deprecated An alias of 'duration' tag.
+
+			'location', // Alias of start-location.
+			'start-location', // Location name where the event starts.
+			'maps-link', // @deprecated An alias for 'start-location-link' tag.
+			'start-location-link', // Link to Google Maps querying the event start location address.
+			'end-location', // Location name where the event ends.
+			'end-location-link', // Link to Google Maps querying the event end location address.
+
+			'link', // An HTML link to the event URL.
+			'url', // A string with the raw event link URL.
+
+			'calendar', // The title of the source calendar.
+			'feed-title', // @deprecated An alias of 'calendar'.
+
+			'id', // The event unique ID.
+			'uid', // An alias of ID.
+			'ical-id', // iCal ID.
+			'event-id', // @deprecated An alias for 'id' tag.
+			'calendar-id', // The calendar ID.
+			'feed-id', // @deprecated An alias for 'calendar-id' tag.
+			'cal-id', // @deprecated An alias for 'calendar-id' tag.
 
 			/* ========= *
 			 * Meta Tags *
 			 * ========= */
 
-			'attachments',          // List of attachments.
-			'attendees',            // List of attendees.
-			'organizer',            // Creator info.
+			'attachments', // List of attachments.
+			'attendees', // List of attendees.
+			'organizer', // Creator info.
 
 			/* ================ *
 			 * Conditional Tags *
 			 * ================ */
 
-			'if-title',              // If the event has a title.
-			'if-description',        // If the event has a description.
-
-			'if-now',                // If the event is taking place now.
-			'if-not-now',            // If the event is not taking place now (may have ended or just not started yet).
-			'if-started',            // If the event has started (and may as well as ended).
-			'if-not-started',        // If the event has NOT started yet (event could be any time in the future).
-			'if-ended',              // If the event has ended (event could be any time in the past).
-			'if-not-ended',          // If the event has NOT ended (may as well as not started yet).
-
-			'if-whole-day',          // If the event lasts the whole day.
-			'if-all-day',            // @deprecated Alias for 'if-whole-day'.
-			'if-not-whole-day',      // If the event does NOT last the whole day.
-			'if-not-all-day',        // @deprecated Alias for 'if-not-whole-day'.
-			'if-end-time',           // If the event has a set end time.
-			'if-no-end-time',        // If the event has NOT a set end time.
-
-			'if-multi-day',          // If the event spans multiple days.
-			'if-single-day',         // If the event does not span multiple days.
-
-			'if-recurring',          // If the event is a recurring event.
-			'if-not-recurring',      // If the event is NOT a recurring event.
-
-			'if-location',           // @deprecated Alias for 'if-start-location'.
-			'if-start-location',     // Does the event has a start location?
-			'if-end-location',       // Does the event has an end location?
-			'if-not-location',       // @deprecated Alias for 'if-not-start-location'.
+			'if-title', // If the event has a title.
+			'if-description', // If the event has a description.
+
+			'if-now', // If the event is taking place now.
+			'if-not-now', // If the event is not taking place now (may have ended or just not started yet).
+			'if-started', // If the event has started (and may as well as ended).
+			'if-not-started', // If the event has NOT started yet (event could be any time in the future).
+			'if-ended', // If the event has ended (event could be any time in the past).
+			'if-not-ended', // If the event has NOT ended (may as well as not started yet).
+
+			'if-whole-day', // If the event lasts the whole day.
+			'if-all-day', // @deprecated Alias for 'if-whole-day'.
+			'if-not-whole-day', // If the event does NOT last the whole day.
+			'if-not-all-day', // @deprecated Alias for 'if-not-whole-day'.
+			'if-end-time', // If the event has a set end time.
+			'if-no-end-time', // If the event has NOT a set end time.
+
+			'if-multi-day', // If the event spans multiple days.
+			'if-single-day', // If the event does not span multiple days.
+
+			'if-recurring', // If the event is a recurring event.
+			'if-not-recurring', // If the event is NOT a recurring event.
+
+			'if-location', // @deprecated Alias for 'if-start-location'.
+			'if-start-location', // Does the event has a start location?
+			'if-end-location', // Does the event has an end location?
+			'if-not-location', // @deprecated Alias for 'if-not-start-location'.
 			'if-not-start-location', // Does the event has NOT a start location?
-			'if-not-end-location',   // Does the event has NOT an end location?
+			'if-not-end-location', // Does the event has NOT an end location?
 
 		);
 	}
@@ -166,19 +166,19 @@ 
 	 *
 	 * @return string
 	 */
-	public function parse_event_template_tags( $template_tags = '' ) {
+	public function parse_event_template_tags($template_tags = '') {
 
 		// Process tags.
 		$result = preg_replace_callback(
 			$this->get_regex(),
-			array( $this, 'process_event_content' ),
+			array($this, 'process_event_content'),
 			$template_tags
 		);
 
 		// Removes extra consecutive <br> tags.
 		// TODO: Doesn't seem to work but going to remove it to allow multiple <br> tags in the editor
 		/*return preg_replace( '#(<br *//*?>\s*)+#i', '<br />', trim( $result ) );*/
-		return do_shortcode( trim( $result ) );
+		return do_shortcode(trim($result));
 	}
 
 	/**
@@ -190,10 +190,10 @@ 
 	 *
 	 * @return string
 	 */
-	public function process_event_content( $match ) {
+	public function process_event_content($match) {
 
-		if ( $match[1] == '[' && $match[6] == ']' ) {
-			return substr( $match[0], 1, - 1 );
+		if ($match[1] == '[' && $match[6] == ']') {
+			return substr($match[0], 1, - 1);
 		}
 
 		$tag     = $match[2]; // Tag name without square brackets.
@@ -205,9 +205,9 @@ 
 		$calendar = $this->calendar;
 		$event    = $this->event;
 
-		if ( ( $calendar instanceof Calendar ) && ( $event instanceof Event ) ) {
+		if (($calendar instanceof Calendar) && ($event instanceof Event)) {
 
-			switch ( $tag ) {
+			switch ($tag) {
 
 				/* ============ *
 				 * Content Tags *
@@ -215,13 +215,13 @@ 
 
 				case 'title' :
 				case 'event-title' :
-					return $this->get_title( $event->title, $attr );
+					return $this->get_title($event->title, $attr);
 
 				case 'description' :
-					return $this->get_description( $event->description, $attr );
+					return $this->get_description($event->description, $attr);
 
 				case 'when' :
-					return $this->get_when( $event );
+					return $this->get_when($event);
 
 				case 'end-date' :
 				case 'end-custom' :
@@ -231,40 +231,40 @@ 
 				case 'start-date' :
 				case 'start-human' :
 				case 'start-time' :
-					return $this->get_dt( $tag, $event, $attr );
+					return $this->get_dt($tag, $event, $attr);
 
 				case 'length' :
 				case 'duration' :
-					if ( false !== $event->end ) {
+					if (false !== $event->end) {
 						$duration = $event->start - $event->end;
-						$value    = human_time_diff( $event->start, $event->end );
+						$value    = human_time_diff($event->start, $event->end);
 					} else {
 						$duration = '-1';
-						$value    = __( 'No end time', 'google-calendar-events' );
+						$value    = __('No end time', 'google-calendar-events');
 					}
-					return ' <span class="simcal-event-duration" data-event-duration="' . $duration . '">' . $value . '</span>';
+					return ' <span class="simcal-event-duration" data-event-duration="'.$duration.'">'.$value.'</span>';
 
 				case 'location' :
 				case 'start-location' :
 				case 'end-location' :
 					$location = $tag == 'end-location' ? $event->end_location['address'] : $event->start_location['address'];
 					$location_class = $tag == 'end-location' ? 'end' : 'start';
-					return ' <span class="simcal-event-address simcal-event-' . $location_class . '-location" itemprop="location" itemscope itemtype="http://schema.org/Place">' . wp_strip_all_tags( $location ) . '</span>';
+					return ' <span class="simcal-event-address simcal-event-'.$location_class.'-location" itemprop="location" itemscope itemtype="http://schema.org/Place">'.wp_strip_all_tags($location).'</span>';
 
 				case 'start-location-link':
 				case 'end-location-link' :
 				case 'maps-link' :
 					$location = $tag == 'end-location-link' ? $event->end_location['address'] : $event->start_location['address'];
-					if ( ! empty( $location ) ) {
-						$url = '//maps.google.com?q=' . urlencode( $location );
-						return $this->make_link( $tag, $url, $calendar->get_event_html( $event, $partial ), $attr );
+					if ( ! empty($location)) {
+						$url = '//maps.google.com?q='.urlencode($location);
+						return $this->make_link($tag, $url, $calendar->get_event_html($event, $partial), $attr);
 					}
 					break;
 
 				case 'link' :
 				case 'url' :
-					$content = 'link' == $tag ? $calendar->get_event_html( $event, $partial ) : '';
-					return $this->make_link( $tag, $event->link, $content , $attr );
+					$content = 'link' == $tag ? $calendar->get_event_html($event, $partial) : '';
+					return $this->make_link($tag, $event->link, $content, $attr);
 
 				case 'calendar' :
 				case 'feed-title' :
@@ -289,22 +289,22 @@ 
 
 				case 'attachments' :
 					$attachments = $event->get_attachments();
-					if ( ! empty( $attachments ) ) {
-						return $this->get_attachments( $attachments );
+					if ( ! empty($attachments)) {
+						return $this->get_attachments($attachments);
 					}
 					break;
 
 				case 'attendees' :
 					$attendees = $event->get_attendees();
-					if ( ! empty( $attendees ) ) {
-						return $this->get_attendees( $attendees, $attr );
+					if ( ! empty($attendees)) {
+						return $this->get_attendees($attendees, $attr);
 					}
 					break;
 
 				case 'organizer' :
 					$organizer = $event->get_organizer();
-					if ( ! empty( $organizer ) ) {
-						return $this->get_organizer( $organizer, $attr );
+					if ( ! empty($organizer)) {
+						return $this->get_organizer($organizer, $attr);
 					}
 					break;
 
@@ -313,35 +313,35 @@ 
 				 * ================ */
 
 				case 'if-title':
-					if ( ! empty( $event->title ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->title)) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-description':
-					if ( ! empty( $event->description ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->description)) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-now' :
 				case 'if-not-now' :
 
-					$start_dt = $event->start_dt->setTimezone( $calendar->timezone );
+					$start_dt = $event->start_dt->setTimezone($calendar->timezone);
 					$start = $start_dt->getTimestamp();
 
-					if ( $event->end_dt instanceof Carbon ) {
-						$end = $event->end_dt->setTimezone( $calendar->timezone )->getTimestamp();
+					if ($event->end_dt instanceof Carbon) {
+						$end = $event->end_dt->setTimezone($calendar->timezone)->getTimestamp();
 					} else {
 						return '';
 					}
 
-					$now = ( $start <= $calendar->now ) && ( $end >= $calendar->now );
+					$now = ($start <= $calendar->now) && ($end >= $calendar->now);
 
-					if ( ( 'if-now' == $tag ) && $now ) {
-						return $calendar->get_event_html( $event, $partial );
-					} elseif ( ( 'if-not-now' == $tag ) && ( false == $now ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (('if-now' == $tag) && $now) {
+						return $calendar->get_event_html($event, $partial);
+					} elseif (('if-not-now' == $tag) && (false == $now)) {
+						return $calendar->get_event_html($event, $partial);
 					}
 
 					break;
@@ -349,15 +349,15 @@ 
 				case 'if-started' :
 				case 'if-not-started' :
 
-					$start = $event->start_dt->setTimezone( $calendar->timezone )->getTimestamp();
+					$start = $event->start_dt->setTimezone($calendar->timezone)->getTimestamp();
 
-					if ( 'if-started' == $tag ) {
-						if ( $start < $calendar->now ) {
-							return $calendar->get_event_html( $event, $partial );
+					if ('if-started' == $tag) {
+						if ($start < $calendar->now) {
+							return $calendar->get_event_html($event, $partial);
 						}
-					} elseif ( 'if-not-started' == $tag ) {
-						if ( $start > $calendar->now ) {
-							return $calendar->get_event_html( $event, $partial );
+					} elseif ('if-not-started' == $tag) {
+						if ($start > $calendar->now) {
+							return $calendar->get_event_html($event, $partial);
 						}
 					}
 
@@ -366,17 +366,17 @@ 
 				case 'if-ended' :
 				case 'if-not-ended' :
 
-					if ( false !== $event->end ) {
+					if (false !== $event->end) {
 
-						$end = $event->end_dt->setTimezone( $calendar->timezone )->getTimestamp();
+						$end = $event->end_dt->setTimezone($calendar->timezone)->getTimestamp();
 
-						if ( 'if-ended' == $tag ) {
-							if ( $end < $calendar->now ) {
-								return $calendar->get_event_html( $event, $partial );
+						if ('if-ended' == $tag) {
+							if ($end < $calendar->now) {
+								return $calendar->get_event_html($event, $partial);
 							}
-						} elseif ( 'if-not-ended' == $tag ) {
-							if ( $end > $calendar->now ) {
-								return $calendar->get_event_html( $event, $partial );
+						} elseif ('if-not-ended' == $tag) {
+							if ($end > $calendar->now) {
+								return $calendar->get_event_html($event, $partial);
 							}
 						}
 
@@ -385,14 +385,14 @@ 
 					break;
 
 				case 'if-end-time' :
-					if ( false !== $event->end ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false !== $event->end) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-no-end-time' :
-					if ( false === $event->end ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false === $event->end) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
@@ -400,59 +400,59 @@ 
 				case 'if-whole-day' :
 				case 'if-not-all-day' :
 				case 'if-not-whole-day' :
-					$bool = strstr( $tag, 'not' ) ? false : true;
-					if ( $bool === $event->whole_day ) {
-						return $calendar->get_event_html( $event, $partial );
+					$bool = strstr($tag, 'not') ? false : true;
+					if ($bool === $event->whole_day) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-recurring' :
-					if ( ! empty( $event->recurrence ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->recurrence)) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-not-recurring' :
-					if ( false === $event->recurrence ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false === $event->recurrence) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-multi-day' :
-					if ( false !== $event->multiple_days ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false !== $event->multiple_days) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-single-day' :
-					if ( false === $event->multiple_days ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (false === $event->multiple_days) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					break;
 
 				case 'if-location' :
 				case 'if-start-location' :
-					if ( ! empty( $event->start_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->start_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					return false;
 
 				case 'if-not-location' :
 				case 'if-not-start-location' :
-					if ( empty( $event->start_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (empty($event->start_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					return '';
 
 				case 'if-not-end-location' :
-					if ( empty( $event->end_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if (empty($event->end_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					return '';
 
 				case 'if-end-location' :
-					if ( ! empty( $event->end_location['address'] ) ) {
-						return $calendar->get_event_html( $event, $partial );
+					if ( ! empty($event->end_location['address'])) {
+						return $calendar->get_event_html($event, $partial);
 					}
 					return '';
 
@@ -461,7 +461,7 @@ 
 				 * ======= */
 
 				default :
-					return wp_kses_post( $before . $partial . $after );
+					return wp_kses_post($before.$partial.$after);
 			}
 		}
 
@@ -479,14 +479,14 @@ 
 	 *
 	 * @return string
 	 */
-	private function limit_words( $text, $limit ) {
+	private function limit_words($text, $limit) {
 
-		$limit = max( absint( $limit ), 0 );
+		$limit = max(absint($limit), 0);
 
-		if ( $limit > 0 && ( str_word_count( $text, 0 ) > $limit ) ) {
-			$words  = str_word_count( $text, 2 );
-			$pos    = array_keys( $words );
-			$text   = trim( substr( $text, 0, $pos[ $limit ] ) ) . '&hellip;';
+		if ($limit > 0 && (str_word_count($text, 0) > $limit)) {
+			$words  = str_word_count($text, 2);
+			$pos    = array_keys($words);
+			$text   = trim(substr($text, 0, $pos[$limit])).'&hellip;';
 		}
 
 		return $text;
@@ -503,26 +503,26 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_title( $title, $attr ) {
+	private function get_title($title, $attr) {
 
-		if ( empty( $title ) ) {
+		if (empty($title)) {
 			return '';
 		}
 
-		$attr = array_merge( array(
-			'html'  => '',  // Parse HTML
-			'limit' => 0,   // Trim length to amount of words
-		), (array) shortcode_parse_atts( $attr ) );
+		$attr = array_merge(array(
+			'html'  => '', // Parse HTML
+			'limit' => 0, // Trim length to amount of words
+		), (array) shortcode_parse_atts($attr));
 
-		if ( ! empty( $attr['html'] ) ) {
-			$title = wp_kses_post( $title );
+		if ( ! empty($attr['html'])) {
+			$title = wp_kses_post($title);
 			$tag = 'div';
 		} else {
-			$title = $this->limit_words( $title, $attr['limit'] );
+			$title = $this->limit_words($title, $attr['limit']);
 			$tag = 'span';
 		}
 
-		return '<' . $tag . ' class="simcal-event-title" itemprop="name">' . $title . '</' . $tag . '>';
+		return '<'.$tag.' class="simcal-event-title" itemprop="name">'.$title.'</'.$tag.'>';
 	}
 
 	/**
@@ -536,42 +536,42 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_description( $description, $attr ) {
+	private function get_description($description, $attr) {
 
-		if ( empty( $description ) ) {
+		if (empty($description)) {
 			return '';
 		}
 
-		$attr = array_merge( array(
-			'limit'     => 0,       // Trim length to number of words
-			'html'      => 'no',    // Parse HTML content
-			'markdown'  => 'no',    // Parse Markdown content
-			'autolink'  => 'no',    // Automatically convert plaintext URIs to anchors
-		), (array) shortcode_parse_atts( $attr ) );
+		$attr = array_merge(array(
+			'limit'     => 0, // Trim length to number of words
+			'html'      => 'no', // Parse HTML content
+			'markdown'  => 'no', // Parse Markdown content
+			'autolink'  => 'no', // Automatically convert plaintext URIs to anchors
+		), (array) shortcode_parse_atts($attr));
 
-		$allow_html = 'no' != $attr['html']     ? true : false;
+		$allow_html = 'no' != $attr['html'] ? true : false;
 		$allow_md   = 'no' != $attr['markdown'] ? true : false;
 
 		$html = '<div class="simcal-event-description" itemprop="description">';
 
 		// Markdown and HTML don't play well together, use one or the other in the same tag.
-		if ( $allow_html || $allow_md ) {
-			if ( $allow_html ) {
-				$description = wp_kses_post( $description );
-			} elseif ( $allow_md ) {
+		if ($allow_html || $allow_md) {
+			if ($allow_html) {
+				$description = wp_kses_post($description);
+			} elseif ($allow_md) {
 				$markdown = new \Parsedown();
-				$description = $markdown->text( wp_strip_all_tags( $description ) );
+				$description = $markdown->text(wp_strip_all_tags($description));
 			}
 		} else {
-			$description = wpautop( $description );
+			$description = wpautop($description);
 		}
 
-		$description = $this->limit_words( $description, $attr['limit'] );
+		$description = $this->limit_words($description, $attr['limit']);
 
-		$html .= $description . '</div>';
+		$html .= $description.'</div>';
 
-		if ( 'no' != $attr['autolink'] ) {
-			$html = ' ' . make_clickable( $html );
+		if ('no' != $attr['autolink']) {
+			$html = ' '.make_clickable($html);
 		}
 
 		return $html;
@@ -587,74 +587,74 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_when( Event $event ) {
+	private function get_when(Event $event) {
 
-		$start = $event->start_dt->setTimezone( $event->timezone );
-		$end = ! is_null( $event->end_dt ) ? $event->end_dt->setTimezone( $event->timezone ) : null;
+		$start = $event->start_dt->setTimezone($event->timezone);
+		$end = ! is_null($event->end_dt) ? $event->end_dt->setTimezone($event->timezone) : null;
 
 		$time_start = '';
 		$time_end = '';
 
-		if ( ! $event->whole_day ) {
+		if ( ! $event->whole_day) {
 
-			$time_start = $this->calendar->datetime_separator .
-			              ' <span class="simcal-event-start simcal-event-start-time" ' .
-			              'data-event-start="' . $start->getTimestamp() . '" ' .
-			              'data-event-format="' . $this->calendar->time_format . '" ' .
-			              'itemprop="startDate" data-content="' . $start->toIso8601String() . '">' .
-			              date_i18n( $this->calendar->time_format, $start->getTimestamp() ) .
+			$time_start = $this->calendar->datetime_separator.
+			              ' <span class="simcal-event-start simcal-event-start-time" '.
+			              'data-event-start="'.$start->getTimestamp().'" '.
+			              'data-event-format="'.$this->calendar->time_format.'" '.
+			              'itemprop="startDate" data-content="'.$start->toIso8601String().'">'.
+			              date_i18n($this->calendar->time_format, $start->getTimestamp()).
 			              '</span> ';
 
-			if ( $end instanceof Carbon ) {
+			if ($end instanceof Carbon) {
 
-				$time_end = ' <span class="simcal-event-end simcal-event-end-time" ' .
-				            'data-event-end="' . $end->getTimestamp() . '" ' .
-				            'data-event-format="' . $this->calendar->time_format . '" ' .
-				            'itemprop="endDate" data-content="' . $end->toIso8601String() . '">' .
-				            date_i18n( $this->calendar->time_format, $end->getTimestamp() ) .
+				$time_end = ' <span class="simcal-event-end simcal-event-end-time" '.
+				            'data-event-end="'.$end->getTimestamp().'" '.
+				            'data-event-format="'.$this->calendar->time_format.'" '.
+				            'itemprop="endDate" data-content="'.$end->toIso8601String().'">'.
+				            date_i18n($this->calendar->time_format, $end->getTimestamp()).
 				            '</span> ';
 
 			}
 
 		}
 
-		if ( $event->multiple_days ) {
+		if ($event->multiple_days) {
 
-			$output = ' <span class="simcal-event-start simcal-event-start-date" ' .
-			          'data-event-start="' . $start->getTimestamp() . '" ' .
-			          'data-event-format="' . $this->calendar->date_format . '" ' .
-			          'itemprop="startDate" data-content="' . $start->toIso8601String() . '">' .
-			          date_i18n( $this->calendar->date_format, $start->getTimestamp() ) .
-			          '</span> ' .
+			$output = ' <span class="simcal-event-start simcal-event-start-date" '.
+			          'data-event-start="'.$start->getTimestamp().'" '.
+			          'data-event-format="'.$this->calendar->date_format.'" '.
+			          'itemprop="startDate" data-content="'.$start->toIso8601String().'">'.
+			          date_i18n($this->calendar->date_format, $start->getTimestamp()).
+			          '</span> '.
 			          $time_start;
 
-			if ( $end instanceof Carbon ) {
+			if ($end instanceof Carbon) {
 
-				$output .= '-' .
-				           ' <span class="simcal-event-start simcal-event-end-date" ' .
-				           'data-event-start="' . $end->getTimestamp() . '" ' .
-				           'data-event-format="' . $this->calendar->date_format . '" ' .
-				           'itemprop="endDate" data-content="' . $end->toIso8601String() . '">' .
-				           date_i18n( $this->calendar->date_format, $end->getTimestamp() ) .
-				           '</span> ' .
+				$output .= '-'.
+				           ' <span class="simcal-event-start simcal-event-end-date" '.
+				           'data-event-start="'.$end->getTimestamp().'" '.
+				           'data-event-format="'.$this->calendar->date_format.'" '.
+				           'itemprop="endDate" data-content="'.$end->toIso8601String().'">'.
+				           date_i18n($this->calendar->date_format, $end->getTimestamp()).
+				           '</span> '.
 				           $time_end;
 			}
 
 		} else {
 
-			$time_end = ! empty( $time_start ) && ! empty( $time_end ) ? ' - ' . $time_end : '';
+			$time_end = ! empty($time_start) && ! empty($time_end) ? ' - '.$time_end : '';
 
-			$output = ' <span class="simcal-event-start simcal-event-start-date" ' .
-			          'data-event-start="' . $start->getTimestamp() . '" ' .
-			          'data-event-format="' . $this->calendar->date_format . '">' .
-			          date_i18n( $this->calendar->date_format, $start->getTimestamp() ) .
-			          '</span> ' .
-			          $time_start .
+			$output = ' <span class="simcal-event-start simcal-event-start-date" '.
+			          'data-event-start="'.$start->getTimestamp().'" '.
+			          'data-event-format="'.$this->calendar->date_format.'">'.
+			          date_i18n($this->calendar->date_format, $start->getTimestamp()).
+			          '</span> '.
+			          $time_start.
 			          $time_end;
 
 		}
 
-		return trim( $output );
+		return trim($output);
 	}
 
 	/**
@@ -669,50 +669,50 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_dt( $tag, Event $event, $attr ) {
+	private function get_dt($tag, Event $event, $attr) {
 
-		$bound = 0 === strpos( $tag, 'end' ) ? 'end' : 'start';
-		if ( ( 'end' == $bound ) && ( false === $event->end ) ) {
+		$bound = 0 === strpos($tag, 'end') ? 'end' : 'start';
+		if (('end' == $bound) && (false === $event->end)) {
 			return '';
 		}
 
-		$dt = $bound . '_dt';
-		if ( ! $event->$dt instanceof Carbon ) {
+		$dt = $bound.'_dt';
+		if ( ! $event->$dt instanceof Carbon) {
 			return '';
 		}
-		$event_dt = $event->$dt->setTimezone( $event->timezone );
+		$event_dt = $event->$dt->setTimezone($event->timezone);
 
-		$attr = array_merge( array(
+		$attr = array_merge(array(
 			'format'    => '',
-		), (array) shortcode_parse_atts( $attr ) );
+		), (array) shortcode_parse_atts($attr));
 
-		$format = ltrim( strstr( $tag, '-' ), '-' );
+		$format = ltrim(strstr($tag, '-'), '-');
 		$dt_format = '';
-		if ( ! empty( $attr['format'] ) ) {
-			$dt_format = esc_attr( wp_strip_all_tags( $attr['format'] ) );
-		} elseif ( 'date' == $format ) {
+		if ( ! empty($attr['format'])) {
+			$dt_format = esc_attr(wp_strip_all_tags($attr['format']));
+		} elseif ('date' == $format) {
 			$dt_format = $this->calendar->date_format;
-		} elseif ( 'time' == $format ) {
+		} elseif ('time' == $format) {
 			$dt_format = $this->calendar->time_format;
 		}
 
-		if ( 'human' == $format ) {
-			$value = human_time_diff( $event_dt->getTimestamp(), Carbon::now( $event->timezone )->getTimestamp() );
+		if ('human' == $format) {
+			$value = human_time_diff($event_dt->getTimestamp(), Carbon::now($event->timezone)->getTimestamp());
 
-			if ( $event_dt->getTimestamp() < Carbon::now( $event->timezone )->getTimestamp() ) {
-				$value .= ' ' . _x( 'ago', 'human date event builder code modifier', 'google-calendar-events' );
+			if ($event_dt->getTimestamp() < Carbon::now($event->timezone)->getTimestamp()) {
+				$value .= ' '._x('ago', 'human date event builder code modifier', 'google-calendar-events');
 			} else {
-				$value .= ' ' . _x( 'from now', 'human date event builder code modifier', 'google-calendar-events' );
+				$value .= ' '._x('from now', 'human date event builder code modifier', 'google-calendar-events');
 			}
 		} else {
-			$value = date_i18n( $dt_format, $event_dt->getTimestamp() );
+			$value = date_i18n($dt_format, $event_dt->getTimestamp());
 		}
 
-		return '<span class="simcal-event-' . $bound . ' ' . 'simcal-event-' . $bound . '-' . $format . '" ' .
-		       'data-event-' . $bound . '="' . $event_dt->getTimestamp() . '" ' .
-		       'data-event-format="' . $dt_format . '" ' .
-		       'itemprop="' . $bound . 'Date" data-content="' . $event_dt->toIso8601String() . '">' .
-		       $value .
+		return '<span class="simcal-event-'.$bound.' '.'simcal-event-'.$bound.'-'.$format.'" '.
+		       'data-event-'.$bound.'="'.$event_dt->getTimestamp().'" '.
+		       'data-event-format="'.$dt_format.'" '.
+		       'itemprop="'.$bound.'Date" data-content="'.$event_dt->toIso8601String().'">'.
+		       $value.
 		       '</span>';
 	}
 
@@ -729,23 +729,23 @@ 
 	 *
 	 * @return string
 	 */
-	private function make_link( $tag, $url, $content, $attr ) {
+	private function make_link($tag, $url, $content, $attr) {
 
-		if ( empty( $url ) ) {
+		if (empty($url)) {
 			return '';
 		}
 
-		$text = empty( $content ) ? $url : $content;
+		$text = empty($content) ? $url : $content;
 
-		$attr = array_merge( array(
-			'autolink'  => false,   // Convert url to link anchor
-			'newwindow' => false,   // If autolink attribute is true, open link in new window
-		), (array) shortcode_parse_atts( $attr ) );
+		$attr = array_merge(array(
+			'autolink'  => false, // Convert url to link anchor
+			'newwindow' => false, // If autolink attribute is true, open link in new window
+		), (array) shortcode_parse_atts($attr));
 
 		$anchor = $tag != 'url' ? 'yes' : $attr['autolink'];
 		$target = $attr['newwindow'] !== false ? 'target="_blank"' : '';
 
-		return $anchor !== false ? ' <a href="' . esc_url( $url ) . '" ' . $target . '>' . $text . '</a>' : ' ' . $text;
+		return $anchor !== false ? ' <a href="'.esc_url($url).'" '.$target.'>'.$text.'</a>' : ' '.$text;
 	}
 
 	/**
@@ -758,20 +758,20 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_attachments( $attachments ) {
+	private function get_attachments($attachments) {
 
-		$html = '<ul class="simcal-attachments">' . "\n\t";
+		$html = '<ul class="simcal-attachments">'."\n\t";
 
-		foreach ( $attachments as $attachment ) {
+		foreach ($attachments as $attachment) {
 			$html .= '<li class="simcal-attachment">';
-			$html .= '<a href="' . $attachment['url'] . '" target="_blank">';
-			$html .= ! empty( $attachment['icon'] ) ? '<img src="' . $attachment['icon'] . '" />' : '';
-			$html .= '<span>' . $attachment['name'] . '</span>';
+			$html .= '<a href="'.$attachment['url'].'" target="_blank">';
+			$html .= ! empty($attachment['icon']) ? '<img src="'.$attachment['icon'].'" />' : '';
+			$html .= '<span>'.$attachment['name'].'</span>';
 			$html .= '</a>';
-			$html .= '</li>' . "\n";
+			$html .= '</li>'."\n";
 		}
 
-		$html .= '</ul>' . "\n";
+		$html .= '</ul>'."\n";
 
 		return $html;
 	}
@@ -787,41 +787,41 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_attendees( $attendees, $attr ) {
+	private function get_attendees($attendees, $attr) {
 
-		$attr = array_merge( array(
-			'photo'     => 'show',  // show/hide attendee photo
-			'email'     => 'hide',  // show/hide attendee email address
-			'rsvp'      => 'hide',  // show/hide rsvp response status
-			'response'  => '',      // filter attendees by rsvp response (yes/no/maybe)
-		), (array) shortcode_parse_atts( $attr ) );
+		$attr = array_merge(array(
+			'photo'     => 'show', // show/hide attendee photo
+			'email'     => 'hide', // show/hide attendee email address
+			'rsvp'      => 'hide', // show/hide rsvp response status
+			'response'  => '', // filter attendees by rsvp response (yes/no/maybe)
+		), (array) shortcode_parse_atts($attr));
 
-		$html = '<ul class="simcal-attendees" itemprop="attendees">' . "\n\t";
+		$html = '<ul class="simcal-attendees" itemprop="attendees">'."\n\t";
 
 		$known = 0;
 		$unknown = 0;
 
-		foreach ( $attendees as $attendee ) {
+		foreach ($attendees as $attendee) {
 
-			if ( 'yes' == $attr['response'] && 'yes' != $attendee['response'] ) {
+			if ('yes' == $attr['response'] && 'yes' != $attendee['response']) {
 				continue;
-			} elseif ( 'no' == $attr['response'] && 'no' != $attendee['response'] ) {
+			} elseif ('no' == $attr['response'] && 'no' != $attendee['response']) {
 				continue;
-			} elseif ( 'maybe' == $attr['response'] && ! in_array( $attendee['response'], array( 'yes', 'maybe' ) ) ) {
+			} elseif ('maybe' == $attr['response'] && ! in_array($attendee['response'], array('yes', 'maybe'))) {
 				continue;
 			}
 
-			if ( ! empty( $attendee['name'] ) ) {
+			if ( ! empty($attendee['name'])) {
 
-				$photo      = 'hide' != $attr['photo'] ? '<img class="avatar avatar-128 photo" src="' . $attendee['photo'] . '" itemprop="image" />' : '';
-				$response   = 'hide' != $attr['rsvp'] ? $this->get_rsvp_response( $attendee['response'] ) : '';
-				$guest      = $photo . '<span itemprop="name">' . $attendee['name'] . $response . '</span>';
+				$photo      = 'hide' != $attr['photo'] ? '<img class="avatar avatar-128 photo" src="'.$attendee['photo'].'" itemprop="image" />' : '';
+				$response   = 'hide' != $attr['rsvp'] ? $this->get_rsvp_response($attendee['response']) : '';
+				$guest      = $photo.'<span itemprop="name">'.$attendee['name'].$response.'</span>';
 
-				if ( ! empty( $attendee['email'] ) && ( 'show' == $attr['email'] ) ) {
-					$guest = sprintf( '<a href="mailto:' . $attendee['email'] . '" itemprop="email">%s</a>', $guest );
+				if ( ! empty($attendee['email']) && ('show' == $attr['email'])) {
+					$guest = sprintf('<a href="mailto:'.$attendee['email'].'" itemprop="email">%s</a>', $guest);
 				}
 
-				$html .= '<li class="simcal-attendee" itemprop="attendee" itemscope itemtype="http://schema.org/Person">' . $guest . '</li>' . "\n";
+				$html .= '<li class="simcal-attendee" itemprop="attendee" itemscope itemtype="http://schema.org/Person">'.$guest.'</li>'."\n";
 
 				$known++;
 
@@ -832,21 +832,21 @@ 
 			}
 		}
 
-		if ( $unknown > 0 ) {
-			if ( $known > 0 ) {
+		if ($unknown > 0) {
+			if ($known > 0) {
 				/* translators: One more person attending the event. */
-				$others = sprintf( _n( '1 more attendee', '%s more attendees', $unknown, 'google-calendar-events' ), $unknown );
+				$others = sprintf(_n('1 more attendee', '%s more attendees', $unknown, 'google-calendar-events'), $unknown);
 			} else {
 				/* translators: One or more persons attending the event whose name is unknown. */
-				$others = sprintf( _n( '1 anonymous attendee', '%s anonymous attendees', $unknown, 'google-calendar-events' ), $unknown );
+				$others = sprintf(_n('1 anonymous attendee', '%s anonymous attendees', $unknown, 'google-calendar-events'), $unknown);
 			}
-			$photo = $attr['photo'] !== 'hide' ? get_avatar( '', 128 ) : '';
-			$html .= '<li class="simcal-attendee simcal-attendee-anonymous">' . $photo . '<span>' . $others . '</span></li>' . "\n";
-		} elseif ( $known === 0 ) {
-			$html .= '<li class="simcal-attendee">' . _x( 'No one yet', 'No one yet rsvp to attend the event.', 'google-calendar-events' ) . '</li>' . "\n";
+			$photo = $attr['photo'] !== 'hide' ? get_avatar('', 128) : '';
+			$html .= '<li class="simcal-attendee simcal-attendee-anonymous">'.$photo.'<span>'.$others.'</span></li>'."\n";
+		} elseif ($known === 0) {
+			$html .= '<li class="simcal-attendee">'._x('No one yet', 'No one yet rsvp to attend the event.', 'google-calendar-events').'</li>'."\n";
 		}
 
-		$html .= '</ul>' . "\n";
+		$html .= '</ul>'."\n";
 
 		return $html;
 	}
@@ -860,23 +860,23 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_rsvp_response( $response ) {
+	private function get_rsvp_response($response) {
 
-		if ( 'yes' == $response ) {
+		if ('yes' == $response) {
 			/* translators: Someone replied with 'yes' to a rsvp request. */
-			$rsvp = __( 'Attending', 'google-calendar-events' );
-		} elseif ( 'no' == $response ) {
+			$rsvp = __('Attending', 'google-calendar-events');
+		} elseif ('no' == $response) {
 			/* translators: Someone replied with 'no' to a rsvp request. */
-			$rsvp = __( 'Not attending', 'google-calendar-events' );
-		} elseif ( 'maybe' == $response ) {
+			$rsvp = __('Not attending', 'google-calendar-events');
+		} elseif ('maybe' == $response) {
 			/* translators: Someone replied with 'maybe' to a rsvp request. */
-			$rsvp = __( 'Maybe attending', 'google-calendar-events' );
+			$rsvp = __('Maybe attending', 'google-calendar-events');
 		} else {
 			/* translators: Someone did not send yet a rsvp confirmation to join an event. */
-			$rsvp = __( 'Response pending', 'google-calendar-events' );
+			$rsvp = __('Response pending', 'google-calendar-events');
 		}
 
-		return ' <small>(' . $rsvp . ')</small>';
+		return ' <small>('.$rsvp.')</small>';
 	}
 
 	/**
@@ -890,21 +890,21 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_organizer( $organizer, $attr ) {
+	private function get_organizer($organizer, $attr) {
 
-		$attr = array_merge( array(
-			'photo' => 'show',  // show/hide attendee photo
-			'email' => 'hide',  // show/hide attendee email address
-		), (array) shortcode_parse_atts( $attr ) );
+		$attr = array_merge(array(
+			'photo' => 'show', // show/hide attendee photo
+			'email' => 'hide', // show/hide attendee email address
+		), (array) shortcode_parse_atts($attr));
 
-		$photo           = 'hide' != $attr['photo'] ? '<img class="avatar avatar-128 photo" src="' . $organizer['photo'] . '" itemprop="image"  />' : '';
-		$organizer_html  = $photo . '<span itemprop="name">' . $organizer['name'] . '</span>';
+		$photo           = 'hide' != $attr['photo'] ? '<img class="avatar avatar-128 photo" src="'.$organizer['photo'].'" itemprop="image"  />' : '';
+		$organizer_html  = $photo.'<span itemprop="name">'.$organizer['name'].'</span>';
 
-		if ( ! empty( $organizer['email'] ) && ( 'show' == $attr['email'] ) ) {
-			$organizer_html = sprintf( '<a href="mailto:' . $organizer['email'] . '" itemprop="email">%s</a>', $organizer_html );
+		if ( ! empty($organizer['email']) && ('show' == $attr['email'])) {
+			$organizer_html = sprintf('<a href="mailto:'.$organizer['email'].'" itemprop="email">%s</a>', $organizer_html);
 		}
 
-		return '<div class="simcal-organizer" itemprop="organizer" itemscope itemtype="https://schema.org/Person">' . $organizer_html . '</div>';
+		return '<div class="simcal-organizer" itemprop="organizer" itemscope itemtype="https://schema.org/Person">'.$organizer_html.'</div>';
 	}
 
 	/**
@@ -929,7 +929,7 @@ 
 		// This is largely borrowed on get_shortcode_regex() from WordPress Core.
 		// @see /wp-includes/shortcodes.php (with some modification)
 
-		$tagregexp = implode( '|', array_values( $this->tags ) );
+		$tagregexp = implode('|', array_values($this->tags));
 
 		return '/'
 		       . '\\['                              // Opening bracket

Doc Comments +3 added lines, -3 removed lines

@@ -65,7 +65,7 @@ 
 	 *
 	 * @since  3.0.0
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	public function get_content_tags() {
 		return  array(
@@ -498,8 +498,8 @@ 
 	 * @since  3.0.0
 	 * @access private
 	 *
-	 * @param  $title
-	 * @param  $attr
+	 * @param  string $title
+	 * @param  string $attr
 	 *
 	 * @return string
 	 */

includes/feeds/google.php

Indentation +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
 			// Google query args.
 			$this->google_calendar_id       = $this->esc_google_calendar_id( get_post_meta( $this->post_id, '_google_calendar_id', true ) );
 			$this->google_events_recurring  = esc_attr( get_post_meta( $this->post_id, '_google_events_recurring', true ) );
-            // note that google_search_query is used in a URL param and not as HTML output, so don't use esc_attr() on it
+			// note that google_search_query is used in a URL param and not as HTML output, so don't use esc_attr() on it
 			$this->google_search_query      = get_post_meta( $this->post_id, '_google_events_search_query', true );
 			$this->google_max_results       = max( absint( get_post_meta( $this->post_id, '_google_events_max_results', true ) ), 1 );
 

Spacing +100 added lines, -100 removed lines

@@ -12,7 +12,7 @@ 
 use SimpleCalendar\Abstracts\Feed;
 use SimpleCalendar\Feeds\Admin\Google_Admin as Admin;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -90,35 +90,35 @@ 
 	 * @param string|Calendar $calendar
 	 * @param bool $load_admin
 	 */
-	public function __construct( $calendar = '', $load_admin = true ) {
+	public function __construct($calendar = '', $load_admin = true) {
 
-		parent::__construct( $calendar );
+		parent::__construct($calendar);
 
 		$this->type = 'google';
-		$this->name = __( 'Google Calendar', 'google-calendar-events' );
+		$this->name = __('Google Calendar', 'google-calendar-events');
 
 		// Google client config.
-		$settings = get_option( 'simple-calendar_settings_feeds' );
-		$this->google_api_key = isset( $settings['google']['api_key'] ) ? esc_attr( $settings['google']['api_key'] ) : '';
-		$this->google_client_scopes = array( \Google_Service_Calendar::CALENDAR_READONLY );
+		$settings = get_option('simple-calendar_settings_feeds');
+		$this->google_api_key = isset($settings['google']['api_key']) ? esc_attr($settings['google']['api_key']) : '';
+		$this->google_client_scopes = array(\Google_Service_Calendar::CALENDAR_READONLY);
 		$this->google_client = $this->get_client();
 
-		if ( $this->post_id > 0 ) {
+		if ($this->post_id > 0) {
 
 			// Google query args.
-			$this->google_calendar_id       = $this->esc_google_calendar_id( get_post_meta( $this->post_id, '_google_calendar_id', true ) );
-			$this->google_events_recurring  = esc_attr( get_post_meta( $this->post_id, '_google_events_recurring', true ) );
+			$this->google_calendar_id       = $this->esc_google_calendar_id(get_post_meta($this->post_id, '_google_calendar_id', true));
+			$this->google_events_recurring  = esc_attr(get_post_meta($this->post_id, '_google_events_recurring', true));
             // note that google_search_query is used in a URL param and not as HTML output, so don't use esc_attr() on it
-			$this->google_search_query      = get_post_meta( $this->post_id, '_google_events_search_query', true );
-			$this->google_max_results       = max( absint( get_post_meta( $this->post_id, '_google_events_max_results', true ) ), 1 );
+			$this->google_search_query      = get_post_meta($this->post_id, '_google_events_search_query', true);
+			$this->google_max_results       = max(absint(get_post_meta($this->post_id, '_google_events_max_results', true)), 1);
 
-			if ( ! is_admin() || defined( 'DOING_AJAX' ) ) {
-				$this->events = ! empty( $this->google_api_key ) ? $this->get_events() : array();
+			if ( ! is_admin() || defined('DOING_AJAX')) {
+				$this->events = ! empty($this->google_api_key) ? $this->get_events() : array();
 			}
 		}
 
-		if ( is_admin() && $load_admin ) {
-			$admin = new Admin( $this, $this->google_api_key, $this->google_calendar_id );
+		if (is_admin() && $load_admin) {
+			$admin = new Admin($this, $this->google_api_key, $this->google_calendar_id);
 			$this->settings = $admin->settings_fields();
 		}
 	}
@@ -132,8 +132,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function esc_google_calendar_id( $id ) {
-		return base64_decode( $id );
+	public function esc_google_calendar_id($id) {
+		return base64_decode($id);
 	}
 
 	/**
@@ -147,85 +147,85 @@ 
 	 */
 	public function get_events() {
 
-		$calendar = get_transient( '_simple-calendar_feed_id_' . strval( $this->post_id ) . '_' . $this->type );
+		$calendar = get_transient('_simple-calendar_feed_id_'.strval($this->post_id).'_'.$this->type);
 
-		if ( empty( $calendar ) && ! empty( $this->google_calendar_id ) ) {
+		if (empty($calendar) && ! empty($this->google_calendar_id)) {
 
 			$error = '';
 
 			try {
-				$response = $this->make_request( $this->google_calendar_id );
-			} catch ( \Exception $e ) {
+				$response = $this->make_request($this->google_calendar_id);
+			} catch (\Exception $e) {
 				$error .= $e->getMessage();
 			}
 
-			if ( empty( $error ) && isset( $response['events'] ) && isset( $response['timezone'] ) ) {
+			if (empty($error) && isset($response['events']) && isset($response['timezone'])) {
 
-				$calendar = array_merge( $response, array( 'events' => array() ) );
+				$calendar = array_merge($response, array('events' => array()));
 
 				// If no timezone has been set, use calendar feed.
-				if ( 'use_calendar' == $this->timezone_setting ) {
+				if ('use_calendar' == $this->timezone_setting) {
 					$this->timezone = $calendar['timezone'];
 				}
 
-				$source = isset( $response['title'] ) ? sanitize_text_field( $response['title'] ) : '';
+				$source = isset($response['title']) ? sanitize_text_field($response['title']) : '';
 
-				if ( ! empty( $response['events'] ) && is_array( $response['events'] ) ) {
-					foreach ( $response['events'] as $event ) {
-						if ( $event instanceof \Google_Service_Calendar_Event ) {
+				if ( ! empty($response['events']) && is_array($response['events'])) {
+					foreach ($response['events'] as $event) {
+						if ($event instanceof \Google_Service_Calendar_Event) {
 
 							// Visibility and status.
 							// Public calendars may have private events which can't be properly accessed by simple api key method.
 							// Also want to skip cancelled events (single occurences deleted from repeating events)
 							$visibility = $event->getVisibility();
 							$status = $event->getStatus();
-							if ( $this->type == 'google' && ( $visibility == 'private' || $visibility == 'confidential' || $status == 'cancelled' ) ) {
+							if ($this->type == 'google' && ($visibility == 'private' || $visibility == 'confidential' || $status == 'cancelled')) {
 								continue;
 							}
 
 							// Event title & description.
-							$title = strip_tags( $event->getSummary() );
-							$title = sanitize_text_field( iconv( mb_detect_encoding( $title, mb_detect_order(), true ), 'UTF-8', $title ) );
-							$description = wp_kses_post( iconv( mb_detect_encoding( $event->getDescription(), mb_detect_order(), true ), 'UTF-8', $event->getDescription() ) );
+							$title = strip_tags($event->getSummary());
+							$title = sanitize_text_field(iconv(mb_detect_encoding($title, mb_detect_order(), true), 'UTF-8', $title));
+							$description = wp_kses_post(iconv(mb_detect_encoding($event->getDescription(), mb_detect_order(), true), 'UTF-8', $event->getDescription()));
 
 							$whole_day = false;
 
 							// Event start properties.
-							if( 'use_calendar' == $this->timezone_setting ) {
+							if ('use_calendar' == $this->timezone_setting) {
 								$start_timezone = ! $event->getStart()->timeZone ? $calendar['timezone'] : $event->getStart()->timeZone;
 							} else {
 								$start_timezone = $this->timezone;
 							}
 
-							if ( is_null( $event->getStart()->dateTime ) ) {
+							if (is_null($event->getStart()->dateTime)) {
 								// Whole day event.
-								$date = Carbon::parse( $event->getStart()->date );
-								$google_start = Carbon::createFromDate( $date->year, $date->month, $date->day, $start_timezone )->startOfDay()->addSeconds( 59 );
-								$google_start_utc = Carbon::createFromDate( $date->year, $date->month, $date->day, 'UTC' )->startOfDay()->addSeconds( 59 );
+								$date = Carbon::parse($event->getStart()->date);
+								$google_start = Carbon::createFromDate($date->year, $date->month, $date->day, $start_timezone)->startOfDay()->addSeconds(59);
+								$google_start_utc = Carbon::createFromDate($date->year, $date->month, $date->day, 'UTC')->startOfDay()->addSeconds(59);
 								$whole_day = true;
 							} else {
-								$date = Carbon::parse( $event->getStart()->dateTime );
+								$date = Carbon::parse($event->getStart()->dateTime);
 
 								// Check if there is an event level timezone
-								if( $event->getStart()->timeZone && 'use_calendar' == $this->timezone_setting ) {
+								if ($event->getStart()->timeZone && 'use_calendar' == $this->timezone_setting) {
 
 									// Get the two different times with the separate timezones so we can check the offsets next
-									$google_start1 = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $date->timezone );
-									$google_start2 = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $event->getStart()->timeZone );
+									$google_start1 = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $date->timezone);
+									$google_start2 = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $event->getStart()->timeZone);
 
 									// Get the offset in hours
 									$offset1 = $google_start1->offsetHours;
 									$offset2 = $google_start2->offsetHours;
 
 									// Get the difference between the two timezones
-									$total_offset = ( $offset2 - $offset1 );
+									$total_offset = ($offset2 - $offset1);
 
 									// Add the hours offset to the date hour
 									$date->hour += $total_offset;
 								}
 
-								$google_start = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $start_timezone );
-								$google_start_utc = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, 'UTC' );
+								$google_start = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $start_timezone);
+								$google_start_utc = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, 'UTC');
 
 								$this->timezone = $start_timezone;
 							}
@@ -236,43 +236,43 @@ 
 
 							$end = $end_utc = $end_timezone = '';
 							$span = 0;
-							if ( false == $event->getEndTimeUnspecified() ) {
+							if (false == $event->getEndTimeUnspecified()) {
 
 								// Event end properties.
-								if( 'use_calendar' == $this->timezone_setting ) {
+								if ('use_calendar' == $this->timezone_setting) {
 									$end_timezone = ! $event->getEnd()->timeZone ? $calendar['timezone'] : $event->getEnd()->timeZone;
 								} else {
 									$end_timezone = $this->timezone;
 								}
 
-								if ( is_null( $event->getEnd()->dateTime ) ) {
+								if (is_null($event->getEnd()->dateTime)) {
 									// Whole day event.
-									$date           = Carbon::parse( $event->getEnd()->date );
-									$google_end     = Carbon::createFromDate( $date->year, $date->month, $date->day, $end_timezone )->startOfDay()->subSeconds( 59 );
-									$google_end_utc = Carbon::createFromDate( $date->year, $date->month, $date->day, 'UTC' )->startOfDay()->subSeconds( 59 );
+									$date           = Carbon::parse($event->getEnd()->date);
+									$google_end     = Carbon::createFromDate($date->year, $date->month, $date->day, $end_timezone)->startOfDay()->subSeconds(59);
+									$google_end_utc = Carbon::createFromDate($date->year, $date->month, $date->day, 'UTC')->startOfDay()->subSeconds(59);
 								} else {
-									$date = Carbon::parse( $event->getEnd()->dateTime );
+									$date = Carbon::parse($event->getEnd()->dateTime);
 
 									// Check if there is an event level timezone
-									if( $event->getEnd()->timeZone && 'use_calendar' == $this->timezone_setting ) {
+									if ($event->getEnd()->timeZone && 'use_calendar' == $this->timezone_setting) {
 
 										// Get the two different times with the separate timezones so we can check the offsets next
-										$google_start1 = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $date->timezone );
-										$google_start2 = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $event->getEnd()->timeZone );
+										$google_start1 = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $date->timezone);
+										$google_start2 = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $event->getEnd()->timeZone);
 
 										// Get the offset in hours
 										$offset1 = $google_start1->offsetHours;
 										$offset2 = $google_start2->offsetHours;
 
 										// Get the difference between the two timezones
-										$total_offset = ( $offset2 - $offset1 );
+										$total_offset = ($offset2 - $offset1);
 
 										// Add the hours offset to the date hour
 										$date->hour += $total_offset;
 									}
 
-									$google_end     = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $end_timezone );
-									$google_end_utc = Carbon::create( $date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, 'UTC' );
+									$google_end     = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, $end_timezone);
+									$google_end_utc = Carbon::create($date->year, $date->month, $date->day, $date->hour, $date->minute, $date->second, 'UTC');
 								}
 								// End.
 								$end = $google_end->getTimestamp();
@@ -280,10 +280,10 @@ 
 								$end_utc = $google_end_utc->getTimestamp();
 
 								// Count multiple days.
-								$span = $google_start->diffInDays( $google_end );
+								$span = $google_start->diffInDays($google_end);
 
-								if ( $span == 0 ) {
-									if ( ( $google_start->toDateString() !== $google_end->toDateString() ) && $google_end->toTimeString() != '00:00:00' ) {
+								if ($span == 0) {
+									if (($google_start->toDateString() !== $google_end->toDateString()) && $google_end->toTimeString() != '00:00:00') {
 										$span = 1;
 									}
 								}
@@ -298,19 +298,19 @@ 
 							// Recurring event.
 							$recurrence = $event->getRecurrence();
 							$recurring_id = $event->getRecurringEventId();
-							if ( ! $recurrence && $recurring_id ) {
+							if ( ! $recurrence && $recurring_id) {
 								$recurrence = true;
 							}
 
 							// Event link.
-							if ( 'use_calendar' == $this->timezone_setting ) {
-								$link = add_query_arg( array( 'ctz' => $this->timezone ), $event->getHtmlLink() );
+							if ('use_calendar' == $this->timezone_setting) {
+								$link = add_query_arg(array('ctz' => $this->timezone), $event->getHtmlLink());
 							} else {
 								$link = $event->getHtmlLink();
 							}
 
 							// Build the event.
-							$calendar['events'][ intval( $start ) ][] = array(
+							$calendar['events'][intval($start)][] = array(
 								'type'           => 'google-calendar',
 								'source'         => $source,
 								'title'          => $title,
@@ -338,24 +338,24 @@ 
 						}
 					}
 
-					if ( ! empty( $calendar['events'] ) ) {
+					if ( ! empty($calendar['events'])) {
 
-						ksort( $calendar['events'], SORT_NUMERIC );
+						ksort($calendar['events'], SORT_NUMERIC);
 
 						set_transient(
-							'_simple-calendar_feed_id_' . strval( $this->post_id ) . '_' . $this->type,
+							'_simple-calendar_feed_id_'.strval($this->post_id).'_'.$this->type,
 							$calendar,
-							max( absint( $this->cache ), 1 ) // Since a value of 0 means forever we set the minimum here to 1 if the user has set it to be 0
+							max(absint($this->cache), 1) // Since a value of 0 means forever we set the minimum here to 1 if the user has set it to be 0
 						);
 					}
 				}
 
 			} else {
 
-				$message  = __( 'While trying to retrieve events, Google returned an error:', 'google-calendar-events' );
-				$message .= '<br><br>' . $error . '<br><br>';
-				$message .= __( 'Please ensure that both your Google Calendar ID and API Key are valid and that the Google Calendar you want to display is public.', 'google-calendar-events' ) . '<br><br>';
-				$message .= __( 'Only you can see this notice.', 'google-calendar-events' );
+				$message  = __('While trying to retrieve events, Google returned an error:', 'google-calendar-events');
+				$message .= '<br><br>'.$error.'<br><br>';
+				$message .= __('Please ensure that both your Google Calendar ID and API Key are valid and that the Google Calendar you want to display is public.', 'google-calendar-events').'<br><br>';
+				$message .= __('Only you can see this notice.', 'google-calendar-events');
 
 				return $message;
 			}
@@ -363,11 +363,11 @@ 
 		}
 
 		// If no timezone has been set, use calendar feed.
-		if ( 'use_calendar' == $this->timezone_setting && isset( $calendar['timezone'] ) ) {
+		if ('use_calendar' == $this->timezone_setting && isset($calendar['timezone'])) {
 			$this->timezone = $calendar['timezone'];
 		}
 
-		return isset( $calendar['events'] ) ? $calendar['events'] : array();
+		return isset($calendar['events']) ? $calendar['events'] : array();
 	}
 
 	/**
@@ -383,67 +383,67 @@ 
 	 *
 	 * @throws \Exception On request failure will throw an exception from Google.
 	 */
-	public function make_request( $id = '', $time_min = 0, $time_max = 0 ) {
+	public function make_request($id = '', $time_min = 0, $time_max = 0) {
 
 		$calendar = array();
 		$google = $this->get_service();
 
-		if ( ! is_null( $google ) && ! empty( $id ) ) {
+		if ( ! is_null($google) && ! empty($id)) {
 
 			// Build the request args.
 			$args = array();
 
 			// Expand recurring events.
-			if ( $this->google_events_recurring == 'show' ) {
+			if ($this->google_events_recurring == 'show') {
 				$args['singleEvents'] = true;
 			}
 
 			// Query events using search terms.
-			if ( ! empty( $this->google_search_query ) ) {
-				$args['q'] = rawurlencode( $this->google_search_query );
+			if ( ! empty($this->google_search_query)) {
+				$args['q'] = rawurlencode($this->google_search_query);
 			}
 
 			// Max results to query.
-			$args['maxResults'] = strval( min( absint( $this->google_max_results ), 2500 ) );
+			$args['maxResults'] = strval(min(absint($this->google_max_results), 2500));
 
 			// Specify a timezone.
 			$timezone = '';
-			if ( 'use_calendar' != get_post_meta( $this->post_id, '_feed_timezone_setting', true ) ) {
+			if ('use_calendar' != get_post_meta($this->post_id, '_feed_timezone_setting', true)) {
 				$args['timeZone'] = $timezone = $this->timezone;
 			}
 
 			// Lower bound (inclusive) for an event's end time to filter by.
-			$earliest_event = intval( $this->time_min );
-			if ( $earliest_event > 0 ) {
+			$earliest_event = intval($this->time_min);
+			if ($earliest_event > 0) {
 				$timeMin = Carbon::now();
-				if ( ! empty( $timezone ) ) {
-					$timeMin->setTimezone( $timezone );
+				if ( ! empty($timezone)) {
+					$timeMin->setTimezone($timezone);
 				}
-				$timeMin->setTimestamp( $earliest_event );
+				$timeMin->setTimestamp($earliest_event);
 				$args['timeMin'] = $timeMin->toRfc3339String();
 			}
 
 			// Upper bound (exclusive) for an event's start time to filter by.
-			$latest_event = intval( $this->time_max );
-			if ( $latest_event > 0 ) {
+			$latest_event = intval($this->time_max);
+			if ($latest_event > 0) {
 				$timeMax = Carbon::now();
-				if ( ! empty( $timezone ) ) {
-					$timeMax->setTimezone( $timezone );
+				if ( ! empty($timezone)) {
+					$timeMax->setTimezone($timezone);
 				}
-				$timeMax->setTimestamp( $latest_event );
+				$timeMax->setTimestamp($latest_event);
 				$args['timeMax'] = $timeMax->toRfc3339String();
 			}
 
 			// Query events in calendar.
-			$response = $google->events->listEvents( $id, $args );
+			$response = $google->events->listEvents($id, $args);
 
-			if ( $response instanceof \Google_Service_Calendar_Events ) {
+			if ($response instanceof \Google_Service_Calendar_Events) {
 				$calendar = array(
 					'id'            => $id,
 					'title'         => $response->getSummary(),
 					'description'   => $response->getDescription(),
 					'timezone'      => $response->getTimeZone(),
-					'url'           => esc_url( '//www.google.com/calendar/embed?src=' . $id ),
+					'url'           => esc_url('//www.google.com/calendar/embed?src='.$id),
 					'events'        => $response->getItems(),
 				);
 			}
@@ -463,10 +463,10 @@ 
 	private function get_client() {
 
 		$client = new \Google_Client();
-		$client->setApplicationName( 'Simple Calendar' );
-		$client->setScopes( $this->google_client_scopes );
-		$client->setDeveloperKey( $this->google_api_key );
-		$client->setAccessType( 'online' );
+		$client->setApplicationName('Simple Calendar');
+		$client->setScopes($this->google_client_scopes);
+		$client->setDeveloperKey($this->google_api_key);
+		$client->setAccessType('online');
 
 		return $client;
 	}
@@ -480,7 +480,7 @@ 
 	 * @return null|\Google_Service_Calendar
 	 */
 	protected function get_service() {
-		return $this->google_client instanceof \Google_Client ? new \Google_Service_Calendar( $this->google_client ) : null;
+		return $this->google_client instanceof \Google_Client ? new \Google_Service_Calendar($this->google_client) : null;
 	}
 
 }

includes/functions/shared.php

Spacing +107 added lines, -107 removed lines

@@ -7,7 +7,7 @@ 
  * @package SimpleCalendar/Functions
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -20,17 +20,17 @@ 
  */
 function is_simple_calendar() {
 
-	if ( is_singular() ) {
+	if (is_singular()) {
 
 		global $post, $post_type;
 
-		if ( 'calendar' == $post_type ) {
+		if ('calendar' == $post_type) {
 			return true;
 		} else {
-			if ( false !== get_post_meta( $post->ID, '_simcal_attach_calendar_id', true ) ) {
+			if (false !== get_post_meta($post->ID, '_simcal_attach_calendar_id', true)) {
 				return true;
 			}
-			if ( has_shortcode( $post->post_content, 'calendar' ) ) {
+			if (has_shortcode($post->post_content, 'calendar')) {
 				return true;
 			}
 		}
@@ -46,8 +46,8 @@ 
  *
  * @return string
  */
-function simcal_get_url( $url ) {
-	return \SimpleCalendar\plugin()->get_url( $url );
+function simcal_get_url($url) {
+	return \SimpleCalendar\plugin()->get_url($url);
 }
 
 /**
@@ -71,9 +71,9 @@ 
  *
  * @return null|\SimpleCalendar\Abstracts\Feed
  */
-function simcal_get_feed( $object ) {
+function simcal_get_feed($object) {
 	$objects = \SimpleCalendar\plugin()->objects;
-	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_feed( $object ) : null;
+	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_feed($object) : null;
 }
 
 /**
@@ -97,9 +97,9 @@ 
  *
  * @return null|\SimpleCalendar\Abstracts\Calendar
  */
-function simcal_get_calendar( $object ) {
+function simcal_get_calendar($object) {
 	$objects = \SimpleCalendar\plugin()->objects;
-	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_calendar( $object ) : null;
+	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_calendar($object) : null;
 }
 
 /**
@@ -112,9 +112,9 @@ 
  *
  * @return mixed
  */
-function simcal_get_calendar_view( $id = 0, $name = '' ) {
+function simcal_get_calendar_view($id = 0, $name = '') {
 	$objects = \SimpleCalendar\plugin()->objects;
-	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_calendar_view( $id, $name ) : false;
+	return $objects instanceof \SimpleCalendar\Objects ? $objects->get_calendar_view($id, $name) : false;
 }
 
 /**
@@ -126,11 +126,11 @@ 
  *
  * @return void
  */
-function simcal_print_calendar( $object ) {
+function simcal_print_calendar($object) {
 
-	$calendar = simcal_get_calendar( $object );
+	$calendar = simcal_get_calendar($object);
 
-	if ( $calendar instanceof \SimpleCalendar\Abstracts\Calendar ) {
+	if ($calendar instanceof \SimpleCalendar\Abstracts\Calendar) {
 		$calendar->html();
 	}
 }
@@ -148,21 +148,21 @@ 
 
 	$vars = array(
 		'ajax_url'  => \SimpleCalendar\plugin()->ajax_url(),
-		'nonce'     => wp_create_nonce( 'simcal' ),
+		'nonce'     => wp_create_nonce('simcal'),
 		'locale'    => \SimpleCalendar\plugin()->locale,
 		'text_dir'  => is_rtl() ? 'rtl' : 'ltr',
 		'months'    => array(
-			'full'  => simcal_get_calendar_names_i18n( 'month', 'full' ),
-			'short' => simcal_get_calendar_names_i18n( 'month', 'short' ),
+			'full'  => simcal_get_calendar_names_i18n('month', 'full'),
+			'short' => simcal_get_calendar_names_i18n('month', 'short'),
 		),
 		'days'      => array(
-			'full'  => simcal_get_calendar_names_i18n( 'day', 'full' ),
-			'short' => simcal_get_calendar_names_i18n( 'day', 'short' ),
+			'full'  => simcal_get_calendar_names_i18n('day', 'full'),
+			'short' => simcal_get_calendar_names_i18n('day', 'short'),
 		),
-		'meridiem' => simcal_get_calendar_names_i18n( 'meridiem' ),
+		'meridiem' => simcal_get_calendar_names_i18n('meridiem'),
 	);
 
-	return array_merge( $vars, apply_filters( 'simcal_common_scripts_variables', array() ) );
+	return array_merge($vars, apply_filters('simcal_common_scripts_variables', array()));
 }
 
 /**
@@ -175,31 +175,31 @@ 
  *
  * @return array Associative array with ids as keys and feed titles as values.
  */
-function simcal_get_calendars( $exclude = '', $cached = true ) {
+function simcal_get_calendars($exclude = '', $cached = true) {
 
-	$calendars = get_transient( '_simple-calendar_feed_ids' );
+	$calendars = get_transient('_simple-calendar_feed_ids');
 
-	if ( ! $calendars || $cached === false ) {
+	if ( ! $calendars || $cached === false) {
 
-		$posts = get_posts( array(
+		$posts = get_posts(array(
 			'post_type' => 'calendar',
 			'nopaging'  => true,
-		) );
+		));
 
 		$calendars = array();
-		foreach ( $posts as $post ) {
-			$calendars[ $post->ID ] = $post->post_title;
+		foreach ($posts as $post) {
+			$calendars[$post->ID] = $post->post_title;
 		}
-		asort( $calendars );
+		asort($calendars);
 
-		set_transient( '_simple-calendar_feed_ids', $calendars, 604800 );
+		set_transient('_simple-calendar_feed_ids', $calendars, 604800);
 	}
 
-	if ( ! empty( $exclude ) ) {
-		if ( is_numeric( $exclude ) ) {
-			unset( $calendars[ intval( $exclude ) ] );
-		} elseif ( is_array( $exclude ) ) {
-			array_diff_key( $calendars, array_map( 'intval', array_keys( $exclude ) ) );
+	if ( ! empty($exclude)) {
+		if (is_numeric($exclude)) {
+			unset($calendars[intval($exclude)]);
+		} elseif (is_array($exclude)) {
+			array_diff_key($calendars, array_map('intval', array_keys($exclude)));
 		}
 	}
 
@@ -218,45 +218,45 @@ 
  *
  * @return array
  */
-function simcal_get_calendar_names_i18n( $group, $style = 'full' ) {
+function simcal_get_calendar_names_i18n($group, $style = 'full') {
 
 	$names = array();
 
-	if ( in_array( $group, array( 'month', 'day', 'meridiem' ) ) ) {
+	if (in_array($group, array('month', 'day', 'meridiem'))) {
 
 		$format = '';
 		$length = 0;
 
 		$date = Carbon\Carbon::now();
 
-		if ( 'month' == $group ) {
-			$date->month( 0 )->startOfMonth();
+		if ('month' == $group) {
+			$date->month(0)->startOfMonth();
 			$format = 'short' == $style ? 'M' : 'F';
 			$length = 11;
-		} elseif ( 'day' == $group ) {
-			$date->next( 6 );
+		} elseif ('day' == $group) {
+			$date->next(6);
 			$format = 'short' == $style ? 'D' : 'l';
 			$length = 6;
-		} elseif ( 'meridiem' == $group ) {
+		} elseif ('meridiem' == $group) {
 			$date->startOfDay();
-			$am = $date->addHour( 1 )->getTimestamp();
-			$pm = $date->addHours( 13 )->getTimestamp();
+			$am = $date->addHour(1)->getTimestamp();
+			$pm = $date->addHours(13)->getTimestamp();
 			return array(
-				'AM' => date_i18n( 'A', $am ),
-				'am' => date_i18n( 'a', $am ),
-				'PM' => date_i18n( 'A', $pm ),
-				'pm' => date_i18n( 'a', $pm ),
+				'AM' => date_i18n('A', $am),
+				'am' => date_i18n('a', $am),
+				'PM' => date_i18n('A', $pm),
+				'pm' => date_i18n('a', $pm),
 			);
 		}
 
 		$i = 0;
-		while ( $i <= $length ) {
-			if ( 'month' == $group ) {
-				$date->addMonths( 1 );
+		while ($i <= $length) {
+			if ('month' == $group) {
+				$date->addMonths(1);
 			} else {
-				$date->addDays( 1 );
+				$date->addDays(1);
 			}
-			$names[ strval( $i ) ] = date_i18n( $format, $date->getTimestamp() );
+			$names[strval($i)] = date_i18n($format, $date->getTimestamp());
 			$i++;
 		}
 
@@ -274,15 +274,15 @@ 
  */
 function simcal_default_event_template() {
 
-	$content  = '<strong>' . '[title]' . '</strong>';
+	$content  = '<strong>'.'[title]'.'</strong>';
 	$content .= "\n\n";
-	$content .= '[when]' . "\n";
+	$content .= '[when]'."\n";
 	$content .= '[location]';
 	$content .= "\n";
-	$content .= '<div>' . '[description]' . '</div>';
-	$content .= "\n" . '[link newwindow="yes"]' . __( 'See more details', 'google-calendar-events' ) . '[/link]';
+	$content .= '<div>'.'[description]'.'</div>';
+	$content .= "\n".'[link newwindow="yes"]'.__('See more details', 'google-calendar-events').'[/link]';
 
-	return apply_filters( 'simcal_default_event_template', $content );
+	return apply_filters('simcal_default_event_template', $content);
 }
 
 /**
@@ -297,21 +297,21 @@ 
  *
  * @return array
  */
-function simcal_get_date_format_order( $date_format ) {
+function simcal_get_date_format_order($date_format) {
 
 	$pos = array(
-		'd' => strpos( $date_format, strpbrk( $date_format, 'Dj' ) ),
-		'm' => strpos( $date_format, strpbrk( $date_format, 'FMmn' ) ),
-		'y' => strpos( $date_format, strpbrk( $date_format, 'Yy' ) ),
+		'd' => strpos($date_format, strpbrk($date_format, 'Dj')),
+		'm' => strpos($date_format, strpbrk($date_format, 'FMmn')),
+		'y' => strpos($date_format, strpbrk($date_format, 'Yy')),
 	);
 
 	// @TODO When one date piece is not found, perhaps fallback to ISO standard position.
 
 	$order = array();
-	foreach ( $pos as $k => $v ) {
-		$order[ $k ] = $v;
+	foreach ($pos as $k => $v) {
+		$order[$k] = $v;
 	}
-	ksort( $order );
+	ksort($order);
 
 	return $order;
 }
@@ -327,11 +327,11 @@ 
  */
 function simcal_get_wp_timezone() {
 
-	$timezone = get_option( 'timezone_string' );
+	$timezone = get_option('timezone_string');
 
-	if ( empty( $timezone ) ) {
-		$gmt = get_option( 'gmt_offset' );
-		$timezone = simcal_get_timezone_from_gmt_offset( $gmt );
+	if (empty($timezone)) {
+		$gmt = get_option('gmt_offset');
+		$timezone = simcal_get_timezone_from_gmt_offset($gmt);
 	}
 
 	return $timezone;
@@ -348,26 +348,26 @@ 
  *
  * @return null|string
  */
-function simcal_get_timezone_from_gmt_offset( $offset ) {
+function simcal_get_timezone_from_gmt_offset($offset) {
 
-	if ( is_numeric( $offset ) ) {
+	if (is_numeric($offset)) {
 
-		if ( 0 === intval( $offset ) ) {
+		if (0 === intval($offset)) {
 			return 'UTC';
 		} else {
-			$offset = floatval( $offset ) * 3600;
+			$offset = floatval($offset) * 3600;
 		}
 
-		$timezone = timezone_name_from_abbr( null, $offset, false );
+		$timezone = timezone_name_from_abbr(null, $offset, false);
 		// This is buggy and might return false:
 		// @see http://php.net/manual/en/function.timezone-name-from-abbr.php#86928
 		// Therefore:
-		if ( false == $timezone ) {
+		if (false == $timezone) {
 
 			$list = timezone_abbreviations_list();
-			foreach ( $list as $abbr ) {
-				foreach ( $abbr as $city ) {
-					if ( $offset == $city['offset'] ) {
+			foreach ($list as $abbr) {
+				foreach ($abbr as $city) {
+					if ($offset == $city['offset']) {
 						return $city['timezone_id'];
 					}
 				}
@@ -390,8 +390,8 @@ 
  *
  * @return int Unix time offset
  */
-function simcal_get_timezone_offset( $timezone ) {
-	return \Carbon\Carbon::now( $timezone )->offset;
+function simcal_get_timezone_offset($timezone) {
+	return \Carbon\Carbon::now($timezone)->offset;
 }
 
 /**
@@ -404,8 +404,8 @@ 
  *
  * @return mixed|string
  */
-function simcal_esc_timezone( $tz, $default = 'UTC' ) {
-	return in_array( $tz, timezone_identifiers_list() ) ? $tz : $default;
+function simcal_esc_timezone($tz, $default = 'UTC') {
+	return in_array($tz, timezone_identifiers_list()) ? $tz : $default;
 }
 
 /**
@@ -417,57 +417,57 @@ 
  *
  * @return bool
  */
-function simcal_delete_feed_transients( $id = '' ) {
+function simcal_delete_feed_transients($id = '') {
 
-	$grouped_ids = get_post_meta( $id, '_grouped_calendars_ids', true );
+	$grouped_ids = get_post_meta($id, '_grouped_calendars_ids', true);
 
 	// If there are group IDs we need to construct an array to pass along with the grouped IDs + the original $post_id
-	if ( is_array( $grouped_ids ) ) {
+	if (is_array($grouped_ids)) {
 		$temp_id = $id;
 		$id = $grouped_ids;
 		$id[] = $temp_id;
 	}
 
-	if ( is_numeric( $id ) ) {
-		$id = intval( $id ) > 0 ? absint( $id ) : simcal_get_calendars();
-	} elseif ( $id instanceof WP_Post ) {
+	if (is_numeric($id)) {
+		$id = intval($id) > 0 ? absint($id) : simcal_get_calendars();
+	} elseif ($id instanceof WP_Post) {
 		$id = $id->ID;
-	} elseif ( is_array( $id ) ) {
-		$id = array_map( 'absint', $id );
+	} elseif (is_array($id)) {
+		$id = array_map('absint', $id);
 	} else {
-		$id = simcal_get_calendars( '', true );
+		$id = simcal_get_calendars('', true);
 	}
 
 	$feed_types = simcal_get_feed_types();
 
-	if ( is_array( $id ) ) {
+	if (is_array($id)) {
 
-		$posts = get_posts( array(
+		$posts = get_posts(array(
 				'post_type' => 'calendar',
 				'fields'    => 'ids',
 				'post__in'  => $id,
 				'nopaging'  => true,
-		) );
+		));
 
-		foreach ( $posts as $post ) {
-			$calendar = simcal_get_calendar( $post );
-			if ( $calendar instanceof \SimpleCalendar\Abstracts\Calendar ) {
-				foreach ( $feed_types as $feed_type ) {
-					delete_transient( '_simple-calendar_feed_id_' . strval( $calendar->id ) . '_' . $feed_type );
+		foreach ($posts as $post) {
+			$calendar = simcal_get_calendar($post);
+			if ($calendar instanceof \SimpleCalendar\Abstracts\Calendar) {
+				foreach ($feed_types as $feed_type) {
+					delete_transient('_simple-calendar_feed_id_'.strval($calendar->id).'_'.$feed_type);
 				}
 			}
 		}
 
 	} else {
 
-		$post = get_post( $id );
-		$calendar = simcal_get_calendar( $post );
-		if ( $calendar instanceof \SimpleCalendar\Abstracts\Calendar ) {
-			foreach ( $feed_types as $feed_type ) {
-				delete_transient( '_simple-calendar_feed_id_' . strval( $calendar->id ) . '_' . $feed_type );
+		$post = get_post($id);
+		$calendar = simcal_get_calendar($post);
+		if ($calendar instanceof \SimpleCalendar\Abstracts\Calendar) {
+			foreach ($feed_types as $feed_type) {
+				delete_transient('_simple-calendar_feed_id_'.strval($calendar->id).'_'.$feed_type);
 			}
 		}
 	}
 
-	return delete_transient( '_simple-calendar_feed_ids' );
+	return delete_transient('_simple-calendar_feed_ids');
 }
\ No newline at end of file

Doc Comments +1 added lines, -1 removed lines

@@ -400,7 +400,7 @@
  * @since  3.0.0
  *
  * @param  string $tz
- * @param  mixed  $default
+ * @param  string  $default
  *
  * @return mixed|string
  */

google-calendar-events.php

Spacing +11 added lines, -11 removed lines

@@ -14,24 +14,24 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 // Plugin constants.
-$this_plugin_path      = trailingslashit( dirname( __FILE__ ) );
-$this_plugin_dir       = plugin_dir_url( __FILE__ );
+$this_plugin_path      = trailingslashit(dirname(__FILE__));
+$this_plugin_dir       = plugin_dir_url(__FILE__);
 $this_plugin_constants = array(
 	'SIMPLE_CALENDAR_VERSION'   => '3.0.15',
 	'SIMPLE_CALENDAR_MAIN_FILE' => __FILE__,
 	'SIMPLE_CALENDAR_URL'       => $this_plugin_dir,
-	'SIMPLE_CALENDAR_ASSETS'    => $this_plugin_dir . 'assets/',
+	'SIMPLE_CALENDAR_ASSETS'    => $this_plugin_dir.'assets/',
 	'SIMPLE_CALENDAR_PATH'      => $this_plugin_path,
-	'SIMPLE_CALENDAR_INC'       => $this_plugin_path . 'includes/',
+	'SIMPLE_CALENDAR_INC'       => $this_plugin_path.'includes/',
 );
-foreach ( $this_plugin_constants as $constant => $value ) {
-	if ( ! defined( $constant ) ) {
-		define( $constant, $value );
+foreach ($this_plugin_constants as $constant => $value) {
+	if ( ! defined($constant)) {
+		define($constant, $value);
 	}
 }
 
@@ -40,7 +40,7 @@ 
 include_once 'includes/wp-requirements.php';
 
 // Check plugin requirements before loading plugin.
-$this_plugin_checks = new SimCal_WP_Requirements( 'Simple Calendar', plugin_basename( __FILE__ ), array(
+$this_plugin_checks = new SimCal_WP_Requirements('Simple Calendar', plugin_basename(__FILE__), array(
 		'PHP'        => '5.3.3',
 		'WordPress'  => '4.1',
 		'Extensions' => array(
@@ -49,8 +49,8 @@ 
 			'json',
 			'mbstring',
 		),
-	) );
-if ( $this_plugin_checks->pass() === false ) {
+	));
+if ($this_plugin_checks->pass() === false) {
 	$this_plugin_checks->halt();
 
 	return;

includes/browser.php

Indentation +1211 added lines, -1211 removed lines

@@ -42,1214 +42,1214 @@
 
 
 
-    class Browser
-    {
-        private $_agent = '';
-        private $_browser_name = '';
-        private $_version = '';
-        private $_platform = '';
-        private $_os = '';
-        private $_is_aol = false;
-        private $_is_mobile = false;
-        private $_is_tablet = false;
-        private $_is_robot = false;
-        private $_is_facebook = false;
-        private $_aol_version = '';
-
-        const BROWSER_UNKNOWN = 'unknown';
-        const VERSION_UNKNOWN = 'unknown';
-
-        const BROWSER_OPERA = 'Opera'; // http://www.opera.com/
-        const BROWSER_OPERA_MINI = 'Opera Mini'; // http://www.opera.com/mini/
-        const BROWSER_WEBTV = 'WebTV'; // http://www.webtv.net/pc/
-        const BROWSER_IE = 'Internet Explorer'; // http://www.microsoft.com/ie/
-        const BROWSER_POCKET_IE = 'Pocket Internet Explorer'; // http://en.wikipedia.org/wiki/Internet_Explorer_Mobile
-        const BROWSER_KONQUEROR = 'Konqueror'; // http://www.konqueror.org/
-        const BROWSER_ICAB = 'iCab'; // http://www.icab.de/
-        const BROWSER_OMNIWEB = 'OmniWeb'; // http://www.omnigroup.com/applications/omniweb/
-        const BROWSER_FIREBIRD = 'Firebird'; // http://www.ibphoenix.com/
-        const BROWSER_FIREFOX = 'Firefox'; // http://www.mozilla.com/en-US/firefox/firefox.html
-        const BROWSER_ICEWEASEL = 'Iceweasel'; // http://www.geticeweasel.org/
-        const BROWSER_SHIRETOKO = 'Shiretoko'; // http://wiki.mozilla.org/Projects/shiretoko
-        const BROWSER_MOZILLA = 'Mozilla'; // http://www.mozilla.com/en-US/
-        const BROWSER_AMAYA = 'Amaya'; // http://www.w3.org/Amaya/
-        const BROWSER_LYNX = 'Lynx'; // http://en.wikipedia.org/wiki/Lynx
-        const BROWSER_SAFARI = 'Safari'; // http://apple.com
-        const BROWSER_IPHONE = 'iPhone'; // http://apple.com
-        const BROWSER_IPOD = 'iPod'; // http://apple.com
-        const BROWSER_IPAD = 'iPad'; // http://apple.com
-        const BROWSER_CHROME = 'Chrome'; // http://www.google.com/chrome
-        const BROWSER_ANDROID = 'Android'; // http://www.android.com/
-        const BROWSER_GOOGLEBOT = 'GoogleBot'; // http://en.wikipedia.org/wiki/Googlebot
-        const BROWSER_SLURP = 'Yahoo! Slurp'; // http://en.wikipedia.org/wiki/Yahoo!_Slurp
-        const BROWSER_W3CVALIDATOR = 'W3C Validator'; // http://validator.w3.org/
-        const BROWSER_BLACKBERRY = 'BlackBerry'; // http://www.blackberry.com/
-        const BROWSER_ICECAT = 'IceCat'; // http://en.wikipedia.org/wiki/GNU_IceCat
-        const BROWSER_NOKIA_S60 = 'Nokia S60 OSS Browser'; // http://en.wikipedia.org/wiki/Web_Browser_for_S60
-        const BROWSER_NOKIA = 'Nokia Browser'; // * all other WAP-based browsers on the Nokia Platform
-        const BROWSER_MSN = 'MSN Browser'; // http://explorer.msn.com/
-        const BROWSER_MSNBOT = 'MSN Bot'; // http://search.msn.com/msnbot.htm
-        const BROWSER_BINGBOT = 'Bing Bot'; // http://en.wikipedia.org/wiki/Bingbot
-
-        const BROWSER_NETSCAPE_NAVIGATOR = 'Netscape Navigator'; // http://browser.netscape.com/ (DEPRECATED)
-        const BROWSER_GALEON = 'Galeon'; // http://galeon.sourceforge.net/ (DEPRECATED)
-        const BROWSER_NETPOSITIVE = 'NetPositive'; // http://en.wikipedia.org/wiki/NetPositive (DEPRECATED)
-        const BROWSER_PHOENIX = 'Phoenix'; // http://en.wikipedia.org/wiki/History_of_Mozilla_Firefox (DEPRECATED)
-
-        const PLATFORM_UNKNOWN = 'unknown';
-        const PLATFORM_WINDOWS = 'Windows';
-        const PLATFORM_WINDOWS_CE = 'Windows CE';
-        const PLATFORM_APPLE = 'Apple';
-        const PLATFORM_LINUX = 'Linux';
-        const PLATFORM_OS2 = 'OS/2';
-        const PLATFORM_BEOS = 'BeOS';
-        const PLATFORM_IPHONE = 'iPhone';
-        const PLATFORM_IPOD = 'iPod';
-        const PLATFORM_IPAD = 'iPad';
-        const PLATFORM_BLACKBERRY = 'BlackBerry';
-        const PLATFORM_NOKIA = 'Nokia';
-        const PLATFORM_FREEBSD = 'FreeBSD';
-        const PLATFORM_OPENBSD = 'OpenBSD';
-        const PLATFORM_NETBSD = 'NetBSD';
-        const PLATFORM_SUNOS = 'SunOS';
-        const PLATFORM_OPENSOLARIS = 'OpenSolaris';
-        const PLATFORM_ANDROID = 'Android';
-
-        const OPERATING_SYSTEM_UNKNOWN = 'unknown';
-
-        public function __construct($userAgent = "")
-        {
-            $this->reset();
-            if ($userAgent != "") {
-                $this->setUserAgent($userAgent);
-            } else {
-                $this->determine();
-            }
-        }
-
-        /**
-         * Reset all properties
-         */
-        public function reset()
-        {
-            $this->_agent = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "";
-            $this->_browser_name = self::BROWSER_UNKNOWN;
-            $this->_version = self::VERSION_UNKNOWN;
-            $this->_platform = self::PLATFORM_UNKNOWN;
-            $this->_os = self::OPERATING_SYSTEM_UNKNOWN;
-            $this->_is_aol = false;
-            $this->_is_mobile = false;
-            $this->_is_tablet = false;
-            $this->_is_robot = false;
-            $this->_is_facebook = false;
-            $this->_aol_version = self::VERSION_UNKNOWN;
-        }
-
-        /**
-         * Check to see if the specific browser is valid
-         * @param string $browserName
-         * @return bool True if the browser is the specified browser
-         */
-        function isBrowser($browserName)
-        {
-            return (0 == strcasecmp($this->_browser_name, trim($browserName)));
-        }
-
-        /**
-         * The name of the browser.  All return types are from the class contants
-         * @return string Name of the browser
-         */
-        public function getBrowser()
-        {
-            return $this->_browser_name;
-        }
-
-        /**
-         * Set the name of the browser
-         * @param $browser string The name of the Browser
-         */
-        public function setBrowser($browser)
-        {
-            $this->_browser_name = $browser;
-        }
-
-        /**
-         * The name of the platform.  All return types are from the class contants
-         * @return string Name of the browser
-         */
-        public function getPlatform()
-        {
-            return $this->_platform;
-        }
-
-        /**
-         * Set the name of the platform
-         * @param string $platform The name of the Platform
-         */
-        public function setPlatform($platform)
-        {
-            $this->_platform = $platform;
-        }
-
-        /**
-         * The version of the browser.
-         * @return string Version of the browser (will only contain alpha-numeric characters and a period)
-         */
-        public function getVersion()
-        {
-            return $this->_version;
-        }
-
-        /**
-         * Set the version of the browser
-         * @param string $version The version of the Browser
-         */
-        public function setVersion($version)
-        {
-            $this->_version = preg_replace('/[^0-9,.,a-z,A-Z-]/', '', $version);
-        }
-
-        /**
-         * The version of AOL.
-         * @return string Version of AOL (will only contain alpha-numeric characters and a period)
-         */
-        public function getAolVersion()
-        {
-            return $this->_aol_version;
-        }
-
-        /**
-         * Set the version of AOL
-         * @param string $version The version of AOL
-         */
-        public function setAolVersion($version)
-        {
-            $this->_aol_version = preg_replace('/[^0-9,.,a-z,A-Z]/', '', $version);
-        }
-
-        /**
-         * Is the browser from AOL?
-         * @return boolean True if the browser is from AOL otherwise false
-         */
-        public function isAol()
-        {
-            return $this->_is_aol;
-        }
-
-        /**
-         * Is the browser from a mobile device?
-         * @return boolean True if the browser is from a mobile device otherwise false
-         */
-        public function isMobile()
-        {
-            return $this->_is_mobile;
-        }
-
-        /**
-         * Is the browser from a tablet device?
-         * @return boolean True if the browser is from a tablet device otherwise false
-         */
-        public function isTablet()
-        {
-            return $this->_is_tablet;
-        }
-
-        /**
-         * Is the browser from a robot (ex Slurp,GoogleBot)?
-         * @return boolean True if the browser is from a robot otherwise false
-         */
-        public function isRobot()
-        {
-            return $this->_is_robot;
-        }
-
-        /**
-         * Is the browser from facebook?
-         * @return boolean True if the browser is from facebook otherwise false
-         */
-        public function isFacebook()
-        {
-            return $this->_is_facebook;
-        }
-
-        /**
-         * Set the browser to be from AOL
-         * @param $isAol
-         */
-        public function setAol($isAol)
-        {
-            $this->_is_aol = $isAol;
-        }
-
-        /**
-         * Set the Browser to be mobile
-         * @param boolean $value is the browser a mobile browser or not
-         */
-        protected function setMobile($value = true)
-        {
-            $this->_is_mobile = $value;
-        }
-
-        /**
-         * Set the Browser to be tablet
-         * @param boolean $value is the browser a tablet browser or not
-         */
-        protected function setTablet($value = true)
-        {
-            $this->_is_tablet = $value;
-        }
-
-        /**
-         * Set the Browser to be a robot
-         * @param boolean $value is the browser a robot or not
-         */
-        protected function setRobot($value = true)
-        {
-            $this->_is_robot = $value;
-        }
-
-        /**
-         * Set the Browser to be a Facebook request
-         * @param boolean $value is the browser a robot or not
-         */
-        protected function setFacebook($value = true)
-        {
-            $this->_is_facebook = $value;
-        }
-
-        /**
-         * Get the user agent value in use to determine the browser
-         * @return string The user agent from the HTTP header
-         */
-        public function getUserAgent()
-        {
-            return $this->_agent;
-        }
-
-        /**
-         * Set the user agent value (the construction will use the HTTP header value - this will overwrite it)
-         * @param string $agent_string The value for the User Agent
-         */
-        public function setUserAgent($agent_string)
-        {
-            $this->reset();
-            $this->_agent = $agent_string;
-            $this->determine();
-        }
-
-        /**
-         * Used to determine if the browser is actually "chromeframe"
-         * @since 1.7
-         * @return boolean True if the browser is using chromeframe
-         */
-        public function isChromeFrame()
-        {
-            return (strpos($this->_agent, "chromeframe") !== false);
-        }
-
-        /**
-         * Returns a formatted string with a summary of the details of the browser.
-         * @return string formatted string with a summary of the browser
-         */
-        public function __toString()
-        {
-            return "<strong>Browser Name:</strong> {$this->getBrowser()}<br/>\n" .
-            "<strong>Browser Version:</strong> {$this->getVersion()}<br/>\n" .
-            "<strong>Browser User Agent String:</strong> {$this->getUserAgent()}<br/>\n" .
-            "<strong>Platform:</strong> {$this->getPlatform()}<br/>";
-        }
-
-        /**
-         * Protected routine to calculate and determine what the browser is in use (including platform)
-         */
-        protected function determine()
-        {
-            $this->checkPlatform();
-            $this->checkBrowsers();
-            $this->checkForAol();
-        }
-
-        /**
-         * Protected routine to determine the browser type
-         * @return boolean True if the browser was detected otherwise false
-         */
-        protected function checkBrowsers()
-        {
-            return (
-                // well-known, well-used
-                // Special Notes:
-                // (1) Opera must be checked before FireFox due to the odd
-                //     user agents used in some older versions of Opera
-                // (2) WebTV is strapped onto Internet Explorer so we must
-                //     check for WebTV before IE
-                // (3) (deprecated) Galeon is based on Firefox and needs to be
-                //     tested before Firefox is tested
-                // (4) OmniWeb is based on Safari so OmniWeb check must occur
-                //     before Safari
-                // (5) Netscape 9+ is based on Firefox so Netscape checks
-                //     before FireFox are necessary
-                $this->checkBrowserWebTv() ||
-                $this->checkBrowserInternetExplorer() ||
-                $this->checkBrowserOpera() ||
-                $this->checkBrowserGaleon() ||
-                $this->checkBrowserNetscapeNavigator9Plus() ||
-                $this->checkBrowserFirefox() ||
-                $this->checkBrowserChrome() ||
-                $this->checkBrowserOmniWeb() ||
-
-                // common mobile
-                $this->checkBrowserAndroid() ||
-                $this->checkBrowseriPad() ||
-                $this->checkBrowseriPod() ||
-                $this->checkBrowseriPhone() ||
-                $this->checkBrowserBlackBerry() ||
-                $this->checkBrowserNokia() ||
-
-                // common bots
-                $this->checkBrowserGoogleBot() ||
-                $this->checkBrowserMSNBot() ||
-                $this->checkBrowserBingBot() ||
-                $this->checkBrowserSlurp() ||
-
-                // check for facebook external hit when loading URL
-                $this->checkFacebookExternalHit() ||
-
-                // WebKit base check (post mobile and others)
-                $this->checkBrowserSafari() ||
-
-                // everyone else
-                $this->checkBrowserNetPositive() ||
-                $this->checkBrowserFirebird() ||
-                $this->checkBrowserKonqueror() ||
-                $this->checkBrowserIcab() ||
-                $this->checkBrowserPhoenix() ||
-                $this->checkBrowserAmaya() ||
-                $this->checkBrowserLynx() ||
-                $this->checkBrowserShiretoko() ||
-                $this->checkBrowserIceCat() ||
-                $this->checkBrowserIceweasel() ||
-                $this->checkBrowserW3CValidator() ||
-                $this->checkBrowserMozilla() /* Mozilla is such an open standard that you must check it last */
-            );
-        }
-
-        /**
-         * Determine if the user is using a BlackBerry (last updated 1.7)
-         * @return boolean True if the browser is the BlackBerry browser otherwise false
-         */
-        protected function checkBrowserBlackBerry()
-        {
-            if (stripos($this->_agent, 'blackberry') !== false) {
-                $aresult = explode("/", stristr($this->_agent, "BlackBerry"));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->_browser_name = self::BROWSER_BLACKBERRY;
-                    $this->setMobile(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the user is using an AOL User Agent (last updated 1.7)
-         * @return boolean True if the browser is from AOL otherwise false
-         */
-        protected function checkForAol()
-        {
-            $this->setAol(false);
-            $this->setAolVersion(self::VERSION_UNKNOWN);
-
-            if (stripos($this->_agent, 'aol') !== false) {
-                $aversion = explode(' ', stristr($this->_agent, 'AOL'));
-                if (isset($aversion[1])) {
-                    $this->setAol(true);
-                    $this->setAolVersion(preg_replace('/[^0-9\.a-z]/i', '', $aversion[1]));
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the GoogleBot or not (last updated 1.7)
-         * @return boolean True if the browser is the GoogletBot otherwise false
-         */
-        protected function checkBrowserGoogleBot()
-        {
-            if (stripos($this->_agent, 'googlebot') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'googlebot'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion(str_replace(';', '', $aversion[0]));
-                    $this->_browser_name = self::BROWSER_GOOGLEBOT;
-                    $this->setRobot(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the MSNBot or not (last updated 1.9)
-         * @return boolean True if the browser is the MSNBot otherwise false
-         */
-        protected function checkBrowserMSNBot()
-        {
-            if (stripos($this->_agent, "msnbot") !== false) {
-                $aresult = explode("/", stristr($this->_agent, "msnbot"));
-                if (isset($aresult[1])) {
-                    $aversion = explode(" ", $aresult[1]);
-                    $this->setVersion(str_replace(";", "", $aversion[0]));
-                    $this->_browser_name = self::BROWSER_MSNBOT;
-                    $this->setRobot(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the BingBot or not (last updated 1.9)
-         * @return boolean True if the browser is the BingBot otherwise false
-         */
-        protected function checkBrowserBingBot()
-        {
-            if (stripos($this->_agent, "bingbot") !== false) {
-                $aresult = explode("/", stristr($this->_agent, "bingbot"));
-                if (isset($aresult[1])) {
-                    $aversion = explode(" ", $aresult[1]);
-                    $this->setVersion(str_replace(";", "", $aversion[0]));
-                    $this->_browser_name = self::BROWSER_BINGBOT;
-                    $this->setRobot(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the W3C Validator or not (last updated 1.7)
-         * @return boolean True if the browser is the W3C Validator otherwise false
-         */
-        protected function checkBrowserW3CValidator()
-        {
-            if (stripos($this->_agent, 'W3C-checklink') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'W3C-checklink'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->_browser_name = self::BROWSER_W3CVALIDATOR;
-                    return true;
-                }
-            } else if (stripos($this->_agent, 'W3C_Validator') !== false) {
-                // Some of the Validator versions do not delineate w/ a slash - add it back in
-                $ua = str_replace("W3C_Validator ", "W3C_Validator/", $this->_agent);
-                $aresult = explode('/', stristr($ua, 'W3C_Validator'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->_browser_name = self::BROWSER_W3CVALIDATOR;
-                    return true;
-                }
-            } else if (stripos($this->_agent, 'W3C-mobileOK') !== false) {
-                $this->_browser_name = self::BROWSER_W3CVALIDATOR;
-                $this->setMobile(true);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the Yahoo! Slurp Robot or not (last updated 1.7)
-         * @return boolean True if the browser is the Yahoo! Slurp Robot otherwise false
-         */
-        protected function checkBrowserSlurp()
-        {
-            if (stripos($this->_agent, 'slurp') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'Slurp'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->_browser_name = self::BROWSER_SLURP;
-                    $this->setRobot(true);
-                    $this->setMobile(false);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Internet Explorer or not (last updated 1.7)
-         * @return boolean True if the browser is Internet Explorer otherwise false
-         */
-        protected function checkBrowserInternetExplorer()
-        {
-            //  Test for IE11
-            if (stripos($this->_agent, 'Trident/7.0; rv:11.0') !== false) {
-                $this->setBrowser(self::BROWSER_IE);
-                $this->setVersion('11.0');
-                return true;
-            } // Test for v1 - v1.5 IE
-            else if (stripos($this->_agent, 'microsoft internet explorer') !== false) {
-                $this->setBrowser(self::BROWSER_IE);
-                $this->setVersion('1.0');
-                $aresult = stristr($this->_agent, '/');
-                if (preg_match('/308|425|426|474|0b1/i', $aresult)) {
-                    $this->setVersion('1.5');
-                }
-                return true;
-            } // Test for versions > 1.5
-            else if (stripos($this->_agent, 'msie') !== false && stripos($this->_agent, 'opera') === false) {
-                // See if the browser is the odd MSN Explorer
-                if (stripos($this->_agent, 'msnb') !== false) {
-                    $aresult = explode(' ', stristr(str_replace(';', '; ', $this->_agent), 'MSN'));
-                    if (isset($aresult[1])) {
-                        $this->setBrowser(self::BROWSER_MSN);
-                        $this->setVersion(str_replace(array('(', ')', ';'), '', $aresult[1]));
-                        return true;
-                    }
-                }
-                $aresult = explode(' ', stristr(str_replace(';', '; ', $this->_agent), 'msie'));
-                if (isset($aresult[1])) {
-                    $this->setBrowser(self::BROWSER_IE);
-                    $this->setVersion(str_replace(array('(', ')', ';'), '', $aresult[1]));
-                    if (stripos($this->_agent, 'IEMobile') !== false) {
-                        $this->setBrowser(self::BROWSER_POCKET_IE);
-                        $this->setMobile(true);
-                    }
-                    return true;
-                }
-            } // Test for versions > IE 10
-            else if (stripos($this->_agent, 'trident') !== false) {
-                $this->setBrowser(self::BROWSER_IE);
-                $result = explode('rv:', $this->_agent);
-                if (isset($result[1])) {
-                    $this->setVersion(preg_replace('/[^0-9.]+/', '', $result[1]));
-                    $this->_agent = str_replace(array("Mozilla", "Gecko"), "MSIE", $this->_agent);
-                }
-            } // Test for Pocket IE
-            else if (stripos($this->_agent, 'mspie') !== false || stripos($this->_agent, 'pocket') !== false) {
-                $aresult = explode(' ', stristr($this->_agent, 'mspie'));
-                if (isset($aresult[1])) {
-                    $this->setPlatform(self::PLATFORM_WINDOWS_CE);
-                    $this->setBrowser(self::BROWSER_POCKET_IE);
-                    $this->setMobile(true);
-
-                    if (stripos($this->_agent, 'mspie') !== false) {
-                        $this->setVersion($aresult[1]);
-                    } else {
-                        $aversion = explode('/', $this->_agent);
-                        if (isset($aversion[1])) {
-                            $this->setVersion($aversion[1]);
-                        }
-                    }
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Opera or not (last updated 1.7)
-         * @return boolean True if the browser is Opera otherwise false
-         */
-        protected function checkBrowserOpera()
-        {
-            if (stripos($this->_agent, 'opera mini') !== false) {
-                $resultant = stristr($this->_agent, 'opera mini');
-                if (preg_match('/\//', $resultant)) {
-                    $aresult = explode('/', $resultant);
-                    if (isset($aresult[1])) {
-                        $aversion = explode(' ', $aresult[1]);
-                        $this->setVersion($aversion[0]);
-                    }
-                } else {
-                    $aversion = explode(' ', stristr($resultant, 'opera mini'));
-                    if (isset($aversion[1])) {
-                        $this->setVersion($aversion[1]);
-                    }
-                }
-                $this->_browser_name = self::BROWSER_OPERA_MINI;
-                $this->setMobile(true);
-                return true;
-            } else if (stripos($this->_agent, 'opera') !== false) {
-                $resultant = stristr($this->_agent, 'opera');
-                if (preg_match('/Version\/(1*.*)$/', $resultant, $matches)) {
-                    $this->setVersion($matches[1]);
-                } else if (preg_match('/\//', $resultant)) {
-                    $aresult = explode('/', str_replace("(", " ", $resultant));
-                    if (isset($aresult[1])) {
-                        $aversion = explode(' ', $aresult[1]);
-                        $this->setVersion($aversion[0]);
-                    }
-                } else {
-                    $aversion = explode(' ', stristr($resultant, 'opera'));
-                    $this->setVersion(isset($aversion[1]) ? $aversion[1] : "");
-                }
-                if (stripos($this->_agent, 'Opera Mobi') !== false) {
-                    $this->setMobile(true);
-                }
-                $this->_browser_name = self::BROWSER_OPERA;
-                return true;
-            } else if (stripos($this->_agent, 'OPR') !== false) {
-                $resultant = stristr($this->_agent, 'OPR');
-                if (preg_match('/\//', $resultant)) {
-                    $aresult = explode('/', str_replace("(", " ", $resultant));
-                    if (isset($aresult[1])) {
-                        $aversion = explode(' ', $aresult[1]);
-                        $this->setVersion($aversion[0]);
-                    }
-                }
-                if (stripos($this->_agent, 'Mobile') !== false) {
-                    $this->setMobile(true);
-                }
-                $this->_browser_name = self::BROWSER_OPERA;
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Chrome or not (last updated 1.7)
-         * @return boolean True if the browser is Chrome otherwise false
-         */
-        protected function checkBrowserChrome()
-        {
-            if (stripos($this->_agent, 'Chrome') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'Chrome'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->setBrowser(self::BROWSER_CHROME);
-                    //Chrome on Android
-                    if (stripos($this->_agent, 'Android') !== false) {
-                        if (stripos($this->_agent, 'Mobile') !== false) {
-                            $this->setMobile(true);
-                        } else {
-                            $this->setTablet(true);
-                        }
-                    }
-                    return true;
-                }
-            }
-            return false;
-        }
-
-
-        /**
-         * Determine if the browser is WebTv or not (last updated 1.7)
-         * @return boolean True if the browser is WebTv otherwise false
-         */
-        protected function checkBrowserWebTv()
-        {
-            if (stripos($this->_agent, 'webtv') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'webtv'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->setBrowser(self::BROWSER_WEBTV);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is NetPositive or not (last updated 1.7)
-         * @return boolean True if the browser is NetPositive otherwise false
-         */
-        protected function checkBrowserNetPositive()
-        {
-            if (stripos($this->_agent, 'NetPositive') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'NetPositive'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion(str_replace(array('(', ')', ';'), '', $aversion[0]));
-                    $this->setBrowser(self::BROWSER_NETPOSITIVE);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Galeon or not (last updated 1.7)
-         * @return boolean True if the browser is Galeon otherwise false
-         */
-        protected function checkBrowserGaleon()
-        {
-            if (stripos($this->_agent, 'galeon') !== false) {
-                $aresult = explode(' ', stristr($this->_agent, 'galeon'));
-                $aversion = explode('/', $aresult[0]);
-                if (isset($aversion[1])) {
-                    $this->setVersion($aversion[1]);
-                    $this->setBrowser(self::BROWSER_GALEON);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Konqueror or not (last updated 1.7)
-         * @return boolean True if the browser is Konqueror otherwise false
-         */
-        protected function checkBrowserKonqueror()
-        {
-            if (stripos($this->_agent, 'Konqueror') !== false) {
-                $aresult = explode(' ', stristr($this->_agent, 'Konqueror'));
-                $aversion = explode('/', $aresult[0]);
-                if (isset($aversion[1])) {
-                    $this->setVersion($aversion[1]);
-                    $this->setBrowser(self::BROWSER_KONQUEROR);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is iCab or not (last updated 1.7)
-         * @return boolean True if the browser is iCab otherwise false
-         */
-        protected function checkBrowserIcab()
-        {
-            if (stripos($this->_agent, 'icab') !== false) {
-                $aversion = explode(' ', stristr(str_replace('/', ' ', $this->_agent), 'icab'));
-                if (isset($aversion[1])) {
-                    $this->setVersion($aversion[1]);
-                    $this->setBrowser(self::BROWSER_ICAB);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is OmniWeb or not (last updated 1.7)
-         * @return boolean True if the browser is OmniWeb otherwise false
-         */
-        protected function checkBrowserOmniWeb()
-        {
-            if (stripos($this->_agent, 'omniweb') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'omniweb'));
-                $aversion = explode(' ', isset($aresult[1]) ? $aresult[1] : "");
-                $this->setVersion($aversion[0]);
-                $this->setBrowser(self::BROWSER_OMNIWEB);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Phoenix or not (last updated 1.7)
-         * @return boolean True if the browser is Phoenix otherwise false
-         */
-        protected function checkBrowserPhoenix()
-        {
-            if (stripos($this->_agent, 'Phoenix') !== false) {
-                $aversion = explode('/', stristr($this->_agent, 'Phoenix'));
-                if (isset($aversion[1])) {
-                    $this->setVersion($aversion[1]);
-                    $this->setBrowser(self::BROWSER_PHOENIX);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Firebird or not (last updated 1.7)
-         * @return boolean True if the browser is Firebird otherwise false
-         */
-        protected function checkBrowserFirebird()
-        {
-            if (stripos($this->_agent, 'Firebird') !== false) {
-                $aversion = explode('/', stristr($this->_agent, 'Firebird'));
-                if (isset($aversion[1])) {
-                    $this->setVersion($aversion[1]);
-                    $this->setBrowser(self::BROWSER_FIREBIRD);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Netscape Navigator 9+ or not (last updated 1.7)
-         * NOTE: (http://browser.netscape.com/ - Official support ended on March 1st, 2008)
-         * @return boolean True if the browser is Netscape Navigator 9+ otherwise false
-         */
-        protected function checkBrowserNetscapeNavigator9Plus()
-        {
-            if (stripos($this->_agent, 'Firefox') !== false && preg_match('/Navigator\/([^ ]*)/i', $this->_agent, $matches)) {
-                $this->setVersion($matches[1]);
-                $this->setBrowser(self::BROWSER_NETSCAPE_NAVIGATOR);
-                return true;
-            } else if (stripos($this->_agent, 'Firefox') === false && preg_match('/Netscape6?\/([^ ]*)/i', $this->_agent, $matches)) {
-                $this->setVersion($matches[1]);
-                $this->setBrowser(self::BROWSER_NETSCAPE_NAVIGATOR);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Shiretoko or not (https://wiki.mozilla.org/Projects/shiretoko) (last updated 1.7)
-         * @return boolean True if the browser is Shiretoko otherwise false
-         */
-        protected function checkBrowserShiretoko()
-        {
-            if (stripos($this->_agent, 'Mozilla') !== false && preg_match('/Shiretoko\/([^ ]*)/i', $this->_agent, $matches)) {
-                $this->setVersion($matches[1]);
-                $this->setBrowser(self::BROWSER_SHIRETOKO);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Ice Cat or not (http://en.wikipedia.org/wiki/GNU_IceCat) (last updated 1.7)
-         * @return boolean True if the browser is Ice Cat otherwise false
-         */
-        protected function checkBrowserIceCat()
-        {
-            if (stripos($this->_agent, 'Mozilla') !== false && preg_match('/IceCat\/([^ ]*)/i', $this->_agent, $matches)) {
-                $this->setVersion($matches[1]);
-                $this->setBrowser(self::BROWSER_ICECAT);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Nokia or not (last updated 1.7)
-         * @return boolean True if the browser is Nokia otherwise false
-         */
-        protected function checkBrowserNokia()
-        {
-            if (preg_match("/Nokia([^\/]+)\/([^ SP]+)/i", $this->_agent, $matches)) {
-                $this->setVersion($matches[2]);
-                if (stripos($this->_agent, 'Series60') !== false || strpos($this->_agent, 'S60') !== false) {
-                    $this->setBrowser(self::BROWSER_NOKIA_S60);
-                } else {
-                    $this->setBrowser(self::BROWSER_NOKIA);
-                }
-                $this->setMobile(true);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Firefox or not (last updated 1.7)
-         * @return boolean True if the browser is Firefox otherwise false
-         */
-        protected function checkBrowserFirefox()
-        {
-            if (stripos($this->_agent, 'safari') === false) {
-                if (preg_match("/Firefox[\/ \(]([^ ;\)]+)/i", $this->_agent, $matches)) {
-                    $this->setVersion($matches[1]);
-                    $this->setBrowser(self::BROWSER_FIREFOX);
-                    //Firefox on Android
-                    if (stripos($this->_agent, 'Android') !== false) {
-                        if (stripos($this->_agent, 'Mobile') !== false) {
-                            $this->setMobile(true);
-                        } else {
-                            $this->setTablet(true);
-                        }
-                    }
-                    return true;
-                } else if (preg_match("/Firefox$/i", $this->_agent, $matches)) {
-                    $this->setVersion("");
-                    $this->setBrowser(self::BROWSER_FIREFOX);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Firefox or not (last updated 1.7)
-         * @return boolean True if the browser is Firefox otherwise false
-         */
-        protected function checkBrowserIceweasel()
-        {
-            if (stripos($this->_agent, 'Iceweasel') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'Iceweasel'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->setBrowser(self::BROWSER_ICEWEASEL);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Mozilla or not (last updated 1.7)
-         * @return boolean True if the browser is Mozilla otherwise false
-         */
-        protected function checkBrowserMozilla()
-        {
-            if (stripos($this->_agent, 'mozilla') !== false && preg_match('/rv:[0-9].[0-9][a-b]?/i', $this->_agent) && stripos($this->_agent, 'netscape') === false) {
-                $aversion = explode(' ', stristr($this->_agent, 'rv:'));
-                preg_match('/rv:[0-9].[0-9][a-b]?/i', $this->_agent, $aversion);
-                $this->setVersion(str_replace('rv:', '', $aversion[0]));
-                $this->setBrowser(self::BROWSER_MOZILLA);
-                return true;
-            } else if (stripos($this->_agent, 'mozilla') !== false && preg_match('/rv:[0-9]\.[0-9]/i', $this->_agent) && stripos($this->_agent, 'netscape') === false) {
-                $aversion = explode('', stristr($this->_agent, 'rv:'));
-                $this->setVersion(str_replace('rv:', '', $aversion[0]));
-                $this->setBrowser(self::BROWSER_MOZILLA);
-                return true;
-            } else if (stripos($this->_agent, 'mozilla') !== false && preg_match('/mozilla\/([^ ]*)/i', $this->_agent, $matches) && stripos($this->_agent, 'netscape') === false) {
-                $this->setVersion($matches[1]);
-                $this->setBrowser(self::BROWSER_MOZILLA);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Lynx or not (last updated 1.7)
-         * @return boolean True if the browser is Lynx otherwise false
-         */
-        protected function checkBrowserLynx()
-        {
-            if (stripos($this->_agent, 'lynx') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'Lynx'));
-                $aversion = explode(' ', (isset($aresult[1]) ? $aresult[1] : ""));
-                $this->setVersion($aversion[0]);
-                $this->setBrowser(self::BROWSER_LYNX);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Amaya or not (last updated 1.7)
-         * @return boolean True if the browser is Amaya otherwise false
-         */
-        protected function checkBrowserAmaya()
-        {
-            if (stripos($this->_agent, 'amaya') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'Amaya'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->setBrowser(self::BROWSER_AMAYA);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Safari or not (last updated 1.7)
-         * @return boolean True if the browser is Safari otherwise false
-         */
-        protected function checkBrowserSafari()
-        {
-            if (stripos($this->_agent, 'Safari') !== false
-                && stripos($this->_agent, 'iPhone') === false
-                && stripos($this->_agent, 'iPod') === false
-            ) {
-
-                $aresult = explode('/', stristr($this->_agent, 'Version'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                } else {
-                    $this->setVersion(self::VERSION_UNKNOWN);
-                }
-                $this->setBrowser(self::BROWSER_SAFARI);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Detect if URL is loaded from FacebookExternalHit
-         * @return boolean True if it detects FacebookExternalHit otherwise false
-         */
-        protected function checkFacebookExternalHit()
-        {
-            if (stristr($this->_agent, 'FacebookExternalHit')) {
-                $this->setRobot(true);
-                $this->setFacebook(true);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Detect if URL is being loaded from internal Facebook browser
-         * @return boolean True if it detects internal Facebook browser otherwise false
-         */
-        protected function checkForFacebookIos()
-        {
-            if (stristr($this->_agent, 'FBIOS')) {
-                $this->setFacebook(true);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Detect Version for the Safari browser on iOS devices
-         * @return boolean True if it detects the version correctly otherwise false
-         */
-        protected function getSafariVersionOnIos()
-        {
-            $aresult = explode('/', stristr($this->_agent, 'Version'));
-            if (isset($aresult[1])) {
-                $aversion = explode(' ', $aresult[1]);
-                $this->setVersion($aversion[0]);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Detect Version for the Chrome browser on iOS devices
-         * @return boolean True if it detects the version correctly otherwise false
-         */
-        protected function getChromeVersionOnIos()
-        {
-            $aresult = explode('/', stristr($this->_agent, 'CriOS'));
-            if (isset($aresult[1])) {
-                $aversion = explode(' ', $aresult[1]);
-                $this->setVersion($aversion[0]);
-                $this->setBrowser(self::BROWSER_CHROME);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is iPhone or not (last updated 1.7)
-         * @return boolean True if the browser is iPhone otherwise false
-         */
-        protected function checkBrowseriPhone()
-        {
-            if (stripos($this->_agent, 'iPhone') !== false) {
-                $this->setVersion(self::VERSION_UNKNOWN);
-                $this->setBrowser(self::BROWSER_IPHONE);
-                $this->getSafariVersionOnIos();
-                $this->getChromeVersionOnIos();
-                $this->checkForFacebookIos();
-                $this->setMobile(true);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is iPad or not (last updated 1.7)
-         * @return boolean True if the browser is iPad otherwise false
-         */
-        protected function checkBrowseriPad()
-        {
-            if (stripos($this->_agent, 'iPad') !== false) {
-                $this->setVersion(self::VERSION_UNKNOWN);
-                $this->setBrowser(self::BROWSER_IPAD);
-                $this->getSafariVersionOnIos();
-                $this->getChromeVersionOnIos();
-                $this->checkForFacebookIos();
-                $this->setTablet(true);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is iPod or not (last updated 1.7)
-         * @return boolean True if the browser is iPod otherwise false
-         */
-        protected function checkBrowseriPod()
-        {
-            if (stripos($this->_agent, 'iPod') !== false) {
-                $this->setVersion(self::VERSION_UNKNOWN);
-                $this->setBrowser(self::BROWSER_IPOD);
-                $this->getSafariVersionOnIos();
-                $this->getChromeVersionOnIos();
-                $this->checkForFacebookIos();
-                $this->setMobile(true);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Android or not (last updated 1.7)
-         * @return boolean True if the browser is Android otherwise false
-         */
-        protected function checkBrowserAndroid()
-        {
-            if (stripos($this->_agent, 'Android') !== false) {
-                $aresult = explode(' ', stristr($this->_agent, 'Android'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                } else {
-                    $this->setVersion(self::VERSION_UNKNOWN);
-                }
-                if (stripos($this->_agent, 'Mobile') !== false) {
-                    $this->setMobile(true);
-                } else {
-                    $this->setTablet(true);
-                }
-                $this->setBrowser(self::BROWSER_ANDROID);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine the user's platform (last updated 1.7)
-         */
-        protected function checkPlatform()
-        {
-            if (stripos($this->_agent, 'windows') !== false) {
-                $this->_platform = self::PLATFORM_WINDOWS;
-            } else if (stripos($this->_agent, 'iPad') !== false) {
-                $this->_platform = self::PLATFORM_IPAD;
-            } else if (stripos($this->_agent, 'iPod') !== false) {
-                $this->_platform = self::PLATFORM_IPOD;
-            } else if (stripos($this->_agent, 'iPhone') !== false) {
-                $this->_platform = self::PLATFORM_IPHONE;
-            } elseif (stripos($this->_agent, 'mac') !== false) {
-                $this->_platform = self::PLATFORM_APPLE;
-            } elseif (stripos($this->_agent, 'android') !== false) {
-                $this->_platform = self::PLATFORM_ANDROID;
-            } elseif (stripos($this->_agent, 'linux') !== false) {
-                $this->_platform = self::PLATFORM_LINUX;
-            } else if (stripos($this->_agent, 'Nokia') !== false) {
-                $this->_platform = self::PLATFORM_NOKIA;
-            } else if (stripos($this->_agent, 'BlackBerry') !== false) {
-                $this->_platform = self::PLATFORM_BLACKBERRY;
-            } elseif (stripos($this->_agent, 'FreeBSD') !== false) {
-                $this->_platform = self::PLATFORM_FREEBSD;
-            } elseif (stripos($this->_agent, 'OpenBSD') !== false) {
-                $this->_platform = self::PLATFORM_OPENBSD;
-            } elseif (stripos($this->_agent, 'NetBSD') !== false) {
-                $this->_platform = self::PLATFORM_NETBSD;
-            } elseif (stripos($this->_agent, 'OpenSolaris') !== false) {
-                $this->_platform = self::PLATFORM_OPENSOLARIS;
-            } elseif (stripos($this->_agent, 'SunOS') !== false) {
-                $this->_platform = self::PLATFORM_SUNOS;
-            } elseif (stripos($this->_agent, 'OS\/2') !== false) {
-                $this->_platform = self::PLATFORM_OS2;
-            } elseif (stripos($this->_agent, 'BeOS') !== false) {
-                $this->_platform = self::PLATFORM_BEOS;
-            } elseif (stripos($this->_agent, 'win') !== false) {
-                $this->_platform = self::PLATFORM_WINDOWS;
-            }
-
-        }
-    }
\ No newline at end of file
+	class Browser
+	{
+		private $_agent = '';
+		private $_browser_name = '';
+		private $_version = '';
+		private $_platform = '';
+		private $_os = '';
+		private $_is_aol = false;
+		private $_is_mobile = false;
+		private $_is_tablet = false;
+		private $_is_robot = false;
+		private $_is_facebook = false;
+		private $_aol_version = '';
+
+		const BROWSER_UNKNOWN = 'unknown';
+		const VERSION_UNKNOWN = 'unknown';
+
+		const BROWSER_OPERA = 'Opera'; // http://www.opera.com/
+		const BROWSER_OPERA_MINI = 'Opera Mini'; // http://www.opera.com/mini/
+		const BROWSER_WEBTV = 'WebTV'; // http://www.webtv.net/pc/
+		const BROWSER_IE = 'Internet Explorer'; // http://www.microsoft.com/ie/
+		const BROWSER_POCKET_IE = 'Pocket Internet Explorer'; // http://en.wikipedia.org/wiki/Internet_Explorer_Mobile
+		const BROWSER_KONQUEROR = 'Konqueror'; // http://www.konqueror.org/
+		const BROWSER_ICAB = 'iCab'; // http://www.icab.de/
+		const BROWSER_OMNIWEB = 'OmniWeb'; // http://www.omnigroup.com/applications/omniweb/
+		const BROWSER_FIREBIRD = 'Firebird'; // http://www.ibphoenix.com/
+		const BROWSER_FIREFOX = 'Firefox'; // http://www.mozilla.com/en-US/firefox/firefox.html
+		const BROWSER_ICEWEASEL = 'Iceweasel'; // http://www.geticeweasel.org/
+		const BROWSER_SHIRETOKO = 'Shiretoko'; // http://wiki.mozilla.org/Projects/shiretoko
+		const BROWSER_MOZILLA = 'Mozilla'; // http://www.mozilla.com/en-US/
+		const BROWSER_AMAYA = 'Amaya'; // http://www.w3.org/Amaya/
+		const BROWSER_LYNX = 'Lynx'; // http://en.wikipedia.org/wiki/Lynx
+		const BROWSER_SAFARI = 'Safari'; // http://apple.com
+		const BROWSER_IPHONE = 'iPhone'; // http://apple.com
+		const BROWSER_IPOD = 'iPod'; // http://apple.com
+		const BROWSER_IPAD = 'iPad'; // http://apple.com
+		const BROWSER_CHROME = 'Chrome'; // http://www.google.com/chrome
+		const BROWSER_ANDROID = 'Android'; // http://www.android.com/
+		const BROWSER_GOOGLEBOT = 'GoogleBot'; // http://en.wikipedia.org/wiki/Googlebot
+		const BROWSER_SLURP = 'Yahoo! Slurp'; // http://en.wikipedia.org/wiki/Yahoo!_Slurp
+		const BROWSER_W3CVALIDATOR = 'W3C Validator'; // http://validator.w3.org/
+		const BROWSER_BLACKBERRY = 'BlackBerry'; // http://www.blackberry.com/
+		const BROWSER_ICECAT = 'IceCat'; // http://en.wikipedia.org/wiki/GNU_IceCat
+		const BROWSER_NOKIA_S60 = 'Nokia S60 OSS Browser'; // http://en.wikipedia.org/wiki/Web_Browser_for_S60
+		const BROWSER_NOKIA = 'Nokia Browser'; // * all other WAP-based browsers on the Nokia Platform
+		const BROWSER_MSN = 'MSN Browser'; // http://explorer.msn.com/
+		const BROWSER_MSNBOT = 'MSN Bot'; // http://search.msn.com/msnbot.htm
+		const BROWSER_BINGBOT = 'Bing Bot'; // http://en.wikipedia.org/wiki/Bingbot
+
+		const BROWSER_NETSCAPE_NAVIGATOR = 'Netscape Navigator'; // http://browser.netscape.com/ (DEPRECATED)
+		const BROWSER_GALEON = 'Galeon'; // http://galeon.sourceforge.net/ (DEPRECATED)
+		const BROWSER_NETPOSITIVE = 'NetPositive'; // http://en.wikipedia.org/wiki/NetPositive (DEPRECATED)
+		const BROWSER_PHOENIX = 'Phoenix'; // http://en.wikipedia.org/wiki/History_of_Mozilla_Firefox (DEPRECATED)
+
+		const PLATFORM_UNKNOWN = 'unknown';
+		const PLATFORM_WINDOWS = 'Windows';
+		const PLATFORM_WINDOWS_CE = 'Windows CE';
+		const PLATFORM_APPLE = 'Apple';
+		const PLATFORM_LINUX = 'Linux';
+		const PLATFORM_OS2 = 'OS/2';
+		const PLATFORM_BEOS = 'BeOS';
+		const PLATFORM_IPHONE = 'iPhone';
+		const PLATFORM_IPOD = 'iPod';
+		const PLATFORM_IPAD = 'iPad';
+		const PLATFORM_BLACKBERRY = 'BlackBerry';
+		const PLATFORM_NOKIA = 'Nokia';
+		const PLATFORM_FREEBSD = 'FreeBSD';
+		const PLATFORM_OPENBSD = 'OpenBSD';
+		const PLATFORM_NETBSD = 'NetBSD';
+		const PLATFORM_SUNOS = 'SunOS';
+		const PLATFORM_OPENSOLARIS = 'OpenSolaris';
+		const PLATFORM_ANDROID = 'Android';
+
+		const OPERATING_SYSTEM_UNKNOWN = 'unknown';
+
+		public function __construct($userAgent = "")
+		{
+			$this->reset();
+			if ($userAgent != "") {
+				$this->setUserAgent($userAgent);
+			} else {
+				$this->determine();
+			}
+		}
+
+		/**
+		 * Reset all properties
+		 */
+		public function reset()
+		{
+			$this->_agent = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "";
+			$this->_browser_name = self::BROWSER_UNKNOWN;
+			$this->_version = self::VERSION_UNKNOWN;
+			$this->_platform = self::PLATFORM_UNKNOWN;
+			$this->_os = self::OPERATING_SYSTEM_UNKNOWN;
+			$this->_is_aol = false;
+			$this->_is_mobile = false;
+			$this->_is_tablet = false;
+			$this->_is_robot = false;
+			$this->_is_facebook = false;
+			$this->_aol_version = self::VERSION_UNKNOWN;
+		}
+
+		/**
+		 * Check to see if the specific browser is valid
+		 * @param string $browserName
+		 * @return bool True if the browser is the specified browser
+		 */
+		function isBrowser($browserName)
+		{
+			return (0 == strcasecmp($this->_browser_name, trim($browserName)));
+		}
+
+		/**
+		 * The name of the browser.  All return types are from the class contants
+		 * @return string Name of the browser
+		 */
+		public function getBrowser()
+		{
+			return $this->_browser_name;
+		}
+
+		/**
+		 * Set the name of the browser
+		 * @param $browser string The name of the Browser
+		 */
+		public function setBrowser($browser)
+		{
+			$this->_browser_name = $browser;
+		}
+
+		/**
+		 * The name of the platform.  All return types are from the class contants
+		 * @return string Name of the browser
+		 */
+		public function getPlatform()
+		{
+			return $this->_platform;
+		}
+
+		/**
+		 * Set the name of the platform
+		 * @param string $platform The name of the Platform
+		 */
+		public function setPlatform($platform)
+		{
+			$this->_platform = $platform;
+		}
+
+		/**
+		 * The version of the browser.
+		 * @return string Version of the browser (will only contain alpha-numeric characters and a period)
+		 */
+		public function getVersion()
+		{
+			return $this->_version;
+		}
+
+		/**
+		 * Set the version of the browser
+		 * @param string $version The version of the Browser
+		 */
+		public function setVersion($version)
+		{
+			$this->_version = preg_replace('/[^0-9,.,a-z,A-Z-]/', '', $version);
+		}
+
+		/**
+		 * The version of AOL.
+		 * @return string Version of AOL (will only contain alpha-numeric characters and a period)
+		 */
+		public function getAolVersion()
+		{
+			return $this->_aol_version;
+		}
+
+		/**
+		 * Set the version of AOL
+		 * @param string $version The version of AOL
+		 */
+		public function setAolVersion($version)
+		{
+			$this->_aol_version = preg_replace('/[^0-9,.,a-z,A-Z]/', '', $version);
+		}
+
+		/**
+		 * Is the browser from AOL?
+		 * @return boolean True if the browser is from AOL otherwise false
+		 */
+		public function isAol()
+		{
+			return $this->_is_aol;
+		}
+
+		/**
+		 * Is the browser from a mobile device?
+		 * @return boolean True if the browser is from a mobile device otherwise false
+		 */
+		public function isMobile()
+		{
+			return $this->_is_mobile;
+		}
+
+		/**
+		 * Is the browser from a tablet device?
+		 * @return boolean True if the browser is from a tablet device otherwise false
+		 */
+		public function isTablet()
+		{
+			return $this->_is_tablet;
+		}
+
+		/**
+		 * Is the browser from a robot (ex Slurp,GoogleBot)?
+		 * @return boolean True if the browser is from a robot otherwise false
+		 */
+		public function isRobot()
+		{
+			return $this->_is_robot;
+		}
+
+		/**
+		 * Is the browser from facebook?
+		 * @return boolean True if the browser is from facebook otherwise false
+		 */
+		public function isFacebook()
+		{
+			return $this->_is_facebook;
+		}
+
+		/**
+		 * Set the browser to be from AOL
+		 * @param $isAol
+		 */
+		public function setAol($isAol)
+		{
+			$this->_is_aol = $isAol;
+		}
+
+		/**
+		 * Set the Browser to be mobile
+		 * @param boolean $value is the browser a mobile browser or not
+		 */
+		protected function setMobile($value = true)
+		{
+			$this->_is_mobile = $value;
+		}
+
+		/**
+		 * Set the Browser to be tablet
+		 * @param boolean $value is the browser a tablet browser or not
+		 */
+		protected function setTablet($value = true)
+		{
+			$this->_is_tablet = $value;
+		}
+
+		/**
+		 * Set the Browser to be a robot
+		 * @param boolean $value is the browser a robot or not
+		 */
+		protected function setRobot($value = true)
+		{
+			$this->_is_robot = $value;
+		}
+
+		/**
+		 * Set the Browser to be a Facebook request
+		 * @param boolean $value is the browser a robot or not
+		 */
+		protected function setFacebook($value = true)
+		{
+			$this->_is_facebook = $value;
+		}
+
+		/**
+		 * Get the user agent value in use to determine the browser
+		 * @return string The user agent from the HTTP header
+		 */
+		public function getUserAgent()
+		{
+			return $this->_agent;
+		}
+
+		/**
+		 * Set the user agent value (the construction will use the HTTP header value - this will overwrite it)
+		 * @param string $agent_string The value for the User Agent
+		 */
+		public function setUserAgent($agent_string)
+		{
+			$this->reset();
+			$this->_agent = $agent_string;
+			$this->determine();
+		}
+
+		/**
+		 * Used to determine if the browser is actually "chromeframe"
+		 * @since 1.7
+		 * @return boolean True if the browser is using chromeframe
+		 */
+		public function isChromeFrame()
+		{
+			return (strpos($this->_agent, "chromeframe") !== false);
+		}
+
+		/**
+		 * Returns a formatted string with a summary of the details of the browser.
+		 * @return string formatted string with a summary of the browser
+		 */
+		public function __toString()
+		{
+			return "<strong>Browser Name:</strong> {$this->getBrowser()}<br/>\n" .
+			"<strong>Browser Version:</strong> {$this->getVersion()}<br/>\n" .
+			"<strong>Browser User Agent String:</strong> {$this->getUserAgent()}<br/>\n" .
+			"<strong>Platform:</strong> {$this->getPlatform()}<br/>";
+		}
+
+		/**
+		 * Protected routine to calculate and determine what the browser is in use (including platform)
+		 */
+		protected function determine()
+		{
+			$this->checkPlatform();
+			$this->checkBrowsers();
+			$this->checkForAol();
+		}
+
+		/**
+		 * Protected routine to determine the browser type
+		 * @return boolean True if the browser was detected otherwise false
+		 */
+		protected function checkBrowsers()
+		{
+			return (
+				// well-known, well-used
+				// Special Notes:
+				// (1) Opera must be checked before FireFox due to the odd
+				//     user agents used in some older versions of Opera
+				// (2) WebTV is strapped onto Internet Explorer so we must
+				//     check for WebTV before IE
+				// (3) (deprecated) Galeon is based on Firefox and needs to be
+				//     tested before Firefox is tested
+				// (4) OmniWeb is based on Safari so OmniWeb check must occur
+				//     before Safari
+				// (5) Netscape 9+ is based on Firefox so Netscape checks
+				//     before FireFox are necessary
+				$this->checkBrowserWebTv() ||
+				$this->checkBrowserInternetExplorer() ||
+				$this->checkBrowserOpera() ||
+				$this->checkBrowserGaleon() ||
+				$this->checkBrowserNetscapeNavigator9Plus() ||
+				$this->checkBrowserFirefox() ||
+				$this->checkBrowserChrome() ||
+				$this->checkBrowserOmniWeb() ||
+
+				// common mobile
+				$this->checkBrowserAndroid() ||
+				$this->checkBrowseriPad() ||
+				$this->checkBrowseriPod() ||
+				$this->checkBrowseriPhone() ||
+				$this->checkBrowserBlackBerry() ||
+				$this->checkBrowserNokia() ||
+
+				// common bots
+				$this->checkBrowserGoogleBot() ||
+				$this->checkBrowserMSNBot() ||
+				$this->checkBrowserBingBot() ||
+				$this->checkBrowserSlurp() ||
+
+				// check for facebook external hit when loading URL
+				$this->checkFacebookExternalHit() ||
+
+				// WebKit base check (post mobile and others)
+				$this->checkBrowserSafari() ||
+
+				// everyone else
+				$this->checkBrowserNetPositive() ||
+				$this->checkBrowserFirebird() ||
+				$this->checkBrowserKonqueror() ||
+				$this->checkBrowserIcab() ||
+				$this->checkBrowserPhoenix() ||
+				$this->checkBrowserAmaya() ||
+				$this->checkBrowserLynx() ||
+				$this->checkBrowserShiretoko() ||
+				$this->checkBrowserIceCat() ||
+				$this->checkBrowserIceweasel() ||
+				$this->checkBrowserW3CValidator() ||
+				$this->checkBrowserMozilla() /* Mozilla is such an open standard that you must check it last */
+			);
+		}
+
+		/**
+		 * Determine if the user is using a BlackBerry (last updated 1.7)
+		 * @return boolean True if the browser is the BlackBerry browser otherwise false
+		 */
+		protected function checkBrowserBlackBerry()
+		{
+			if (stripos($this->_agent, 'blackberry') !== false) {
+				$aresult = explode("/", stristr($this->_agent, "BlackBerry"));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->_browser_name = self::BROWSER_BLACKBERRY;
+					$this->setMobile(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the user is using an AOL User Agent (last updated 1.7)
+		 * @return boolean True if the browser is from AOL otherwise false
+		 */
+		protected function checkForAol()
+		{
+			$this->setAol(false);
+			$this->setAolVersion(self::VERSION_UNKNOWN);
+
+			if (stripos($this->_agent, 'aol') !== false) {
+				$aversion = explode(' ', stristr($this->_agent, 'AOL'));
+				if (isset($aversion[1])) {
+					$this->setAol(true);
+					$this->setAolVersion(preg_replace('/[^0-9\.a-z]/i', '', $aversion[1]));
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the GoogleBot or not (last updated 1.7)
+		 * @return boolean True if the browser is the GoogletBot otherwise false
+		 */
+		protected function checkBrowserGoogleBot()
+		{
+			if (stripos($this->_agent, 'googlebot') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'googlebot'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion(str_replace(';', '', $aversion[0]));
+					$this->_browser_name = self::BROWSER_GOOGLEBOT;
+					$this->setRobot(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the MSNBot or not (last updated 1.9)
+		 * @return boolean True if the browser is the MSNBot otherwise false
+		 */
+		protected function checkBrowserMSNBot()
+		{
+			if (stripos($this->_agent, "msnbot") !== false) {
+				$aresult = explode("/", stristr($this->_agent, "msnbot"));
+				if (isset($aresult[1])) {
+					$aversion = explode(" ", $aresult[1]);
+					$this->setVersion(str_replace(";", "", $aversion[0]));
+					$this->_browser_name = self::BROWSER_MSNBOT;
+					$this->setRobot(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the BingBot or not (last updated 1.9)
+		 * @return boolean True if the browser is the BingBot otherwise false
+		 */
+		protected function checkBrowserBingBot()
+		{
+			if (stripos($this->_agent, "bingbot") !== false) {
+				$aresult = explode("/", stristr($this->_agent, "bingbot"));
+				if (isset($aresult[1])) {
+					$aversion = explode(" ", $aresult[1]);
+					$this->setVersion(str_replace(";", "", $aversion[0]));
+					$this->_browser_name = self::BROWSER_BINGBOT;
+					$this->setRobot(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the W3C Validator or not (last updated 1.7)
+		 * @return boolean True if the browser is the W3C Validator otherwise false
+		 */
+		protected function checkBrowserW3CValidator()
+		{
+			if (stripos($this->_agent, 'W3C-checklink') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'W3C-checklink'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->_browser_name = self::BROWSER_W3CVALIDATOR;
+					return true;
+				}
+			} else if (stripos($this->_agent, 'W3C_Validator') !== false) {
+				// Some of the Validator versions do not delineate w/ a slash - add it back in
+				$ua = str_replace("W3C_Validator ", "W3C_Validator/", $this->_agent);
+				$aresult = explode('/', stristr($ua, 'W3C_Validator'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->_browser_name = self::BROWSER_W3CVALIDATOR;
+					return true;
+				}
+			} else if (stripos($this->_agent, 'W3C-mobileOK') !== false) {
+				$this->_browser_name = self::BROWSER_W3CVALIDATOR;
+				$this->setMobile(true);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the Yahoo! Slurp Robot or not (last updated 1.7)
+		 * @return boolean True if the browser is the Yahoo! Slurp Robot otherwise false
+		 */
+		protected function checkBrowserSlurp()
+		{
+			if (stripos($this->_agent, 'slurp') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'Slurp'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->_browser_name = self::BROWSER_SLURP;
+					$this->setRobot(true);
+					$this->setMobile(false);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Internet Explorer or not (last updated 1.7)
+		 * @return boolean True if the browser is Internet Explorer otherwise false
+		 */
+		protected function checkBrowserInternetExplorer()
+		{
+			//  Test for IE11
+			if (stripos($this->_agent, 'Trident/7.0; rv:11.0') !== false) {
+				$this->setBrowser(self::BROWSER_IE);
+				$this->setVersion('11.0');
+				return true;
+			} // Test for v1 - v1.5 IE
+			else if (stripos($this->_agent, 'microsoft internet explorer') !== false) {
+				$this->setBrowser(self::BROWSER_IE);
+				$this->setVersion('1.0');
+				$aresult = stristr($this->_agent, '/');
+				if (preg_match('/308|425|426|474|0b1/i', $aresult)) {
+					$this->setVersion('1.5');
+				}
+				return true;
+			} // Test for versions > 1.5
+			else if (stripos($this->_agent, 'msie') !== false && stripos($this->_agent, 'opera') === false) {
+				// See if the browser is the odd MSN Explorer
+				if (stripos($this->_agent, 'msnb') !== false) {
+					$aresult = explode(' ', stristr(str_replace(';', '; ', $this->_agent), 'MSN'));
+					if (isset($aresult[1])) {
+						$this->setBrowser(self::BROWSER_MSN);
+						$this->setVersion(str_replace(array('(', ')', ';'), '', $aresult[1]));
+						return true;
+					}
+				}
+				$aresult = explode(' ', stristr(str_replace(';', '; ', $this->_agent), 'msie'));
+				if (isset($aresult[1])) {
+					$this->setBrowser(self::BROWSER_IE);
+					$this->setVersion(str_replace(array('(', ')', ';'), '', $aresult[1]));
+					if (stripos($this->_agent, 'IEMobile') !== false) {
+						$this->setBrowser(self::BROWSER_POCKET_IE);
+						$this->setMobile(true);
+					}
+					return true;
+				}
+			} // Test for versions > IE 10
+			else if (stripos($this->_agent, 'trident') !== false) {
+				$this->setBrowser(self::BROWSER_IE);
+				$result = explode('rv:', $this->_agent);
+				if (isset($result[1])) {
+					$this->setVersion(preg_replace('/[^0-9.]+/', '', $result[1]));
+					$this->_agent = str_replace(array("Mozilla", "Gecko"), "MSIE", $this->_agent);
+				}
+			} // Test for Pocket IE
+			else if (stripos($this->_agent, 'mspie') !== false || stripos($this->_agent, 'pocket') !== false) {
+				$aresult = explode(' ', stristr($this->_agent, 'mspie'));
+				if (isset($aresult[1])) {
+					$this->setPlatform(self::PLATFORM_WINDOWS_CE);
+					$this->setBrowser(self::BROWSER_POCKET_IE);
+					$this->setMobile(true);
+
+					if (stripos($this->_agent, 'mspie') !== false) {
+						$this->setVersion($aresult[1]);
+					} else {
+						$aversion = explode('/', $this->_agent);
+						if (isset($aversion[1])) {
+							$this->setVersion($aversion[1]);
+						}
+					}
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Opera or not (last updated 1.7)
+		 * @return boolean True if the browser is Opera otherwise false
+		 */
+		protected function checkBrowserOpera()
+		{
+			if (stripos($this->_agent, 'opera mini') !== false) {
+				$resultant = stristr($this->_agent, 'opera mini');
+				if (preg_match('/\//', $resultant)) {
+					$aresult = explode('/', $resultant);
+					if (isset($aresult[1])) {
+						$aversion = explode(' ', $aresult[1]);
+						$this->setVersion($aversion[0]);
+					}
+				} else {
+					$aversion = explode(' ', stristr($resultant, 'opera mini'));
+					if (isset($aversion[1])) {
+						$this->setVersion($aversion[1]);
+					}
+				}
+				$this->_browser_name = self::BROWSER_OPERA_MINI;
+				$this->setMobile(true);
+				return true;
+			} else if (stripos($this->_agent, 'opera') !== false) {
+				$resultant = stristr($this->_agent, 'opera');
+				if (preg_match('/Version\/(1*.*)$/', $resultant, $matches)) {
+					$this->setVersion($matches[1]);
+				} else if (preg_match('/\//', $resultant)) {
+					$aresult = explode('/', str_replace("(", " ", $resultant));
+					if (isset($aresult[1])) {
+						$aversion = explode(' ', $aresult[1]);
+						$this->setVersion($aversion[0]);
+					}
+				} else {
+					$aversion = explode(' ', stristr($resultant, 'opera'));
+					$this->setVersion(isset($aversion[1]) ? $aversion[1] : "");
+				}
+				if (stripos($this->_agent, 'Opera Mobi') !== false) {
+					$this->setMobile(true);
+				}
+				$this->_browser_name = self::BROWSER_OPERA;
+				return true;
+			} else if (stripos($this->_agent, 'OPR') !== false) {
+				$resultant = stristr($this->_agent, 'OPR');
+				if (preg_match('/\//', $resultant)) {
+					$aresult = explode('/', str_replace("(", " ", $resultant));
+					if (isset($aresult[1])) {
+						$aversion = explode(' ', $aresult[1]);
+						$this->setVersion($aversion[0]);
+					}
+				}
+				if (stripos($this->_agent, 'Mobile') !== false) {
+					$this->setMobile(true);
+				}
+				$this->_browser_name = self::BROWSER_OPERA;
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Chrome or not (last updated 1.7)
+		 * @return boolean True if the browser is Chrome otherwise false
+		 */
+		protected function checkBrowserChrome()
+		{
+			if (stripos($this->_agent, 'Chrome') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'Chrome'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->setBrowser(self::BROWSER_CHROME);
+					//Chrome on Android
+					if (stripos($this->_agent, 'Android') !== false) {
+						if (stripos($this->_agent, 'Mobile') !== false) {
+							$this->setMobile(true);
+						} else {
+							$this->setTablet(true);
+						}
+					}
+					return true;
+				}
+			}
+			return false;
+		}
+
+
+		/**
+		 * Determine if the browser is WebTv or not (last updated 1.7)
+		 * @return boolean True if the browser is WebTv otherwise false
+		 */
+		protected function checkBrowserWebTv()
+		{
+			if (stripos($this->_agent, 'webtv') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'webtv'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->setBrowser(self::BROWSER_WEBTV);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is NetPositive or not (last updated 1.7)
+		 * @return boolean True if the browser is NetPositive otherwise false
+		 */
+		protected function checkBrowserNetPositive()
+		{
+			if (stripos($this->_agent, 'NetPositive') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'NetPositive'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion(str_replace(array('(', ')', ';'), '', $aversion[0]));
+					$this->setBrowser(self::BROWSER_NETPOSITIVE);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Galeon or not (last updated 1.7)
+		 * @return boolean True if the browser is Galeon otherwise false
+		 */
+		protected function checkBrowserGaleon()
+		{
+			if (stripos($this->_agent, 'galeon') !== false) {
+				$aresult = explode(' ', stristr($this->_agent, 'galeon'));
+				$aversion = explode('/', $aresult[0]);
+				if (isset($aversion[1])) {
+					$this->setVersion($aversion[1]);
+					$this->setBrowser(self::BROWSER_GALEON);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Konqueror or not (last updated 1.7)
+		 * @return boolean True if the browser is Konqueror otherwise false
+		 */
+		protected function checkBrowserKonqueror()
+		{
+			if (stripos($this->_agent, 'Konqueror') !== false) {
+				$aresult = explode(' ', stristr($this->_agent, 'Konqueror'));
+				$aversion = explode('/', $aresult[0]);
+				if (isset($aversion[1])) {
+					$this->setVersion($aversion[1]);
+					$this->setBrowser(self::BROWSER_KONQUEROR);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is iCab or not (last updated 1.7)
+		 * @return boolean True if the browser is iCab otherwise false
+		 */
+		protected function checkBrowserIcab()
+		{
+			if (stripos($this->_agent, 'icab') !== false) {
+				$aversion = explode(' ', stristr(str_replace('/', ' ', $this->_agent), 'icab'));
+				if (isset($aversion[1])) {
+					$this->setVersion($aversion[1]);
+					$this->setBrowser(self::BROWSER_ICAB);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is OmniWeb or not (last updated 1.7)
+		 * @return boolean True if the browser is OmniWeb otherwise false
+		 */
+		protected function checkBrowserOmniWeb()
+		{
+			if (stripos($this->_agent, 'omniweb') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'omniweb'));
+				$aversion = explode(' ', isset($aresult[1]) ? $aresult[1] : "");
+				$this->setVersion($aversion[0]);
+				$this->setBrowser(self::BROWSER_OMNIWEB);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Phoenix or not (last updated 1.7)
+		 * @return boolean True if the browser is Phoenix otherwise false
+		 */
+		protected function checkBrowserPhoenix()
+		{
+			if (stripos($this->_agent, 'Phoenix') !== false) {
+				$aversion = explode('/', stristr($this->_agent, 'Phoenix'));
+				if (isset($aversion[1])) {
+					$this->setVersion($aversion[1]);
+					$this->setBrowser(self::BROWSER_PHOENIX);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Firebird or not (last updated 1.7)
+		 * @return boolean True if the browser is Firebird otherwise false
+		 */
+		protected function checkBrowserFirebird()
+		{
+			if (stripos($this->_agent, 'Firebird') !== false) {
+				$aversion = explode('/', stristr($this->_agent, 'Firebird'));
+				if (isset($aversion[1])) {
+					$this->setVersion($aversion[1]);
+					$this->setBrowser(self::BROWSER_FIREBIRD);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Netscape Navigator 9+ or not (last updated 1.7)
+		 * NOTE: (http://browser.netscape.com/ - Official support ended on March 1st, 2008)
+		 * @return boolean True if the browser is Netscape Navigator 9+ otherwise false
+		 */
+		protected function checkBrowserNetscapeNavigator9Plus()
+		{
+			if (stripos($this->_agent, 'Firefox') !== false && preg_match('/Navigator\/([^ ]*)/i', $this->_agent, $matches)) {
+				$this->setVersion($matches[1]);
+				$this->setBrowser(self::BROWSER_NETSCAPE_NAVIGATOR);
+				return true;
+			} else if (stripos($this->_agent, 'Firefox') === false && preg_match('/Netscape6?\/([^ ]*)/i', $this->_agent, $matches)) {
+				$this->setVersion($matches[1]);
+				$this->setBrowser(self::BROWSER_NETSCAPE_NAVIGATOR);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Shiretoko or not (https://wiki.mozilla.org/Projects/shiretoko) (last updated 1.7)
+		 * @return boolean True if the browser is Shiretoko otherwise false
+		 */
+		protected function checkBrowserShiretoko()
+		{
+			if (stripos($this->_agent, 'Mozilla') !== false && preg_match('/Shiretoko\/([^ ]*)/i', $this->_agent, $matches)) {
+				$this->setVersion($matches[1]);
+				$this->setBrowser(self::BROWSER_SHIRETOKO);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Ice Cat or not (http://en.wikipedia.org/wiki/GNU_IceCat) (last updated 1.7)
+		 * @return boolean True if the browser is Ice Cat otherwise false
+		 */
+		protected function checkBrowserIceCat()
+		{
+			if (stripos($this->_agent, 'Mozilla') !== false && preg_match('/IceCat\/([^ ]*)/i', $this->_agent, $matches)) {
+				$this->setVersion($matches[1]);
+				$this->setBrowser(self::BROWSER_ICECAT);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Nokia or not (last updated 1.7)
+		 * @return boolean True if the browser is Nokia otherwise false
+		 */
+		protected function checkBrowserNokia()
+		{
+			if (preg_match("/Nokia([^\/]+)\/([^ SP]+)/i", $this->_agent, $matches)) {
+				$this->setVersion($matches[2]);
+				if (stripos($this->_agent, 'Series60') !== false || strpos($this->_agent, 'S60') !== false) {
+					$this->setBrowser(self::BROWSER_NOKIA_S60);
+				} else {
+					$this->setBrowser(self::BROWSER_NOKIA);
+				}
+				$this->setMobile(true);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Firefox or not (last updated 1.7)
+		 * @return boolean True if the browser is Firefox otherwise false
+		 */
+		protected function checkBrowserFirefox()
+		{
+			if (stripos($this->_agent, 'safari') === false) {
+				if (preg_match("/Firefox[\/ \(]([^ ;\)]+)/i", $this->_agent, $matches)) {
+					$this->setVersion($matches[1]);
+					$this->setBrowser(self::BROWSER_FIREFOX);
+					//Firefox on Android
+					if (stripos($this->_agent, 'Android') !== false) {
+						if (stripos($this->_agent, 'Mobile') !== false) {
+							$this->setMobile(true);
+						} else {
+							$this->setTablet(true);
+						}
+					}
+					return true;
+				} else if (preg_match("/Firefox$/i", $this->_agent, $matches)) {
+					$this->setVersion("");
+					$this->setBrowser(self::BROWSER_FIREFOX);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Firefox or not (last updated 1.7)
+		 * @return boolean True if the browser is Firefox otherwise false
+		 */
+		protected function checkBrowserIceweasel()
+		{
+			if (stripos($this->_agent, 'Iceweasel') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'Iceweasel'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->setBrowser(self::BROWSER_ICEWEASEL);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Mozilla or not (last updated 1.7)
+		 * @return boolean True if the browser is Mozilla otherwise false
+		 */
+		protected function checkBrowserMozilla()
+		{
+			if (stripos($this->_agent, 'mozilla') !== false && preg_match('/rv:[0-9].[0-9][a-b]?/i', $this->_agent) && stripos($this->_agent, 'netscape') === false) {
+				$aversion = explode(' ', stristr($this->_agent, 'rv:'));
+				preg_match('/rv:[0-9].[0-9][a-b]?/i', $this->_agent, $aversion);
+				$this->setVersion(str_replace('rv:', '', $aversion[0]));
+				$this->setBrowser(self::BROWSER_MOZILLA);
+				return true;
+			} else if (stripos($this->_agent, 'mozilla') !== false && preg_match('/rv:[0-9]\.[0-9]/i', $this->_agent) && stripos($this->_agent, 'netscape') === false) {
+				$aversion = explode('', stristr($this->_agent, 'rv:'));
+				$this->setVersion(str_replace('rv:', '', $aversion[0]));
+				$this->setBrowser(self::BROWSER_MOZILLA);
+				return true;
+			} else if (stripos($this->_agent, 'mozilla') !== false && preg_match('/mozilla\/([^ ]*)/i', $this->_agent, $matches) && stripos($this->_agent, 'netscape') === false) {
+				$this->setVersion($matches[1]);
+				$this->setBrowser(self::BROWSER_MOZILLA);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Lynx or not (last updated 1.7)
+		 * @return boolean True if the browser is Lynx otherwise false
+		 */
+		protected function checkBrowserLynx()
+		{
+			if (stripos($this->_agent, 'lynx') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'Lynx'));
+				$aversion = explode(' ', (isset($aresult[1]) ? $aresult[1] : ""));
+				$this->setVersion($aversion[0]);
+				$this->setBrowser(self::BROWSER_LYNX);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Amaya or not (last updated 1.7)
+		 * @return boolean True if the browser is Amaya otherwise false
+		 */
+		protected function checkBrowserAmaya()
+		{
+			if (stripos($this->_agent, 'amaya') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'Amaya'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->setBrowser(self::BROWSER_AMAYA);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Safari or not (last updated 1.7)
+		 * @return boolean True if the browser is Safari otherwise false
+		 */
+		protected function checkBrowserSafari()
+		{
+			if (stripos($this->_agent, 'Safari') !== false
+				&& stripos($this->_agent, 'iPhone') === false
+				&& stripos($this->_agent, 'iPod') === false
+			) {
+
+				$aresult = explode('/', stristr($this->_agent, 'Version'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+				} else {
+					$this->setVersion(self::VERSION_UNKNOWN);
+				}
+				$this->setBrowser(self::BROWSER_SAFARI);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Detect if URL is loaded from FacebookExternalHit
+		 * @return boolean True if it detects FacebookExternalHit otherwise false
+		 */
+		protected function checkFacebookExternalHit()
+		{
+			if (stristr($this->_agent, 'FacebookExternalHit')) {
+				$this->setRobot(true);
+				$this->setFacebook(true);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Detect if URL is being loaded from internal Facebook browser
+		 * @return boolean True if it detects internal Facebook browser otherwise false
+		 */
+		protected function checkForFacebookIos()
+		{
+			if (stristr($this->_agent, 'FBIOS')) {
+				$this->setFacebook(true);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Detect Version for the Safari browser on iOS devices
+		 * @return boolean True if it detects the version correctly otherwise false
+		 */
+		protected function getSafariVersionOnIos()
+		{
+			$aresult = explode('/', stristr($this->_agent, 'Version'));
+			if (isset($aresult[1])) {
+				$aversion = explode(' ', $aresult[1]);
+				$this->setVersion($aversion[0]);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Detect Version for the Chrome browser on iOS devices
+		 * @return boolean True if it detects the version correctly otherwise false
+		 */
+		protected function getChromeVersionOnIos()
+		{
+			$aresult = explode('/', stristr($this->_agent, 'CriOS'));
+			if (isset($aresult[1])) {
+				$aversion = explode(' ', $aresult[1]);
+				$this->setVersion($aversion[0]);
+				$this->setBrowser(self::BROWSER_CHROME);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is iPhone or not (last updated 1.7)
+		 * @return boolean True if the browser is iPhone otherwise false
+		 */
+		protected function checkBrowseriPhone()
+		{
+			if (stripos($this->_agent, 'iPhone') !== false) {
+				$this->setVersion(self::VERSION_UNKNOWN);
+				$this->setBrowser(self::BROWSER_IPHONE);
+				$this->getSafariVersionOnIos();
+				$this->getChromeVersionOnIos();
+				$this->checkForFacebookIos();
+				$this->setMobile(true);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is iPad or not (last updated 1.7)
+		 * @return boolean True if the browser is iPad otherwise false
+		 */
+		protected function checkBrowseriPad()
+		{
+			if (stripos($this->_agent, 'iPad') !== false) {
+				$this->setVersion(self::VERSION_UNKNOWN);
+				$this->setBrowser(self::BROWSER_IPAD);
+				$this->getSafariVersionOnIos();
+				$this->getChromeVersionOnIos();
+				$this->checkForFacebookIos();
+				$this->setTablet(true);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is iPod or not (last updated 1.7)
+		 * @return boolean True if the browser is iPod otherwise false
+		 */
+		protected function checkBrowseriPod()
+		{
+			if (stripos($this->_agent, 'iPod') !== false) {
+				$this->setVersion(self::VERSION_UNKNOWN);
+				$this->setBrowser(self::BROWSER_IPOD);
+				$this->getSafariVersionOnIos();
+				$this->getChromeVersionOnIos();
+				$this->checkForFacebookIos();
+				$this->setMobile(true);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Android or not (last updated 1.7)
+		 * @return boolean True if the browser is Android otherwise false
+		 */
+		protected function checkBrowserAndroid()
+		{
+			if (stripos($this->_agent, 'Android') !== false) {
+				$aresult = explode(' ', stristr($this->_agent, 'Android'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+				} else {
+					$this->setVersion(self::VERSION_UNKNOWN);
+				}
+				if (stripos($this->_agent, 'Mobile') !== false) {
+					$this->setMobile(true);
+				} else {
+					$this->setTablet(true);
+				}
+				$this->setBrowser(self::BROWSER_ANDROID);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine the user's platform (last updated 1.7)
+		 */
+		protected function checkPlatform()
+		{
+			if (stripos($this->_agent, 'windows') !== false) {
+				$this->_platform = self::PLATFORM_WINDOWS;
+			} else if (stripos($this->_agent, 'iPad') !== false) {
+				$this->_platform = self::PLATFORM_IPAD;
+			} else if (stripos($this->_agent, 'iPod') !== false) {
+				$this->_platform = self::PLATFORM_IPOD;
+			} else if (stripos($this->_agent, 'iPhone') !== false) {
+				$this->_platform = self::PLATFORM_IPHONE;
+			} elseif (stripos($this->_agent, 'mac') !== false) {
+				$this->_platform = self::PLATFORM_APPLE;
+			} elseif (stripos($this->_agent, 'android') !== false) {
+				$this->_platform = self::PLATFORM_ANDROID;
+			} elseif (stripos($this->_agent, 'linux') !== false) {
+				$this->_platform = self::PLATFORM_LINUX;
+			} else if (stripos($this->_agent, 'Nokia') !== false) {
+				$this->_platform = self::PLATFORM_NOKIA;
+			} else if (stripos($this->_agent, 'BlackBerry') !== false) {
+				$this->_platform = self::PLATFORM_BLACKBERRY;
+			} elseif (stripos($this->_agent, 'FreeBSD') !== false) {
+				$this->_platform = self::PLATFORM_FREEBSD;
+			} elseif (stripos($this->_agent, 'OpenBSD') !== false) {
+				$this->_platform = self::PLATFORM_OPENBSD;
+			} elseif (stripos($this->_agent, 'NetBSD') !== false) {
+				$this->_platform = self::PLATFORM_NETBSD;
+			} elseif (stripos($this->_agent, 'OpenSolaris') !== false) {
+				$this->_platform = self::PLATFORM_OPENSOLARIS;
+			} elseif (stripos($this->_agent, 'SunOS') !== false) {
+				$this->_platform = self::PLATFORM_SUNOS;
+			} elseif (stripos($this->_agent, 'OS\/2') !== false) {
+				$this->_platform = self::PLATFORM_OS2;
+			} elseif (stripos($this->_agent, 'BeOS') !== false) {
+				$this->_platform = self::PLATFORM_BEOS;
+			} elseif (stripos($this->_agent, 'win') !== false) {
+				$this->_platform = self::PLATFORM_WINDOWS;
+			}
+
+		}
+	}
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -353,9 +353,9 @@
          */
         public function __toString()
         {
-            return "<strong>Browser Name:</strong> {$this->getBrowser()}<br/>\n" .
-            "<strong>Browser Version:</strong> {$this->getVersion()}<br/>\n" .
-            "<strong>Browser User Agent String:</strong> {$this->getUserAgent()}<br/>\n" .
+            return "<strong>Browser Name:</strong> {$this->getBrowser()}<br/>\n".
+            "<strong>Browser Version:</strong> {$this->getVersion()}<br/>\n".
+            "<strong>Browser User Agent String:</strong> {$this->getUserAgent()}<br/>\n".
             "<strong>Platform:</strong> {$this->getPlatform()}<br/>";
         }
 

Doc Comments +2 added lines, -2 removed lines

@@ -166,7 +166,7 @@ 
 
         /**
          * Set the name of the browser
-         * @param $browser string The name of the Browser
+         * @param string $browser string The name of the Browser
          */
         public function setBrowser($browser)
         {
@@ -274,7 +274,7 @@ 
 
         /**
          * Set the browser to be from AOL
-         * @param $isAol
+         * @param boolean $isAol
          */
         public function setAol($isAol)
         {